Issue #9: Lint action is failing

- Use latest revive install command. - Fix lint errors. - Adjust lint command in Makefile. No longer needs the return status reversed. Closes #9
sprak3000 · Mar 8, 2024 · 65fd60b · 65fd60b
1 parent 2f6d7b3
commit 65fd60b
Show file tree

Hide file tree

Showing 5 changed files with 18 additions and 16 deletions.
diff --git a/.github/workflows/quality-and-tests.yml b/.github/workflows/quality-and-tests.yml
@@ -16,7 +16,7 @@ jobs:
       - name: Install gotestsum
         run: make install-gotestsum
       - name: Install revive
-        run: go get -u github.com/mgechev/revive
+        run: go install github.com/mgechev/revive@latest
       - name: go mod tidy
         run: go mod tidy
       - name: go mod vendor

diff --git a/Makefile b/Makefile
@@ -13,7 +13,7 @@ analyze: lint vet test ## Run lint, vet, and test
 
 .PHONY: lint
 lint: ## Lint the code
-	@! revive -config .revive.toml ./... | grep -v vendor
+	@ revive -config .revive.toml ./... | grep -v vendor
 
 .PHONY: test
 test: unit-test ## Run the test suite(s).

diff --git a/slack/response_test.go b/slack/response_test.go
@@ -57,38 +57,38 @@ func TestUnit_ReadStatus(t *testing.T) {
 					},
 				},
 			},
