update linter go version (#264)

* update linter go version * gofumpt files * update linter * fix linting issues * fix linting issues * fix http request * update github action branches * add to skip list * Update actions.yaml --------- Co-authored-by: Shayna Finocchiaro <[email protected]>
dell · Feb 23, 2024 · 2214b85 · 2214b85
1 parent 0fa115f
commit 2214b85
Show file tree

Hide file tree

Showing 79 changed files with 429 additions and 435 deletions.
diff --git a/.github/workflows/linters.yaml b/.github/workflows/linters.yaml
@@ -16,7 +16,7 @@ jobs:
     steps:
       - uses: actions/setup-go@v5
         with:
-          go-version: "1.21"
+          go-version: "1.22"
           cache: false
       - name: Checkout the code
         uses: actions/checkout@v4

diff --git a/.golangci.yaml b/.golangci.yaml
@@ -1,6 +1,5 @@
 run:
   timeout: 20m
-  issue-exit-code: 0 # we will change this later
   tests: true
   skip-dirs-use-default: true
   modules-download-mode: readonly
@@ -26,8 +25,6 @@ linters:
   enable:
     # A stricter replacement for gofmt.
     - gofumpt
-    # Inspects source code for security problems.
-    - gosec
     # Check for correctness of programs.
     - govet
     # Drop-in replacement of golint.

diff --git a/Makefile b/Makefile
@@ -135,3 +135,7 @@ package:
 .PHONY: download-csm-common
 download-csm-common:
 	curl -O -L https://raw.githubusercontent.com/dell/csm/main/config/csm-common.mk
+
+.PHONY: lint
+lint: 
+	golangci-lint run --fix
diff --git a/cmd/karavictl/cmd/cluster_info.go b/cmd/karavictl/cmd/cluster_info.go
@@ -28,7 +28,7 @@ func NewClusterInfoCmd() *cobra.Command {
 		Use:   "cluster-info",
 		Short: "Display the state of resources within the cluster",
 		Long:  `Prints table of resources within the cluster, including their readiness`,
-		Run: func(cmd *cobra.Command, args []string) {
+		Run: func(cmd *cobra.Command, _ []string) {
 			cmdArgs := []string{"kubectl", "get", "deploy", "-n", "karavi"}
 			if v, _ := cmd.Flags().GetBool("watch"); v {
 				cmdArgs = append(cmdArgs, "--watch")

diff --git a/cmd/karavictl/cmd/generate.go b/cmd/karavictl/cmd/generate.go
@@ -26,7 +26,7 @@ func NewGenerateCmd() *cobra.Command {
 		Use:   "generate",
 		Short: "Generate resources for use with Karavi",
 		Long:  `Generates resources for use with Karavi`,
-		Run: func(cmd *cobra.Command, args []string) {
+		Run: func(cmd *cobra.Command, _ []string) {
 			err := cmd.Usage()
 			if err != nil {
 				reportErrorAndExit(JSONOutput, os.Stderr, err)

diff --git a/cmd/karavictl/cmd/generate_admin.go b/cmd/karavictl/cmd/generate_admin.go
@@ -26,7 +26,7 @@ func NewAdminCmd() *cobra.Command {
 		Use:   "admin",
 		Short: "Generate admin token for use with CSM Authorization",
 		Long:  `Generate admin token for use with CSM Authorization`,
-		Run: func(cmd *cobra.Command, args []string) {
+		Run: func(cmd *cobra.Command, _ []string) {
 			err := cmd.Usage()
 			if err != nil {
 				reportErrorAndExit(JSONOutput, os.Stderr, err)

diff --git a/cmd/karavictl/cmd/generate_admin_token.go b/cmd/karavictl/cmd/generate_admin_token.go
@@ -34,7 +34,7 @@ func NewAdminTokenCmd() *cobra.Command {
 		Use:   "token",
 		Short: "Generate tokens for an admin.",
 		Long:  `Generates tokens for an admin.`,
-		RunE: func(cmd *cobra.Command, args []string) error {
+		RunE: func(cmd *cobra.Command, _ []string) error {
 			adminName, err := cmd.Flags().GetString("name")
 			if err != nil {
 				reportErrorAndExit(JSONOutput, cmd.ErrOrStderr(), err)

diff --git a/cmd/karavictl/cmd/generate_admin_token_test.go b/cmd/karavictl/cmd/generate_admin_token_test.go
@@ -29,10 +29,10 @@ func TestGenerateAdminToken(t *testing.T) {
 	}
 	t.Run("it requests creation of admin token", func(t *testing.T) {
 		defer afterFn()
-		JSONOutput = func(w io.Writer, _ interface{}) error {
+		JSONOutput = func(_ io.Writer, _ interface{}) error {
 			return nil
 		}
-		osExit = func(code int) {
+		osExit = func(_ int) {
 		}
 		var gotOutput bytes.Buffer
 

diff --git a/cmd/karavictl/cmd/generate_token.go b/cmd/karavictl/cmd/generate_token.go
@@ -34,7 +34,7 @@ func NewGenerateTokenCmd() *cobra.Command {
 		Use:   "token",
 		Short: "Generate tokens for a tenant.",
 		Long:  `Generates tokens for a tenant.`,
-		RunE: func(cmd *cobra.Command, args []string) error {
+		RunE: func(cmd *cobra.Command, _ []string) error {
 			addr, err := cmd.Flags().GetString("addr")
 			if err != nil {
 				reportErrorAndExit(JSONOutput, cmd.ErrOrStderr(), err)

diff --git a/cmd/karavictl/cmd/role.go b/cmd/karavictl/cmd/role.go
@@ -59,7 +59,7 @@ func NewRoleCmd() *cobra.Command {
 		Use:   "role",
 		Short: "Manage roles",
 		Long:  `Manage roles`,
-		Run: func(cmd *cobra.Command, args []string) {
+		Run: func(cmd *cobra.Command, _ []string) {
 			if err := cmd.Usage(); err != nil {
 				reportErrorAndExit(JSONOutput, cmd.ErrOrStderr(), fmt.Errorf("error: %+v", err))
 			}
@@ -192,7 +192,6 @@ func validatePowerFlexPool(storageSystemDetails System, storageSystemID string,
 		Username: storageSystemDetails.User,
 		Password: storageSystemDetails.Password,
 	})
-
 	if err != nil {
 		return fmt.Errorf("powerflex authentication failed: %+v", err)
 	}
@@ -377,7 +376,6 @@ func createRoleServiceClient(addr string, insecure bool) (pb.RoleServiceClient,
 				})
 			}),
 			grpc.WithInsecure())
-
 		if err != nil {
 			log.Fatal(err)
 		}
@@ -392,7 +390,6 @@ func createRoleServiceClient(addr string, insecure bool) (pb.RoleServiceClient,
 		conn, err = grpc.Dial(addr,
 			grpc.WithTransportCredentials(creds),
 			grpc.WithTimeout(10*time.Second))
-
 		if err != nil {
 			log.Fatal(err)
 		}

diff --git a/cmd/karavictl/cmd/role_create.go b/cmd/karavictl/cmd/role_create.go
@@ -37,7 +37,7 @@ func NewRoleCreateCmd() *cobra.Command {
 		Use:   "create",
 		Short: "Create one or more CSM roles",
 		Long:  `Creates one or more CSM roles`,
-		Run: func(cmd *cobra.Command, args []string) {
+		Run: func(cmd *cobra.Command, _ []string) {
 			outFormat := "failed to create role: %+v\n"
 
 			// parse flags

diff --git a/cmd/karavictl/cmd/role_create_test.go b/cmd/karavictl/cmd/role_create_test.go
@@ -38,21 +38,21 @@ func TestRoleCreateHandler(t *testing.T) {
 	t.Run("it requests creation of a role", func(t *testing.T) {
 		defer afterFn()
 		var gotCalled bool
-		CreateHTTPClient = func(addr string, insecure bool) (api.Client, error) {
+		CreateHTTPClient = func(_ string, _ bool) (api.Client, error) {
 			return &mocks.FakeClient{
-				PostFn: func(ctx context.Context, path string, headers map[string]string, query url.Values, body, resp interface{}) error {
+				PostFn: func(_ context.Context, _ string, _ map[string]string, _ url.Values, _, _ interface{}) error {
 					gotCalled = true
 					return nil
 				},
 			}, nil
 		}
-		ReadAccessAdminToken = func(afile string) (string, string, error) {
+		ReadAccessAdminToken = func(_ string) (string, string, error) {
 			return "AUnumberTokenIsNotWorkingman", "AUnumberTokenIsNotWorkingman", nil
 		}
-		JSONOutput = func(w io.Writer, _ interface{}) error {
+		JSONOutput = func(_ io.Writer, _ interface{}) error {
 			return nil
 		}
-		osExit = func(code int) {
+		osExit = func(_ int) {
 		}
 		var gotOutput bytes.Buffer
 
@@ -70,10 +70,10 @@ func TestRoleCreateHandler(t *testing.T) {
 	})
 	t.Run("it requires a valid role server connection", func(t *testing.T) {
 		defer afterFn()
-		CreateHTTPClient = func(addr string, insecure bool) (api.Client, error) {
+		CreateHTTPClient = func(_ string, _ bool) (api.Client, error) {
 			return nil, errors.New("failed to create role: test server error")
 		}
-		ReadAccessAdminToken = func(afile string) (string, string, error) {
+		ReadAccessAdminToken = func(_ string) (string, string, error) {
 			return "AUnumberTokenIsNotWorkingman", "AUnumberTokenIsNotWorkingman", nil
 		}
 		var gotCode int
@@ -106,14 +106,14 @@ func TestRoleCreateHandler(t *testing.T) {
 	})
 	t.Run("it handles server errors", func(t *testing.T) {
 		defer afterFn()
-		CreateHTTPClient = func(addr string, insecure bool) (api.Client, error) {
+		CreateHTTPClient = func(_ string, _ bool) (api.Client, error) {
 			return &mocks.FakeClient{
-				PostFn: func(ctx context.Context, path string, headers map[string]string, query url.Values, body, resp interface{}) error {
+				PostFn: func(_ context.Context, _ string, _ map[string]string, _ url.Values, _, _ interface{}) error {
 					return errors.New("failed to create role: test error")
 				},
 			}, nil
 		}
-		ReadAccessAdminToken = func(afile string) (string, string, error) {
+		ReadAccessAdminToken = func(_ string) (string, string, error) {
 			return "AUnumberTokenIsNotWorkingman", "AUnumberTokenIsNotWorkingman", nil
 		}
 		var gotCode int

diff --git a/cmd/karavictl/cmd/role_delete.go b/cmd/karavictl/cmd/role_delete.go
@@ -35,7 +35,7 @@ func NewRoleDeleteCmd() *cobra.Command {
 		Use:   "delete",
 		Short: "Delete one or more CSM roles",
 		Long:  `Delete one or mroe CSM roles`,
-		Run: func(cmd *cobra.Command, args []string) {
+		Run: func(cmd *cobra.Command, _ []string) {
 			ctx, cancel := context.WithCancel(context.Background())
 			defer cancel()
 

diff --git a/cmd/karavictl/cmd/role_delete_test.go b/cmd/karavictl/cmd/role_delete_test.go
@@ -38,20 +38,20 @@ func TestRoleDeleteHandler(t *testing.T) {
 	t.Run("it requests creation of a role", func(t *testing.T) {
 		defer afterFn()
 		var gotCalled bool
-		CreateHTTPClient = func(addr string, insecure bool) (api.Client, error) {
+		CreateHTTPClient = func(_ string, _ bool) (api.Client, error) {
 			return &mocks.FakeClient{
-				DeleteFn: func(ctx context.Context, path string, headers map[string]string, query url.Values, body, resp interface{}) error {
+				DeleteFn: func(_ context.Context, _ string, _ map[string]string, _ url.Values, _, _ interface{}) error {
 					gotCalled = true
 					return nil
 				},
 			}, nil
 		}
-		JSONOutput = func(w io.Writer, _ interface{}) error {
+		JSONOutput = func(_ io.Writer, _ interface{}) error {
 			return nil
 		}
-		osExit = func(code int) {
+		osExit = func(_ int) {
 		}
-		ReadAccessAdminToken = func(afile string) (string, string, error) {
+		ReadAccessAdminToken = func(_ string) (string, string, error) {
 			return "AUnumberTokenIsNotWorkingman", "AUnumberTokenIsNotWorkingman", nil
 		}
 		var gotOutput bytes.Buffer
@@ -72,7 +72,7 @@ func TestRoleDeleteHandler(t *testing.T) {
 
 	t.Run("it requires a valid role server connection", func(t *testing.T) {
 		defer afterFn()
-		CreateHTTPClient = func(addr string, insecure bool) (api.Client, error) {
+		CreateHTTPClient = func(_ string, _ bool) (api.Client, error) {
 			return nil, errors.New("failed to delete role: test server error")
 		}
 		var gotCode int
@@ -82,7 +82,7 @@ func TestRoleDeleteHandler(t *testing.T) {
 			done <- struct{}{}
 			done <- struct{}{} // we can't let this function return
 		}
-		ReadAccessAdminToken = func(afile string) (string, string, error) {
+		ReadAccessAdminToken = func(_ string) (string, string, error) {
 			return "AUnumberTokenIsNotWorkingman", "AUnumberTokenIsNotWorkingman", nil
 		}
 		var gotOutput bytes.Buffer
@@ -109,9 +109,9 @@ func TestRoleDeleteHandler(t *testing.T) {
 
 	t.Run("it handles server errors", func(t *testing.T) {
 		defer afterFn()
-		CreateHTTPClient = func(addr string, insecure bool) (api.Client, error) {
+		CreateHTTPClient = func(_ string, _ bool) (api.Client, error) {
 			return &mocks.FakeClient{
-				DeleteFn: func(ctx context.Context, path string, headers map[string]string, query url.Values, body, resp interface{}) error {
+				DeleteFn: func(_ context.Context, _ string, _ map[string]string, _ url.Values, _, _ interface{}) error {
 					return errors.New("failed to delete role: test error")
 				},
 			}, nil
@@ -123,7 +123,7 @@ func TestRoleDeleteHandler(t *testing.T) {
 			done <- struct{}{}
 			done <- struct{}{} // we can't let this function return
 		}
-		ReadAccessAdminToken = func(afile string) (string, string, error) {
+		ReadAccessAdminToken = func(_ string) (string, string, error) {
 			return "AUnumberTokenIsNotWorkingman", "AUnumberTokenIsNotWorkingman", nil
 		}
 		var gotOutput bytes.Buffer

diff --git a/cmd/karavictl/cmd/role_get.go b/cmd/karavictl/cmd/role_get.go
@@ -34,7 +34,7 @@ func NewRoleGetCmd() *cobra.Command {
 		Use:   "get",
 		Short: "Get CSM role",
 		Long:  `Get CSM role`,
-		Run: func(cmd *cobra.Command, args []string) {
+		Run: func(cmd *cobra.Command, _ []string) {
 			ctx, cancel := context.WithCancel(context.Background())
 			defer cancel()
 

diff --git a/cmd/karavictl/cmd/role_get_test.go b/cmd/karavictl/cmd/role_get_test.go
@@ -57,9 +57,9 @@ func TestRoleGetHandler(t *testing.T) {
 			t.Fatal(err)
 		}
 
-		CreateHTTPClient = func(addr string, insecure bool) (api.Client, error) {
+		CreateHTTPClient = func(_ string, _ bool) (api.Client, error) {
 			return &mocks.FakeClient{
-				GetFn: func(ctx context.Context, path string, headers map[string]string, query url.Values, resp interface{}) error {
+				GetFn: func(_ context.Context, _ string, _ map[string]string, _ url.Values, resp interface{}) error {
 					b64Content := base64.StdEncoding.EncodeToString([]byte(b))
 					jsonStr := fmt.Sprintf(`{"role": "%s"}`, b64Content)
 					err = json.Unmarshal([]byte(jsonStr), resp)
@@ -71,9 +71,9 @@ func TestRoleGetHandler(t *testing.T) {
 			}, nil
 		}
 
-		osExit = func(code int) {
+		osExit = func(_ int) {
 		}
-		ReadAccessAdminToken = func(afile string) (string, string, error) {
+		ReadAccessAdminToken = func(_ string) (string, string, error) {
 			return "AUnumberTokenIsNotWorkingman", "AUnumberTokenIsNotWorkingman", nil
 		}
 		var gotOutput bytes.Buffer
@@ -94,7 +94,7 @@ func TestRoleGetHandler(t *testing.T) {
 
 	t.Run("it requires a valid role server connection", func(t *testing.T) {
 		defer afterFn()
-		CreateHTTPClient = func(addr string, insecure bool) (api.Client, error) {
+		CreateHTTPClient = func(_ string, _ bool) (api.Client, error) {
 			return nil, errors.New("failed to get role: test server error")
 		}
 
@@ -105,7 +105,7 @@ func TestRoleGetHandler(t *testing.T) {
 			done <- struct{}{}
 			done <- struct{}{} // we can't let this function return
 		}
-		ReadAccessAdminToken = func(afile string) (string, string, error) {
+		ReadAccessAdminToken = func(_ string) (string, string, error) {
 			return "AUnumberTokenIsNotWorkingman", "AUnumberTokenIsNotWorkingman", nil
 		}
 		var gotOutput bytes.Buffer
@@ -132,14 +132,14 @@ func TestRoleGetHandler(t *testing.T) {
 
 	t.Run("it handles server errors", func(t *testing.T) {
 		defer afterFn()
-		CreateHTTPClient = func(addr string, insecure bool) (api.Client, error) {
+		CreateHTTPClient = func(_ string, _ bool) (api.Client, error) {
 			return &mocks.FakeClient{
-				GetFn: func(ctx context.Context, path string, headers map[string]string, query url.Values, resp interface{}) error {
+				GetFn: func(_ context.Context, _ string, _ map[string]string, _ url.Values, _ interface{}) error {
 					return errors.New("failed to get role: test error")
 				},
 			}, nil
 		}
-		ReadAccessAdminToken = func(afile string) (string, string, error) {
+		ReadAccessAdminToken = func(_ string) (string, string, error) {
 			return "AUnumberTokenIsNotWorkingman", "AUnumberTokenIsNotWorkingman", nil
 		}
 		var gotCode int

diff --git a/cmd/karavictl/cmd/role_list.go b/cmd/karavictl/cmd/role_list.go
@@ -33,7 +33,7 @@ func NewRoleListCmd() *cobra.Command {
 		Use:   "list",
 		Short: "List CSM roles",
 		Long:  `List CSM roles`,
-		Run: func(cmd *cobra.Command, args []string) {
+		Run: func(cmd *cobra.Command, _ []string) {
 			ctx, cancel := context.WithCancel(context.Background())
 			defer cancel()