Reworked cleanup workflow + use 'prod' for main branch

PrepPal-cc · Jul 30, 2024 · ac0ec5d · ac0ec5d
1 parent a02d2f7
commit ac0ec5d
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 50 deletions.
diff --git a/.github/workflows/cleanup-aws.yml b/.github/workflows/cleanup-aws.yml
@@ -14,17 +14,14 @@ permissions:
 jobs:
   cleanup:
     runs-on: ubuntu-latest
+    environment: ${{ github.ref_name }}
     if: github.event.inputs.confirmation == 'YES'
-    env:
-      SST_STAGE: ${{ github.ref == 'refs/heads/dev' && 'v1-web-dev' || github.ref == 'refs/heads/staging' && 'v1-web-staging' || github.ref == 'refs/heads/main' && 'v1-web-prod' || '' }}
-      STACK_NAME: ${{ github.ref == 'refs/heads/dev' && 'preppal-v1-web-dev' || github.ref == 'refs/heads/staging' && 'preppal-v1-web-staging' || github.ref == 'refs/heads/main' && 'preppal-v1-web-prod' || '' }}
-
     steps:
       - name: Checkout repository
-        uses: actions/checkout@v2
+        uses: actions/checkout@v1
 
       - name: Setup Node.js
-        uses: actions/setup-node@v2
+        uses: actions/setup-node@v1
         with:
           node-version: '18'
 
@@ -37,57 +34,27 @@ jobs:
           role-to-assume: ${{ secrets.AWS_ROLE_ARN }}
           aws-region: ${{ secrets.AWS_REGION }}
 
-      - name: Validate environment
-        run: |
-          if [ -z "$SST_STAGE" ] || [ -z "$STACK_NAME" ]; then
-            echo "Cleanup is only supported for dev, staging, and main branches"
-            exit 1
-          fi
-
       - name: Remove SST resources
-        run: npx sst remove --stage ${{ env.SST_STAGE }}
+        run: |
+          STAGE=$(echo ${{ github.ref_name }} | sed 's/main/prod/')
+          npx sst remove --stage $STAGE
 
       - name: Verify removal
         run: |
           echo "Verifying removal of resources for ${{ github.ref }} branch..."
           
-          # Check if the CloudFormation stack still exists
-          if aws cloudformation describe-stacks --stack-name ${{ env.STACK_NAME }} 2>&1 | grep -q 'does not exist'; then
-            echo "CloudFormation stack ${{ env.STACK_NAME }} has been successfully removed."
-          else
-            echo "Warning: CloudFormation stack ${{ env.STACK_NAME }} may still exist."
-          fi
-          
-          # Check for S3 buckets
-          S3_BUCKETS=$(aws s3api list-buckets --query "Buckets[?starts_with(Name, '${{ env.STACK_NAME }}')].Name" --output text)
-          if [ -z "$S3_BUCKETS" ]; then
-            echo "No S3 buckets found for ${{ env.STACK_NAME }}."
-          else
-            echo "Warning: S3 buckets may still exist: $S3_BUCKETS"
-          fi
-          
-          # Check for Lambda functions
-          LAMBDA_FUNCTIONS=$(aws lambda list-functions --query "Functions[?starts_with(FunctionName, '${{ env.STACK_NAME }}')].FunctionName" --output text)
-          if [ -z "$LAMBDA_FUNCTIONS" ]; then
-            echo "No Lambda functions found for ${{ env.STACK_NAME }}."
-          else
-            echo "Warning: Lambda functions may still exist: $LAMBDA_FUNCTIONS"
-          fi
+          STACK_NAME=$(if [[ ${{ github.ref }} == 'refs/heads/dev' ]]; then echo "dev"; elif [[ ${{ github.ref }} == 'refs/heads/staging' ]]; then echo "staging"; elif [[ ${{ github.ref }} == 'refs/heads/main' ]]; then echo "prod"; fi)
           
-          # Check for API Gateway APIs
-          API_IDS=$(aws apigateway get-rest-apis --query "items[?starts_with(name, '${{ env.STACK_NAME }}')].id" --output text)
-          if [ -z "$API_IDS" ]; then
-            echo "No API Gateway APIs found for ${{ env.STACK_NAME }}."
+          # Check if the CloudFormation stack still exists
+          if aws cloudformation describe-stacks --stack-name $STACK_NAME 2>&1 | grep -q 'does not exist'; then
+            echo "CloudFormation stack $STACK_NAME has been successfully removed."
           else
-            echo "Warning: API Gateway APIs may still exist: $API_IDS"
+            echo "Warning: CloudFormation stack $STACK_NAME may still exist."
           fi
           
-          # Check for CloudFront distributions
-          CF_DISTRIBUTIONS=$(aws cloudfront list-distributions --query "DistributionList.Items[?contains(Origins.Items[0].Id, '${{ env.STACK_NAME }}')].Id" --output text)
-          if [ -z "$CF_DISTRIBUTIONS" ]; then
-            echo "No CloudFront distributions found for ${{ env.STACK_NAME }}."
-          else
-            echo "Warning: CloudFront distributions may still exist: $CF_DISTRIBUTIONS"
-          fi
+          # Additional resource checks can be added here if needed
           
-          echo "Resource verification complete."
+          echo "Resource verification complete."
+
+      - name: Print caller identity
+        run: aws sts get-caller-identity
diff --git a/.github/workflows/deploy-aws.yml b/.github/workflows/deploy-aws.yml
@@ -18,7 +18,7 @@ permissions:
 jobs:
   build-and-deploy:
     runs-on: ubuntu-latest
-    environment: ${{ github.ref_name }}
+    environment: ${{ github.ref_name == 'main' && 'prod' || github.ref_name }}
     if: github.event.inputs.confirmation == 'YES' || github.event_name != 'workflow_dispatch'
     steps:
       - name: Checkout repository