From 4fd26fa0fa18687b016239f8d81968bb96fbba10 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan-Otto=20Kr=C3=B6pke?= Date: Sat, 5 Jul 2025 15:32:59 +0200 Subject: [PATCH] update: remove deprecated flags (#2113) --- internal/collector/update/update.go | 42 ----------------------------- 1 file changed, 42 deletions(-) diff --git a/internal/collector/update/update.go b/internal/collector/update/update.go index cd1cb84f..cbdad6e9 100644 --- a/internal/collector/update/update.go +++ b/internal/collector/update/update.go @@ -87,21 +87,6 @@ func NewWithFlags(app *kingpin.Application) *Collector { config: ConfigDefaults, } - var ( - online bool - scrapeInterval time.Duration - ) - - app.Flag( - "collector.updates.online", - "Deprecated: Please use collector.update.online instead", - ).Default(strconv.FormatBool(ConfigDefaults.Online)).BoolVar(&online) - - app.Flag( - "collector.updates.scrape-interval", - "Deprecated: Please use collector.update.scrape-interval instead", - ).Default(ConfigDefaults.ScrapeInterval.String()).DurationVar(&scrapeInterval) - app.Flag( "collector.update.online", "Whether to search for updates online.", @@ -112,33 +97,6 @@ func NewWithFlags(app *kingpin.Application) *Collector { "Define the interval of scraping Windows Update information.", ).Default(ConfigDefaults.ScrapeInterval.String()).DurationVar(&c.config.ScrapeInterval) - app.Action(func(*kingpin.ParseContext) error { - // Use deprecated flags only if new ones weren't explicitly set - if online { - // If the new flag is set, ignore the old one - if !c.config.Online { - c.config.Online = online - } - - slog.Warn("Warning: --collector.updates.online is deprecated, use --collector.update.online instead.", - slog.String("collector", Name), - ) - } - - if scrapeInterval != ConfigDefaults.ScrapeInterval { - // If the new flag is set, ignore the old one - if c.config.ScrapeInterval != scrapeInterval { - c.config.ScrapeInterval = scrapeInterval - } - - slog.Warn("Warning: --collector.updates.scrape-interval is deprecated, use --collector.update.scrape-interval instead.", - slog.String("collector", Name), - ) - } - - return nil - }) - return c }