Lint updates

Signed-off-by: James Taylor <[email protected]>

Author: jt-nti

.github/workflows/golangci-lint.yml

@@ -29,4 +29,4 @@ jobs:
       - name: golangci-lint
         uses: golangci/golangci-lint-action@4afd733a84b1f43292c63897423277bb7f4313a9 # v8.0.0
         with:
-          version: v1.62
+          version: v2.1

.golangci.yml

@@ -1,7 +1,6 @@
-run:
-  timeout: 5m
+version: "2"
 linters:
-  disable-all: true
+  default: none
   enable:
     - asciicheck
     - bidichk
@@ -22,23 +21,18 @@ linters:
     - forbidigo
     - forcetypeassert
     - funlen
-    - gci
     - gochecknoglobals
     - gochecknoinits
     - gocognit
     - goconst
     - gocritic
     - gocyclo
     - godot
-    - gofmt
-    - gofumpt
     - goheader
-    - goimports
     - gomoddirectives
     - gomodguard
     - goprintffuncname
     - gosec
-    - gosimple
     - govet
     - grouper
     - importas
@@ -64,30 +58,49 @@ linters:
     - rowserrcheck
     - sqlclosecheck
     - staticcheck
-    - stylecheck
-    - tenv
     - testpackage
     - thelper
     - tparallel
-    - typecheck
     - unconvert
     - unparam
     - unused
     - varnamelen
     - wastedassign
     - whitespace
     - wsl
-linters-settings:
-  errorlint:
-    errorf: true
-  funlen:
-    lines: 100
-  nolintlint:
-    require-explanation: true
-    require-specific: true
-issues:
-  exclude-rules:
-    - path: _test\.go
-      text: "dot-imports"
-      linters:
-        - revive
+  settings:
+    errorlint:
+      errorf: true
+    funlen:
+      lines: 100
+    nolintlint:
+      require-explanation: true
+      require-specific: true
+  exclusions:
+    generated: lax
+    presets:
+      - comments
+      - common-false-positives
+      - legacy
+      - std-error-handling
+    rules:
+      - linters:
+          - revive
+        path: _test\.go
+        text: dot-imports
+    paths:
+      - third_party$
+      - builtin$
+      - examples$
+formatters:
+  enable:
+    - gci
+    - gofmt
+    - gofumpt
+    - goimports
+  exclusions:
+    generated: lax
+    paths:
+      - third_party$
+      - builtin$
+      - examples$

internal/util/k8s.go

@@ -480,7 +480,7 @@ func CreateChaincodeJob(
 		}
 	}
 
-	jobName := jobDefinition.ObjectMeta.Name
+	jobName := jobDefinition.Name
 
 	logger.Debugf(
 		"Creating chaincode job for chaincode ID %s: %s/%s",

test/testscript_helpers.go

@@ -130,19 +130,19 @@ func jobInfoCmd(script *testscript.TestScript, _ bool, args []string) {
 	job := waitForChaincodeJob(script, cfg, cclabel, cchash)
 
 	var err error
-	_, err = script.Stdout().Write([]byte(fmt.Sprintf("Job name: %s\n", job.GetName())))
+	_, err = script.Stdout().Write(fmt.Appendf(nil, "Job name: %s\n", job.GetName()))
 	script.Check(err)
 
-	_, err = script.Stdout().Write([]byte(fmt.Sprintf("Job namespace: %s\n", job.GetNamespace())))
+	_, err = script.Stdout().Write(fmt.Appendf(nil, "Job namespace: %s\n", job.GetNamespace()))
 	script.Check(err)
 
 	for k, v := range job.GetLabels() {
-		_, err = script.Stdout().Write([]byte(fmt.Sprintf("Job label: %s=%s\n", k, v)))
+		_, err = script.Stdout().Write(fmt.Appendf(nil, "Job label: %s=%s\n", k, v))
 		script.Check(err)
 	}
 
 	for k, v := range job.GetAnnotations() {
-		_, err = script.Stdout().Write([]byte(fmt.Sprintf("Job annotation: %s=%s\n", k, v)))
+		_, err = script.Stdout().Write(fmt.Appendf(nil, "Job annotation: %s=%s\n", k, v))
 		script.Check(err)
 	}
 }
@@ -163,36 +163,36 @@ func podInfoCmd(script *testscript.TestScript, _ bool, args []string) {
 	podname := pod.GetName()
 
 	var err error
-	_, err = script.Stdout().Write([]byte(fmt.Sprintf("Pod name: %s\n", podname)))
+	_, err = script.Stdout().Write(fmt.Appendf(nil, "Pod name: %s\n", podname))
 	script.Check(err)
 
-	_, err = script.Stdout().Write([]byte(fmt.Sprintf("Pod namespace: %s\n", pod.GetNamespace())))
+	_, err = script.Stdout().Write(fmt.Appendf(nil, "Pod namespace: %s\n", pod.GetNamespace()))
 	script.Check(err)
 
-	_, err = script.Stdout().Write([]byte(fmt.Sprintf("Pod service account: %s\n", pod.Spec.ServiceAccountName)))
+	_, err = script.Stdout().Write(fmt.Appendf(nil, "Pod service account: %s\n", pod.Spec.ServiceAccountName))
 	script.Check(err)
 
 	for k, v := range pod.GetLabels() {
-		_, err = script.Stdout().Write([]byte(fmt.Sprintf("Pod label: %s=%s\n", k, v)))
+		_, err = script.Stdout().Write(fmt.Appendf(nil, "Pod label: %s=%s\n", k, v))
 		script.Check(err)
 	}
 
 	for k, v := range pod.GetAnnotations() {
-		_, err = script.Stdout().Write([]byte(fmt.Sprintf("Pod annotation: %s=%s\n", k, v)))
+		_, err = script.Stdout().Write(fmt.Appendf(nil, "Pod annotation: %s=%s\n", k, v))
 		script.Check(err)
 	}
 
 	if pod.Spec.Affinity != nil && pod.Spec.Affinity.NodeAffinity.RequiredDuringSchedulingIgnoredDuringExecution != nil {
 		for _, t := range pod.Spec.Affinity.NodeAffinity.RequiredDuringSchedulingIgnoredDuringExecution.NodeSelectorTerms {
 			for _, e := range t.MatchExpressions {
-				_, err = script.Stdout().Write([]byte(fmt.Sprintf("Pod affinity: %v=%v op=%v\n", e.Key, e.Values, e.Operator)))
+				_, err = script.Stdout().Write(fmt.Appendf(nil, "Pod affinity: %v=%v op=%v\n", e.Key, e.Values, e.Operator))
 				script.Check(err)
 			}
 		}
 	}
 
 	for _, t := range pod.Spec.Tolerations {
-		_, err = script.Stdout().Write([]byte(fmt.Sprintf("Pod toleration: %v=%v:%v op=%v for %vs\n", t.Key, t.Value, t.Effect, t.Operator, t.TolerationSeconds)))
+		_, err = script.Stdout().Write(fmt.Appendf(nil, "Pod toleration: %v=%v:%v op=%v for %vs\n", t.Key, t.Value, t.Effect, t.Operator, t.TolerationSeconds))
 		script.Check(err)
 	}
 }