CI/CD modifications

Author: devsocket

.github/workflows/terraform-infra-apply.yaml

@@ -8,9 +8,15 @@ on:
 jobs:
   terraform:
     runs-on: ubuntu-latest
+    if: contains(fromJson('["devsocket"]'), github.actor)
 
     env:
       TF_VAR_db_admin_password: ${{ secrets.DB_ADMIN_PASSWORD }}
+      ARM_CLIENT_ID: ${{ secrets.AZURE_CLIENT_ID }}
+      ARM_CLIENT_SECRET: ${{ secrets.AZURE_CLIENT_SECRET }}
+      ARM_SUBSCRIPTION_ID: ${{ secrets.AZURE_SUBSCRIPTION_ID }}
+      ARM_TENANT_ID: ${{ secrets.AZURE_TENANT_ID }}
+
 
     steps:
       - name: Checkout code
@@ -27,6 +33,15 @@ jobs:
         uses: azure/login@v1
         with:
           creds: ${{ secrets.AZURE_CREDENTIALS }}
+          # client-id: ${{ secrets.AZURE_CLIENT_ID }}
+          # tenant-id: ${{ secrets.AZURE_TENANT_ID }}
+          # subscription-id: ${{ secrets.AZURE_SUBSCRIPTION_ID }}
+
+        run: |
+        #   az account set --subscription "a6d4bb1c-5386-4a9a-af52-ef605eeea0b0"
+          az group create --name "ecommerce-qa-rg" --location "East US" || true
+          az storage account create --name "qatfstateaccount" --resource-group "ecommerce-qa-rg" --location "East US" --sku Standard_LRS || true
+          az storage container create --name "qatfstate" --account-name "qatfstateaccount" || true
 
       - name: Setup Terraform
         uses: hashicorp/setup-terraform@v2

.github/workflows/terraform-infra-destroy.yaml

@@ -8,6 +8,7 @@ on:
 jobs:
   terraform-destroy:
     runs-on: ubuntu-latest
+    if: contains(fromJson('["devsocket"]'), github.actor)
 
     env:
       TF_VAR_db_admin_password: ${{ secrets.DB_ADMIN_PASSWORD }}

terraform/environments/qa/backend.tf

@@ -1,8 +1,8 @@
 terraform {
   backend "azurerm" {
-    resource_group_name  = "tf-state-rg"
-    storage_account_name = "tfstateaccount"
-    container_name       = "tfstate"
+    resource_group_name  = var.resource_group_name
+    storage_account_name = var.storage_account_name
+    container_name       = var.container_name
     key                  = "qa.terraform.tfstate"
   }
 }

terraform/environments/qa/terraform.tfvars

@@ -5,6 +5,8 @@ key_vault_name = "ecommerce-qa-kv"
 event_hub_namespace_name = "ecommerce-qa-eh"
 postgres_name = "ecommerce-qa-db"
 db_admin_password = "SuperSecretPassword@123"
+storage_account_name = "qatfstateaccount"
+container_name = "qatfstate"
 tags = {
   environment = "qa"
 }

terraform/environments/qa/variables.tf

@@ -5,6 +5,12 @@ variable "key_vault_name" {}
 variable "event_hub_namespace_name" {}
 variable "postgres_name" {}
 variable "db_admin_password" {}
+variable "storage_account_name" {
+  default = "qatfstateaccount"
+}
+variable "container_name" {
+  default = "qatfstate" 
+}
 variable "tags" {
   type = map(string)
   default = {}