Linter update + add revive rules (#3127)

* Linter update + add revive rules

Signed-off-by: Steve Coffman <steve@khanacademy.org>

* More revive lints

Signed-off-by: Steve Coffman <steve@khanacademy.org>

---------

Signed-off-by: Steve Coffman <steve@khanacademy.org>

.github/workflows/lint.yml

@@ -13,7 +13,7 @@ concurrency:
 jobs:
   golangci-lint:
     env:
-      GOLANGCI_LINT_VERSION: v1.59.0
+      GOLANGCI_LINT_VERSION: v1.59.1
     strategy:
       matrix:
         go: ["1.21", "1.22"]

.golangci.yml

@@ -28,6 +28,30 @@ linters-settings:
     rules:
       - name: empty-lines
       - name: use-any
+      - name: struct-tag
+      - name: blank-imports
+      - name: context-as-argument
+      - name: context-keys-type
+      - name: error-return
+      - name: error-naming
+      - name: exported
+        disabled: true
+      - name: if-return
+      - name: increment-decrement
+      - name: var-declaration
+      - name: package-comments
+        disabled: true
+      - name: range
+      - name: receiver-naming
+      - name: time-naming
+      - name: unexported-return
+      - name: indent-error-flow
+      - name: errorf
+      - name: superfluous-else
+      - name: unused-parameter
+        disabled: true
+      - name: unreachable-code
+      - name: redefines-builtin-id
   testifylint:
     disable-all: true
     enable:

graphql/handler/transport/websocket.go

@@ -193,7 +193,7 @@ func (c *wsConnection) init() bool {
 			}
 		}
 
-		var initAckPayload *InitPayload = nil
+		var initAckPayload *InitPayload
 		if c.InitFunc != nil {
 			var ctx context.Context
 			ctx, initAckPayload, err = c.InitFunc(c.ctx, c.initPayload)

internal/code/imports.go

@@ -102,21 +102,21 @@ func goModuleRoot(dir string) (string, bool) {
 			// go.mod is not found in the tree, so the same sentinel value fits all the directories in a tree
 			goModuleRootCache[d] = result
 		} else {
-			if relPath, err := filepath.Rel(result.goModPath, d); err != nil {
+			relPath, err := filepath.Rel(result.goModPath, d)
+			if err != nil {
 				panic(err)
-			} else {
-				path := result.moduleName
-				relPath := filepath.ToSlash(relPath)
-				if !strings.HasSuffix(relPath, "/") {
-					path += "/"
-				}
-				path += relPath
-
-				goModuleRootCache[d] = goModuleSearchResult{
-					path:       path,
-					goModPath:  result.goModPath,
-					moduleName: result.moduleName,
-				}
+			}
+			path := result.moduleName
+			relPath = filepath.ToSlash(relPath)
+			if !strings.HasSuffix(relPath, "/") {
+				path += "/"
+			}
+			path += relPath
+
+			goModuleRootCache[d] = goModuleSearchResult{
+				path:       path,
+				goModPath:  result.goModPath,
+				moduleName: result.moduleName,
 			}
 		}
 	}

main.go

@@ -187,10 +187,7 @@ var generateCmd = &cli.Command{
 			}
 		}
 
-		if err = api.Generate(cfg); err != nil {
-			return err
-		}
-		return nil
+		return api.Generate(cfg)
 	},
 }
 

plugin/modelgen/models.go

@@ -292,18 +292,17 @@ func (m *Plugin) MutateConfig(cfg *config.Config) error {
 			getter += "\treturn interfaceSlice\n"
 			getter += "}"
 			return getter
-		} else {
-			getter := fmt.Sprintf("func (this %s) Get%s() %s { return ", templates.ToGo(model.Name), field.GoName, goType)
-
-			if interfaceFieldTypeIsPointer && !structFieldTypeIsPointer {
-				getter += "&"
-			} else if !interfaceFieldTypeIsPointer && structFieldTypeIsPointer {
-				getter += "*"
-			}
+		}
+		getter := fmt.Sprintf("func (this %s) Get%s() %s { return ", templates.ToGo(model.Name), field.GoName, goType)
 
-			getter += fmt.Sprintf("this.%s }", field.GoName)
-			return getter
+		if interfaceFieldTypeIsPointer && !structFieldTypeIsPointer {
+			getter += "&"
+		} else if !interfaceFieldTypeIsPointer && structFieldTypeIsPointer {
+			getter += "*"
 		}
+
+		getter += fmt.Sprintf("this.%s }", field.GoName)
+		return getter
 	}
 	funcMap := template.FuncMap{
 		"getInterfaceByName": getInterfaceByName,