Several code cleanups prompted by golangci-lint

Signed-off-by: Bryan Boreham <[email protected]>

Author: bboreham

pkg/configs/configs.go

@@ -203,10 +203,8 @@ func (c RulesConfig) parseV2Formatted() (map[string]rulefmt.RuleGroups, error) {
 
 	for fn, content := range c.Files {
 		rgs, errs := rulefmt.Parse([]byte(content))
-		if errs != nil {
-			for _, err := range errs {
-				return nil, err
-			}
+		for _, err := range errs { // return just the first error, if any
+			return nil, err
 		}
 		ruleMap[fn] = *rgs
 

pkg/cortex/modules.go

@@ -312,7 +312,7 @@ func (t *Cortex) initQueryFrontend(cfg *Config) (err error) {
 func (t *Cortex) stopQueryFrontend() (err error) {
 	t.frontend.Close()
 	if t.cache != nil {
-		t.cache.Stop()
+		_ = t.cache.Stop()
 		t.cache = nil
 	}
 	return

pkg/ingester/ingester_v2.go

@@ -407,12 +407,14 @@ func (i *Ingester) getOrCreateTSDB(userID string, force bool) (*tsdb.DB, error)
 	i.done.Add(1)
 	go func() {
 		defer i.done.Done()
-		runutil.Repeat(i.cfg.TSDBConfig.ShipInterval, i.quit, func() error {
+		if err := runutil.Repeat(i.cfg.TSDBConfig.ShipInterval, i.quit, func() error {
 			if uploaded, err := s.Sync(context.Background()); err != nil {
 				level.Warn(util.Logger).Log("err", err, "uploaded", uploaded)
 			}
 			return nil
-		})
+		}); err != nil {
+			level.Warn(util.Logger).Log("err", err)
+		}
 	}()
 
 	i.TSDBState.dbs[userID] = db

pkg/ring/model.go

@@ -171,7 +171,7 @@ func (i *IngesterDesc) IsHealthy(op Operation, heartbeatTimeout time.Duration) b
 		healthy = true
 	}
 
-	return healthy && time.Now().Sub(time.Unix(i.Timestamp, 0)) <= heartbeatTimeout
+	return healthy && time.Since(time.Unix(i.Timestamp, 0)) <= heartbeatTimeout
 }
 
 // Merge merges other ring into this one. Returns sub-ring that represents the change,

pkg/util/limiter/rate_limiter.go

@@ -99,7 +99,7 @@ func (l *RateLimiter) recheckTenantLimiter(now time.Time, tenantID string) *rate
 	l.tenantsLock.Lock()
 	defer l.tenantsLock.Unlock()
 
-	entry, _ := l.tenants[tenantID]
+	entry := l.tenants[tenantID]
 
 	// We check again if the recheck period elapsed, cause it may
 	// have already been rechecked in the meanwhile.