fix: all linter warnings

Author: d-led

cmd/root.go

@@ -69,22 +69,21 @@ func Execute() {
 
 func init() {
 	cobra.OnInitialize(initConfig)
+	registerRootPersistentFlags()
+	SetUpViper()
+}
 
-	// Here you will define your flags and configuration settings.
-	// Cobra supports persistent flags, which, if defined here,
-	// will be global for your application.
-
+func defaultConfigHome() string {
 	home := "$HOME"
-
 	if homeString, err := homedir.Dir(); err == nil {
 		if expandedHomeString, err := homedir.Expand(homeString); err == nil {
 			home = expandedHomeString
 		}
 	}
+	return home
+}
 
-	rootCmd.PersistentFlags().StringVar(&cfgFile, "config", "", "config file (default is "+filepath.Join(home, ".link-checker-service.toml)"))
-
-	// HTTP client
+func registerHTTPClientPersistentFlags() {
 	rootCmd.PersistentFlags().StringP(proxyKey, "", "", "HTTP client: proxy server to use, e.g. http://myproxy:8080")
 	_ = viper.BindPFlag(proxyKey, rootCmd.PersistentFlags().Lookup(proxyKey))
 	rootCmd.PersistentFlags().StringP(pacScriptURLKey, "", "", "HTTP client: PAC script URL, e.g. http://myproxy/proxy.pac")
@@ -106,11 +105,9 @@ func init() {
 	_ = viper.BindPFlag(httpClientMapKey+enableRequestTracingKey, rootCmd.PersistentFlags().Lookup(enableRequestTracingKey))
 	rootCmd.PersistentFlags().Uint(limitBodyToNBytesKey, 0, "HTTP client: maximum number of bytes to read from the body when searching for patterns. Unlimited if 0!")
 	_ = viper.BindPFlag(httpClientMapKey+limitBodyToNBytesKey, rootCmd.PersistentFlags().Lookup(limitBodyToNBytesKey))
-	// service
-	rootCmd.PersistentFlags().UintP(maxConcurrentHTTPRequestsKey, "c", 256, "maximum number of total concurrent HTTP requests")
-	_ = viper.BindPFlag(maxConcurrentHTTPRequestsKey, rootCmd.PersistentFlags().Lookup(maxConcurrentHTTPRequestsKey))
+}
 
-	// cache
+func registerCachePersistentFlags() {
 	rootCmd.PersistentFlags().String(cacheExpirationIntervalKey, "24h", "Expire each URL check result after <interval> (in ns/us/ms/s/m/h)")
 	_ = viper.BindPFlag(cacheExpirationIntervalKey, rootCmd.PersistentFlags().Lookup(cacheExpirationIntervalKey))
 	rootCmd.PersistentFlags().String(cacheCleanupIntervalKey, "48h", "Interval between cache cleanups (in ns/us/ms/s/m/h)")
@@ -121,6 +118,11 @@ func init() {
 	_ = viper.BindPFlag(cacheMaxSizeKey, rootCmd.PersistentFlags().Lookup(cacheMaxSizeKey))
 	rootCmd.PersistentFlags().Int64(cacheNumCountersKey, 10_000_000, "Number of 4-bit access counters. Set at approx 10x max unique expected URLs (when cacheUseRistretto enabled)")
 	_ = viper.BindPFlag(cacheNumCountersKey, rootCmd.PersistentFlags().Lookup(cacheNumCountersKey))
+}
+
+func registerServicePersistentFlags() {
+	rootCmd.PersistentFlags().UintP(maxConcurrentHTTPRequestsKey, "c", 256, "maximum number of total concurrent HTTP requests")
+	_ = viper.BindPFlag(maxConcurrentHTTPRequestsKey, rootCmd.PersistentFlags().Lookup(maxConcurrentHTTPRequestsKey))
 
 	rootCmd.PersistentFlags().String(retryFailedAfterKey, "30s", "If a URL check failed, e.g. intermittently, re-run it after <interval>  (in ns/us/ms/s/m/h)")
 	_ = viper.BindPFlag(retryFailedAfterKey, rootCmd.PersistentFlags().Lookup(retryFailedAfterKey))
@@ -137,12 +139,14 @@ func init() {
 	rootCmd.PersistentFlags().StringSliceP(urlCheckerPluginsKey, "p", []string{"urlcheck"},
 		"provide a list of URL checkers. Additionally, 'urlcheck-noproxy' can be used if a proxy is defined, and an additional check without a proxy makes sense. The argument sequence is the checker sequence.")
 	_ = viper.BindPFlag(urlCheckerPluginsKey, rootCmd.PersistentFlags().Lookup(urlCheckerPluginsKey))
+}
 
-	SetUpViper()
-
-	// Cobra also supports local flags, which will only run
-	// when this action is called directly.
-	// rootCmd.Flags().BoolP("toggle", "t", false, "Help message for toggle")
+func registerRootPersistentFlags() {
+	home := defaultConfigHome()
+	rootCmd.PersistentFlags().StringVar(&cfgFile, "config", "", "config file (default is "+filepath.Join(home, ".link-checker-service.toml)"))
+	registerHTTPClientPersistentFlags()
+	registerCachePersistentFlags()
+	registerServicePersistentFlags()
 }
 
 // SetUpViper configures environment variable and global flag handling

cmd/serve.go

@@ -69,7 +69,7 @@ func fetchConfig() {
 	if viper.Get(domainBlacklistGlobsKey) != nil {
 		g := viper.GetStringSlice(domainBlacklistGlobsKey)
 		// empty string slice config creates a single slice with a "[]" -> fix
-		if g != nil && !(len(g) == 1 && g[0] == "[]") {
+		if g != nil && (len(g) != 1 || g[0] != "[]") {
 			domainBlacklistGlobs = viper.GetStringSlice(domainBlacklistGlobsKey)
 		}
 	}

infrastructure/cache.go

@@ -50,7 +50,9 @@ func (c defaultCache) Get(url string) (*URLCheckResult, bool) {
 	value, found := c.cache.Get(url)
 
 	if found {
-		return value.(*URLCheckResult), true
+		if v, ok := value.(*URLCheckResult); ok {
+			return v, true
+		}
 	}
 
 	return nil, false

infrastructure/domain_rate_limited_checker.go

@@ -49,7 +49,13 @@ func (c *DomainRateLimitedChecker) CheckURL(ctx context.Context, url string) *UR
 	if limiterInstance, ok := c.domains.Load(key); !ok {
 		limiter = rate.NewLimiter(c.ratePerSecond /*per second*/, 1 /*burst*/)
 	} else {
-		limiter = limiterInstance.(*rate.Limiter)
+		l, typeOK := limiterInstance.(*rate.Limiter)
+		if !typeOK {
+			limiter = rate.NewLimiter(c.ratePerSecond, 1)
+			c.domains.Store(key, limiter)
+		} else {
+			limiter = l
+		}
 	}
 	if err := limiter.Wait(ctx); err != nil {
 		nowEpoch := time.Now().Unix()
@@ -58,7 +64,7 @@ func (c *DomainRateLimitedChecker) CheckURL(ctx context.Context, url string) *UR
 		return &URLCheckResult{
 			Status:                Dropped,
 			Code:                  CustomHTTPErrorCode,
-			Error:                 fmt.Errorf("domain rate limiter aborted: %v", err),
+			Error:                 fmt.Errorf("domain rate limiter aborted: %w", err),
 			FetchedAtEpochSeconds: nowEpoch,
 			BodyPatternsFound:     []string{},
 		}