Update actions

Author: nikhilwoodruff

.github/workflows/gcp-deploy.reusable.yml

@@ -91,6 +91,13 @@ jobs:
         tagger_container_tag = "${{ github.sha }}"
         EOF
     
+    - name: Handle existing workflows
+      run: |
+        # Check for existing workflows and delete them if they exist
+        # This is necessary because workflows can't be imported into terraform state
+        chmod +x deployment/terraform/handle-existing-workflows.sh
+        ./deployment/terraform/handle-existing-workflows.sh "${{ vars.PROJECT_ID }}" "${{ vars.REGION }}" --delete || true
+    
     - name: Deploy infrastructure
       id: deploy_infra
       working-directory: deployment/terraform/infra

Makefile

@@ -244,6 +244,10 @@ terraform-import:
 	@echo "Importing existing resources into terraform state..."
 	@cd deployment/terraform && ./import-existing.sh
 
+terraform-handle-workflows:
+	@echo "Checking and handling existing workflows..."
+	@cd deployment/terraform && ./handle-existing-workflows.sh $(PROJECT_ID) $(TF_VAR_region)
+
 terraform-destroy:
 	@echo "⚠️  WARNING: This will destroy all terraform-managed resources!"
 	@echo "Press Ctrl+C to cancel, or Enter to continue..."

deployment/DEPLOYMENT_GUIDE.md

@@ -19,6 +19,11 @@ cp deployment/.env.example deployment/.env
 ```bash
 # If you get "already exists" errors, run:
 make terraform-import
+
+# For workflow errors specifically (workflows can't be imported):
+./deployment/terraform/handle-existing-workflows.sh $PROJECT_ID
+# To auto-delete existing workflows, add --delete flag:
+# ./deployment/terraform/handle-existing-workflows.sh $PROJECT_ID us-central1 --delete
 ```
 
 3. Deploy:

deployment/terraform/handle-existing-workflows.sh

@@ -0,0 +1,63 @@
+#!/bin/bash
+# Script to handle existing workflows before terraform deployment
+
+set -e
+
+# Get project ID from command line or environment
+PROJECT_ID="${1:-${TF_VAR_project_id}}"
+REGION="${2:-${TF_VAR_region:-us-central1}}"
+
+if [ -z "$PROJECT_ID" ]; then
+    echo "Usage: $0 <project_id> [region]"
+    echo "Or set TF_VAR_project_id environment variable"
+    exit 1
+fi
+
+echo "Checking for existing workflows in project: $PROJECT_ID, region: $REGION"
+
+# Check if workflows exist
+EXISTING_WORKFLOWS=$(gcloud workflows list --location="$REGION" --project="$PROJECT_ID" --format="value(name)" 2>/dev/null || true)
+
+# Check for our specific workflows
+for workflow in "simulation-workflow" "wait-for-country-packages"; do
+    if echo "$EXISTING_WORKFLOWS" | grep -q "$workflow"; then
+        echo "Found existing workflow: $workflow"
+        echo "Options:"
+        echo "  1. Delete the workflow manually:"
+        echo "     gcloud workflows delete $workflow --location=$REGION --project=$PROJECT_ID"
+        echo ""
+        echo "  2. Or use terraform import (but this may not work with all configurations):"
+        echo "     cd deployment/terraform/infra"
+        echo "     terraform import google_workflows_workflow.$(echo $workflow | tr '-' '_') projects/$PROJECT_ID/locations/$REGION/workflows/$workflow"
+        echo ""
+        FOUND_EXISTING=true
+    fi
+done
+
+if [ "$FOUND_EXISTING" = true ]; then
+    echo ""
+    echo "⚠️  Existing workflows found. You have two options:"
+    echo ""
+    echo "Option A: Delete existing workflows and let terraform recreate them"
+    echo "  Run: $0 $PROJECT_ID $REGION --delete"
+    echo ""
+    echo "Option B: Keep existing workflows (may cause deployment to fail)"
+    echo "  Continue with deployment and handle errors manually"
+    echo ""
+    
+    # Check for --delete flag
+    if [ "$3" = "--delete" ]; then
+        echo "Deleting existing workflows..."
+        for workflow in "simulation-workflow" "wait-for-country-packages"; do
+            if echo "$EXISTING_WORKFLOWS" | grep -q "$workflow"; then
+                echo "Deleting $workflow..."
+                gcloud workflows delete "$workflow" --location="$REGION" --project="$PROJECT_ID" --quiet || true
+            fi
+        done
+        echo "✅ Workflows deleted. You can now run terraform deployment."
+    else
+        exit 1
+    fi
+else
+    echo "✅ No conflicting workflows found. Safe to proceed with terraform deployment."
+fi