Merge pull request #318 from aholovko/go_1.18

chore: update to Go 1.18
trustbloc · Jul 19, 2022 · 3a2f412 · 3a2f412
2 parents 740622e + 141b538
commit 3a2f412
Show file tree

Hide file tree

Showing 22 changed files with 48 additions and 2,883 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -7,7 +7,7 @@
 name: "kms ci"
 
 env:
-  GO_VERSION: 1.17
+  GO_VERSION: 1.18
 
 on:
   push:

diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
@@ -7,7 +7,7 @@
 name: "kms release"
 
 env:
-  GO_VERSION: 1.17
+  GO_VERSION: 1.18
 
 on:
   push:

diff --git a/.golangci.yml b/.golangci.yml
@@ -5,6 +5,7 @@
 #
 
 run:
+  go: 1.17
   concurrency: 4
   deadline: 3m
   issues-exit-code: 1
@@ -32,6 +33,11 @@ linters-settings:
     simplify: true
   goimports:
     local-prefixes: github.com/trustbloc/kms
+  gci:
+    sections:
+      - standard
+      - default
+      - prefix(github.com/trustbloc/kms)
   gocyclo:
     min-complexity: 15
   cyclop:
@@ -91,6 +97,14 @@ linters:
     - forbidigo
     - wrapcheck
     - stylecheck
+    - varnamelen
+    - tagliatelle
+    - maintidx
+    - ifshort
+    - golint # deprecated
+    - ireturn
+    - forcetypeassert
+    - promlinter
 
 issues:
   exclude-use-default: false

diff --git a/Makefile b/Makefile
@@ -3,7 +3,7 @@
 # SPDX-License-Identifier: Apache-2.0
 
 GOBIN_PATH      =$(abspath .)/build/bin
-LINT_VERSION    ?=v1.39.0
+LINT_VERSION    ?=v1.44.2
 MOCK_VERSION 	?=v1.6.0
 SWAGGER_VERSION ?=v0.27.0
 SWAGGER_DIR     ="./test/bdd/fixtures/specs"
@@ -13,7 +13,7 @@ DOCKER_OUTPUT_NS      ?=ghcr.io
 KMS_SERVER_IMAGE_NAME ?=trustbloc/kms
 
 ALPINE_VER ?= 3.14
-GO_VER     ?= 1.17
+GO_VER     ?= 1.18
 
 OS := $(shell uname)
 ifeq  ($(OS),$(filter $(OS),Darwin Linux))

diff --git a/cmd/kms-cli/go.mod b/cmd/kms-cli/go.mod
@@ -1,6 +1,10 @@
+// Copyright SecureKey Technologies Inc. All Rights Reserved.
+//
+// SPDX-License-Identifier: Apache-2.0
+
 module github.com/trustbloc/kms/cmd/kms-cli
 
