Merge pull request #1312 from HadwaAbdelhalem/update_azure_modules_pr…

…ovider Update Azure example to move the azurerm provider version constraint into the required_provider.
gruntwork-io · Jun 23, 2023 · a86c8a5 · a86c8a5
2 parents b8689cd + 7e2df9f
commit a86c8a5
Show file tree

Hide file tree

Showing 22 changed files with 164 additions and 32 deletions.
diff --git a/examples/azure/terraform-azure-aci-example/main.tf b/examples/azure/terraform-azure-aci-example/main.tf
@@ -8,8 +8,16 @@
 # CONFIGURE OUR AZURE CONNECTION
 # ------------------------------------------------------------------------------
 
+terraform {
+  required_providers {
+    azurerm = {
+      version = "~>2.29.0"
+      source  = "hashicorp/azurerm"
+    }
+  }
+}
+
 provider "azurerm" {
-  version = "~>2.29.0"
   features {}
 }
 

diff --git a/examples/azure/terraform-azure-acr-example/main.tf b/examples/azure/terraform-azure-acr-example/main.tf
@@ -8,8 +8,16 @@
 # CONFIGURE OUR AZURE CONNECTION
 # ------------------------------------------------------------------------------
 
+terraform {
+  required_providers {
+    azurerm = {
+      version = "~>2.29.0"
+      source  = "hashicorp/azurerm"
+    }
+  }
+}
+
 provider "azurerm" {
-  version = "~>2.29.0"
   features {}
 }
 

diff --git a/examples/azure/terraform-azure-availabilityset-example/main.tf b/examples/azure/terraform-azure-availabilityset-example/main.tf
@@ -5,22 +5,25 @@
 # ---------------------------------------------------------------------------------------------------------------------
 # See test/azure/terraform_azure_availabilityset_example_test.go for how to write automated tests for this code.
 # ---------------------------------------------------------------------------------------------------------------------
-
 provider "azurerm" {
-  version = "~> 2.50"
   features {}
 }
 
 # ---------------------------------------------------------------------------------------------------------------------
 # PIN TERRAFORM VERSION TO >= 0.12
 # The examples have been upgraded to 0.12 syntax
 # ---------------------------------------------------------------------------------------------------------------------
-
 terraform {
   # This module is now only being tested with Terraform 0.13.x. However, to make upgrading easier, we are setting
   # 0.12.26 as the minimum version, as that version added support for required_providers with source URLs, making it
   # forwards compatible with 0.13.x code.
   required_version = ">= 0.12.26"
+  required_providers {
+    azurerm = {
+      version = "~> 2.50"
+      source  = "hashicorp/azurerm"
+    }
+  }
 }
 
 # ---------------------------------------------------------------------------------------------------------------------

diff --git a/examples/azure/terraform-azure-cosmosdb-example/main.tf b/examples/azure/terraform-azure-cosmosdb-example/main.tf
@@ -6,11 +6,9 @@
 # ---------------------------------------------------------------------------------------------------------------------
 
 provider "azurerm" {
-  version = "~> 2.29"
   features {}
 }
 
-
 # ---------------------------------------------------------------------------------------------------------------------
 # PIN TERRAFORM VERSION TO >= 0.12
 # The examples have been upgraded to 0.12 syntax
@@ -21,8 +19,16 @@ terraform {
   # 0.12.26 as the minimum version, as that version added support for required_providers with source URLs, making it
   # forwards compatible with 0.13.x code.
   required_version = ">= 0.12.26"
+  required_providers {
+    azurerm = {
+      version = "~> 2.29"
+      source  = "hashicorp/azurerm"
+    }
+  }
 }
 
+
+
 # ---------------------------------------------------------------------------------------------------------------------
 # DEPLOY A RESOURCE GROUP
 # ---------------------------------------------------------------------------------------------------------------------

diff --git a/examples/azure/terraform-azure-datafactory-example/main.tf b/examples/azure/terraform-azure-datafactory-example/main.tf
@@ -8,9 +8,15 @@
 # ---------------------------------------------------------------------------------------------------------------------
 # CONFIGURE OUR AZURE CONNECTION
 # ---------------------------------------------------------------------------------------------------------------------
-
+terraform {
+  required_providers {
+    azurerm = {
+      version = "~> 2.93.0"
+      source  = "hashicorp/azurerm"
+    }
+  }
+}
 provider "azurerm" {
-  version = "~>2.93.0"
   features {}
 }
 

diff --git a/examples/azure/terraform-azure-disk-example/main.tf b/examples/azure/terraform-azure-disk-example/main.tf
@@ -6,7 +6,6 @@
 # ---------------------------------------------------------------------------------------------------------------------
 
 provider "azurerm" {
-  version = "~> 2.29"
   features {}
 }
 
