Dev (#14)

* Updated all files for proper version constraints

* Added new NAt IP

* Updated subnet module for adding log_config and private_ip_google_access

* Added service account and vm modules with a test vm instance

* Generated documents for each module using terraform-docs

* Generated documents for dev environment using terraform-docs

* Added more modules

* Updated workflow files

* Re-organized project directory structure

* Dev (#9)

* Updated all files for proper version constraints

* Added new NAt IP

* Updated subnet module for adding log_config and private_ip_google_access

* Added service account and vm modules with a test vm instance

* Generated documents for each module using terraform-docs

* Generated documents for dev environment using terraform-docs

* Added prod environment (#12)

Author: akmshasan

.github/workflows/terraform-apply.yml

@@ -12,34 +12,35 @@ jobs:
       - name: Checkout
         uses: actions/checkout@v3
 
-      - name: Set Environment Folder
-        id: env
+      - name: Detect Changed Environments
+        id: changes
         run: |
-          if git diff-tree --no-commit-id --name-only -r ${{ github.sha }} | grep '^environments/dev/'; then
-            echo "env_folder=environments/dev" >> $GITHUB_OUTPUT
-          elif git diff-tree --no-commit-id --name-only -r ${{ github.sha }} | grep '^environments/prod/'; then
-            echo "env_folder=environments/prod" >> $GITHUB_OUTPUT
-          else
-            echo "env_folder=" >> $GITHUB_OUTPUT
-          fi
+          changed_dirs=$(git diff-tree --no-commit-id --name-only -r ${{ github.sha }} \
+            | grep -E '^projects/[^/]+/environments/(dev|prod)/' \
+            | cut -d '/' -f1-4 \
+            | sort -u)
+
+          echo "changed=${changed_dirs}" >> $GITHUB_OUTPUT
 
       - name: Exit if No Matching Env
-        if: steps.env.outputs.env_folder == ''
-        run: echo "No changes to dev or prod environments. Skipping apply."
+        if: steps.changes.outputs.changed == ''
+        run: echo "No dev/prod environment changes detected. Skipping."
 
       - name: Decode GCP SA
-        if: steps.env.outputs.env_folder != ''
+        if: steps.changes.outputs.changed != ''
         run: echo "${{ secrets.GCP_SA_KEY_BASE64 }}" | base64 -d > gcp-creds.json
 
       - name: Set up Terraform
-        if: steps.env.outputs.env_folder != ''
+        if: steps.changes.outputs.changed != ''
         uses: hashicorp/setup-terraform@v2
         with:
           terraform_version: 1.11.4
 
-      - name: Terraform Init & Apply
-        if: steps.env.outputs.env_folder != ''
-        working-directory: ${{ steps.env.outputs.env_folder }}
+      - name: Terraform Init & Apply (per env)
+        if: steps.changes.outputs.changed != ''
         run: |
-          terraform init
-          terraform apply -auto-approve
+          for env_dir in ${{ steps.changes.outputs.changed }}; do
+            echo "==> Applying in $env_dir"
+            terraform -chdir=$env_dir init
+            terraform -chdir=$env_dir apply -auto-approve
+          done

.github/workflows/terraform-plan-dev.yml

@@ -4,10 +4,16 @@ on:
   push:
     branches: [dev]
     paths:
-      - "environments/dev/**"
+      - "projects/learning/environments/dev/**"
+      - "projects/learning2/environments/dev/**"
 
 jobs:
-  call-plan:
+  plan-learning:
     uses: ./.github/workflows/terraform-plan.yml
     with:
-      environment: dev
+      environment: projects/learning/environments/dev
+
+  plan-learning2:
+    uses: ./.github/workflows/terraform-plan.yml
+    with:
+      environment: projects/learning2/environments/dev

.github/workflows/terraform-plan-prod.yml

@@ -2,12 +2,18 @@ name: Terraform Plan (Prod)
 
 on:
   push:
-    branches: [prod]
+    branches: [main]
     paths:
-      - "environments/prod/**"
+      - "projects/learning/environments/prod/**"
+      - "projects/learning2/environments/prod/**"
 
 jobs:
-  call-plan:
+  plan-learning:
     uses: ./.github/workflows/terraform-plan.yml
     with:
-      environment: prod
+      environment: projects/learning/environments/prod
+
+  plan-learning2:
+    uses: ./.github/workflows/terraform-plan.yml
+    with:
+      environment: projects/learning2/environments/prod

.github/workflows/terraform-plan.yml

@@ -1,43 +1,48 @@
-name: Terraform Plan (Reusable)
+name: Terraform Plan
 
 on:
-  workflow_call:
-    inputs:
-      environment:
-        required: true
-        type: string
+  pull_request:
+    branches: [main]
 
 jobs:
   plan:
     runs-on: ubuntu-latest
 
-    env:
-      GOOGLE_APPLICATION_CREDENTIALS: ${{ github.workspace }}/gcp-creds.json
-
     steps:
-      - name: Checkout repo
+      - name: Checkout code
         uses: actions/checkout@v3
 
-      - name: Decode GCP Service Account
-        run: echo "${{ secrets.GCP_SA_KEY_BASE64 }}" | base64 -d > "$GOOGLE_APPLICATION_CREDENTIALS"
+      - name: Detect Changed Environments
+        id: changes
+        run: |
+          changed_dirs=$(git diff --name-only origin/main...HEAD \
+            | grep -E '^projects/[^/]+/environments/(dev|prod)/' \
+            | cut -d '/' -f1-4 \
+            | sort -u)
 
-      - name: Setup Terraform
-        uses: hashicorp/setup-terraform@v2
-        with:
-          terraform_version: 1.11.4
+          echo "changed=${changed_dirs}" >> $GITHUB_OUTPUT
 
-      - name: Terraform Init
-        working-directory: environments/${{ inputs.environment }}
-        run: terraform init
+      - name: Exit if No Matching Env
+        if: steps.changes.outputs.changed == ''
+        run: echo "No dev/prod environment changes detected. Skipping."
 
-      - name: Terraform Format
-        working-directory: environments/${{ inputs.environment }}
-        run: terraform fmt -check
+      - name: Decode GCP SA
+        if: steps.changes.outputs.changed != ''
+        run: echo "${{ secrets.GCP_SA_KEY_BASE64 }}" | base64 -d > gcp-creds.json
 
-      - name: Terraform Validate
-        working-directory: environments/${{ inputs.environment }}
-        run: terraform validate
+      - name: Set up Terraform
+        if: steps.changes.outputs.changed != ''
+        uses: hashicorp/setup-terraform@v2
+        with:
+          terraform_version: 1.11.4
 
-      - name: Terraform Plan
-        working-directory: environments/${{ inputs.environment }}
-        run: terraform plan
+      - name: Terraform Init & Plan (per env)
+        if: steps.changes.outputs.changed != ''
+        run: |
+          for env_dir in ${{ steps.changes.outputs.changed }}; do
+            echo "==> Planning in $env_dir"
+            terraform -chdir=$env_dir init
+            terraform -chdir=$env_dir fmt -check
+            terraform -chdir=$env_dir validate
+            terraform -chdir=$env_dir plan
+          done