-go 1.17
+go 1.18
 
 require (
 	github.com/spf13/cobra v1.3.0

diff --git a/cmd/kms-cli/go.sum b/cmd/kms-cli/go.sum
diff --git a/cmd/kms-server/go.mod b/cmd/kms-server/go.mod
@@ -4,7 +4,7 @@
 
 module github.com/trustbloc/kms/cmd/kms-server
 
-go 1.17
+go 1.18
 
 require (
 	github.com/aws/aws-sdk-go v1.42.33

diff --git a/cmd/kms-server/go.sum b/cmd/kms-server/go.sum
diff --git a/go.mod b/go.mod
@@ -4,7 +4,7 @@
 
 module github.com/trustbloc/kms
 
-go 1.17
+go 1.18
 
 require (
 	github.com/aws/aws-sdk-go v1.42.33

diff --git a/go.sum b/go.sum
diff --git a/pkg/aws/service_test.go b/pkg/aws/service_test.go
@@ -325,31 +325,31 @@ func (m *mockAWSClient) Sign(input *kms.SignInput) (*kms.SignOutput, error) {
 		return m.signFunc(input)
 	}
 
-	return nil, nil
+	return nil, nil //nolint:nilnil
 }
 
 func (m *mockAWSClient) GetPublicKey(input *kms.GetPublicKeyInput) (*kms.GetPublicKeyOutput, error) {
 	if m.getPublicKeyFunc != nil {
 		return m.getPublicKeyFunc(input)
 	}
 
-	return nil, nil
+	return nil, nil //nolint:nilnil
 }
 
 func (m *mockAWSClient) Verify(input *kms.VerifyInput) (*kms.VerifyOutput, error) {
 	if m.verifyFunc != nil {
 		return m.verifyFunc(input)
 	}
 
-	return nil, nil
+	return nil, nil //nolint:nilnil
 }
 
 func (m *mockAWSClient) DescribeKey(input *kms.DescribeKeyInput) (*kms.DescribeKeyOutput, error) {
 	if m.describeKeyFunc != nil {
 		return m.describeKeyFunc(input)
 	}
 
-	return nil, nil
+	return nil, nil //nolint:nilnil
 }
 
 func (m *mockAWSClient) CreateKeyRequest(input *kms.CreateKeyInput) (req *request.Request,

diff --git a/pkg/controller/mw/authmw/gnapmw/gnap_middleware_test.go b/pkg/controller/mw/authmw/gnapmw/gnap_middleware_test.go
@@ -58,7 +58,7 @@ func TestAccept(t *testing.T) {
 	mw := gnapmw.Middleware{}
 
 	for _, tt := range tests {
-		req, err := http.NewRequestWithContext(context.Background(), "", "", nil)
+		req, err := http.NewRequestWithContext(context.Background(), "", "", http.NoBody)
 		require.NoError(t, err)
 
 		for _, header := range tt.headers {
@@ -155,7 +155,7 @@ func TestMiddleware(t *testing.T) {
 		next := NewMockHTTPHandler(ctrl)
 		next.EXPECT().ServeHTTP(gomock.Any(), gomock.Any()).Times(1)
 
-		req, err := http.NewRequestWithContext(context.Background(), "", "", nil)
+		req, err := http.NewRequestWithContext(context.Background(), "", "", http.NoBody)
 		require.NoError(t, err)
 
 		req.Header.Add("Authorization", "GNAP token")
@@ -205,7 +205,7 @@ func TestMiddleware(t *testing.T) {
 		next := NewMockHTTPHandler(ctrl)
 		next.EXPECT().ServeHTTP(gomock.Any(), gomock.Any()).Times(0)
 
-		req, err := http.NewRequestWithContext(context.Background(), "", "", nil)
+		req, err := http.NewRequestWithContext(context.Background(), "", "", http.NoBody)
 		require.NoError(t, err)
 
 		req.Header.Add("Authorization", "GNAP token")
@@ -234,7 +234,7 @@ func TestMiddleware(t *testing.T) {
 		next := NewMockHTTPHandler(ctrl)
 		next.EXPECT().ServeHTTP(gomock.Any(), gomock.Any()).Times(0)
 
-		req, err := http.NewRequestWithContext(context.Background(), "", "", nil)
+		req, err := http.NewRequestWithContext(context.Background(), "", "", http.NoBody)
 		require.NoError(t, err)
 
 		req.Header.Add("Authorization", "Bearer token")
@@ -263,7 +263,7 @@ func TestMiddleware(t *testing.T) {
 		next := NewMockHTTPHandler(ctrl)
 		next.EXPECT().ServeHTTP(gomock.Any(), gomock.Any()).Times(0)
 
-		req, err := http.NewRequestWithContext(context.Background(), "", "", nil)
+		req, err := http.NewRequestWithContext(context.Background(), "", "", http.NoBody)
 		require.NoError(t, err)
 
 		req.Header.Add("Authorization", "GNAP token")
@@ -292,7 +292,7 @@ func TestMiddleware(t *testing.T) {
 		next := NewMockHTTPHandler(ctrl)
 		next.EXPECT().ServeHTTP(gomock.Any(), gomock.Any()).Times(0)
 
-		req, err := http.NewRequestWithContext(context.Background(), "", "", nil)
+		req, err := http.NewRequestWithContext(context.Background(), "", "", http.NoBody)
 		require.NoError(t, err)
 
 		req.Header.Add("Authorization", "GNAP token")

diff --git a/pkg/controller/mw/authmw/oauthmw/oauth_middleware_test.go b/pkg/controller/mw/authmw/oauthmw/oauth_middleware_test.go
@@ -50,7 +50,7 @@ func TestAccept(t *testing.T) {
 	mw := oauthmw.Middleware{}
 
 	for _, tt := range tests {
-		req, err := http.NewRequestWithContext(context.Background(), "", "", nil)
+		req, err := http.NewRequestWithContext(context.Background(), "", "", http.NoBody)
 		require.NoError(t, err)
 
 		for _, header := range tt.headers {
@@ -70,7 +70,7 @@ func TestMiddleware(t *testing.T) {
 		next := NewMockHTTPHandler(ctrl)
 		next.EXPECT().ServeHTTP(gomock.Any(), gomock.Any()).Times(1)
 
-		req, err := http.NewRequestWithContext(context.Background(), "", "", nil)
+		req, err := http.NewRequestWithContext(context.Background(), "", "", http.NoBody)
 		require.NoError(t, err)
 
 		rr := httptest.NewRecorder()

diff --git a/pkg/controller/mw/authmw/wrap_auth_middleware_test.go b/pkg/controller/mw/authmw/wrap_auth_middleware_test.go
@@ -27,7 +27,7 @@ func TestWrapMiddleware(t *testing.T) {
 
 		auth := authmw.Wrap()(next)
 
-		req, err := http.NewRequestWithContext(context.Background(), "", "", nil)
+		req, err := http.NewRequestWithContext(context.Background(), "", "", http.NoBody)
 		require.NoError(t, err)
 
 		rr := httptest.NewRecorder()
@@ -51,7 +51,7 @@ func TestWrapMiddleware(t *testing.T) {
 
 		auth := authmw.Wrap(mw)(next)
 
-		req, err := http.NewRequestWithContext(context.Background(), "", "", nil)
+		req, err := http.NewRequestWithContext(context.Background(), "", "", http.NoBody)
 		require.NoError(t, err)
 
 		rr := httptest.NewRecorder()

diff --git a/pkg/controller/mw/authmw/zcapmw/zcap_middleware_test.go b/pkg/controller/mw/authmw/zcapmw/zcap_middleware_test.go
@@ -39,7 +39,7 @@ func TestMiddleware(t *testing.T) {
 			server := httptest.NewServer(mw)
 			defer server.Close()
 
-			req, err := http.NewRequest(http.MethodPost, server.URL+rest.KeyPath, nil) // nolint:noctx // ignore
+			req, err := http.NewRequest(http.MethodPost, server.URL+rest.KeyPath, http.NoBody) // nolint:noctx // ignore
 			require.NoError(t, err)
 
 			response, err := http.DefaultClient.Do(req) // nolint:bodyclose // ignore
@@ -77,7 +77,7 @@ func TestMiddleware(t *testing.T) {
 			config := newConfig()
 			mwFactory := Middleware{Config: config, Action: "createKey"}
 
-			req, err := http.NewRequestWithContext(context.Background(), "", "", nil)
+			req, err := http.NewRequestWithContext(context.Background(), "", "", http.NoBody)
 			require.NoError(t, err)
 
 			req.Header.Add("Capability-Invocation", "zcap")

diff --git a/pkg/shamir/provider.go b/pkg/shamir/provider.go
@@ -54,7 +54,7 @@ func CreateProvider(c *ProviderConfig) Provider {
 func (p *provider) FetchSecretShare(subject string) ([]byte, error) {
 	uri := fmt.Sprintf("%s/secret?sub=%s", p.authServerURL, url.QueryEscape(subject))
 
-	req, err := http.NewRequestWithContext(context.Background(), http.MethodGet, uri, nil)
+	req, err := http.NewRequestWithContext(context.Background(), http.MethodGet, uri, http.NoBody)
 	if err != nil {
 		return nil, fmt.Errorf("new request: %w", err)
 	}

diff --git a/pkg/shamir/provider_test.go b/pkg/shamir/provider_test.go
@@ -11,7 +11,7 @@ import (
 	"encoding/base64"
 	"encoding/json"
 	"errors"
-	"io/ioutil"
+	"io"
 	"net/http"
 	"testing"
 
@@ -33,7 +33,7 @@ func TestProvider_FetchSecretShare_Success(t *testing.T) {
 
 	resp := &http.Response{
 		StatusCode: http.StatusOK,
-		Body:       ioutil.NopCloser(bytes.NewBuffer(b)),
+		Body:       io.NopCloser(bytes.NewBuffer(b)),
 	}
 
 	client := NewMockHTTPClient(ctrl)
@@ -64,7 +64,7 @@ func TestProvider_FetchSecretShare_Failed(t *testing.T) {
 
 	resp := &http.Response{
 		StatusCode: http.StatusBadRequest,
-		Body:       ioutil.NopCloser(bytes.NewBuffer(b)),
+		Body:       io.NopCloser(bytes.NewBuffer(b)),
 	}
 
 	client := NewMockHTTPClient(ctrl)

diff --git a/pkg/zcapld/service.go b/pkg/zcapld/service.go
@@ -84,8 +84,7 @@ func (s *Service) SignHeader(req *http.Request, capabilityBytes []byte) (*http.H
 	}
 
 	req.Header.Set(zcapld.CapabilityInvocationHTTPHeader,
-		fmt.Sprintf(`zcap capability="%s",action="%s"`,
-			base64.URLEncoding.EncodeToString(compressedZcap), action))
+		fmt.Sprintf("zcap capability=%q,action=%q", base64.URLEncoding.EncodeToString(compressedZcap), action))
 
 	hs := httpsignatures.NewHTTPSignatures(&zcapld.AriesDIDKeySecrets{})
 	hs.SetSignatureHashAlgorithm(&zcapld.AriesDIDKeySignatureHashAlgorithm{

diff --git a/test/bdd/go.mod b/test/bdd/go.mod
@@ -4,7 +4,7 @@
 
 module github.com/trustbloc/kms/test/bdd
 
-go 1.17
+go 1.18
 
 require (
 	github.com/coreos/go-oidc/v3 v3.1.0
-Original file line number
+Diff line change
@@ Expand Up / @@ -7,7 +7,7 @@ @@
     name: "kms ci"
     env:
-      GO_VERSION: 1.17
+      GO_VERSION: 1.18
     on:
       push:
@@ Expand Down @@