feat: Update dev/qa deployments to use variable passing from compliance-cli

- Modified dev.yaml and qa.yaml to use substitution variables
- Updated compliance-cli to trigger builds with proper substitutions
- Added triggerBuild functions to pass configuration dynamically
- Aligned dev/qa deployment pattern with preview deployments

Author: pinetops

build-and-push.sh

@@ -12,12 +12,12 @@ echo "Building multi-arch Docker image: ${FULL_IMAGE}"
 echo "Platforms: linux/amd64, linux/arm64"
 
 # Ensure buildx is available and create/use builder
-if ! docker buildx ls | grep -q multiarch-builder; then
+if ! docker buildx ls | grep -q orbstack-builder; then
     echo "Creating buildx builder..."
-    docker buildx create --name multiarch-builder --use
+    docker buildx create --name orbstack-builder --driver docker-container --use
 else
     echo "Using existing buildx builder..."
-    docker buildx use multiarch-builder
+    docker buildx use orbstack-builder
 fi
 
 # Build and push in one step (buildx requires --push for multi-arch)

internal/deploy/deploy.go

@@ -5,6 +5,7 @@ import (
 	"os"
 	"os/exec"
 	"strings"
+	"time"
 )
 
 // Deploy executes the deployment
@@ -165,4 +166,130 @@ func buildDeployParams(config *Config) string {
 	params = append(params, fmt.Sprintf("CLUSTER_NAME=%s", clusterName))
 
 	return strings.Join(params, ",")
+}
+
+// triggerBuild triggers a Cloud Build for the specified environment
+func triggerBuild(config *Config, environment string) error {
+	fmt.Printf("Triggering %s build...\n", environment)
+	
+	// Build substitutions
+	substitutions := []string{
+		fmt.Sprintf("_PROJECT_ID=%s", config.ProjectID),
+		fmt.Sprintf("_REGION=%s", config.Region),
+		fmt.Sprintf("_IMAGE_REPO=%s-images", config.AppConfig.App),
+		fmt.Sprintf("_CACHE_REPO=%s-cache", config.AppConfig.App),
+		fmt.Sprintf("_IMAGE_NAME=%s", config.AppConfig.App),
+		fmt.Sprintf("_IMAGE_PREFIX=%s", environment),
+		fmt.Sprintf("COMMIT_SHA=%s", config.CommitSHA),
+		fmt.Sprintf("SHORT_SHA=%s", config.ShortSHA),
+	}
+	
+	// Build gcloud command
+	triggerName := fmt.Sprintf("%s-%s-trigger", config.AppConfig.App, environment)
+	args := []string{
+		"builds", "triggers", "run", triggerName,
+		"--region=" + config.Region,
+		"--project=" + config.ProjectID,
+		"--branch=master",
+	}
+	
+	// Add substitutions
+	for _, sub := range substitutions {
+		args = append(args, "--substitutions="+sub)
+	}
+	
+	cmd := exec.Command("gcloud", args...)
+	cmd.Stdout = os.Stdout
+	cmd.Stderr = os.Stderr
+	
+	if err := cmd.Run(); err != nil {
+		return fmt.Errorf("failed to trigger build: %w", err)
+	}
+	
+	// Wait for build to complete
+	fmt.Println("Waiting for build to complete...")
+	return waitForBuild(config, triggerName)
+}
+
+// triggerBuildWithTag triggers a Cloud Build for QA with tag
+func triggerBuildWithTag(config *Config, environment string, tagName string) error {
+	fmt.Printf("Triggering %s build with tag %s...\n", environment, tagName)
+	
+	// Build substitutions
+	substitutions := []string{
+		fmt.Sprintf("_PROJECT_ID=%s", config.ProjectID),
+		fmt.Sprintf("_REGION=%s", config.Region),
+		fmt.Sprintf("_IMAGE_REPO=%s-images", config.AppConfig.App),
+		fmt.Sprintf("_CACHE_REPO=%s-cache", config.AppConfig.App),
+		fmt.Sprintf("_IMAGE_NAME=%s", config.AppConfig.App),
+		fmt.Sprintf("_IMAGE_PREFIX=%s", environment),
+		fmt.Sprintf("COMMIT_SHA=%s", config.CommitSHA),
+		fmt.Sprintf("SHORT_SHA=%s", config.ShortSHA),
+		fmt.Sprintf("TAG_NAME=%s", tagName),
+	}
+	
+	// Build gcloud command for QA (uses tag trigger)
+	triggerName := fmt.Sprintf("%s-qa-deployment", config.AppConfig.App)
+	args := []string{
+		"builds", "triggers", "run", triggerName,
+		"--region=" + config.Region,
+		"--project=" + config.ProjectID,
+		"--tag=" + tagName,
+	}
+	
+	// Add substitutions
+	for _, sub := range substitutions {
+		args = append(args, "--substitutions="+sub)
+	}
+	
+	cmd := exec.Command("gcloud", args...)
+	cmd.Stdout = os.Stdout
+	cmd.Stderr = os.Stderr
+	
+	if err := cmd.Run(); err != nil {
+		return fmt.Errorf("failed to trigger build: %w", err)
+	}
+	
+	// Wait for build to complete
+	fmt.Println("Waiting for build to complete...")
+	return waitForBuild(config, triggerName)
+}
+
+// waitForBuild waits for a Cloud Build to complete
+func waitForBuild(config *Config, triggerName string) error {
+	maxAttempts := 60 // 30 minutes with 30 second intervals
+	
+	for i := 0; i < maxAttempts; i++ {
+		// Get latest build status
+		args := []string{
+			"builds", "list",
+			"--region=" + config.Region,
+			"--project=" + config.ProjectID,
+			"--limit=1",
+			"--filter=substitutions.TRIGGER_NAME:" + triggerName,
+			"--format=value(status)",
+		}
+		
+		cmd := exec.Command("gcloud", args...)
+		output, err := cmd.Output()
+		if err != nil {
+			return fmt.Errorf("failed to get build status: %w", err)
+		}
+		
+		status := strings.TrimSpace(string(output))
+		
+		switch status {
+		case "SUCCESS":
+			fmt.Println("✅ Build completed successfully")
+			return nil
+		case "FAILURE", "TIMEOUT", "CANCELLED":
+			return fmt.Errorf("build failed with status: %s", status)
+		default:
+			// Still running
+			fmt.Printf("Build status: %s - waiting...\n", status)
+			time.Sleep(30 * time.Second)
+		}
+	}
+	
+	return fmt.Errorf("build timed out after 30 minutes")
 }

internal/deploy/dev.go

@@ -58,6 +58,11 @@ func NewDevCommand(appConfig *config.AppConfig) *cobra.Command {
 				deployConfig.ReleaseName = fmt.Sprintf("dev-%s", deployConfig.ShortSHA)
 			}
 
+			// Trigger Cloud Build with substitutions
+			if err := triggerBuild(deployConfig, "dev"); err != nil {
+				return fmt.Errorf("failed to trigger build: %w", err)
+			}
+
 			return Deploy(deployConfig)
 		},
 	}

internal/deploy/qa.go

@@ -57,6 +57,14 @@ func NewQACommand(appConfig *config.AppConfig) *cobra.Command {
 				deployConfig.ReleaseName = fmt.Sprintf("qa-%s", deployConfig.ShortSHA)
 			}
 
+			// Get TAG_NAME from environment
+			tagName := getStringValue(cmd, "tag", "TAG_NAME")
+			
+			// Trigger Cloud Build with substitutions
+			if err := triggerBuildWithTag(deployConfig, "qa", tagName); err != nil {
+				return fmt.Errorf("failed to trigger build: %w", err)
+			}
+
 			return Deploy(deployConfig)
 		},
 	}