fix linting errors. linting is a necessary evil

Author: jericop

commands/create_stack.go

@@ -86,7 +86,11 @@ func createStackRun(flags createStackFlags) error {
 	if err != nil {
 		return err
 	}
-	defer os.RemoveAll(scratch)
+	defer func() {
+		if err2 := os.RemoveAll(scratch); err2 != nil && err == nil {
+			err = err2
+		}
+	}()
 
 	client, err := ihop.NewClient(scratch)
 	if err != nil {
@@ -127,5 +131,5 @@ func createStackRun(flags createStackFlags) error {
 		}
 	}
 
-	return nil
+	return err // err should be nil here, but return err to catch deferred error
 }

commands/pack.go

@@ -65,7 +65,11 @@ func packRun(flags packFlags) error {
 	if err != nil {
 		return fmt.Errorf("unable to create temporary directory: %s", err)
 	}
-	defer os.RemoveAll(tmpDir)
+	defer func() {
+		if err2 := os.RemoveAll(tmpDir); err2 != nil && err == nil {
+			err = err2
+		}
+	}()
 
 	if flags.extensionTOMLPath != "" {
 		err := packRunExtension(flags, tmpDir)
@@ -91,7 +95,7 @@ func packRun(flags packFlags) error {
 
 	config.Buildpack.Version = flags.version
 
-	fmt.Fprintf(os.Stdout, "Packing %s %s...\n", config.Buildpack.Name, flags.version)
+	_, _ = fmt.Fprintf(os.Stdout, "Packing %s %s...\n", config.Buildpack.Name, flags.version)
 
 	if flags.stack != "" {
 		var filteredDependencies []cargo.ConfigMetadataDependency
@@ -137,7 +141,7 @@ func packRun(flags packFlags) error {
 		return fmt.Errorf("failed to create output: %s", err)
 	}
 
-	return nil
+	return err // err should be nil here, but return err to catch deferred error
 }
 
 func packRunExtension(flags packFlags, tmpDir string) error {
@@ -158,7 +162,7 @@ func packRunExtension(flags packFlags, tmpDir string) error {
 
 	config.Extension.Version = flags.version
 
-	fmt.Fprintf(os.Stdout, "Packing %s %s...\n", config.Extension.Name, flags.version)
+	_, _ = fmt.Fprintf(os.Stdout, "Packing %s %s...\n", config.Extension.Name, flags.version)
 
 	if flags.stack != "" {
 		var filteredDependencies []cargo.ConfigExtensionMetadataDependency

commands/publish_image.go

@@ -52,7 +52,11 @@ func publishImageRun(flags publishImageFlags) error {
 	if err != nil {
 		return err
 	}
-	defer os.RemoveAll(scratch)
+	defer func() {
+		if err2 := os.RemoveAll(scratch); err2 != nil && err == nil {
+			err = err2
+		}
+	}()
 
 	tmpExtractedImage := filepath.Join(scratch, "extracted_image")
 	err = extractTar(flags.imageArchive, tmpExtractedImage)
@@ -71,5 +75,5 @@ func publishImageRun(flags publishImageFlags) error {
 		return err
 	}
 
-	return nil
+	return err // err should be nil here, but return err to catch deferred error
 }

commands/publish_stack.go

@@ -69,7 +69,11 @@ func publishStackRun(flags publishStackFlags) error {
 	if err != nil {
 		return err
 	}
-	defer os.RemoveAll(scratch)
+	defer func() {
+		if err2 := os.RemoveAll(scratch); err2 != nil && err == nil {
+			err = err2
+		}
+	}()
 
 	tmpBuild := filepath.Join(scratch, "build")
 	err = extractTar(flags.buildArchive, tmpBuild)
@@ -100,7 +104,7 @@ func publishStackRun(flags publishStackFlags) error {
 		return err
 	}
 
-	return nil
+	return err // err should be nil here, but return err to catch deferred error
 }
 
 func extractTar(input string, destination string) error {

commands/update_dependencies.go

@@ -101,7 +101,11 @@ func updateDependenciesRun(flags updateDependenciesFlags) error {
 	if err != nil {
 		return fmt.Errorf("failed to open buildpack config file: %w", err)
 	}
-	defer file.Close()
+	defer func() {
+		if err2 := file.Close(); err2 != nil && err == nil {
+			err = err2
+		}
+	}()
 
 	err = cargo.EncodeConfig(file, config)
 	if err != nil {
@@ -110,5 +114,5 @@ func updateDependenciesRun(flags updateDependenciesFlags) error {
 
 	fmt.Println("Updating buildpack.toml with new versions: ", reflect.ValueOf(newVersionsFound).MapKeys())
 
-	return nil
+	return err // err should be nil here, but return err to catch deferred error
 }

integration/create_stack_test.go

@@ -64,7 +64,9 @@ func testCreateStack(t *testing.T, _ spec.G, it spec.S) {
 
 			archive, err := os.Open(filepath.Join(tmpDir, "build.oci"))
 			Expect(err).NotTo(HaveOccurred())
-			defer archive.Close()
+			defer func() {
+				Expect(archive.Close()).To(Succeed())
+			}()
 
 			err = vacation.NewArchive(archive).Decompress(dir)
 			Expect(err).NotTo(HaveOccurred())
@@ -150,7 +152,9 @@ func testCreateStack(t *testing.T, _ spec.G, it spec.S) {
 
 			archive, err := os.Open(filepath.Join(tmpDir, "run.oci"))
 			Expect(err).NotTo(HaveOccurred())
-			defer archive.Close()
+			defer func() {
+				Expect(archive.Close()).NotTo(HaveOccurred())
+			}()
 
 			err = vacation.NewArchive(archive).Decompress(dir)
 			Expect(err).NotTo(HaveOccurred())

integration/init_test.go

@@ -63,7 +63,11 @@ func ExtractFile(file *os.File, name string) ([]byte, *tar.Header, error) {
 	if err != nil {
 		return nil, nil, err
 	}
-	defer gzr.Close()
+	defer func() {
+		if err2 := gzr.Close(); err2 != nil && err == nil {
+			err = err2
+		}
+	}()
 
 	tr := tar.NewReader(gzr)
 

integration/matchers/match_toml_content.go

@@ -5,7 +5,7 @@ import (
 	"os"
 
 	"github.com/onsi/gomega/types"
-	. "github.com/paketo-buildpacks/packit/v2/matchers"
+	"github.com/paketo-buildpacks/packit/v2/matchers"
 )
 
 func MatchTomlContent(expectedFilePath string) types.GomegaMatcher {
@@ -33,7 +33,7 @@ func (m matchTomlContentMatcher) Match(actual interface{}) (bool, error) {
 		return false, err
 	}
 
-	matchTomlMatcher := MatchTOML(expectedContents)
+	matchTomlMatcher := matchers.MatchTOML(expectedContents)
 	return matchTomlMatcher.Match(actualContents)
 }
 

integration/pack_extension_test.go

@@ -243,7 +243,7 @@ func testPackExtension(t *testing.T, context spec.G, it spec.S) {
 						http.NotFound(w, req)
 					}
 
-					fmt.Fprint(w, "dependency-contents")
+					_, _ = fmt.Fprint(w, "dependency-contents")
 				}))
 
 				config, err := cargo.NewExtensionParser().Parse(filepath.Join(extensionDir, "extension.toml"))

integration/pack_test.go

@@ -264,7 +264,7 @@ func testPack(t *testing.T, context spec.G, it spec.S) {
 						http.NotFound(w, req)
 					}
 
-					fmt.Fprint(w, "dependency-contents")
+					_, _ = fmt.Fprint(w, "dependency-contents")
 				}))
 
 				config, err := cargo.NewBuildpackParser().Parse(filepath.Join(buildpackDir, "buildpack.toml"))