Merge branch 'master' of https://github.com/Pwd9000-ML/Azure-Terrafor…

…m-Deployments
psenger · Aug 11, 2023 · 647b247 · 647b247
2 parents 8d425f1 + 89ce2c4
commit 647b247
Show file tree

Hide file tree

Showing 12 changed files with 35 additions and 35 deletions.
diff --git a/.github/workflows/04_App_Acr.yml b/.github/workflows/04_App_Acr.yml
@@ -10,10 +10,10 @@ jobs:
     environment: null        
     steps:
       - name: Checkout
-        uses: actions/checkout@v3.1.0
+        uses: actions/checkout@v3.5.3
 
       - name: Dev TF Plan Deploy
-        uses: Pwd9000-ML/[email protected].5
+        uses: Pwd9000-ML/[email protected].6
         with:
           path: 04_App_Acr
           plan_mode: deploy
@@ -38,7 +38,7 @@ jobs:
     steps:
       - name: Dev TF Deploy
         if: ${{ github.actor != 'dependabot[bot]' }}
-        uses: Pwd9000-ML/[email protected].5
+        uses: Pwd9000-ML/[email protected].6
         with:
           plan_mode: deploy
           tf_version: latest
@@ -59,10 +59,10 @@ jobs:
 #    environment: null        
 #    steps:
 #      - name: Checkout
-#        uses: actions/checkout@v3.1.0
+#        uses: actions/checkout@v3.5.3
 
 #      - name: Dev TF Plan Destroy
-#        uses: Pwd9000-ML/[email protected].5
+#        uses: Pwd9000-ML/[email protected].6
 #        with:
 #          path: 04_App_Acr
 #          plan_mode: destroy
@@ -87,7 +87,7 @@ jobs:
 #    steps:
 #      - name: Dev TF Destroy
 #        if: ${{ github.actor != 'dependabot[bot]' }}
-#        uses: Pwd9000-ML/[email protected].5
+#        uses: Pwd9000-ML/[email protected].6
 #        with:
 #          plan_mode: destroy
 #          tf_version: latest

diff --git a/.github/workflows/05_lookup_demo.yml b/.github/workflows/05_lookup_demo.yml
@@ -10,10 +10,10 @@ jobs:
     environment: null        
     steps:
       - name: Checkout
-        uses: actions/checkout@v3.1.0
+        uses: actions/checkout@v3.5.3
 
       - name: Dev TF Plan Deploy
-        uses: Pwd9000-ML/[email protected].5
+        uses: Pwd9000-ML/[email protected].6
         with:
           path: 05_lookup_demo
           plan_mode: deploy
@@ -38,7 +38,7 @@ jobs:
     steps:
       - name: Dev TF Deploy
         if: ${{ github.actor != 'dependabot[bot]' }}
-        uses: Pwd9000-ML/[email protected].5
+        uses: Pwd9000-ML/[email protected].6
         with:
           plan_mode: deploy
           tf_version: latest
@@ -59,10 +59,10 @@ jobs:
 #    environment: null        
 #    steps:
 #      - name: Checkout
-#        uses: actions/checkout@v3.1.0
+#        uses: actions/checkout@v3.5.3
 
 #      - name: Dev TF Plan Destroy
-#        uses: Pwd9000-ML/[email protected].5
+#        uses: Pwd9000-ML/[email protected].6
 #        with:
 #          path: 05_lookup_demo
 #          plan_mode: destroy
@@ -87,7 +87,7 @@ jobs:
 #    steps:
 #      - name: Dev TF Destroy
 #        if: ${{ github.actor != 'dependabot[bot]' }}
-#        uses: Pwd9000-ML/[email protected].5
+#        uses: Pwd9000-ML/[email protected].6
 #        with:
 #          plan_mode: destroy
 #          tf_version: latest

diff --git a/.github/workflows/Auto_Generate_Module_Documentation.yml b/.github/workflows/Auto_Generate_Module_Documentation.yml
@@ -9,7 +9,7 @@ jobs:
   docs:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v3.1.0
+    - uses: actions/checkout@v3.5.3
       with:
         ref: ${{ github.event.pull_request.head.ref }}
 

diff --git a/.github/workflows/Marketplace_Example.yml b/.github/workflows/Marketplace_Example.yml
@@ -17,10 +17,10 @@ jobs:
     environment: null #(Optional) If using GitHub Environments          
     steps:
       - name: Checkout
-        uses: actions/checkout@v3.1.0
+        uses: actions/checkout@v3.5.3
 
       - name: Dev TF Plan Deploy
-        uses: Pwd9000-ML/[email protected].5
+        uses: Pwd9000-ML/[email protected].6
         with:
           path: 01_Foundation                  ## (Optional) Specify path TF module relevant to repo root. Default="."
           plan_mode: deploy                    ## (Optional) Specify plan mode. Valid options are "deploy" or "destroy". Default="deploy"
@@ -45,7 +45,7 @@ jobs:
     steps:
       - name: Dev TF Deploy
         if: ${{ github.actor != 'dependabot[bot]' }}
-        uses: Pwd9000-ML/[email protected].5
+        uses: Pwd9000-ML/[email protected].6
         with:
           plan_mode: deploy                  ## (Optional) Specify plan mode. Valid options are "deploy" or "destroy". Default="deploy"
           tf_version: latest                 ## (Optional) Specifies version of Terraform to use. e.g: 1.1.0 Default="latest"
@@ -66,10 +66,10 @@ jobs:
     environment: null #(Optional) If using GitHub Environments          
     steps:
       - name: Checkout
