code review fixes

Author: daniel-cit

0-bootstrap/scripts/choose_build_type.sh

@@ -23,7 +23,7 @@ TARGET_BUILD="$1"
 build_types=("cb" "github" "gitlab" "jenkins" "terraform_cloud")
 
 # Validate the build_type input
-if [[ ! " ${build_types[*]} " =~ " ${TARGET_BUILD} " ]]; then
+if [[ ! " ${build_types[*]} " == *" ${TARGET_BUILD} "* ]]; then
   echo "Error: Invalid build type '$TARGET_BUILD'.  Must be one of: ${build_types[*]}"
   exit 1
 fi

helpers/foundation-deployer/github/github.go

@@ -46,7 +46,7 @@ const (
 )
 
 type GH struct {
-	TriggerNewBuild func(t testing.TB, ctx context.Context, owner, repo, token string, runID int64) (int64, string, string, error)
+	TriggerNewBuild func(t testing.TB, ctx context.Context, owner, repo, token, commitSha string, runID int64) (int64, string, string, error)
 	sleepTime       time.Duration
 }
 
@@ -59,7 +59,7 @@ func NewGH() GH {
 }
 
 // triggerNewBuild triggers a new action execution
-func triggerNewBuild(t testing.TB, ctx context.Context, owner, repo, token string, runID int64) (int64, string, string, error) {
+func triggerNewBuild(t testing.TB, ctx context.Context, owner, repo, token, commitSha string, runID int64) (int64, string, string, error) {
 	ts := oauth2.StaticTokenSource(&oauth2.Token{AccessToken: token})
 	tc := oauth2.NewClient(ctx, ts)
 	client := github.NewClient(tc)
@@ -75,8 +75,9 @@ func triggerNewBuild(t testing.TB, ctx context.Context, owner, repo, token strin
 		}
 		return 0, "", "", fmt.Errorf("error re-running workflow status: %d body: %s", resp.StatusCode, string(bodyBytes))
 	}
-	opts := &github.ListWorkflowRunsOptions{
 
+	opts := &github.ListWorkflowRunsOptions{
+		HeadSHA: commitSha,
 		ListOptions: github.ListOptions{
 			PerPage: 1,
 			Page:    1,
@@ -115,17 +116,18 @@ func triggerNewBuild(t testing.TB, ctx context.Context, owner, repo, token strin
 }
 
 // GetLastActionState returns the state of the latest action
-func (g GH) GetLastActionState(t testing.TB, ctx context.Context, owner, repo, token string) (int64, string, string, error) {
+func (g GH) GetLastActionState(t testing.TB, ctx context.Context, owner, repo, token, commitSha string) (int64, string, string, error) {
 	ts := oauth2.StaticTokenSource(&oauth2.Token{AccessToken: token})
 	tc := oauth2.NewClient(ctx, ts)
 	client := github.NewClient(tc)
 
 	opts := &github.ListWorkflowRunsOptions{
-
+		HeadSHA: commitSha,
 		ListOptions: github.ListOptions{
 			PerPage: 1,
 		},
 	}
+
 	runs, _, err := client.Actions.ListRepositoryWorkflowRuns(ctx, owner, repo, opts)
 
 	if err != nil {
@@ -260,7 +262,7 @@ func (g GH) GetFinalActionState(t testing.TB, ctx context.Context, owner, repo,
 }
 
 // WaitBuildSuccess waits for the current build in a repo to finish.
-func (g GH) WaitBuildSuccess(t testing.TB, owner, repo, token string, failureMsg string, maxBuildRetry, maxErrorRetries int, timeBetweenErrorRetries time.Duration) error {
+func (g GH) WaitBuildSuccess(t testing.TB, owner, repo, token, commitSha, failureMsg string, maxBuildRetry, maxErrorRetries int, timeBetweenErrorRetries time.Duration) error {
 	var status, conclusion string
 	var runID int64
 	var err error
@@ -269,7 +271,7 @@ func (g GH) WaitBuildSuccess(t testing.TB, owner, repo, token string, failureMsg
 	// wait action creation
 	time.Sleep(30 * time.Second)
 
-	runID, status, conclusion, err = g.GetLastActionState(t, ctx, owner, repo, token)
+	runID, status, conclusion, err = g.GetLastActionState(t, ctx, owner, repo, token, commitSha)
 	if err != nil {
 		return err
 	}
@@ -295,7 +297,7 @@ func (g GH) WaitBuildSuccess(t testing.TB, owner, repo, token string, failureMsg
 		}
 
 		// Trigger a new build
-		runID, status, conclusion, err = g.TriggerNewBuild(t, ctx, owner, repo, token, runID)
+		runID, status, conclusion, err = g.TriggerNewBuild(t, ctx, owner, repo, token, commitSha, runID)
 		if err != nil {
 			return fmt.Errorf("failed to trigger new action (attempt %d/%d): %w", i+1, maxErrorRetries, err)
 		}

helpers/foundation-deployer/stages/executor.go

@@ -61,7 +61,7 @@ func NewGitHubExecutor(owner, repo, token string) *GitHubExecutor {
 }
 
 func (e *GitHubExecutor) WaitBuildSuccess(t testing.TB, commitSha, failureMsg string) error {
-	return e.executor.WaitBuildSuccess(t, e.owner, e.repo, e.token, failureMsg, MaxBuildRetries, MaxErrorRetries, TimeBetweenErrorRetries)
+	return e.executor.WaitBuildSuccess(t, e.owner, e.repo, e.token, commitSha, failureMsg, MaxBuildRetries, MaxErrorRetries, TimeBetweenErrorRetries)
 }
 
 type GitLabExecutor struct {

helpers/foundation-deployer/utils/git.go

@@ -63,15 +63,13 @@ func cloneGit(t testing.TB, repositoryUrl, path string, logger *logger.Logger) G
 
 	if os.IsNotExist(err) {
 		cmd := exec.Command("git", "clone", repositoryUrl, path)
-		fmt.Printf("Executing command %s", cmd)
-		// Run the command and capture its standard output
-		output, err := cmd.Output()
+		fmt.Printf("Executing command %s\n", cmd.String())
+		// Run the command and capture its combined output
+		output, err := cmd.CombinedOutput()
 		if err != nil {
 			t.Fatalf("Error executing git command: %v", err)
 		}
-		// Convert the output to a string and trim whitespace
-		branchName := strings.TrimSpace(string(output))
-		fmt.Printf("Current Git branch: %s\n", branchName)
+		fmt.Printf("git clone output:\n%s\n", string(output))
 	}
 
 	return GitRepo{