Fix GitHub and Resource Provider for plan

Azure · Nov 9, 2023 · 2ba348c · 2ba348c
1 parent 21e0e5d
commit 2ba348c
Show file tree

Hide file tree

Showing 5 changed files with 27 additions and 27 deletions.
diff --git a/bootstrap/modules/github/repository.tf b/bootstrap/modules/github/repository.tf
@@ -47,6 +47,6 @@ resource "github_branch_protection" "alz" {
   required_pull_request_reviews {
     dismiss_stale_reviews           = true
     restrict_dismissals             = true
-    required_approving_review_count = 1
+    required_approving_review_count = length(var.approvers) > 1 ? 1 : null
   }
 }
diff --git a/templates/.ci_cd/.github/workflows/ci.yaml b/templates/.ci_cd/.github/workflows/ci.yaml
@@ -61,24 +61,19 @@ jobs:
 
       - name: Terraform Plan
         id: plan
-        run: terraform plan -no-color -input=false
-        continue-on-error: true
-
+        run: terraform plan -input=false
+
       - name: Update Pull Request
-        if: github.event_name == 'pull_request'
+        if: (success() || failure()) && github.event_name == 'pull_request'
         uses: actions/github-script@v6
-        env:
-          PLAN: "terraform\n$${{ steps.plan.outputs.stdout }}"
         with:
           github-token: $${{ secrets.GITHUB_TOKEN }}
           script: |
             const output = `#### Terraform Plan 📖\`$${{ steps.plan.outcome }}\`
 
-            <details><summary>Show Plan</summary>
+            <details><summary>Run details</summary>
 
-            \`\`\`\n
-            $${process.env.PLAN}
-            \`\`\`
+            The plan was a $${{ steps.plan.outcome }} see the action for more details.
 
             </details>
 
@@ -90,7 +85,3 @@ jobs:
               repo: context.repo.repo,
               body: output
             })
-
-      - name: Terraform Plan Status
-        if: steps.plan.outcome == 'failure'
-        run: exit 1
diff --git a/templates/basic/versions.tf b/templates/basic/versions.tf
@@ -7,17 +7,20 @@ terraform {
 }
 
 provider "azurerm" {
+  skip_provider_registration = true
   features {}
 }
 
 provider "azurerm" {
-  alias           = "management"
-  subscription_id = var.subscription_id_management
+  alias                      = "management"
+  subscription_id            = var.subscription_id_management
+  skip_provider_registration = true
   features {}
 }
 
 provider "azurerm" {
-  alias           = "connectivity"
-  subscription_id = var.subscription_id_connectivity
+  alias                      = "connectivity"
+  subscription_id            = var.subscription_id_connectivity
+  skip_provider_registration = true
   features {}
 }
diff --git a/templates/complete/versions.tf b/templates/complete/versions.tf
@@ -7,17 +7,20 @@ terraform {
 }
 
 provider "azurerm" {
+  skip_provider_registration = true
   features {}
 }
 
 provider "azurerm" {
-  alias           = "management"
-  subscription_id = var.subscription_id_management
+  skip_provider_registration = true
+  alias                      = "management"
+  subscription_id            = var.subscription_id_management
   features {}
 }
 
 provider "azurerm" {
-  alias           = "connectivity"
-  subscription_id = var.subscription_id_connectivity
+  skip_provider_registration = true
+  alias                      = "connectivity"
+  subscription_id            = var.subscription_id_connectivity
   features {}
 }
diff --git a/templates/hubnetworking/versions.tf b/templates/hubnetworking/versions.tf
@@ -7,17 +7,20 @@ terraform {
 }
 
 provider "azurerm" {
+  skip_provider_registration = true
   features {}
 }
 
 provider "azurerm" {
-  alias           = "management"
-  subscription_id = var.subscription_id_management
+  skip_provider_registration = true
+  alias                      = "management"
+  subscription_id            = var.subscription_id_management
   features {}
 }
 
 provider "azurerm" {
-  alias           = "connectivity"
-  subscription_id = var.subscription_id_connectivity
+  skip_provider_registration = true
+  alias                      = "connectivity"
+  subscription_id            = var.subscription_id_connectivity
   features {}
 }