lint fixes

docker · Oct 6, 2024 · cc14e73 · cc14e73
1 parent 18ca016
commit cc14e73
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 14 deletions.
diff --git a/pkg/compose/hash.go b/pkg/compose/hash.go
@@ -20,10 +20,10 @@ import (
 	"bytes"
 	"encoding/json"
 	"fmt"
-	"github.com/docker/compose/v2/pkg/utils"
 	"time"
 
 	"github.com/compose-spec/compose-go/v2/types"
+	"github.com/docker/compose/v2/pkg/utils"
 	"github.com/opencontainers/go-digest"
 )
 
@@ -38,16 +38,16 @@ func ServiceHash(o types.ServiceConfig) (string, error) {
 	}
 	o.DependsOn = nil
 
-	bytes, err := json.Marshal(o)
+	data, err := json.Marshal(o)
 	if err != nil {
 		return "", err
 	}
-	return digest.SHA256.FromBytes(bytes).Encoded(), nil
+	return digest.SHA256.FromBytes(data).Encoded(), nil
 }
 
 // ServiceConfigsHash computes the configuration hash for service configs.
 func ServiceConfigsHash(project *types.Project, serviceConfig types.ServiceConfig) (string, error) {
-	bytes := make([]byte, 0)
+	data := make([]byte, 0)
 	for _, config := range serviceConfig.Configs {
 		file := project.Configs[config.Source]
 		b, err := createTarForConfig(project, types.FileReferenceConfig(config), types.FileObjectConfig(file))
@@ -56,15 +56,15 @@ func ServiceConfigsHash(project *types.Project, serviceConfig types.ServiceConfi
 			return "", err
 		}
 
-		bytes = append(bytes, b.Bytes()...)
+		data = append(data, b.Bytes()...)
 	}
 
-	return digest.SHA256.FromBytes(bytes).Encoded(), nil
+	return digest.SHA256.FromBytes(data).Encoded(), nil
 }
 
 // ServiceSecretsHash computes the configuration hash for service secrets.
 func ServiceSecretsHash(project *types.Project, serviceConfig types.ServiceConfig) (string, error) {
-	bytes := make([]byte, 0)
+	data := make([]byte, 0)
 	for _, secret := range serviceConfig.Secrets {
 		file := project.Secrets[secret.Source]
 		b, err := createTarForConfig(project, types.FileReferenceConfig(secret), types.FileObjectConfig(file))
@@ -73,10 +73,10 @@ func ServiceSecretsHash(project *types.Project, serviceConfig types.ServiceConfi
 			return "", err
 		}
 
-		bytes = append(bytes, b.Bytes()...)
+		data = append(data, b.Bytes()...)
 	}
 
-	return digest.SHA256.FromBytes(bytes).Encoded(), nil
+	return digest.SHA256.FromBytes(data).Encoded(), nil
 }
 
 func createTarForConfig(
@@ -91,9 +91,10 @@ func createTarForConfig(
 		serviceConfig.Target = "/" + serviceConfig.Source
 	}
 
-	if file.Content != "" {
+	switch {
+	case file.Content != "":
 		return bytes.NewBuffer([]byte(file.Content)), nil
-	} else if file.Environment != "" {
+	case file.Environment != "":
 		env, ok := project.Environment[file.Environment]
 		if !ok {
 			return nil, fmt.Errorf(
@@ -103,7 +104,7 @@ func createTarForConfig(
 			)
 		}
 		return bytes.NewBuffer([]byte(env)), nil
-	} else if file.File != "" {
+	case file.File != "":
 		return utils.CreateTarByPath(file.File, modTime)
 	}
 

diff --git a/pkg/utils/tar.go b/pkg/utils/tar.go
@@ -75,7 +75,9 @@ func CreateTar(content []byte, config types.FileReferenceConfig, modTime time.Ti
 func CreateTarByPath(path string, modTime time.Time) (*bytes.Buffer, error) {
 	b := new(bytes.Buffer)
 	tw := tar.NewWriter(b)
-	defer tw.Close()
+	defer func() {
+		_ = tw.Close()
+	}()
 
 	// Walk the directory or file tree at the given path
 	err := filepath.Walk(path, func(file string, fi os.FileInfo, err error) error {
@@ -110,7 +112,9 @@ func CreateTarByPath(path string, modTime time.Time) (*bytes.Buffer, error) {
 			if err != nil {
 				return err
 			}
-			defer f.Close()
+			defer func() {
+				_ = f.Close()
+			}()
 
 			if _, err := io.Copy(tw, f); err != nil {
 				return err