fix the incompatibility between az-cli and terraform (#435)

Azure-Samples · Jul 14, 2022 · 9a5e2fb · 9a5e2fb
1 parent 592f8b5
commit 9a5e2fb
Show file tree

Hide file tree

Showing 28 changed files with 28 additions and 33 deletions.
diff --git a/...ion/spring-cloud-azure-starter-appconfiguration/appconfiguration-client/terraform/main.tf b/...ion/spring-cloud-azure-starter-appconfiguration/appconfiguration-client/terraform/main.tf
@@ -2,7 +2,7 @@ terraform {
   required_providers {
     azurerm = {
       source  = "hashicorp/azurerm"
-      version = "2.99"
+      version = "3.9.0"
     }
     azurecaf = {
       source  = "aztfmod/azurecaf"

diff --git a/cache/spring-cloud-azure-starter/spring-cloud-azure-sample-cache/terraform/main.tf b/cache/spring-cloud-azure-starter/spring-cloud-azure-sample-cache/terraform/main.tf
@@ -2,7 +2,7 @@ terraform {
   required_providers {
     azurerm = {
       source  = "hashicorp/azurerm"
-      version = "2.99"
+      version = "3.9.0"
     }
     azurecaf = {
       source  = "aztfmod/azurecaf"

diff --git a/cosmos/azure-spring-data-cosmos/cosmos-multi-database-multi-account/terraform/main.tf b/cosmos/azure-spring-data-cosmos/cosmos-multi-database-multi-account/terraform/main.tf
@@ -2,7 +2,7 @@ terraform {
   required_providers {
     azurerm  = {
       source  = "hashicorp/azurerm"
-      version = "2.99"
+      version = "3.9.0"
     }
     azurecaf = {
       source  = "aztfmod/azurecaf"

diff --git a/cosmos/azure-spring-data-cosmos/cosmos-multi-database-single-account/terraform/main.tf b/cosmos/azure-spring-data-cosmos/cosmos-multi-database-single-account/terraform/main.tf
@@ -2,7 +2,7 @@ terraform {
   required_providers {
     azurerm  = {
       source  = "hashicorp/azurerm"
-      version = "2.99"
+      version = "3.9.0"
     }
     azurecaf = {
       source  = "aztfmod/azurecaf"

diff --git a/cosmos/spring-cloud-azure-starter-cosmos/spring-cloud-azure-cosmos-sample/terraform/main.tf b/cosmos/spring-cloud-azure-starter-cosmos/spring-cloud-azure-cosmos-sample/terraform/main.tf
@@ -2,7 +2,7 @@ terraform {
   required_providers {
     azurerm = {
       source  = "hashicorp/azurerm"
-      version = "2.99"
+      version = "3.9.0"
     }
     azurecaf = {
       source  = "aztfmod/azurecaf"

diff --git a/...g-cloud-azure-starter-data-cosmos/spring-cloud-azure-data-cosmos-sample/terraform/main.tf b/...g-cloud-azure-starter-data-cosmos/spring-cloud-azure-data-cosmos-sample/terraform/main.tf
@@ -2,7 +2,7 @@ terraform {
   required_providers {
     azurerm = {
       source  = "hashicorp/azurerm"
-      version = "2.99"
+      version = "3.9.0"
     }
     azurecaf = {
       source  = "aztfmod/azurecaf"

diff --git a/eventhubs/spring-cloud-azure-starter-eventhubs/eventhubs-client/terraform/main.tf b/eventhubs/spring-cloud-azure-starter-eventhubs/eventhubs-client/terraform/main.tf
@@ -2,7 +2,7 @@ terraform {
   required_providers {
     azurerm = {
       source  = "hashicorp/azurerm"
-      version = "2.99"
+      version = "3.9.0"
     }
     azurecaf = {
       source  = "aztfmod/azurecaf"

diff --git a/.../spring-cloud-azure-starter-integration-eventhubs/eventhubs-integration/terraform/main.tf b/.../spring-cloud-azure-starter-integration-eventhubs/eventhubs-integration/terraform/main.tf
@@ -2,7 +2,7 @@ terraform {
   required_providers {
     azurerm = {
       source  = "hashicorp/azurerm"
-      version = "2.99"
+      version = "3.9.0"
     }
     azurecaf = {
       source  = "aztfmod/azurecaf"
@@ -85,7 +85,6 @@ resource "azurerm_storage_account" "storage_account" {
   location                 = var.location
   account_tier             = "Standard"
   account_replication_type = "LRS"
-  allow_blob_public_access = true
 
   tags = {
     "spring-cloud-azure-sample" = var.sample_tag_value

diff --git a/...bs/spring-cloud-azure-starter/spring-cloud-azure-sample-eventhubs-kafka/terraform/main.tf b/...bs/spring-cloud-azure-starter/spring-cloud-azure-sample-eventhubs-kafka/terraform/main.tf
@@ -2,7 +2,7 @@ terraform {
   required_providers {
     azurerm = {
       source  = "hashicorp/azurerm"
-      version = "2.99"
+      version = "3.9.0"
     }
     azurecaf = {
       source  = "aztfmod/azurecaf"

diff --git a/eventhubs/spring-cloud-azure-stream-binder-eventhubs/eventhubs-binder/terraform/main.tf b/eventhubs/spring-cloud-azure-stream-binder-eventhubs/eventhubs-binder/terraform/main.tf
@@ -2,7 +2,7 @@ terraform {
   required_providers {
     azurerm = {
       source  = "hashicorp/azurerm"
-      version = "2.99"
+      version = "3.9.0"
     }
     azurecaf = {
       source  = "aztfmod/azurecaf"
@@ -85,7 +85,6 @@ resource "azurerm_storage_account" "storage_account" {
   location                 = var.location
   account_tier             = "Standard"
   account_replication_type = "LRS"
-  allow_blob_public_access = true
 
   tags = {
     "spring-cloud-azure-sample" = var.sample_tag_value

diff --git a/eventhubs/spring-cloud-azure-stream-binder-eventhubs/eventhubs-multibinders/pom.xml b/eventhubs/spring-cloud-azure-stream-binder-eventhubs/eventhubs-multibinders/pom.xml
@@ -12,7 +12,7 @@
     <relativePath>../../../pom.xml</relativePath>
   </parent>
 
-  <artifactId>spring-cloud-azure-sample-stream-eventhubs-multibinders</artifactId>
+  <artifactId>eventhubs-multibinders</artifactId>
   <version>1.0.0</version>
   <packaging>jar</packaging>
 

diff --git a/...thubs/spring-cloud-azure-stream-binder-eventhubs/eventhubs-multibinders/terraform/main.tf b/...thubs/spring-cloud-azure-stream-binder-eventhubs/eventhubs-multibinders/terraform/main.tf
@@ -2,7 +2,7 @@ terraform {
   required_providers {
     azurerm = {
       source  = "hashicorp/azurerm"
-      version = "2.99"
+      version = "3.9.0"
     }
     azurecaf = {
       source  = "aztfmod/azurecaf"
@@ -119,7 +119,6 @@ resource "azurerm_storage_account" "storage_account" {
   location                 = var.location
   account_tier             = "Standard"
   account_replication_type = "LRS"
-  allow_blob_public_access = true
 
   tags = {
     "spring-cloud-azure-sample" = var.sample_tag_value

diff --git a/keyvault/spring-cloud-azure-starter-keyvault-secrets/property-source/terraform/main.tf b/keyvault/spring-cloud-azure-starter-keyvault-secrets/property-source/terraform/main.tf
@@ -2,7 +2,7 @@ terraform {
   required_providers {
     azurerm = {
       source  = "hashicorp/azurerm"
-      version = "2.99"
+      version = "3.9.0"
     }
     azurecaf = {
       source  = "aztfmod/azurecaf"

diff --git a/keyvault/spring-cloud-azure-starter-keyvault-secrets/secret-client/terraform/main.tf b/keyvault/spring-cloud-azure-starter-keyvault-secrets/secret-client/terraform/main.tf
@@ -2,7 +2,7 @@ terraform {
   required_providers {
     azurerm = {
       source  = "hashicorp/azurerm"
-      version = "2.99"
+      version = "3.9.0"
     }
     azurecaf = {
       source  = "aztfmod/azurecaf"

diff --git a/...s/spring-cloud-azure-starter-integration-servicebus/multiple-namespaces/terraform/main.tf b/...s/spring-cloud-azure-starter-integration-servicebus/multiple-namespaces/terraform/main.tf
@@ -2,7 +2,7 @@ terraform {
   required_providers {
     azurerm = {
       source  = "hashicorp/azurerm"
-      version = "2.99"
+      version = "3.9.0"
     }
     azurecaf = {
       source  = "aztfmod/azurecaf"

diff --git a/...ebus/spring-cloud-azure-starter-integration-servicebus/single-namespace/terraform/main.tf b/...ebus/spring-cloud-azure-starter-integration-servicebus/single-namespace/terraform/main.tf
@@ -2,7 +2,7 @@ terraform {
   required_providers {
     azurerm = {
       source  = "hashicorp/azurerm"
-      version = "2.99"
+      version = "3.9.0"
     }
     azurecaf = {
       source  = "aztfmod/azurecaf"

diff --git a/servicebus/spring-cloud-azure-starter-servicebus-jms/servicebus-jms-queue/terraform/main.tf b/servicebus/spring-cloud-azure-starter-servicebus-jms/servicebus-jms-queue/terraform/main.tf
@@ -2,7 +2,7 @@ terraform {
   required_providers {
     azurerm = {
       source  = "hashicorp/azurerm"
-      version = "2.99"
+      version = "3.9.0"
     }
     azurecaf = {
       source  = "aztfmod/azurecaf"

diff --git a/servicebus/spring-cloud-azure-starter-servicebus-jms/servicebus-jms-topic/terraform/main.tf b/servicebus/spring-cloud-azure-starter-servicebus-jms/servicebus-jms-topic/terraform/main.tf
@@ -2,7 +2,7 @@ terraform {
   required_providers {
     azurerm = {
       source  = "hashicorp/azurerm"
-      version = "2.99"
+      version = "3.9.0"
     }
     azurecaf = {
       source  = "aztfmod/azurecaf"

diff --git a/...bus/spring-cloud-azure-stream-binder-servicebus/servicebus-multibinders/terraform/main.tf b/...bus/spring-cloud-azure-stream-binder-servicebus/servicebus-multibinders/terraform/main.tf
@@ -2,7 +2,7 @@ terraform {
   required_providers {
     azurerm = {
       source  = "hashicorp/azurerm"
-      version = "2.99"
+      version = "3.9.0"
     }
     azurecaf = {
       source  = "aztfmod/azurecaf"

diff --git a/...spring-cloud-azure-stream-binder-servicebus/servicebus-queue-binder-arm/terraform/main.tf b/...spring-cloud-azure-stream-binder-servicebus/servicebus-queue-binder-arm/terraform/main.tf
@@ -2,7 +2,7 @@ terraform {
   required_providers {
     azurerm = {
       source  = "hashicorp/azurerm"
-      version = "2.99.0"
+      version = "3.9.0"
     }
     azurecaf = {
       source  = "aztfmod/azurecaf"

diff --git a/...bus/spring-cloud-azure-stream-binder-servicebus/servicebus-queue-binder/terraform/main.tf b/...bus/spring-cloud-azure-stream-binder-servicebus/servicebus-queue-binder/terraform/main.tf
@@ -2,7 +2,7 @@ terraform {
   required_providers {
     azurerm = {
       source  = "hashicorp/azurerm"
-      version = "2.99"
+      version = "3.9.0"
     }
     azurecaf = {
       source  = "aztfmod/azurecaf"

diff --git a/...bus/spring-cloud-azure-stream-binder-servicebus/servicebus-topic-binder/terraform/main.tf b/...bus/spring-cloud-azure-stream-binder-servicebus/servicebus-topic-binder/terraform/main.tf
@@ -2,7 +2,7 @@ terraform {
   required_providers {
     azurerm = {
       source  = "hashicorp/azurerm"
-      version = "2.99"
+      version = "3.9.0"
     }
     azurecaf = {
       source  = "aztfmod/azurecaf"

diff --git a/spring-native/storage-blob-native/terraform/main.tf b/spring-native/storage-blob-native/terraform/main.tf
@@ -2,7 +2,7 @@ terraform {
   required_providers {
     azurerm = {
       source  = "hashicorp/azurerm"
-      version = "2.99"
+      version = "3.9.0"
     }
     azurecaf = {
       source  = "aztfmod/azurecaf"
@@ -47,7 +47,6 @@ resource "azurerm_storage_account" "application" {
   location                 = var.location
   account_tier             = "Standard"
   account_replication_type = "LRS"
-  allow_blob_public_access = true
 
   tags = {
     "spring-cloud-azure-sample" = var.sample_tag_value

diff --git a/spring-petclinic-microservices/terraform/main.tf b/spring-petclinic-microservices/terraform/main.tf
@@ -2,7 +2,7 @@ terraform {
   required_providers {
     azurerm  = {
       source  = "hashicorp/azurerm"
-      version = "2.99"
+      version = "3.9.0"
     }
     azurecaf = {
       source  = "aztfmod/azurecaf"

diff --git a/...cloud-azure-starter-integration-storage-queue/storage-queue-integration/terraform/main.tf b/...cloud-azure-starter-integration-storage-queue/storage-queue-integration/terraform/main.tf
@@ -2,7 +2,7 @@ terraform {
   required_providers {
     azurerm = {
       source  = "hashicorp/azurerm"
-      version = "2.99"
+      version = "3.9.0"
     }
     azurecaf = {
       source  = "aztfmod/azurecaf"

diff --git a/...g-cloud-azure-starter-integration-storage-queue/storage-queue-operation/terraform/main.tf b/...g-cloud-azure-starter-integration-storage-queue/storage-queue-operation/terraform/main.tf
@@ -2,7 +2,7 @@ terraform {
   required_providers {
     azurerm = {
       source  = "hashicorp/azurerm"
-      version = "2.99"
+      version = "3.9.0"
     }
     azurecaf = {
       source  = "aztfmod/azurecaf"

diff --git a/storage/spring-cloud-azure-starter-storage-blob/storage-blob-sample/terraform/main.tf b/storage/spring-cloud-azure-starter-storage-blob/storage-blob-sample/terraform/main.tf
@@ -2,7 +2,7 @@ terraform {
   required_providers {
     azurerm = {
       source  = "hashicorp/azurerm"
-      version = "2.99"
+      version = "3.9.0"
     }
     azurecaf = {
       source  = "aztfmod/azurecaf"
@@ -47,7 +47,6 @@ resource "azurerm_storage_account" "application" {
   location                 = var.location
   account_tier             = "Standard"
   account_replication_type = "LRS"
-  allow_blob_public_access = true
 
   tags = {
     "spring-cloud-azure-sample" = var.sample_tag_value

diff --git a/storage/spring-cloud-azure-starter-storage-queue/storage-queue-client/terraform/main.tf b/storage/spring-cloud-azure-starter-storage-queue/storage-queue-client/terraform/main.tf
@@ -2,7 +2,7 @@ terraform {
   required_providers {
     azurerm = {
       source  = "hashicorp/azurerm"
-      version = "2.99"
+      version = "3.9.0"
     }
     azurecaf = {
       source  = "aztfmod/azurecaf"