@@ -15,6 +14,12 @@ terraform {
   # 0.12.26 as the minimum version, as that version added support for required_providers with source URLs, making it
   # forwards compatible with 0.13.x code.
   required_version = ">= 0.12.26"
+  required_providers {
+    azurerm = {
+      version = "~> 2.29"
+      source  = "hashicorp/azurerm"
+    }
+  }
 }
 
 # ---------------------------------------------------------------------------------------------------------------------

diff --git a/examples/azure/terraform-azure-example/main.tf b/examples/azure/terraform-azure-example/main.tf
@@ -6,7 +6,6 @@
 # ---------------------------------------------------------------------------------------------------------------------
 
 provider "azurerm" {
-  version = "~> 2.50"
   features {}
 }
 
@@ -21,6 +20,12 @@ terraform {
   # 0.12.26 as the minimum version, as that version added support for required_providers with source URLs, making it
   # forwards compatible with 0.13.x code.
   required_version = ">= 0.12.26"
+  required_providers {
+    azurerm = {
+      version = "~> 2.50"
+      source  = "hashicorp/azurerm"
+    }
+  }
 }
 
 # ---------------------------------------------------------------------------------------------------------------------

diff --git a/examples/azure/terraform-azure-functionapp-example/main.tf b/examples/azure/terraform-azure-functionapp-example/main.tf
@@ -8,8 +8,17 @@
 # ---------------------------------------------------------------------------------------------------------------------
 # CONFIGURE OUR AZURE CONNECTION
 # ---------------------------------------------------------------------------------------------------------------------
+
+terraform {
+  required_providers {
+    azurerm = {
+      version = "~>2.29.0"
+      source  = "hashicorp/azurerm"
+    }
+  }
+}
+
 provider "azurerm" {
-  version = "~>2.29.0"
   features {}
 }
 

