code review fixes

Author: daniel-cit

0-bootstrap/README-GitLab.md

@@ -218,7 +218,7 @@ Run the `0-bootstrap/scripts/git_create_branches_helper.sh` script to create the
    cd ./envs/shared
    ```
 
-1. Run the helper script `choose_build_type.sh` to enable Bootstrap GitHub version
+1. Run the helper script `choose_build_type.sh` to enable Bootstrap GitLab version
    ```bash
    ./scripts/choose_build_type.sh gitlab
    ```

0-bootstrap/README-Jenkins.md

@@ -139,7 +139,7 @@ You arrived to these instructions because you are using the `jenkins_bootstrap`
    cd ./envs/shared
    ```
 
-1. Run the helper script `choose_build_type.sh` to enable Bootstrap GitHub version
+1. Run the helper script `choose_build_type.sh` to enable Bootstrap Jenkins version
    ```bash
    ./scripts/choose_build_type.sh jenkins
    ```

0-bootstrap/README-Terraform-Cloud.md

@@ -136,7 +136,7 @@ You must be authenticated to the VCS provider. See [GitHub authentication](https
    cd ./envs/shared
    ```
 
-1. Run the helper script `choose_build_type.sh` to enable Bootstrap GitHub version
+1. Run the helper script `choose_build_type.sh` to enable Bootstrap Terraform Cloud version
    ```bash
    ./scripts/choose_build_type.sh terraform_cloud
    ```

helpers/foundation-deployer/github/github.go

@@ -288,7 +288,7 @@ func (g GH) WaitBuildSuccess(t testing.TB, owner, repo, token, commitSha, failur
 			if err != nil {
 				return err
 			}
-			if utils.IsRetryableError(t, logs) {
+			if !utils.IsRetryableError(t, logs) {
 				return fmt.Errorf("%s\nSee:\nhttps://github.com/%s/%s/actions/runs/%d\nfor details", failureMsg, owner, repo, runID)
 			}
 			fmt.Println("build failed with retryable error. a new build will be triggered.")

helpers/foundation-deployer/gitlab/gitlab.go

@@ -223,7 +223,7 @@ func (g GL) WaitBuildSuccess(t testing.TB, owner, project, token, commitSha, fai
 			if err != nil {
 				return err
 			}
-			if utils.IsRetryableError(t, logs) {
+			if !utils.IsRetryableError(t, logs) {
 				return fmt.Errorf("%s\nSee:\nhttps://gitlab.com/%s/%s/-/jobs/%d\nfor details", failureMsg, owner, project, jobID)
 			}
 			fmt.Println("job failed with retryable error. a new job will be triggered.")

helpers/foundation-deployer/main.go

@@ -183,12 +183,13 @@ func main() {
 	}
 
 	var envVars map[string]string
-	if conf.BuildType != stages.BuildTypeGiHub {
+
+	switch conf.BuildType {
+	case stages.BuildTypeGiHub:
 		envVars = map[string]string{
 			"TF_VAR_gh_token": conf.GitToken,
 		}
-	}
-	if conf.BuildType == stages.BuildTypeGitLab {
+	case stages.BuildTypeGitLab:
 		envVars = map[string]string{
 			"TF_VAR_gitlab_token": conf.GitToken,
 		}

helpers/foundation-deployer/utils/files.go

@@ -145,26 +145,25 @@ func RenameBuildFiles(basePath, targetBuild string) error {
 				return fmt.Errorf("error renaming file \"%s\": %w", file, err)
 			}
 		}
+	}
 
-		// Rename *_BUILD_TYPE.tf.example to *_BUILD_TYPE.tf if they exist.
-		pattern := filepath.Join(basePath, fmt.Sprintf("*_%s.tf%s", targetBuild, DisableFileSuffix))
-		files, err := filepath.Glob(pattern)
-		if err != nil {
-			return fmt.Errorf("error finding files (target rename): %w", err)
-		}
+	// Rename *_BUILD_TYPE.tf.example to *_BUILD_TYPE.tf if they exist.
+	pattern := filepath.Join(basePath, fmt.Sprintf("*_%s.tf%s", targetBuild, DisableFileSuffix))
+	files, err := filepath.Glob(pattern)
+	if err != nil {
+		return fmt.Errorf("error finding files (target rename): %w", err)
+	}
 
-		for _, file := range files {
-			baseName := strings.TrimSuffix(file, fmt.Sprintf(".tf%s", DisableFileSuffix))
-			newName := baseName + ".tf"
+	for _, file := range files {
+		baseName := strings.TrimSuffix(file, fmt.Sprintf(".tf%s", DisableFileSuffix))
+		newName := baseName + ".tf"
 
-			fmt.Printf("Renaming \"%s\" to \"%s\"\n", file, newName)
+		fmt.Printf("Renaming \"%s\" to \"%s\"\n", file, newName)
 
-			err := os.Rename(file, newName)
-			if err != nil {
-				return fmt.Errorf("error renaming file \"%s\": %w", file, err)
-			}
+		err := os.Rename(file, newName)
+		if err != nil {
+			return fmt.Errorf("error renaming file \"%s\": %w", file, err)
 		}
 	}
-
 	return nil
 }