upd lint

Author: vitalii-codefresh

.golangci.yaml

@@ -1,11 +1,9 @@
-# This file contains all available configuration options
-# with their default values.
+version: "2"
 
 # options for analysis running
 run:
-  # https://github.com/golangci/golangci-lint/issues/2649
-  # enable go 1.17 linting, will not allow generics
-  go: "1.17"
+  # Updated to match go.mod version
+  go: "1.25"
 
   # default concurrency is a available CPU number
   concurrency: 4
@@ -17,12 +15,14 @@ run:
   issues-exit-code: 1
 
 linters:
+  default: none
   enable:
     - gocyclo
     - errcheck
     - godox
+
 # all available settings of specific linters
-linters-settings:
+linters.settings:
   errcheck:
     # report about not checking of errors in type assertions: `a := b.(MyStruct)`;
     # default is false: such cases aren't reported by default.

cmd/commands/helm.go

@@ -265,7 +265,7 @@ func getPlatformClient(ctx context.Context, opts *HelmValidateValuesOptions, cod
 	}
 
 	if caCert != "" {
-		defer os.Remove(caCert)
+		defer func() { _ = os.Remove(caCert) }()
 	}
 
 	return cfConfig.NewAdHocClient(ctx, url, cfToken, caCert)
@@ -420,7 +420,7 @@ func checkIngressDef(ctx context.Context, opts *HelmValidateValuesOptions, ingre
 		return err
 	}
 
-	res.Body.Close()
+	_ = res.Body.Close()
 	return nil
 }
 
@@ -462,7 +462,7 @@ func checkGit(ctx context.Context, opts *HelmValidateValuesOptions, values chart
 	}
 
 	if caCert != "" {
-		defer os.Remove(caCert)
+		defer func() { _ = os.Remove(caCert) }()
 	}
 
 	provider, err := git.GetProvider(cliGitProvider, gitApiUrl, caCert)

cmd/commands/helm_test.go

@@ -662,7 +662,7 @@ argo-cd:
 			}
 
 			if got != "" {
-				defer os.Remove(got)
+				defer func() { _ = os.Remove(got) }()
 			}
 
 			if !strings.HasSuffix(got, tt.want) {

cmd/commands/product-release_test.go

@@ -213,7 +213,7 @@ func getProductReleaseJsonStringMock() ([]map[string]any, error) {
 	if err != nil {
 		return nil, err
 	}
-	defer file.Close()
+	defer func() { _ = file.Close() }()
 
 	data, err := io.ReadAll(file)
 	if err != nil {

cmd/commands/runtime.go

@@ -454,7 +454,7 @@ func downloadRuntimeLogs() error {
 	if err != nil {
 		return err
 	}
-	defer response.Body.Close()
+	defer func() { _ = response.Body.Close() }()
 	fullFilename, err := getFullFilename(response)
 	if err != nil {
 		return err
@@ -490,7 +490,7 @@ func downloadFile(response *http.Response, fullFilename string) error {
 	if err != nil {
 		return err
 	}
-	defer fileDescriptor.Close()
+	defer func() { _ = fileDescriptor.Close() }()
 	_, err = io.Copy(fileDescriptor, response.Body)
 	return err
 }

hack/license.go

@@ -59,7 +59,7 @@ func main() {
 		}
 		f, err := os.OpenFile(path, os.O_RDWR, info.Mode())
 		die(err)
-		defer f.Close()
+		defer func() { _ = f.Close() }()
 
 		data, err := io.ReadAll(f)
 		die(err)

internal/git/provider_bitbucket-server.go

@@ -96,7 +96,7 @@ func (bbs *bitbucketServer) checkProjectAdminPermission(ctx context.Context, tok
 	if err != nil {
 		return fmt.Errorf("failed checking Project admin permission: %w", err)
 	}
-	defer res.Body.Close()
+	defer func() { _ = res.Body.Close() }()
 
 	if res.StatusCode != http.StatusBadRequest {
 		return errors.New("git-token is invalid or missing required \"Project admin\" scope")
@@ -112,7 +112,7 @@ func (bbs *bitbucketServer) getCurrentUsername(ctx context.Context, token string
 	if err != nil {
 		return "", fmt.Errorf("failed getting current user: %w", err)
 	}
-	defer res.Body.Close()
+	defer func() { _ = res.Body.Close() }()
 
 	username := res.Header.Get("X-AUSERNAME")
 	if username == "" {

internal/git/provider_bitbucket.go

@@ -123,7 +123,7 @@ func (bb *bitbucket) getCurrentUserScopes(ctx context.Context, token, username s
 	if err != nil {
 		return "", fmt.Errorf("failed getting current user: %w", err)
 	}
-	defer res.Body.Close()
+	defer func() { _ = res.Body.Close() }()
 
 	scopes := res.Header.Get("x-oauth-scopes")
 

internal/git/provider_github.go

@@ -116,7 +116,7 @@ func (g *github) verifyToken(ctx context.Context, token string, requiredScopes [
 	if err != nil {
 		return err
 	}
-	defer res.Body.Close()
+	defer func() { _ = res.Body.Close() }()
 
 	rawScopes := res.Header.Get("X-Oauth-Scopes")
 	if rawScopes == "" {

internal/git/provider_gitlab.go

@@ -98,7 +98,7 @@ func (g *gitlab) checkApiScope(ctx context.Context, token string) error {
 	if err != nil {
 		return fmt.Errorf("failed checking api scope: %w", err)
 	}
-	defer res.Body.Close()
+	defer func() { _ = res.Body.Close() }()
 
 	if res.StatusCode != http.StatusBadRequest {
 		return errors.New("git-token is invalid or missing required \"api\" scope")
@@ -114,7 +114,7 @@ func (g *gitlab) checkTokenType(token string, ctx context.Context) (string, erro
 		return "", fmt.Errorf("failed getting user: %w", err)
 	}
 
-	defer userRes.Body.Close()
+	defer func() { _ = userRes.Body.Close() }()
 
 	bodyBytes, err := io.ReadAll(userRes.Body)
 	if err != nil {