Add revive linter and enable superfluous-else rule (#1448)

kolide · Nov 8, 2023 · a2ba4c4 · a2ba4c4
1 parent d5cca90
commit a2ba4c4
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 5 deletions.
diff --git a/.golangci.yml b/.golangci.yml
@@ -15,6 +15,7 @@ linters:
     - sqlclosecheck
     - unconvert
     - paralleltest
+    - revive
   disable:
     - errcheck
     - gosec
@@ -32,6 +33,13 @@ linters-settings:
     ignore: github.com/go-kit/kit/log:Log
   gofmt:
     simplify: false
+  revive:
+    rules:
+      - name: superfluous-else
+        severity: warning
+        disabled: false
+        arguments:
+          - "preserveScope"
 
 issues:
   exclude-rules:

diff --git a/cmd/launcher/main.go b/cmd/launcher/main.go
@@ -75,9 +75,9 @@ func main() {
 					logutil.Fatal(logger, err, "exec")
 				}
 				panic("how")
-			} else {
-				level.Debug(logger).Log("msg", "Nothing new")
 			}
+
+			level.Debug(logger).Log("msg", "Nothing new")
 		}
 	}
 

diff --git a/ee/desktop/runner/runner_linux.go b/ee/desktop/runner/runner_linux.go
@@ -126,9 +126,6 @@ func (r *DesktopUsersProcessesRunner) userEnvVars(ctx context.Context, uid strin
 			envVars["DISPLAY"] = r.displayFromXwayland(ctx, int32(uidInt))
 
 			break
-		} else {
-			// Not a graphical session
-			continue
 		}
 	}