Merge pull request #14 from Indu-Sah-Foundation/test

optmized terraform

Author: exploratoryprorammer

.github/workflows/terraform.yml

@@ -1,4 +1,4 @@
-name: Terraform Apply
+name: Terraform Deploy
 
 on:
   push:
@@ -13,7 +13,7 @@ permissions:
   id-token: write
 
 jobs:
-  terraform:
+  setup-backend:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout Repository
@@ -31,34 +31,34 @@ jobs:
           tenant-id: ${{ secrets.AZURE_TENANT_ID }}
           subscription-id: ${{ secrets.AZURE_SUBSCRIPTION_ID }}
 
-      - name: Setup Terraform State Storage
+      - name: Setup State Backend
+        working-directory: backend-setup
         run: |
-          # Create resource group for state if it doesn't exist
-          az group create --name terraform-state-rg --location eastus2 || true
+          terraform init
+          terraform apply -auto-approve
 
-          # Create storage account if it doesn't exist
-          az storage account create \
-            --name isfterraformstate \
-            --resource-group terraform-state-rg \
-            --location eastus2 \
-            --sku Standard_LRS \
-            --encryption-services blob || true
+  deploy-infrastructure:
+    needs: setup-backend
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout Repository
+        uses: actions/checkout@v4
 
-          # Create container if it doesn't exist
-          az storage container create \
-            --name tfstate \
-            --account-name isfterraformstate || true
+      - name: Setup Terraform
+        uses: hashicorp/setup-terraform@v3
+        with:
+          terraform_version: 1.9.8
+
+      - name: Azure Login via OIDC
+        uses: azure/login@v2
+        with:
+          client-id: ${{ secrets.AZURE_CLIENT_ID }}
+          tenant-id: ${{ secrets.AZURE_TENANT_ID }}
+          subscription-id: ${{ secrets.AZURE_SUBSCRIPTION_ID }}
 
       - name: Terraform Init
         run: terraform init
 
-      - name: Import Existing Resources
-        continue-on-error: true
-        run: |
-          terraform import -var-file="env.tfvars" azurerm_resource_group.rg /subscriptions/${{ secrets.AZURE_SUBSCRIPTION_ID }}/resourceGroups/isfinfa-rg || true
-          terraform import -var-file="env.tfvars" azurerm_service_plan.asp /subscriptions/${{ secrets.AZURE_SUBSCRIPTION_ID }}/resourceGroups/isfinfa-rg/providers/Microsoft.Web/serverFarms/isfinfa-plan || true
-          terraform import -var-file="env.tfvars" azurerm_linux_web_app.backend /subscriptions/${{ secrets.AZURE_SUBSCRIPTION_ID }}/resourceGroups/isfinfa-rg/providers/Microsoft.Web/sites/isfinfa-go-backend || true
-
       - name: Terraform Validate
         run: terraform validate
 

backend-setup/main.tf

@@ -0,0 +1,43 @@
+terraform {
+  required_providers {
+    azurerm = {
+      source  = "hashicorp/azurerm"
+      version = "~> 3.0"
+    }
+  }
+}
+
+provider "azurerm" {
+  features {}
+}
+
+resource "azurerm_resource_group" "state" {
+  name     = "terraform-state-rg"
+  location = "eastus2"
+}
+
+resource "azurerm_storage_account" "state" {
+  name                     = "isfterraformstate"
+  resource_group_name      = azurerm_resource_group.state.name
+  location                 = azurerm_resource_group.state.location
+  account_tier             = "Standard"
+  account_replication_type = "LRS"
+}
+
+resource "azurerm_storage_container" "state" {
+  name                  = "tfstate"
+  storage_account_name  = azurerm_storage_account.state.name
+  container_access_type = "private"
+}
+
+output "storage_account_name" {
+  value = azurerm_storage_account.state.name
+}
+
+output "container_name" {
+  value = azurerm_storage_container.state.name
+}
+
+output "resource_group_name" {
+  value = azurerm_resource_group.state.name
+}

import.tf

@@ -0,0 +1,17 @@
+# Import existing resources if they were created outside Terraform
+# Remove this file after first successful apply
+
+import {
+  to = azurerm_resource_group.rg
+  id = "/subscriptions/e00ac8d0-d7ed-48ef-9463-cc5138d2a3db/resourceGroups/isfinfa-rg"
+}
+
+import {
+  to = azurerm_service_plan.asp
+  id = "/subscriptions/e00ac8d0-d7ed-48ef-9463-cc5138d2a3db/resourceGroups/isfinfa-rg/providers/Microsoft.Web/serverFarms/isfinfa-plan"
+}
+
+import {
+  to = azurerm_linux_web_app.backend
+  id = "/subscriptions/e00ac8d0-d7ed-48ef-9463-cc5138d2a3db/resourceGroups/isfinfa-rg/providers/Microsoft.Web/sites/isfinfa-go-backend"
+}