fix: resolve go vet non-constant format string errors and bare DeferCleanup

Author: ramonskie

src/python/finalize/finalize.go

@@ -95,15 +95,15 @@ func (f *Finalizer) HandleCollectstatic() error {
 	f.Log.Info("Running python %s collectstatic --noinput --traceback", managePyPath)
 	output := new(bytes.Buffer)
 	if err = f.Command.Execute(f.Stager.BuildDir(), output, text.NewIndentWriter(os.Stderr, []byte("       ")), "python", managePyPath, "collectstatic", "--noinput", "--traceback"); err != nil {
-		f.Log.Error(fmt.Sprintf(` !     Error while running '$ python %s collectstatic --noinput'.
+		f.Log.Error(` !     Error while running '$ python %s collectstatic --noinput'.
        See traceback above for details.
 
        You may need to update application code to resolve this error.
        Or, you can disable collectstatic for this application:
 
           $ cf set-env <app> DISABLE_COLLECTSTATIC 1
 
-       https://devcenter.heroku.com/articles/django-assets`, managePyPath))
+       https://devcenter.heroku.com/articles/django-assets`, managePyPath)
 		return err
 	}
 

src/python/hooks/appdynamics.go

@@ -123,7 +123,7 @@ func (h AppdynamicsHook) RewriteRequirementsFile(stager *libbuildpack.Stager) er
 		panic(err)
 	}
 	fileContents, _ := os.ReadFile(f.Name())
-	h.Log.Info(string(fileContents))
+	h.Log.Info("%s", string(fileContents))
 
 	return nil
 }
@@ -138,7 +138,7 @@ func (h AppdynamicsHook) RewriteProcFileWithAppdynamics(stager *libbuildpack.Sta
 			return err
 		}
 		fileContents, _ := os.ReadFile(file)
-		h.Log.Info(string(fileContents))
+		h.Log.Info("%s", string(fileContents))
 	} else {
 		h.Log.Info("Cannot find Procfile, skipping this step!")
 	}
@@ -148,7 +148,7 @@ func (h AppdynamicsHook) RewriteProcFileWithAppdynamics(stager *libbuildpack.Sta
 func (h AppdynamicsHook) CreateAppDynamicsEnv(stager *libbuildpack.Stager, environmentVars map[string]string) error {
 	scriptContents := h.GenerateAppdynamicsScript(environmentVars)
 	h.Log.BeginStep("Writing Appdynamics Environment")
-	h.Log.Debug(scriptContents)
+	h.Log.Debug("%s", scriptContents)
 	return stager.WriteProfileD("appdynamics.sh", scriptContents)
 }
 

src/python/hooks/hooks_app.go

@@ -30,7 +30,7 @@ func runHook(scriptName string, compiler *libbuildpack.Stager) error {
 	if exists, err := libbuildpack.FileExists(path); err != nil {
 		return err
 	} else if exists {
-		compiler.Logger().BeginStep("Running " + scriptName + " hook")
+		compiler.Logger().BeginStep("Running %s hook", scriptName)
 		if err := os.Chmod(path, 0755); err != nil {
 			return err
 		}

src/python/hooks/sealights.go

@@ -139,7 +139,7 @@ func (sh SealightsHook) RewriteProcFileWithSealights(stager *libbuildpack.Stager
 		if err != nil {
 			return fmt.Errorf("Error reading file %s: %v", file, err)
 		}
-		sh.Log.Info(string(fileContents))
+		sh.Log.Info("%s", string(fileContents))
 	} else {
 		sh.Log.Info("Cannot find Procfile, skipping this step!")
 	}

src/python/supply/supply.go

@@ -876,7 +876,7 @@ func pipCommand() []string {
 
 func (s *Supplier) runPipInstall(args ...string) error {
 	installCmd := append(append(pipCommand(), "install"), args...)
-	s.Log.Info(strings.Join(installCmd, " "))
+	s.Log.Info("%s", strings.Join(installCmd, " "))
 	return s.Command.Execute(s.Stager.BuildDir(), indentWriter(os.Stdout), indentWriter(os.Stderr), installCmd[0], installCmd[1:]...)
 }
 

src/python/supply/supply_test.go

@@ -393,7 +393,9 @@ var _ = Describe("Supply", func() {
 	})
 
 	Describe("HandleFfi", func() {
-		DeferCleanup(os.Setenv, "LIBFFI", "")
+		BeforeEach(func() {
+			DeferCleanup(os.Setenv, "LIBFFI", "")
+		})
 
 		Context("when the app uses ffi", func() {
 			BeforeEach(func() {
@@ -750,7 +752,9 @@ export GUNICORN_CMD_ARGS=${GUNICORN_CMD_ARGS:-'--access-logfile -'}
 	})
 
 	Describe("SetupCacheDir", func() {
-		DeferCleanup(os.Unsetenv, "XDG_CACHE_HOME")
+		BeforeEach(func() {
+			DeferCleanup(os.Unsetenv, "XDG_CACHE_HOME")
+		})
 
 		It("Sets pip's cache directory", func() {
 			mockStager.EXPECT().WriteEnvFile("XDG_CACHE_HOME", filepath.Join(cacheDir, "pip_cache"))