fix: linting issues

Author: pacostas

build.go

@@ -45,20 +45,21 @@ func Build(logger scribe.Emitter, reloader Reloader) packit.BuildFunc {
 			arg = fmt.Sprintf("cd %s && %s", projectPath, arg)
 		}
 
-		// ubuntu uses dash as the default shell while ubi uses bash as the default shell
-		// The version of bash on the current ubi images does not work properly with the
-		// signal handling added in the script. Running with bash -c and escaping quotes in
-		// the command changes the behavior so that it matches that when running with dash
-		// This is fixed in more recent versions of bash ( 5.x and greater) but it will be some
-		// time before ubi (and ubuntu it seems) will use that new a version of bash.  This work
-		// around is needed until then.
+		/*
+			Ubuntu uses Dash as the default shell, while UBI uses Bash.
+			The version of Bash on the current UBI images does not properly handle
+			the signal handling logic added in the script. Running the command using bash -c
+			and escaping the quotes changes the behavior to match that of of running with Dash.
+			This issue is fixed in more recent versions of Bash (>=5.x), however until UBI and Ubuntu
+			begin using this version, the following workaround is necesary.
+		*/
 		etcOsReleaseFileContent, err := os.ReadFile(filepath.Join("/etc/os-release"))
 		if err == nil {
 			re := regexp.MustCompile(`ID=(rhel|"rhel")`)
 
 			match := re.FindStringSubmatch(string(etcOsReleaseFileContent))
 			if match != nil {
-				arg = fmt.Sprintf("bash -c \"%s\"", strings.Replace(arg, `"`, `\"`, -1))
+				arg = fmt.Sprintf("bash -c \"%s\"", strings.ReplaceAll(arg, `"`, `\"`))
 			}
 		}
 

integration/app_with_start_cmd_test.go

@@ -89,7 +89,9 @@ func testAppWithStartCmd(t *testing.T, context spec.G, it spec.S) {
 
 			response, err := http.Get(fmt.Sprintf("http://localhost:%s", container.HostPort("8080")))
 			Expect(err).NotTo(HaveOccurred())
-			defer response.Body.Close()
+			defer func() {
+				Expect(response.Body.Close()).To(Succeed())
+			}()
 
 			Expect(response.StatusCode).To(Equal(http.StatusOK))
 
@@ -145,7 +147,9 @@ func testAppWithStartCmd(t *testing.T, context spec.G, it spec.S) {
 
 			response, err := http.Get(fmt.Sprintf("http://localhost:%s", container.HostPort("8080")))
 			Expect(err).NotTo(HaveOccurred())
-			defer response.Body.Close()
+			defer func() {
+				Expect(response.Body.Close()).To(Succeed())
+			}()
 
 			Expect(response.StatusCode).To(Equal(http.StatusOK))
 
@@ -162,7 +166,7 @@ func testAppWithStartCmd(t *testing.T, context spec.G, it spec.S) {
 			Eventually(cLogs).Should(ContainSubstring("start:dev"))
 		})
 
-it("builds a working OCI image and runs a start cmd with arg", func() {
+		it("builds a working OCI image and runs a start cmd with arg", func() {
 			var err error
 			source, err = occam.Source(filepath.Join("testdata", "app_with_start_cmd"))
 			Expect(err).NotTo(HaveOccurred())
@@ -194,7 +198,9 @@ it("builds a working OCI image and runs a start cmd with arg", func() {
 
 			response, err := http.Get(fmt.Sprintf("http://localhost:%s", container.HostPort("8080")))
 			Expect(err).NotTo(HaveOccurred())
-			defer response.Body.Close()
+			defer func() {
+				Expect(response.Body.Close()).To(Succeed())
+			}()
 
 			Expect(response.StatusCode).To(Equal(http.StatusOK))
 

integration/graceful_shutdown_app_test.go

@@ -90,7 +90,9 @@ func testGracefulShutdown(t *testing.T, context spec.G, it spec.S) {
 
 			response, err := http.Get(fmt.Sprintf("http://localhost:%s", container.HostPort("8080")))
 			Expect(err).NotTo(HaveOccurred())
-			defer response.Body.Close()
+			defer func() {
+				Expect(response.Body.Close()).To(Succeed())
+			}()
 
 			Expect(response.StatusCode).To(Equal(http.StatusOK))
 

integration/init_test.go

@@ -52,16 +52,15 @@ var settings struct {
 func TestIntegration(t *testing.T) {
 	Expect := NewWithT(t).Expect
 
-	file, err := os.Open("../integration.json")
+	integrationFile, err := os.Open("../integration.json")
 	Expect(err).NotTo(HaveOccurred())
-	defer file.Close()
-
-	Expect(json.NewDecoder(file).Decode(&settings.Config)).To(Succeed())
-
-	file, err = os.Open("../buildpack.toml")
+	err = json.NewDecoder(integrationFile).Decode(&settings.Config)
 	Expect(err).NotTo(HaveOccurred())
+	Expect(integrationFile.Close()).To(Succeed())
 
-	_, err = toml.NewDecoder(file).Decode(&settings.Buildpack)
+	buildpackFile, err := os.Open("../buildpack.toml")
+	Expect(err).NotTo(HaveOccurred())
+	_, err = toml.NewDecoder(buildpackFile).Decode(&settings.Buildpack)
 	Expect(err).NotTo(HaveOccurred())
 
 	root, err := filepath.Abs("./..")

integration/project_path_test.go

@@ -98,7 +98,9 @@ func testProjectPath(t *testing.T, context spec.G, it spec.S) {
 
 			response, err := http.Get(fmt.Sprintf("http://localhost:%s", container.HostPort("8080")))
 			Expect(err).NotTo(HaveOccurred())
-			defer response.Body.Close()
+			defer func() {
+				Expect(response.Body.Close()).To(Succeed())
+			}()
 
 			Expect(response.StatusCode).To(Equal(http.StatusOK))
 
@@ -161,7 +163,9 @@ func testProjectPath(t *testing.T, context spec.G, it spec.S) {
 
 				response, err := http.Get(fmt.Sprintf("http://localhost:%s", container.HostPort("8080")))
 				Expect(err).NotTo(HaveOccurred())
-				defer response.Body.Close()
+				defer func() {
+					Expect(response.Body.Close()).To(Succeed())
+				}()
 
 				Expect(response.StatusCode).To(Equal(http.StatusOK))