update go to 1.18 (#46)

* update go to 1.18 Signed-off-by: Jonathan Marcantonio <[email protected]> * fix linters Signed-off-by: Jonathan Marcantonio <[email protected]> * fix golangci-lint version Signed-off-by: Jonathan Marcantonio <[email protected]> * enable linters gocognit, nolintlint, typecheck Signed-off-by: Jonathan Marcantonio <[email protected]>
open-cluster-management-io · Jul 7, 2022 · 1184777 · 1184777
1 parent f86f7d9
commit 1184777
Show file tree

Hide file tree

Showing 11 changed files with 62 additions and 140 deletions.
diff --git a/.github/workflows/go-postsubmit.yml b/.github/workflows/go-postsubmit.yml
@@ -8,7 +8,7 @@ on:
 
 env:
   # Common versions
-  GO_VERSION: '1.17'
+  GO_VERSION: '1.18'
   GO_REQUIRED_MIN_VERSION: ''
   GOPATH: '/home/runner/work/multicloud-operators-channel/multicloud-operators-channel/go'
 defaults:

diff --git a/.github/workflows/go-presubmit.yml b/.github/workflows/go-presubmit.yml
@@ -8,7 +8,7 @@ on:
 
 env:
   # Common versions
-  GO_VERSION: '1.17'
+  GO_VERSION: '1.18'
   GO_REQUIRED_MIN_VERSION: ''
   GOPATH: '/home/runner/work/multicloud-operators-channel/multicloud-operators-channel/go'
 defaults:

diff --git a/.github/workflows/go-release.yml b/.github/workflows/go-release.yml
@@ -6,7 +6,7 @@ on:
       - 'v*.*.*'
 env:
   # Common versions
-  GO_VERSION: '1.17'
+  GO_VERSION: '1.18'
   GO_REQUIRED_MIN_VERSION: ''
   GOPATH: '/home/runner/work/multicloud-operators-channel/multicloud-operators-channel/go'
   GITHUB_REF: ${{ github.ref }}

diff --git a/build/Dockerfile.prow b/build/Dockerfile.prow
@@ -1,4 +1,4 @@
-FROM registry.ci.openshift.org/stolostron/builder:go1.17-linux AS builder
+FROM registry.ci.openshift.org/stolostron/builder:go1.18-linux AS builder
 
 WORKDIR /go/src/github.com/stolostron/multicluster-operators-channel
 COPY . .

diff --git a/build/run-code-lint.sh b/build/run-code-lint.sh
@@ -37,7 +37,7 @@ gem install mdl
 gem install awesome_bot
 
 # Install golangci-lint
-curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s -- -b "$(go env GOPATH)"/bin v1.24.0
+curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s -- -b "$(go env GOPATH)"/bin v1.46.2
 
 # Start lint task
 make -f Makefile.prow lint-all
diff --git a/cmd/manager/exec/manager.go b/cmd/manager/exec/manager.go
@@ -55,9 +55,9 @@ import (
 
 // Change below variables to serve metrics on different host or port.
 var (
-	metricsHost             = "0.0.0.0"
-	metricsPort         int = 8384
-	operatorMetricsPort int = 8687
+	metricsHost         = "0.0.0.0"
+	metricsPort         = 8384
+	operatorMetricsPort = 8687
 )
 
 const (

diff --git a/common/config/.golangci.yml b/common/config/.golangci.yml
@@ -1,10 +1,11 @@
 service:
   # When updating this, also update the version stored in docker/build-tools/Dockerfile in the multicloudlab/tools repo.
-  golangci-lint-version: 1.28.x # use the fixed version to not introduce new linters unexpectedly
+  golangci-lint-version: 1.46.x # use the fixed version to not introduce new linters unexpectedly
 run:
   # timeout for analysis, e.g. 30s, 5m, default is 1m
   deadline: 20m
   timeout: 20m
+  go: '1.17'
 
   # which dirs to skip: they won't be analyzed;
   # can use regexp here: generated.*, regexp is applied on full path;
@@ -28,31 +29,56 @@ run:
 linters:
   enable-all: true
   disable:
+    - bodyclose
+    - containedctx
+    - contextcheck
+    - cyclop
     - depguard
     - dupl
+    - forbidigo
+    - funlen
+    - errchkjson
+    - exhaustive
+    - exhaustruct
+    - exhaustivestruct
+    - forcetypeassert
+    - gci
     - gochecknoglobals
     - gochecknoinits
     - goconst
+    - gocritic
     - gocyclo
+    - godot
+    - goerr113
+    - gofumpt
+    - golint
+    - gomnd
+    - gomoddirectives
     - gosec
+    - ifshort
+    - ineffassign
+    - interfacer
+    - ireturn
+    - maintidx 
+    - maligned
     - nakedret
+    - nestif
+    - nilnil
+    - nlreturn
+    - noctx
+    - nonamedreturns
+    - paralleltest
     - prealloc
+    - predeclared
+    - staticcheck
     - scopelint
-    - funlen
-    - bodyclose
-
+    - tagliatelle
+    - tenv
     - testpackage
-    - stylecheck
-    - noctx
-    - gomnd
-    - goerr113
-    - godot
-    - gofumpt
-    - nestif
-    - ineffassign
-
-    - godox
-    - unused
+    - thelper
+    - varnamelen
+    - wastedassign
+    - wrapcheck
   fast: false
 
 linters-settings:
@@ -64,6 +90,10 @@ linters-settings:
     # report about assignment of errors to blank identifier: `num, _ := strconv.Atoi(numStr)`;
     # default is false: such cases aren't reported by default.
     check-blank: false
+  nolintlint:
+    # Disable to ensure that all nolint directives actually have an effect.
+    # Default: false
+    allow-unused: true
   govet:
     # report about shadowed variables
     check-shadowing: false

diff --git a/common/scripts/lint_go.sh b/common/scripts/lint_go.sh
@@ -14,7 +14,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s -- -b $(go env GOPATH)/bin v1.28.3
+curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s -- -b $(go env GOPATH)/bin v1.46.2
 
 export GOLANGCI_LINT_CACHE=/tmp/golangci-cache
 rm -rf $GOLANGCI_LINT_CACHE

diff --git a/go.mod b/go.mod
@@ -1,6 +1,6 @@
 module open-cluster-management.io/multicloud-operators-channel
 
-go 1.17
+go 1.18
 
 require (
 	github.com/aws/aws-sdk-go-v2 v1.13.0

diff --git a/go.sum b/go.sum
diff --git a/pkg/webhook/certificate.go b/pkg/webhook/certificate.go
@@ -201,7 +201,7 @@ func GenerateSelfSignedCACert(cn string) (Certificate, error) {
 
 	priv, err := rsa.GenerateKey(rand.Reader, rsaKeySize)
 	if err != nil {
-		return ca, fmt.Errorf("error generating rsa key: %s", err)
+		return ca, fmt.Errorf("error generating rsa key: %w", err)
 	}
 
 	ca.Cert, ca.Key, err = getCertAndKey(template, priv, template, priv)
@@ -221,7 +221,7 @@ func GenerateSignedCert(cn string, alternateDNS []string, ca Certificate) (Certi
 	signerCert, err := x509.ParseCertificate(decodedSignerCert.Bytes)
 	if err != nil {
 		return cert, fmt.Errorf(
-			"error parsing certificate: decodedSignerCert.Bytes: %s",
+			"error parsing certificate: decodedSignerCert.Bytes: %w",
 			err,
 		)
 	}
@@ -234,7 +234,7 @@ func GenerateSignedCert(cn string, alternateDNS []string, ca Certificate) (Certi
 	signerKey, err := x509.ParsePKCS1PrivateKey(decodedSignerKey.Bytes)
 	if err != nil {
 		return cert, fmt.Errorf(
-			"error parsing prive key: decodedSignerKey.Bytes: %s",
+			"error parsing prive key: decodedSignerKey.Bytes: %w",
 			err,
 		)
 	}
@@ -246,7 +246,7 @@ func GenerateSignedCert(cn string, alternateDNS []string, ca Certificate) (Certi
 
 	priv, err := rsa.GenerateKey(rand.Reader, rsaKeySize)
 	if err != nil {
-		return cert, fmt.Errorf("error generating rsa key: %s", err)
+		return cert, fmt.Errorf("error generating rsa key: %w", err)
 	}
 
 	cert.Cert, cert.Key, err = getCertAndKey(template, priv, signerCert, signerKey)
@@ -295,15 +295,15 @@ func getCertAndKey(
 	)
 
 	if err != nil {
-		return "", "", fmt.Errorf("error creating certificate: %s", err)
+		return "", "", fmt.Errorf("error creating certificate: %w", err)
 	}
 
 	certBuffer := bytes.Buffer{}
 	if err := pem.Encode(
 		&certBuffer,
 		&pem.Block{Type: "CERTIFICATE", Bytes: derBytes},
 	); err != nil {
-		return "", "", fmt.Errorf("error pem-encoding certificate: %s", err)
+		return "", "", fmt.Errorf("error pem-encoding certificate: %w", err)
 	}
 
 	keyBuffer := bytes.Buffer{}
@@ -314,7 +314,7 @@ func getCertAndKey(
 			Bytes: x509.MarshalPKCS1PrivateKey(signeeKey),
 		},
 	); err != nil {
-		return "", "", fmt.Errorf("error pem-encoding key: %s", err)
+		return "", "", fmt.Errorf("error pem-encoding key: %w", err)
 	}
 
 	return certBuffer.String(), keyBuffer.String(), nil