Feature/ci cd (#97)

additional testing
sourcefuse · Jan 5, 2024 · 4974a40 · 4974a40
1 parent ea61140
commit 4974a40
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 7 deletions.
diff --git a/.github/workflows/deploy-backstage-prod.yaml b/.github/workflows/deploy-backstage-prod.yaml
@@ -26,6 +26,7 @@ jobs:
       id-token: write
       contents: read
       pull-requests: write
+    if: ${{ github.event.workflow_run.conclusion == 'success' }}
 
     steps:
       - name: Checkout
@@ -48,7 +49,7 @@ jobs:
         id: workflow_vars
         run: |
           echo "plan_id=$(git rev-parse --short "$GITHUB_SHA")" >> $GITHUB_OUTPUT
-          echo "git_tag=${GITHUB_REF#refs/*/}" >> $GITHUB_OUTPUT
+          echo "git_tag=${github.ref_name}" >> $GITHUB_OUTPUT
 
       # configure iam
       - name: Configure IAM Role
@@ -70,7 +71,7 @@ jobs:
         id: prod_plan
         shell: bash
         run: |
-          ./scripts/action-init-plan-apply.sh -a prod
+          ./scripts/action-init-plan-apply.sh -p prod
         continue-on-error: false
 
         #publish plan to artifacts

diff --git a/.github/workflows/docker-push.yaml b/.github/workflows/docker-push.yaml
@@ -2,10 +2,9 @@
 name: Docker Push
 
 on:            # yamllint disable-line rule:truthy
-  workflow_run:
-    workflows: ["Tag"]
-    types:
-      - completed
+  push:
+    tags:
+      - '**'
 
 jobs:
   build_and_push_prod:
@@ -22,7 +21,7 @@ jobs:
 
       - name: Set output
         id: vars
-        run: echo "git_tag=${GITHUB_REF#refs/*/}" >> $GITHUB_OUTPUT
+        run: echo "git_tag=${github.ref_name}" >> $GITHUB_OUTPUT
 
       # configure iam
       - name: Configure IAM Role

diff --git a/terraform/iam/locals.tf b/terraform/iam/locals.tf
@@ -12,6 +12,7 @@ locals {
             "Action" : [
               "ec2:*",
               "ecs:*",
+              "ecr:*",
               "route53:*",
               "ssm:*",
               "secretsmanager:*"