go-lint fixes

Author: daniel-cit

helpers/foundation-deployer/gcp/gcp_test.go

@@ -32,7 +32,7 @@ func TestIsComponentInstalledFound(t *gotest.T) {
 		Runf: func(t testing.TB, cmd string, args ...interface{}) gjson.Result {
 			return gjson.Result{
 				Type: gjson.JSON,
-				Raw:  fmt.Sprintf("%s", string(betaComponents[:])),
+				Raw:  string(betaComponents[:]),
 			}
 		},
 		sleepTime: 1,
@@ -49,7 +49,7 @@ func TestIsComponentInstalledNotFound(t *gotest.T) {
 		Runf: func(t testing.TB, cmd string, args ...interface{}) gjson.Result {
 			return gjson.Result{
 				Type: gjson.JSON,
-				Raw:  fmt.Sprintf("%s", string(betaComponents[:])),
+				Raw:  string(betaComponents[:]),
 			}
 		},
 		sleepTime: 1,

helpers/foundation-deployer/stages/data.go

@@ -320,11 +320,11 @@ func ReadGlobalTFVars(file string) (GlobalTFVars, error) {
 	}
 	_, err := os.Stat(file)
 	if os.IsNotExist(err) {
-		return globalTfvars, fmt.Errorf("tfvars file '%s' does not exits\n", file)
+		return globalTfvars, fmt.Errorf("tfvars file '%s' does not exits", file)
 	}
 	err = utils.ReadTfvars(file, &globalTfvars)
 	if err != nil {
-		return globalTfvars, fmt.Errorf("Failed to load tfvars file %s. Error: %s\n", file, err.Error())
+		return globalTfvars, fmt.Errorf("failed to load tfvars file %s. Error: %s", file, err.Error())
 	}
 	return globalTfvars, nil
 }

helpers/foundation-deployer/stages/validate.go

@@ -33,11 +33,11 @@ const (
 func ValidateDirectories(g GlobalTFVars) error {
 	_, err := os.Stat(g.FoundationCodePath)
 	if os.IsNotExist(err) {
-		return fmt.Errorf("Stopping execution, FoundationCodePath directory '%s' does not exits\n", g.FoundationCodePath)
+		return fmt.Errorf("stopping execution, FoundationCodePath directory '%s' does not exits", g.FoundationCodePath)
 	}
 	_, err = os.Stat(g.CodeCheckoutPath)
 	if os.IsNotExist(err) {
-		return fmt.Errorf("Stopping execution, CodeCheckoutPath directory '%s' does not exits\n", g.CodeCheckoutPath)
+		return fmt.Errorf("stopping execution, CodeCheckoutPath directory '%s' does not exits", g.CodeCheckoutPath)
 	}
 	return nil
 }
@@ -56,7 +56,7 @@ func ValidateComponents(t testing.TB) error {
 		}
 	}
 	if len(missing) > 0 {
-		return fmt.Errorf("Missing Google Cloud SDK component:%v", missing)
+		return fmt.Errorf("missing Google Cloud SDK component:%v", missing)
 	}
 	return nil
 }

helpers/foundation-deployer/stages/vet.go

@@ -51,22 +51,35 @@ func TerraformVet(t testing.TB, terraformDir, policyPath, project string) error
 		return err
 	}
 	jsonFile, err := utils.WriteTmpFileWithExtension(jsonPlan, "json")
-	defer os.Remove(jsonFile)
-	defer os.Remove(options.PlanFilePath)
+
+	defer func() {
+		err := os.Remove(jsonFile)
+		if err != nil {
+			fmt.Fprintf(os.Stderr, "Error removing file: %s\n", err)
+		}
+	}()
+
+	defer func() {
+		err := os.Remove(options.PlanFilePath)
+		if err != nil {
+			fmt.Fprintf(os.Stderr, "Error removing file: %s\n", err)
+		}
+	}()
+
 	if err != nil {
 		return err
 	}
 	command := fmt.Sprintf("beta terraform vet %s --policy-library=%s --project=%s --quiet", jsonFile, policyPath, project)
 	result, err := gcloud.RunCmdE(t, command)
-	if err != nil && !(strings.Contains(err.Error(), "Validating resources") && strings.Contains(err.Error(), "done")) {
+	if err != nil && (!strings.Contains(err.Error(), "Validating resources") || !strings.Contains(err.Error(), "done")) {
 		return err
 	}
 	if !gjson.Valid(result) {
-		return fmt.Errorf("Error parsing output, invalid json: %s", result)
+		return fmt.Errorf("error parsing output, invalid json: %s", result)
 	}
 
 	if len(gjson.Parse(result).Array()) > 0 {
-		return fmt.Errorf("Policy violations found: %s", result)
+		return fmt.Errorf("policy violations found: %s", result)
 	}
 	fmt.Println("")
 	fmt.Println("# The configuration passed tf vet.")

helpers/foundation-deployer/utils/files.go

@@ -74,7 +74,7 @@ func ReplaceStringInFile(filename, old, new string) error {
 	if err != nil {
 		return err
 	}
-	return os.WriteFile(filename, bytes.Replace(f, []byte(old), []byte(new), -1), 0644)
+	return os.WriteFile(filename, bytes.ReplaceAll(f, []byte(old), []byte(new)), 0644)
 }
 
 // FindFiles find files with the given filename under the directory skipping terraform temp dir.

helpers/foundation-deployer/utils/logger.go

@@ -32,7 +32,10 @@ func NewCustomLogger() CustomLogger {
 	}
 }
 func (c CustomLogger) Logf(t grunttest.TestingT, format string, args ...interface{}) {
-	fmt.Fprintln(os.Stdout, fmt.Sprintf(c.baseFmt, fmt.Sprintf(format, args...)))
+	_, err := fmt.Fprintln(os.Stdout, fmt.Sprintf(c.baseFmt, fmt.Sprintf(format, args...)))
+	if err != nil {
+        fmt.Fprintf(os.Stderr, "Error writing log: %s\n", err)
+    }
 }
 
 func GetLogger(quiet bool) *logger.Logger {