-        uses: actions/checkout@v3.1.0
+        uses: actions/checkout@v3.5.3
 
       - name: Dev TF Plan Destroy
-        uses: Pwd9000-ML/[email protected].5
+        uses: Pwd9000-ML/[email protected].6
         with:
           path: 01_Foundation                ## (Optional) Specify path TF module relevant to repo root. Default="."
           plan_mode: destroy                 ## (Optional) Specify plan mode. Valid options are "deploy" or "destroy". Default="deploy"
@@ -94,7 +94,7 @@ jobs:
     steps:
       - name: Dev TF Destroy
         if: ${{ github.actor != 'dependabot[bot]' }}
-        uses: Pwd9000-ML/[email protected].5
+        uses: Pwd9000-ML/[email protected].6
         with:
           plan_mode: destroy                 ## (Optional) Specify plan mode. Valid options are "deploy" or "destroy". Default="deploy"
           tf_version: latest                 ## (Optional) Specifies version of Terraform to use. e.g: 1.1.0 Default="latest"

diff --git a/.github/workflows/Marketplace_Example_Tests.yml b/.github/workflows/Marketplace_Example_Tests.yml
@@ -23,10 +23,10 @@ jobs:
     if: ${{ github.actor == 'dependabot[bot]' }}
     steps:
       - name: Checkout
-        uses: actions/checkout@v3.1.0
+        uses: actions/checkout@v3.5.3
 
       - name: Run Dependency Tests - Plan AND Apply AND Destroy
-        uses: Pwd9000-ML/[email protected].5
+        uses: Pwd9000-ML/[email protected].6
         with:
           test_type: plan-apply-destroy      ## (Required) Valid options are "plan", "plan-apply", "plan-apply-destroy". Default="plan"
           path: 01_Foundation                ## (Optional) Specify path TF module relevant to repo root. Default="."

diff --git a/.github/workflows/az_tf_apply.yml b/.github/workflows/az_tf_apply.yml
@@ -68,7 +68,7 @@ jobs:
 
     steps:
       - name: Download Artifact
-        uses: actions/[email protected].0
+        uses: actions/[email protected].2
         with:
           name: ${{ inputs.tf_key }}
           path: ${{ inputs.path }}
@@ -77,7 +77,7 @@ jobs:
         run: unzip ${{ inputs.tf_key }}.zip
 
       - name: Setup Terraform
-        uses: hashicorp/[email protected].2
+        uses: hashicorp/[email protected].3
         with:
           terraform_version: ${{ inputs.tf_version }}
 

diff --git a/.github/workflows/az_tf_plan.yml b/.github/workflows/az_tf_plan.yml
@@ -78,11 +78,11 @@ jobs:
 
     steps:
       - name: Checkout
-        uses: actions/checkout@v3.1.0
+        uses: actions/checkout@v3.5.3
 
       - name: Scan IaC - tfsec
         if: ${{ inputs.ENABLE_TFSEC == 'true' }}
-        uses: aquasecurity/[email protected].3
+        uses: aquasecurity/[email protected].4
         with:
           sarif_file: tfsec.sarif         
 
@@ -93,7 +93,7 @@ jobs:
           sarif_file: tfsec.sarif  
 
       - name: Setup Terraform
-        uses: hashicorp/[email protected].2
+        uses: hashicorp/[email protected].3
         with:
           terraform_version: ${{ inputs.tf_version }}
 
@@ -122,7 +122,7 @@ jobs:
         run: zip -r ${{ inputs.tf_key }}.zip ./*
 
       - name: Upload Artifact
-        uses: actions/[email protected].0
+        uses: actions/[email protected].2
         with:
           name: "${{ inputs.tf_key }}"
           path: "${{ inputs.path }}/${{ inputs.tf_key }}.zip"

diff --git a/01_Foundation/main.tf b/01_Foundation/main.tf
@@ -1,10 +1,10 @@
 terraform {
-  required_version = "~> 1.3.0"
+  required_version = ">= 1.5.0"
   backend "azurerm" {}
   required_providers {
     azurerm = {
       source  = "hashicorp/azurerm"
-      version = "~> 3.27.0"
+      version = "~> 3.68.0"
     }
   }
 }

diff --git a/02_Storage/main.tf b/02_Storage/main.tf
@@ -1,10 +1,10 @@
 terraform {
-  required_version = "~> 1.3.0"
+  required_version = ">= 1.5.0"
   backend "azurerm" {}
   required_providers {
     azurerm = {
       source  = "hashicorp/azurerm"
-      version = "~> 3.27.0"
+      version = "~> 3.68.0"
     }
   }
 }

diff --git a/03_etc_etc/another_terraform_module.tf b/03_etc_etc/another_terraform_module.tf
@@ -1,10 +1,10 @@
 terraform {
-  required_version = "~> 1.3.0"
+  required_version = ">= 1.5.0"
   backend "azurerm" {}
   required_providers {
     azurerm = {
       source  = "hashicorp/azurerm"
-      version = "~> 3.27.0"
+      version = "~> 3.68.0"
     }
   }
 }

diff --git a/04_App_Acr/main.tf b/04_App_Acr/main.tf
@@ -1,5 +1,5 @@
 terraform {
-  required_version = "~> 1.3.0"
+  required_version = ">= 1.5.0"
   backend "azurerm" {}
   required_providers {
     azurerm = {

diff --git a/05_lookup_demo/main.tf b/05_lookup_demo/main.tf
@@ -1,5 +1,5 @@
 terraform {
-  required_version = "~> 1.3.0"
+  required_version = ">= 1.5.0"
   backend "azurerm" {}
   required_providers {
     azurerm = {