feat: go1.20 and golangci-lint v1.55.2 (#480)

* fix: remove invalid 'unused' config and fix wsl trailing whitespace key name Signed-off-by: mikeee <[email protected]> * fix: disable inamedparam linter Signed-off-by: mikeee <[email protected]> * fix: update package and tool to go1.21.5 Signed-off-by: mikeee <[email protected]> * fix: correct majority of the testifylinter issues relating to error assertions Signed-off-by: mikeee <[email protected]> * fix: reverse actual and expected values Signed-off-by: mikeee <[email protected]> * fix: correct test cases Signed-off-by: mikeee <[email protected]> * fix: correct misspell - upsert Signed-off-by: mikeee <[email protected]> * fix: add missing import Signed-off-by: mikeee <[email protected]> * update: bump validation workflow to 1.21 Signed-off-by: mikeee <[email protected]> * fix: refactor direct access references to proto fields Signed-off-by: mikeee <[email protected]> * fix: revert to go1.20 retaining version-1 support Signed-off-by: mikeee <[email protected]> * fix: update test-dapr-bot workflow golangci-lint ver to 1.55.2 Signed-off-by: mikeee <[email protected]> * fix: fix assertions for dapr-bot and check-lint-version Signed-off-by: mikeee <[email protected]> * fix: remove length function call Signed-off-by: mikeee <[email protected]> * fix: fix StateConsistency logic and add tests to satisfy codecov Signed-off-by: mikeee <[email protected]> * tests: add coverage of empty store names for delete bulk state item method Signed-off-by: mikeee <[email protected]> --------- Signed-off-by: mikeee <[email protected]>
dapr · Dec 11, 2023 · 04f7b59 · 04f7b59
1 parent 959de75
commit 04f7b59
Show file tree

Hide file tree

Showing 53 changed files with 625 additions and 525 deletions.
diff --git a/.github/workflows/dapr-bot.yml b/.github/workflows/dapr-bot.yml
@@ -21,7 +21,7 @@ jobs:
       - name: Setup Golang
         uses: actions/setup-go@v4
         with:
-          go-version: ~1.21
+          go-version: ~1.20
           cache-dependency-path: |
             ./.github/workflows/dapr-bot/
 

diff --git a/.github/workflows/dapr-bot/Makefile b/.github/workflows/dapr-bot/Makefile
@@ -1,4 +1,4 @@
-GO_COMPAT_VERSION=1.21
+GO_COMPAT_VERSION=1.20
 
 .PHONY: cover
 cover:

diff --git a/.github/workflows/dapr-bot/bot_test.go b/.github/workflows/dapr-bot/bot_test.go
@@ -8,9 +8,10 @@ import (
 	"github.com/google/go-github/v55/github"
 	"github.com/jinzhu/copier"
 	"github.com/stretchr/testify/assert"
+	"github.com/stretchr/testify/require"
 )
 
-var testBot *Bot = &Bot{
+var testBot = &Bot{
 	ctx:         context.Background(),
 	issueClient: &testClient{},
 }
@@ -50,7 +51,7 @@ func TestHandleEvent(t *testing.T) {
 		}
 		testEventCopy.IssueCommentEvent.Comment.Body = github.String("/assign")
 		res, err := testBot.HandleEvent(ctx, testEventCopy)
-		assert.NoError(t, err)
+		require.NoError(t, err)
 		assert.NotEmpty(t, res)
 	})
 
@@ -67,7 +68,7 @@ func TestHandleEvent(t *testing.T) {
 		}
 		testEventCopy.IssueCommentEvent.Comment.Body = github.String("/assign \r \ntest body")
 		res, err := testBot.HandleEvent(ctx, testEventCopy)
-		assert.NoError(t, err)
+		require.NoError(t, err)
 		assert.NotEmpty(t, res)
 	})
 
@@ -84,7 +85,7 @@ func TestHandleEvent(t *testing.T) {
 		}
 		testEventCopy.IssueCommentEvent.Comment.Body = github.String("/assign")
 		res, err := testBot.HandleEvent(ctx, testEventCopy)