diff --git a/examples/azure/terraform-azure-keyvault-example/main.tf b/examples/azure/terraform-azure-keyvault-example/main.tf
@@ -6,7 +6,6 @@
 # ---------------------------------------------------------------------------------------------------------------------
 
 provider "azurerm" {
-  version = "~>3.0"
   features {
     key_vault {
       purge_soft_delete_on_destroy = false
@@ -24,6 +23,12 @@ terraform {
   # 0.12.26 as the minimum version, as that version added support for required_providers with source URLs, making it
   # forwards compatible with 0.13.x code.
   required_version = ">= 0.12.26"
+  required_providers {
+    azurerm = {
+      version = "~>3.0"
+      source  = "hashicorp/azurerm"
+    }
+  }
 }
 
 # ---------------------------------------------------------------------------------------------------------------------

diff --git a/examples/azure/terraform-azure-loadbalancer-example/main.tf b/examples/azure/terraform-azure-loadbalancer-example/main.tf
@@ -6,7 +6,6 @@
 # See test/azure/terraform_azure_loadbalancer_example_test.go for how to write automated tests for this code.
 # ---------------------------------------------------------------------------------------------------------------------
 provider "azurerm" {
-  version = "~>2.29"
   features {}
 }
 
@@ -20,6 +19,12 @@ terraform {
   # 0.12.26 as the minimum version, as that version added support for required_providers with source URLs, making it
   # forwards compatible with 0.13.x code.
   required_version = ">= 0.12.26"
+  required_providers {
+    azurerm = {
+      version = "~>2.29"
+      source  = "hashicorp/azurerm"
+    }
+  }
 }
 
 # ---------------------------------------------------------------------------------------------------------------------

diff --git a/examples/azure/terraform-azure-loganalytics-example/main.tf b/examples/azure/terraform-azure-loganalytics-example/main.tf
@@ -6,7 +6,6 @@
 # ---------------------------------------------------------------------------------------------------------------------
 
 provider "azurerm" {
-  version = "~> 2.20"
   features {}
 }
 
@@ -17,6 +16,12 @@ terraform {
   # 0.12.26 as the minimum version, as that version added support for required_providers with source URLs, making it
   # forwards compatible with 0.13.x code.
   required_version = ">= 0.12.26"
+  required_providers {
+    azurerm = {
+      version = "~> 2.20"
+      source  = "hashicorp/azurerm"
+    }
+  }
 }
 
 # ---------------------------------------------------------------------------------------------------------------------

diff --git a/examples/azure/terraform-azure-monitor-example/main.tf b/examples/azure/terraform-azure-monitor-example/main.tf
@@ -7,25 +7,28 @@
 # ---------------------------------------------------------------------------------------------------------------------
 
 provider "azurerm" {
-  version = "~> 2.29"
-
   features {
     key_vault {
       purge_soft_delete_on_destroy = true
     }
   }
 }
 
-# Configure the Microsoft Azure Active Directory Provider
-provider "azuread" {
-  version = "=0.7.0"
-}
-
 terraform {
   # This module is now only being tested with Terraform 0.13.x. However, to make upgrading easier, we are setting
   # 0.12.26 as the minimum version, as that version added support for required_providers with source URLs, making it
   # forwards compatible with 0.13.x code.
   required_version = ">= 0.12.26"
+  required_providers {
+    azurerm = {
+      version = "~> 2.29"
+      source  = "hashicorp/azurerm"
+    }
+    azuread = {
+      version = "=0.7.0"
+      source  = "hashicorp/azuread"
+    }
+  }
 }
 
 resource "random_string" "short" {

diff --git a/examples/azure/terraform-azure-mysqldb-example/main.tf b/examples/azure/terraform-azure-mysqldb-example/main.tf
@@ -8,9 +8,19 @@
 # ---------------------------------------------------------------------------------------------------------------------
 # CONFIGURE OUR AZURE CONNECTION
 # ---------------------------------------------------------------------------------------------------------------------
+terraform {
+  # This module is now only being tested with Terraform 0.13.x. However, to make upgrading easier, we are setting
+  # 0.12.26 as the minimum version, as that version added support for required_providers with source URLs, making it
+  # forwards compatible with 0.13.x code.
+  required_providers {
+    azurerm = {
+      version = "~>2.29.0"
+      source  = "hashicorp/azurerm"
+    }
+  }
+}
 
 provider "azurerm" {
-  version = "~>2.29.0"
   features {}
 }
 

diff --git a/examples/azure/terraform-azure-network-example/main.tf b/examples/azure/terraform-azure-network-example/main.tf
@@ -7,7 +7,6 @@
 # ---------------------------------------------------------------------------------------------------------------------
 
 provider "azurerm" {
-  version = "~>2.20"
   features {}
 }
 
@@ -21,6 +20,12 @@ terraform {
   # 0.12.26 as the minimum version, as that version added support for required_providers with source URLs, making it
   # forwards compatible with 0.13.x code.
   required_version = ">= 0.12.26"
+  required_providers {
+    azurerm = {
+      version = "~>2.20"
+      source  = "hashicorp/azurerm"
+    }
+  }
 }
 
 # ---------------------------------------------------------------------------------------------------------------------

diff --git a/examples/azure/terraform-azure-nsg-example/main.tf b/examples/azure/terraform-azure-nsg-example/main.tf
@@ -7,7 +7,6 @@
 # ---------------------------------------------------------------------------------------------------------------------
 
 provider "azurerm" {
-  version = "~>2.50"
   features {}
 }
 
@@ -18,6 +17,12 @@ provider "azurerm" {
 
 terraform {
   required_version = ">= 0.12"
+  required_providers {
+    azurerm = {
+      version = "~> 2.50"
+      source  = "hashicorp/azurerm"
+    }
+  }
 }
 
 # ---------------------------------------------------------------------------------------------------------------------

diff --git a/examples/azure/terraform-azure-recoveryservices-example/main.tf b/examples/azure/terraform-azure-recoveryservices-example/main.tf
@@ -7,7 +7,6 @@
 # ---------------------------------------------------------------------------------------------------------------------
 
 provider "azurerm" {
-  version = "~> 2.20"
   features {}
 }
 
@@ -16,6 +15,12 @@ terraform {
   # 0.12.26 as the minimum version, as that version added support for required_providers with source URLs, making it
   # forwards compatible with 0.13.x code.
   required_version = ">= 0.12.26"
+  required_providers {
+    azurerm = {
+      version = "~> 2.20"
+      source  = "hashicorp/azurerm"
+    }
+  }
 }
 
 # ---------------------------------------------------------------------------------------------------------------------

diff --git a/examples/azure/terraform-azure-resourcegroup-example/main.tf b/examples/azure/terraform-azure-resourcegroup-example/main.tf
@@ -6,7 +6,6 @@
 # ---------------------------------------------------------------------------------------------------------------------
 
 provider "azurerm" {
-  version = "~> 2.20"
   features {}
 }
 
@@ -17,6 +16,12 @@ terraform {
   # 0.12.26 as the minimum version, as that version added support for required_providers with source URLs, making it
   # forwards compatible with 0.13.x code.
   required_version = ">= 0.12.26"
+  required_providers {
+    azurerm = {
+      version = "~> 2.20"
+      source  = "hashicorp/azurerm"
+    }
+  }
 }
 
 # ---------------------------------------------------------------------------------------------------------------------

diff --git a/examples/azure/terraform-azure-servicebus-example/main.tf b/examples/azure/terraform-azure-servicebus-example/main.tf
@@ -10,10 +10,20 @@
 # ---------------------------------------------------------------------------------------------------------------------
 
 provider "azurerm" {
-  version = "~>2.29"
   features {}
 }
 
+terraform {
+  # This module is now only being tested with Terraform 0.13.x. However, to make upgrading easier, we are setting
+  # 0.12.26 as the minimum version, as that version added support for required_providers with source URLs, making it
+  # forwards compatible with 0.13.x code.
+  required_providers {
+    azurerm = {
+      version = "~>2.29"
+      source  = "hashicorp/azurerm"
+    }
+  }
+}
 # ---------------------------------------------------------------------------------------------------------------------
 # DEPLOY A RESOURCE GROUP
 # ---------------------------------------------------------------------------------------------------------------------