fix: update workflows for oidc plans (#385)

liatrio · Jul 3, 2023 · beb5c4b · beb5c4b
1 parent 5586ece
commit beb5c4b
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 10 deletions.
diff --git a/.github/workflows/apply-prod.yml b/.github/workflows/apply-prod.yml
@@ -44,6 +44,8 @@ jobs:
   plan:
     name: "Terraform Prod plan"
     runs-on: ubuntu-latest
+    environment:
+      name: "plan"
     needs: build
     steps:
       - name: Checkout
@@ -63,8 +65,6 @@ jobs:
           ARM_SUBSCRIPTION_ID: ${{ secrets.AZURE_PROD_SUBSCRIPTION_ID }}
           ARM_USE_OIDC: true
           TF_VAR_gratibot_image: "${{ env.IMAGE_NAME }}:${{ needs.build.outputs.docker_tag }}"
-          TF_VAR_app_token: ${{ secrets.PROD_PLAN_APP_TOKEN }}
-          TF_VAR_bot_user_token: ${{ secrets.PROD_PLAN_BOT_TOKEN }}
           TF_VAR_gratibot_limit: ${{ inputs.gratibot_limit }}
   apply:
     name: "Terraform Prod Apply"
@@ -90,6 +90,4 @@ jobs:
           ARM_SUBSCRIPTION_ID: ${{ secrets.AZURE_PROD_SUBSCRIPTION_ID }}
           ARM_USE_OIDC: true
           TF_VAR_gratibot_image: "${{ env.IMAGE_NAME }}:${{ needs.build.outputs.docker_tag }}"
-          TF_VAR_app_token: ${{ secrets.PROD_APP_TOKEN }}
-          TF_VAR_bot_user_token: ${{ secrets.PROD_BOT_TOKEN }}
           GRATIBOT_LIMIT: ${{ inputs.gratibot_limit }}
diff --git a/.github/workflows/pull-request.yaml b/.github/workflows/pull-request.yaml
@@ -64,8 +64,6 @@ jobs:
         working-directory: infra/terragrunt/nonprod/gratibot/
         env:
           TF_VAR_gratibot_image: "${{ env.IMAGE_NAME }}:${{ needs.build.outputs.docker_tag }}"
-          TF_VAR_app_token: ${{ secrets.NONPROD_APP_TOKEN }}
-          TF_VAR_bot_user_token: ${{ secrets.NONPROD_BOT_TOKEN }}
   plan:
     name: "Terraform Nonprod plan"
     runs-on: ubuntu-latest
@@ -91,8 +89,6 @@ jobs:
           ARM_SUBSCRIPTION_ID: ${{ secrets.AZURE_NONPROD_SUBSCRIPTION_ID }}
           ARM_USE_OIDC: true
           TF_VAR_gratibot_image: "${{ env.IMAGE_NAME }}:${{ needs.build.outputs.docker_tag }}"
-          TF_VAR_app_token: ${{ secrets.NONPROD_APP_TOKEN }}
-          TF_VAR_bot_user_token: ${{ secrets.NONPROD_BOT_TOKEN }}
 
       - uses: liatrio/[email protected]
         with:

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -69,8 +69,6 @@ jobs:
           ARM_SUBSCRIPTION_ID: ${{ secrets.AZURE_NONPROD_SUBSCRIPTION_ID }}
           ARM_USE_OIDC: true
           TF_VAR_gratibot_image: "${{ env.IMAGE_NAME }}:${{ needs.build.outputs.docker_tag }}"
-          TF_VAR_app_token: ${{ secrets.NONPROD_APP_TOKEN }}
-          TF_VAR_bot_user_token: ${{ secrets.NONPROD_BOT_TOKEN }}
           TF_VAR_gratibot_limit: ${{ inputs.gratibot_limit }}
   release:
     name: "Create Release"