-			setupBaseClient: func(t *testing.T, expectedErr glitch.DataError) client.BaseClient {
+			setupBaseClient: func(_ *testing.T, expectedErr glitch.DataError) client.BaseClient {
 				c := clientmock.NewMockBaseClient(ctrl)
 				c.EXPECT().MakeRequest(gomock.Any(), http.MethodGet, "test-slug", nil, gomock.Any(), nil).Return(http.StatusOK, []byte(sampleActiveResp), expectedErr)
 				return c
 			},
-			validate: func(t *testing.T, expectedResp, actualResp status.Details, expectedErr, actualErr glitch.DataError) {
+			validate: func(t *testing.T, expectedResp, actualResp status.Details, _, actualErr glitch.DataError) {
 				require.Equal(t, expectedResp, actualResp)
 				require.NoError(t, actualErr)
 			},
 		},
 		"exceptional path- unable to make client request": {
 			expectedResp: Response{},
 			expectedErr:  glitch.NewDataError(nil, "test-err-code", "test-err"),
-			setupBaseClient: func(t *testing.T, expectedErr glitch.DataError) client.BaseClient {
+			setupBaseClient: func(_ *testing.T, expectedErr glitch.DataError) client.BaseClient {
 				c := clientmock.NewMockBaseClient(ctrl)
 				c.EXPECT().MakeRequest(gomock.Any(), http.MethodGet, "test-slug", nil, gomock.Any(), nil).Return(http.StatusInternalServerError, nil, expectedErr)
 				return c
 			},
-			validate: func(t *testing.T, expectedResp, actualResp status.Details, expectedErr, actualErr glitch.DataError) {
+			validate: func(t *testing.T, expectedResp, actualResp status.Details, _, actualErr glitch.DataError) {
 				require.Equal(t, expectedResp, actualResp)
 				require.Error(t, actualErr)
 				require.Equal(t, status.ErrorUnableToMakeClientRequest, actualErr.Code())
 			},
 		},
 		"exceptional path- unable to parse response": {
 			expectedResp: Response{},
-			setupBaseClient: func(t *testing.T, expectedErr glitch.DataError) client.BaseClient {
+			setupBaseClient: func(_ *testing.T, expectedErr glitch.DataError) client.BaseClient {
 				c := clientmock.NewMockBaseClient(ctrl)
 				c.EXPECT().MakeRequest(gomock.Any(), http.MethodGet, "test-slug", nil, gomock.Any(), nil).Return(http.StatusOK, []byte(`{bad: ^JSON`), expectedErr)
 				return c
 			},
-			validate: func(t *testing.T, expectedResp, actualResp status.Details, expectedErr, actualErr glitch.DataError) {
+			validate: func(t *testing.T, expectedResp, actualResp status.Details, _, actualErr glitch.DataError) {
 				require.Equal(t, expectedResp, actualResp)
 				require.Error(t, actualErr)
 				require.Equal(t, status.ErrorUnableToParseClientResponse, actualErr.Code())

diff --git a/statuspageio/response_test.go b/statuspageio/response_test.go
@@ -41,38 +41,38 @@ func TestUnit_ReadStatus(t *testing.T) {
 					UpdatedAt: sampleOKTime,
 				},
 			},
-			setupBaseClient: func(t *testing.T, expectedErr glitch.DataError) client.BaseClient {
+			setupBaseClient: func(_ *testing.T, expectedErr glitch.DataError) client.BaseClient {
 				c := clientmock.NewMockBaseClient(ctrl)
 				c.EXPECT().MakeRequest(gomock.Any(), http.MethodGet, "test-slug", nil, gomock.Any(), nil).Return(http.StatusOK, []byte(sampleOKResp), expectedErr)
 				return c
 			},
-			validate: func(t *testing.T, expectedResp, actualResp status.Details, expectedErr, actualErr glitch.DataError) {
+			validate: func(t *testing.T, expectedResp, actualResp status.Details, _, actualErr glitch.DataError) {
 				require.Equal(t, expectedResp, actualResp)
 				require.NoError(t, actualErr)
 			},
 		},
 		"exceptional path- unable to make client request": {
 			expectedResp: Response{},
 			expectedErr:  glitch.NewDataError(nil, "test-err-code", "test-err"),
-			setupBaseClient: func(t *testing.T, expectedErr glitch.DataError) client.BaseClient {
+			setupBaseClient: func(_ *testing.T, expectedErr glitch.DataError) client.BaseClient {
 				c := clientmock.NewMockBaseClient(ctrl)
 				c.EXPECT().MakeRequest(gomock.Any(), http.MethodGet, "test-slug", nil, gomock.Any(), nil).Return(http.StatusInternalServerError, nil, expectedErr)
 				return c
 			},
-			validate: func(t *testing.T, expectedResp, actualResp status.Details, expectedErr, actualErr glitch.DataError) {
+			validate: func(t *testing.T, expectedResp, actualResp status.Details, _, actualErr glitch.DataError) {
 				require.Equal(t, expectedResp, actualResp)
 				require.Error(t, actualErr)
 				require.Equal(t, status.ErrorUnableToMakeClientRequest, actualErr.Code())
 			},
 		},
 		"exceptional path- unable to parse response": {
 			expectedResp: Response{},
-			setupBaseClient: func(t *testing.T, expectedErr glitch.DataError) client.BaseClient {
+			setupBaseClient: func(_ *testing.T, expectedErr glitch.DataError) client.BaseClient {
 				c := clientmock.NewMockBaseClient(ctrl)
 				c.EXPECT().MakeRequest(gomock.Any(), http.MethodGet, "test-slug", nil, gomock.Any(), nil).Return(http.StatusOK, []byte(`{bad: ^JSON`), expectedErr)
 				return c
 			},
-			validate: func(t *testing.T, expectedResp, actualResp status.Details, expectedErr, actualErr glitch.DataError) {
+			validate: func(t *testing.T, expectedResp, actualResp status.Details, _, actualErr glitch.DataError) {
 				require.Equal(t, expectedResp, actualResp)
 				require.Error(t, actualErr)
 				require.Equal(t, status.ErrorUnableToParseClientResponse, actualErr.Code())

diff --git a/whatsup/client.go b/whatsup/client.go
@@ -32,7 +32,8 @@ func NewStatusPageClient() StatusPageClient {
 // StatuspageIoService handles fetching statuspage.io style status pages
 func (spc *statusPageClient) StatuspageIoService(serviceName, pageURL string) (status.Details, glitch.DataError) {
 	u, err := url.Parse(pageURL)
-	sf := func(serviceName string, useTLS bool) (url.URL, error) {
+	// No use for service name or use TLS flag here.
+	sf := func(_ string, _ bool) (url.URL, error) {
 		return *u, err
 	}
 	c := client.NewBaseClient(sf, serviceName, true, 10*time.Second, nil)
@@ -43,7 +44,8 @@ func (spc *statusPageClient) StatuspageIoService(serviceName, pageURL string) (s
 func (spc *statusPageClient) Slack() (status.Details, glitch.DataError) {
 	sn := slack.ServiceType
 	u, err := url.Parse("https://status.slack.com/api/v2.0.0/current")
-	sf := func(serviceName string, useTLS bool) (url.URL, error) {
+	// No use for service name or use TLS flag here.
+	sf := func(_ string, _ bool) (url.URL, error) {
 		return *u, err
 	}
 	c := client.NewBaseClient(sf, sn, true, 10*time.Second, nil)