ci: add golangci-lint workflow and fix lint errors (#34)

Author: nottrif

.gitattributes

@@ -0,0 +1 @@
+*.go text eol=lf

.github/workflows/golangci-lint.yml

@@ -0,0 +1,54 @@
+name: golangci-lint
+on:
+  push:
+    branches:
+      - main
+  pull_request:
+
+permissions:
+  contents: read
+  # Optional: allow read access to pull request. Use with `only-new-issues` option.
+  pull-requests: read
+
+jobs:
+  golangci:
+    name: lint
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v3
+      - uses: actions/setup-go@v4
+        with:
+          go-version: '1.21'
+          cache: false
+      - name: golangci-lint
+        uses: golangci/golangci-lint-action@v3
+        with:
+          # Require: The version of golangci-lint to use.
+          # When `install-mode` is `binary` (default) the value can be v1.2 or v1.2.3 or `latest` to use the latest version.
+          # When `install-mode` is `goinstall` the value can be v1.2.3, `latest`, or the hash of a commit.
+          version: v1.54
+
+          # Optional: working directory, useful for monorepos
+          # working-directory: somedir
+
+          # Optional: golangci-lint command line arguments.
+          #
+          # Note: By default, the `.golangci.yml` file should be at the root of the repository.
+          # The location of the configuration file can be changed by using `--config=`
+          # args: --timeout=30m --config=/my/path/.golangci.yml --issues-exit-code=0 
+
+          # Optional: show only new issues if it's a pull request. The default value is `false`.
+          only-new-issues: true
+
+          # Optional: if set to true, then all caching functionality will be completely disabled,
+          #           takes precedence over all other caching options.
+          # skip-cache: true
+
+          # Optional: if set to true, then the action won't cache or restore ~/go/pkg.
+          # skip-pkg-cache: true
+
+          # Optional: if set to true, then the action won't cache or restore ~/.cache/go-build.
+          # skip-build-cache: true
+
+          # Optional: The mode to install golangci-lint. It can be 'binary' or 'goinstall'.
+          # install-mode: "goinstall"

internal/pkg/db/memdb_test.go

@@ -55,7 +55,7 @@ func TestGetServiceByID(t *testing.T) {
 	assert.Equal(t, svc, service, "check the service")
 
 	// Test Case 2: get service by id (not found)
-	service, err = db.GetServiceByID("not-found")
+	_, err = db.GetServiceByID("not-found")
 	assert.Equal(t, NotFound, err, "check the error")
 
 	// Test Case 3: Service don't have id
@@ -83,7 +83,7 @@ func TestGetRouteByID(t *testing.T) {
 	assert.Equal(t, route, route1, "check the route")
 
 	// Test Case 2: get route by id (not found)
-	route1, err = db.GetRouteByID("not-found")
+	_, err = db.GetRouteByID("not-found")
 	assert.Equal(t, NotFound, err, "check the error")
 
 	// Test Case 3: Route don't have id

internal/pkg/differ/differ.go

@@ -61,8 +61,6 @@ type Differ struct {
 	localDB      *db.DB
 	localConfig  *types.Configuration
 	remoteConfig *types.Configuration
-
-	evenChan *data.Event
 }
 
 // NewDiffer creates a new Differ object.

internal/pkg/validator/validator.go

@@ -7,14 +7,11 @@ import (
 	"github.com/api7/adc/pkg/api/apisix"
 	"github.com/api7/adc/pkg/api/apisix/types"
 	"github.com/api7/adc/pkg/common"
-	"github.com/api7/adc/pkg/data"
 )
 
 type Validator struct {
 	localConfig *types.Configuration
 	cluster     apisix.Cluster
-
-	evenChan *data.Event
 }
 
 func NewValidator(local *types.Configuration, cluster apisix.Cluster) (*Validator, error) {

test/cli/scaffold/scaffold.go

@@ -47,22 +47,22 @@ func NewScaffold() *Scaffold {
 	})
 
 	ginkgo.AfterEach(func() {
-		for route, _ := range s.routes {
+		for route := range s.routes {
 			s.DeleteRoute(route)
 		}
-		for svc, _ := range s.services {
+		for svc := range s.services {
 			s.DeleteService(svc)
 		}
-		for consumer, _ := range s.consumers {
+		for consumer := range s.consumers {
 			s.DeleteConsumer(consumer)
 		}
-		for globalRule, _ := range s.globalRules {
+		for globalRule := range s.globalRules {
 			s.DeleteGlobalRule(globalRule)
 		}
-		for pluginConfig, _ := range s.pluginConfigs {
+		for pluginConfig := range s.pluginConfigs {
 			s.DeletePluginConfig(pluginConfig)
 		}
-		for consumerGroup, _ := range s.consumerGroups {
+		for consumerGroup := range s.consumerGroups {
 			s.DeleteConsumerGroup(consumerGroup)
 		}
 		for pluginMetadata, _ := range s.pluginMetadatas {

test/cli/suites-consumer/sdk.go

@@ -31,6 +31,7 @@ var _ = ginkgo.Describe("adc APISIX consumer SDK tests", func() {
 				Username: "consumer1",
 			}
 			_, err = s.CreateConsumer(baseConsumer1)
+			gomega.Expect(err).To(gomega.BeNil(), "error while creating consumer")
 
 			// get consumer 1
 			consumer, err = s.GetConsumer("consumer1")

test/cli/suites/dump.go

@@ -71,6 +71,7 @@ version: ""
 			err = s.DeleteService("svc1")
 			gomega.Expect(err).To(gomega.BeNil(), "check service delete")
 			err = s.DeleteService("svc2")
+			gomega.Expect(err).To(gomega.BeNil(), "check service delete")
 		})
 	})
 })

test/cli/suites/sdk.go

@@ -55,6 +55,7 @@ var _ = ginkgo.Describe("adc APISIX SDK tests", func() {
 				ServiceID: "svc1",
 			}
 			_, err = s.CreateRoute(baseRoute1)
+			gomega.Expect(err).To(gomega.BeNil(), "check route creation")
 
 			// get route 1
 			route, err = s.GetRoute("route1")