From 40ae68e3814a452d5e7b52bfe03f20c7de71a14c Mon Sep 17 00:00:00 2001
From: Administrator <gitlab_admin_731e3f@example.com>
Date: Tue, 15 Oct 2024 11:33:38 -0600
Subject: [PATCH] use login at a higher level

---
 .github/actions/tf-setup/action.yml | 34 +++++++++++++----------------
 .github/workflows/deploy-dev.yml    | 15 ++++++++-----
 2 files changed, 25 insertions(+), 24 deletions(-)

diff --git a/.github/actions/tf-setup/action.yml b/.github/actions/tf-setup/action.yml
index 49c1c09c..3318ca43 100644
--- a/.github/actions/tf-setup/action.yml
+++ b/.github/actions/tf-setup/action.yml
@@ -7,15 +7,15 @@ inputs:
   azure-resource-group:
     description: The Azure Resource Group for this environment.
     required: true
-  azure-client-id:
-    description: The Azure client_id for this environment.
-    required: true
-  azure-tenant-id:
-    description: The Azure tenant_id for this environment.
-    required: true
-  azure-subscription-id:
-    description: The Azure subscription_id for this environment.
-    required: true
+  # azure-client-id:
+  #   description: The Azure client_id for this environment.
+  #   required: true
+  # azure-tenant-id:
+  #   description: The Azure tenant_id for this environment.
+  #   required: true
+  # azure-subscription-id:
+  #   description: The Azure subscription_id for this environment.
+  #   required: true
   app-name:
     description: The name of the application being deployed in Terraform.
     required: true
@@ -35,11 +35,7 @@ inputs:
 runs:
   using: composite
   steps:
-    - uses: azure/login@v2
-      with:
-        client-id: ${{ secrets.AZURE_CLIENT_ID }}
-        tenant-id: ${{ secrets.AZURE_TENANT_ID }}
-        subscription-id: ${{ secrets.AZURE_SUBSCRIPTION_ID }}
+
     # - name: Setup Terraform
     #   uses: hashicorp/setup-terraform@v3
     # - name: Terraform Init
@@ -59,9 +55,9 @@ runs:
         RESOURCE_GROUP_NAME: ${{ inputs.azure-resource-group }}
         CLIENT_ID: ${{ inputs.azure-client-id }}
       run: |
-        echo subscription_id=\""$SUBSCRIPTION_ID"\" >> terraform.tfvars
+        # echo subscription_id=\""$SUBSCRIPTION_ID"\" >> terraform.tfvars
         echo resource_group_name=\""$RESOURCE_GROUP_NAME"\" >> terraform.tfvars
-        echo client_id=\""$CLIENT_ID"\" >> terraform.tfvars
+        # echo client_id=\""$CLIENT_ID"\" >> terraform.tfvars
         echo name=\""$NAME"\" >> terraform.tfvars
         az config set defaults.group=$RESOURCE_GROUP_NAME
     - name: Set environment
@@ -76,9 +72,9 @@ runs:
     - name: Terraform deploy
       working-directory: ./ops/terraform
       env:
-        ARM_CLIENT_ID: ${{ inputs.azure-client-id }}
-        ARM_TENANT_ID: ${{ inputs.azure-tenant-id }}
-        ARM_SUBSCRIPTION_ID: ${{ inputs.azure-subscription-id }}
+        # ARM_CLIENT_ID: ${{ inputs.azure-client-id }}
+        # ARM_TENANT_ID: ${{ inputs.azure-tenant-id }}
+        # ARM_SUBSCRIPTION_ID: ${{ inputs.azure-subscription-id }}
         TF_ENV: ${{ steps.set-environment.outputs.tf-env }}
 
       # env: # all Azure interaction is through Terraform
diff --git a/.github/workflows/deploy-dev.yml b/.github/workflows/deploy-dev.yml
index cde71443..f406ee3b 100644
--- a/.github/workflows/deploy-dev.yml
+++ b/.github/workflows/deploy-dev.yml
@@ -70,12 +70,17 @@ jobs:
     # needs: [build_frontend, build_docker_ocr]
     steps:
       - uses: actions/checkout@v4
+      - uses: azure/login@v2
+        with:
+          client-id: ${{ secrets.AZURE_CLIENT_ID }}
+          tenant-id: ${{ secrets.AZURE_TENANT_ID }}
+          subscription-id: ${{ secrets.AZURE_SUBSCRIPTION_ID }}
       - uses: ./.github/actions/tf-setup
         name: Setup this environment with Terraform
         with:
           deploy-env: dev2
-          azure-client-id: ${{ secrets.AZURE_CLIENT_ID }}
-          azure-tenant-id: ${{ secrets.AZURE_TENANT_ID }}
-          azure-subscription-id: ${{ secrets.AZURE_SUBSCRIPTION_ID }}
-          app-name: reportvision
-        secrets: inherit
\ No newline at end of file
+          azure-resource-group: reportvision-rg-dev2
+          # azure-client-id: ${{ secrets.AZURE_CLIENT_ID }}
+          # azure-tenant-id: ${{ secrets.AZURE_TENANT_ID }}
+          # azure-subscription-id: ${{ secrets.AZURE_SUBSCRIPTION_ID }}
+          app-name: reportvision
\ No newline at end of file