-		assert.Error(t, err)
+		require.Error(t, err)
 		assert.NotEmpty(t, res)
 	})
 
@@ -99,7 +100,7 @@ func TestHandleEvent(t *testing.T) {
 		}
 		testEventCopy.IssueCommentEvent.Comment.Body = github.String("assign")
 		res, err := testBot.HandleEvent(ctx, testEventCopy)
-		assert.NoError(t, err)
+		require.NoError(t, err)
 		assert.Equal(t, "no command found", res)
 	})
 }
@@ -111,7 +112,7 @@ func TestCreateIssueComment(t *testing.T) {
 		}
 		testBot.issueClient = &tc
 		err := testBot.CreateIssueComment("test", testEvent)
-		assert.Error(t, err)
+		require.Error(t, err)
 	})
 
 	t.Run("create issue comment", func(t *testing.T) {
@@ -120,7 +121,7 @@ func TestCreateIssueComment(t *testing.T) {
 		}
 		testBot.issueClient = &tc
 		err := testBot.CreateIssueComment("test", testEvent)
-		assert.NoError(t, err)
+		require.NoError(t, err)
 	})
 
 	t.Run("create issue comment with empty body", func(t *testing.T) {
@@ -129,7 +130,7 @@ func TestCreateIssueComment(t *testing.T) {
 		}
 		testBot.issueClient = &tc
 		err := testBot.CreateIssueComment("", testEvent)
-		assert.Error(t, err)
+		require.Error(t, err)
 	})
 }
 
@@ -140,7 +141,7 @@ func TestAssignIssueToCommenter(t *testing.T) {
 		}
 		testBot.issueClient = &tc
 		assignee, err := testBot.AssignIssueToCommenter(testEvent)
-		assert.Error(t, err)
+		require.Error(t, err)
 		assert.Empty(t, assignee)
 	})
 
@@ -156,7 +157,7 @@ func TestAssignIssueToCommenter(t *testing.T) {
 		}
 		testEventCopy.IssueCommentEvent.Issue.Assignees = []*github.User{}
 		assignee, err := testBot.AssignIssueToCommenter(testEventCopy)
-		assert.NoError(t, err)
+		require.NoError(t, err)
 		assert.Equal(t, "testCommentLogin", assignee)
 	})
 
@@ -170,7 +171,7 @@ func TestAssignIssueToCommenter(t *testing.T) {
 		}
 		testEventCopy.IssueCommentEvent.Issue.State = github.String("closed")
 		assignee, err := testBot.AssignIssueToCommenter(testEventCopy)
-		assert.Error(t, err)
+		require.Error(t, err)
 		assert.Empty(t, assignee)
 	})
 
@@ -184,7 +185,7 @@ func TestAssignIssueToCommenter(t *testing.T) {
 		}
 		testEventCopy.IssueCommentEvent.Issue.Assignees = []*github.User{{Login: github.String("testCommentLogin")}}
 		assignee, err := testBot.AssignIssueToCommenter(testEventCopy)
-		assert.Error(t, err)
+		require.Error(t, err)
 		assert.Empty(t, assignee)
 	})
 
@@ -200,7 +201,7 @@ func TestAssignIssueToCommenter(t *testing.T) {
 		}
 		testEventCopy.IssueCommentEvent.Issue.Assignees = []*github.User{{Login: github.String("testCommentLogin2")}}
 		assignee, err := testBot.AssignIssueToCommenter(testEventCopy)
-		assert.Error(t, err)
+		require.Error(t, err)
 		assert.Empty(t, assignee)
 	})
 }
diff --git a/.github/workflows/dapr-bot/event_test.go b/.github/workflows/dapr-bot/event_test.go
@@ -8,9 +8,10 @@ import (
 
 	"github.com/google/go-github/v55/github"
 	"github.com/stretchr/testify/assert"
+	"github.com/stretchr/testify/require"
 )
 
