chore: update to Azure V4 provider (#891)

blgm · web-flow · commit 46c8c9fa7b25 · 2025-02-25T09:28:29.000Z
- Some properties have been renamed or turned into sets
- Tests for previous upgrade have been updated to no longer expect failure first time
diff --git a/acceptance-tests/helpers/services/upgrade.go b/acceptance-tests/helpers/services/upgrade.go
@@ -38,14 +38,3 @@ func (s *ServiceInstance) UpgradeAvailable() bool {
 	Expect(json.Unmarshal([]byte(out), &receiver)).NotTo(HaveOccurred())
 	return receiver.UpgradeAvailable
 }
-
-func (s *ServiceInstance) UpgradeExpectFailure() {
-	Expect(s.UpgradeAvailable()).To(BeTrue(), "service instance does not have an upgrade available")
-
-	session := cf.Start("upgrade-service", s.Name, "--force", "--wait")
-	Eventually(session).WithTimeout(operationTimeout).Should(Exit())
-
-	out, _ := cf.Run("service", s.Name)
-	Expect(out).To(MatchRegexp(`status:\s+update failed`))
-	Expect(out).To(MatchRegexp(`message:\s+upgrade failed: Error: A resource with the ID .* already exists`))
-}
diff --git a/acceptance-tests/upgrade/update_and_upgrade_mssql_db_failover_group_existing_test.go b/acceptance-tests/upgrade/update_and_upgrade_mssql_db_failover_group_existing_test.go
@@ -104,12 +104,7 @@ var _ = Describe("Upgrade and Update csb-azure-mssql-db-failover-group 'existing
 			Expect(plans.ExistsAndAvailable(servicePlan, serviceOffering, serviceBroker.Name))
 			Expect(plans.ExistsAndAvailable(servicePlanExisting, serviceOffering, serviceBroker.Name))
 
-			By("upgrading previous service, failing first time and then repeating")
-			// Because the "azurerm_sql_database" resource is deleted at the same time as the "azurerm_mssql_database"
-			// is created, the upgrade will fail due to using the same name in Azure
-			initialFogInstance.UpgradeExpectFailure()
-			// The deletion operation of the "azurerm_sql_database" resource should now have completed, so the
-			// "azurerm_mssql_database" can be created without a name conflict in Azure
+			By("upgrading previous service")
 			initialFogInstance.Upgrade()
 
 			By("upgrading previous 'existing' service")
diff --git a/acceptance-tests/upgrade/update_and_upgrade_mssql_db_failover_group_test.go b/acceptance-tests/upgrade/update_and_upgrade_mssql_db_failover_group_test.go
@@ -90,14 +90,7 @@ var _ = Describe("UpgradeMssqlDBFailoverGroupTest", Label("mssql-db-failover-gro
 			By("validating that the instance plan is still active")
 			Expect(plans.ExistsAndAvailable(servicePlan, serviceOffering, serviceBroker.Name))
 
-			// Because the "azurerm_sql_database" resource is deleted at the same time as the "azurerm_mssql_database"
-			// is created, the upgrade will fail due to using the same name in Azure
-			By("upgrading previous services and failing")
-			initialFogInstance.UpgradeExpectFailure()
-
-			// The deletion operation of the "azurerm_sql_database" resource should now have completed, so the
-			// "azurerm_mssql_database" can be created without a name conflict in Azure
-			By("upgrading again and succeeding")
+			By("upgrading previous services")
 			initialFogInstance.Upgrade()
 
 			By("getting the previously set value using the second app")
diff --git a/manifest.yml b/manifest.yml
@@ -33,8 +33,8 @@ terraform_binaries:
   source: https://github.com/opentofu/opentofu/archive/v1.9.0.zip
   default: true
 - name: terraform-provider-azurerm
-  version: 3.117.0
-  source: https://github.com/terraform-providers/terraform-provider-azurerm/archive/v3.117.0.zip
+  version: 4.19.0
+  source: https://github.com/terraform-providers/terraform-provider-azurerm/archive/v4.19.0.zip
 - name: terraform-provider-random
   version: 3.6.3
   source: https://github.com/terraform-providers/terraform-provider-random/archive/v3.6.3.zip
diff --git a/terraform-tests/cosmosdb_mongo_test.go b/terraform-tests/cosmosdb_mongo_test.go
@@ -84,11 +84,11 @@ var _ = Describe("CosmosDB Mongo", Label("cosmosdb-mongo-terraform"), Ordered, f
 					"resource_group_name":               Equal(resourceGroupName),
 					"offer_type":                        Equal("Standard"),
 					"kind":                              Equal("MongoDB"),
-					"enable_automatic_failover":         BeTrue(),
-					"enable_multiple_write_locations":   BeTrue(),
+					"automatic_failover_enabled":        BeTrue(),
+					"multiple_write_locations_enabled":  BeTrue(),
 					"is_virtual_network_filter_enabled": BeFalse(),
 					"public_network_access_enabled":     BeTrue(),
-					"ip_range_filter":                   Equal("0.0.0.0"),
+					"ip_range_filter":                   ConsistOf("0.0.0.0"),
 					"tags": MatchAllKeys(Keys{
 						"k1": Equal("v1"),
 					}),
diff --git a/terraform/azure-mongodb/provision/main.tf b/terraform/azure-mongodb/provision/main.tf
@@ -51,10 +51,10 @@ resource "azurerm_cosmosdb_account" "mongo-account" {
     }
   }
 
-  enable_automatic_failover         = var.enable_automatic_failover
-  enable_multiple_write_locations   = var.enable_multiple_write_locations
+  automatic_failover_enabled        = var.enable_automatic_failover
+  multiple_write_locations_enabled  = var.enable_multiple_write_locations
   is_virtual_network_filter_enabled = local.enable_virtual_network_filter
-  ip_range_filter                   = var.ip_range_filter
+  ip_range_filter                   = [var.ip_range_filter]
   tags                              = var.labels
   public_network_access_enabled     = var.public_network_access_enabled
 
diff --git a/terraform/azure-mongodb/provision/outputs.tf b/terraform/azure-mongodb/provision/outputs.tf
@@ -1,5 +1,5 @@
 output "uri" {
-  value     = replace(azurerm_cosmosdb_account.mongo-account.connection_strings[0], "/?", "/${azurerm_cosmosdb_mongo_database.mongo-db.name}?")
+  value     = replace(azurerm_cosmosdb_account.mongo-account.primary_mongodb_connection_string, "/?", "/${azurerm_cosmosdb_mongo_database.mongo-db.name}?")
   sensitive = true
 }
 output "status" {
diff --git a/terraform/azure-mongodb/provision/versions.tf b/terraform/azure-mongodb/provision/versions.tf
@@ -2,7 +2,7 @@ terraform {
   required_providers {
     azurerm = {
       source  = "registry.terraform.io/hashicorp/azurerm"
-      version = "~> 3"
+      version = "~> 4"
     }
     random = {
       source  = "registry.terraform.io/hashicorp/random"
diff --git a/terraform/azure-mssql-db-failover/azure-versions.tf b/terraform/azure-mssql-db-failover/azure-versions.tf
@@ -2,7 +2,7 @@ terraform {
   required_providers {
     azurerm = {
       source  = "registry.terraform.io/hashicorp/azurerm"
-      version = "~> 3"
+      version = "~> 4"
     }
   }
 }
diff --git a/terraform/azure-mssql-db/provision/mssql-db-versions.tf b/terraform/azure-mssql-db/provision/mssql-db-versions.tf
@@ -7,7 +7,7 @@ terraform {
 
     azurerm = {
       source  = "registry.terraform.io/hashicorp/azurerm"
-      version = "~> 3"
+      version = "~> 4"
     }
   }
 }
diff --git a/terraform/azure-redis/provision/versions.tf b/terraform/azure-redis/provision/versions.tf
@@ -2,7 +2,7 @@ terraform {
   required_providers {
     azurerm = {
       source  = "registry.terraform.io/hashicorp/azurerm"
-      version = "~> 3"
+      version = "~> 4"
     }
     random = {
       source  = "registry.terraform.io/hashicorp/random"

Original file line number	Diff line number	Diff line change
`@@ -51,10 +51,10 @@ resource "azurerm_cosmosdb_account" "mongo-account" {`
`51`	`51`	`}`
`52`	`52`	`}`
`53`	`53`
`54`		`- enable_automatic_failover = var.enable_automatic_failover`
`55`		`- enable_multiple_write_locations = var.enable_multiple_write_locations`
	`54`	`+ automatic_failover_enabled = var.enable_automatic_failover`
	`55`	`+ multiple_write_locations_enabled = var.enable_multiple_write_locations`
`56`	`56`	`is_virtual_network_filter_enabled = local.enable_virtual_network_filter`
`57`		`- ip_range_filter = var.ip_range_filter`
	`57`	`+ ip_range_filter = [var.ip_range_filter]`
`58`	`58`	`tags = var.labels`
`59`	`59`	`public_network_access_enabled = var.public_network_access_enabled`
`60`	`60`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`output "uri" {`
`2`		`- value = replace(azurerm_cosmosdb_account.mongo-account.connection_strings[0], "/?", "/${azurerm_cosmosdb_mongo_database.mongo-db.name}?")`
	`2`	`+ value = replace(azurerm_cosmosdb_account.mongo-account.primary_mongodb_connection_string, "/?", "/${azurerm_cosmosdb_mongo_database.mongo-db.name}?")`
`3`	`3`	`sensitive = true`
`4`	`4`	`}`
`5`	`5`	`output "status" {`
Original file line number	Diff line number	Diff line change
`@@ -2,7 +2,7 @@ terraform {`
`2`	`2`	`required_providers {`
`3`	`3`	`azurerm = {`
`4`	`4`	`source = "registry.terraform.io/hashicorp/azurerm"`
`5`		`- version = "~> 3"`
	`5`	`+ version = "~> 4"`
`6`	`6`	`}`
`7`	`7`	`random = {`
`8`	`8`	`source = "registry.terraform.io/hashicorp/random"`
Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@ terraform {`
`7`	`7`
`8`	`8`	`azurerm = {`
`9`	`9`	`source = "registry.terraform.io/hashicorp/azurerm"`
`10`		`- version = "~> 3"`
	`10`	`+ version = "~> 4"`
`11`	`11`	`}`
`12`	`12`	`}`
`13`	`13`	`}`