Enable early-return rule

.golangci.yml

@@ -63,6 +63,8 @@ linters-settings:
         disabled: false
       - name: unreachable-code
         disabled: false
+      - name: early-return
+        disabled: false
 
 issues:
   exclude-rules:

pkg/osquery/runtime/history/storage.go

@@ -19,13 +19,12 @@ func (h *History) load() error {
 
 	var instances []*Instance
 
-	if instancesBytes != nil {
-		if err := json.Unmarshal(instancesBytes, &instances); err != nil {
-			return fmt.Errorf("error unmarshalling osquery_instance_history: %w", err)
-		}
-	} else {
+	if instancesBytes == nil {
 		return nil
 	}
+	if err := json.Unmarshal(instancesBytes, &instances); err != nil {
+		return fmt.Errorf("error unmarshalling osquery_instance_history: %w", err)
+	}
 
 	h.instances = instances
 	return nil

pkg/osquery/runtime/runner.go

@@ -546,24 +546,22 @@ func (r *Runner) launchOsqueryInstance() error {
 				// better for a Limiter
 				maxHealthChecks := 5
 				for i := 1; i <= maxHealthChecks; i++ {
-					if err := r.Healthy(); err != nil {
-						if i == maxHealthChecks {
-							level.Info(o.logger).Log("msg", "Health check failed. Giving up", "attempt", i, "err", err)
-							return fmt.Errorf("health check failed: %w", err)
-						}
-
-						level.Debug(o.logger).Log("msg", "Health check failed. Will retry", "attempt", i, "err", err)
-						time.Sleep(1 * time.Second)
-
-					} else {
-						// err was nil, clear failed
+					err := r.Healthy()
+					if err == nil {
+						// err was nil, clear failed attempts
 						if i > 1 {
 							level.Debug(o.logger).Log("msg", "Health check passed. Clearing error", "attempt", i)
 						}
-
 						break
 					}
 
+					if i == maxHealthChecks {
+						level.Info(o.logger).Log("msg", "Health check failed. Giving up", "attempt", i, "err", err)
+						return fmt.Errorf("health check failed: %w", err)
+					}
+
+					level.Debug(o.logger).Log("msg", "Health check failed. Will retry", "attempt", i, "err", err)
+					time.Sleep(1 * time.Second)
 				}
 			}
 		}