-var testEvent Event = Event{
+var testEvent = Event{
 	Type: "issue_comment",
 	Path: "test/test",
 	IssueCommentEvent: &github.IssueCommentEvent{
@@ -36,14 +37,14 @@ func TestProcessEvent(t *testing.T) {
 	}
 	t.Run("process event", func(t *testing.T) {
 		event, err := ProcessEvent(testEvent.Type, testEvent.Path, testEventData)
-		assert.NoError(t, err)
+		require.NoError(t, err)
 		assert.NotNil(t, event)
 		assert.Equal(t, "test/test", event.Path)
 	})
 
 	t.Run("process event with empty path", func(t *testing.T) {
 		event, err := ProcessEvent(testEvent.Type, "", testEventData)
-		assert.Error(t, err)
+		require.Error(t, err)
 		assert.Empty(t, event)
 	})
 
@@ -53,22 +54,22 @@ func TestProcessEvent(t *testing.T) {
 
 	t.Run("process issue_comment event", func(t *testing.T) {
 		event, err := ProcessEvent(testEvent.Type, testEvent.Path, testEventData)
-		assert.NoError(t, err)
+		require.NoError(t, err)
 		assert.NotNil(t, event)
 		assert.Equal(t, "issue_comment", event.Type)
 	})
 
 	t.Run("process invalid event", func(t *testing.T) {
 		event, err := ProcessEvent(testEvent.Type, testEvent.Path, randomData.Bytes())
-		assert.Error(t, err)
+		require.Error(t, err)
 		assert.Empty(t, event)
 	})
 }
 
 func TestGetIssueAssignees(t *testing.T) {
 	t.Run("get assignees", func(t *testing.T) {
 		assignees := testEvent.GetIssueAssignees()
-		assert.Equal(t, 1, len(assignees))
+		assert.Len(t, assignees, 1)
 		assert.Equal(t, "testAssignee", assignees[0])
 	})
 }

diff --git a/.github/workflows/dapr-bot/go.mod b/.github/workflows/dapr-bot/go.mod
@@ -1,6 +1,6 @@
 module github.com/dapr/go-sdk/.github/workflows/dapr-bot
 
-go 1.21
+go 1.20
 
 require (
 	github.com/google/go-github/v55 v55.0.0

diff --git a/.github/workflows/dapr-bot/go.sum b/.github/workflows/dapr-bot/go.sum
@@ -8,7 +8,6 @@ github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c
 github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/google/go-cmp v0.5.2/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
 github.com/google/go-cmp v0.5.9 h1:O2Tfq5qg4qc4AmwVlvv0oLiVAGB7enBSJ2x2DqQFi38=
-github.com/google/go-cmp v0.5.9/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
 github.com/google/go-github/v55 v55.0.0 h1:4pp/1tNMB9X/LuAhs5i0KQAE40NmiR/y6prLNb9x9cg=
 github.com/google/go-github/v55 v55.0.0/go.mod h1:JLahOTA1DnXzhxEymmFF5PP2tSS9JVNj68mSZNDwskA=
 github.com/google/go-querystring v1.1.0 h1:AnCroh3fv4ZBgVIf1Iwtovgjaw/GiKJo8M8yD/fhyJ8=

diff --git a/.github/workflows/release-on-tag.yaml b/.github/workflows/release-on-tag.yaml
@@ -15,7 +15,7 @@ jobs:
     - name: Setup
       uses: actions/setup-go@v3
       with:
-        go-version: ^1.19
+        go-version: ^1.20
 
     - name: Checkout
       uses: actions/checkout@v3

diff --git a/.github/workflows/test-dapr-bot.yml b/.github/workflows/test-dapr-bot.yml
@@ -20,10 +20,10 @@ jobs:
       fail-fast: false
       matrix:
         gover:
-          - "1.21"
+          - "1.20"
     env:
       GOVER: ${{ matrix.gover }}
-      GOLANGCILINT_VER: v1.54.2
+      GOLANGCILINT_VER: v1.55.2
 
     steps:
       - name: Setup

diff --git a/.github/workflows/test-on-push.yaml b/.github/workflows/test-on-push.yaml
@@ -14,12 +14,11 @@ jobs:
       fail-fast: false
       matrix:
         gover:
-          - "1.19"
           - "1.20"
           - "1.21"
     env:
       GOVER: ${{ matrix.gover }}
-      GOLANGCILINT_VER: v1.54.2
+      GOLANGCILINT_VER: v1.55.2
 
     steps:
       - name: Setup

diff --git a/.github/workflows/test-tooling.yml b/.github/workflows/test-tooling.yml
@@ -20,15 +20,15 @@ jobs:
       fail-fast: false
       matrix:
         gover:
-          - "1.21"
+          - "1.20"
         os: 
           - "ubuntu-latest"
           - "windows-latest"
           - "macos-latest"
     runs-on: ${{ matrix.os }}
     env:
       GOVER: ${{ matrix.gover }}
-      GOLANGCILINT_VER: v1.54.2 # Make sure to bump /tools/check-lint-version/main_test.go
+      GOLANGCILINT_VER: v1.55.2 # Make sure to bump /tools/check-lint-version/main_test.go
 
     steps:
       - name: Setup

diff --git a/.golangci.yml b/.golangci.yml
@@ -164,12 +164,6 @@ linters-settings:
     line-length: 120
     # tab width in spaces. Default to 1.
     tab-width: 1
-  unused:
-    # treat code as a program (not a library) and report unused exported identifiers; default is false.
-    # XXX: if you enable this setting, unused will report a lot of false-positives in text editors:
-    # if it's called for subdir of a project it can't find funcs usages. All text editor integrations
-    # with golangci-lint call it on a directory with the changed file.
-    check-exported: false
   unparam:
     # Inspect exported functions, default is false. Set to true if no external program/library imports your code.
     # XXX: if you enable this setting, unparam will report a lot of false-positives in text editors:
@@ -242,7 +236,7 @@ linters-settings:
     # Allow multiline assignments to be cuddled. Default is true.
     allow-multiline-assign: true
     # Allow case blocks to end with a whitespace.
-    allow-case-traling-whitespace: true
+    force-case-trailing-whitespace: 0
     # Allow declarations (var) to be cuddled.
     allow-cuddle-declarations: false
 
@@ -310,6 +304,7 @@ linters:
     - varcheck
     - deadcode
     - golint
+    - inamedparam
 issues:
   exclude-rules:
     - path: .*_test.go

diff --git a/Makefile b/Makefile
@@ -1,6 +1,6 @@
 RELEASE_VERSION  =v1.0.0-rc-3
 GDOC_PORT        =8888
-GO_COMPAT_VERSION=1.19
+GO_COMPAT_VERSION=1.20
 
 .PHONY: all
 all: help

diff --git a/actor/manager/container_test.go b/actor/manager/container_test.go
@@ -72,7 +72,7 @@ func TestContainerInvoke(t *testing.T) {
 	mockCodec.EXPECT().Unmarshal([]byte(param), gomock.Any()).SetArg(1, "param").Return(nil)
 
 	rsp, err := container.Invoke("Invoke", []byte(param))
-	require.Equal(t, 2, len(rsp))
+	require.Len(t, rsp, 2)
 	require.Equal(t, actorErr.Success, err)
 	assert.Equal(t, param, rsp[0].Interface().(string))
 }
diff --git a/client/actor.go b/client/actor.go
@@ -74,7 +74,7 @@ func (c *GRPCClient) InvokeActor(ctx context.Context, in *InvokeActorRequest) (o
 	out = &InvokeActorResponse{}
 
 	if resp != nil {
-		out.Data = resp.Data
+		out.Data = resp.GetData()
 	}
 
 	return out, nil
@@ -421,7 +421,7 @@ func (c *GRPCClient) GetActorState(ctx context.Context, in *GetActorStateRequest
 	if err != nil {
 		return nil, fmt.Errorf("error invoking actor get state %s/%s: %w", in.ActorType, in.ActorID, err)
 	}
-	return &GetActorStateResponse{Data: rsp.Data}, nil
+	return &GetActorStateResponse{Data: rsp.GetData()}, nil
 }
 
 type ActorStateOperation struct {