Upgrade terraform-provider-azurerm to v4.11.0 (#2668)

This PR was generated via `$ upgrade-provider pulumi/pulumi-azure --kind=all --target-bridge-version=latest`. The only manual edit is [this one](https://github.com/pulumi/pulumi-azure/pull/2668/files#diff-34c57e622183cb0d8dd0d3f9eaa0861b3340120e9b2ad811bac7ac7be4cea4b1R1164) to fix >error: failed to gather package metadata: problem gathering resources: 1 error occurred: > * azurerm_databricks_workspace_customer_managed_key: could not find docs for resource 'azurerm_databricks_workspace_customer_managed_key'. Override the Docs property in the resource mapping. --- - Upgrading terraform-provider-azurerm from 4.10.0 to 4.11.0. Fixes #2665
pulumi · Nov 25, 2024 · 16faff6 · 16faff6
1 parent d8ef112
commit 16faff6
Show file tree

Hide file tree

Showing 191 changed files with 9,765 additions and 670 deletions.
diff --git a/patches/0001-Set-user-agent-in-client-options.patch b/patches/0001-Set-user-agent-in-client-options.patch
@@ -6,10 +6,10 @@ Subject: [PATCH] Set user agent in client options
 Use Pulumi-specific user agent which includes the current provider version number.
 
 diff --git a/internal/common/client_options.go b/internal/common/client_options.go
-index 4e13bed1d8..bb2705e3e0 100644
+index 99352e4d62..5006e975b0 100644
 --- a/internal/common/client_options.go
 +++ b/internal/common/client_options.go
-@@ -104,6 +104,8 @@ func userAgent(userAgent, tfVersion, partnerID string, disableTerraformPartnerID
+@@ -101,6 +101,8 @@ func userAgent(userAgent, tfVersion, partnerID string, disableTerraformPartnerID
  	if features.FivePointOhBeta() {
  		providerUserAgent = fmt.Sprintf("%s terraform-provider-azurerm/%s+5.0-beta", tfUserAgent, version.ProviderVersion)
  	}
@@ -18,7 +18,7 @@ index 4e13bed1d8..bb2705e3e0 100644
  	userAgent = strings.TrimSpace(fmt.Sprintf("%s %s", userAgent, providerUserAgent))
 
  	// append the CloudShell version to the user agent if it exists
-@@ -112,11 +114,11 @@ func userAgent(userAgent, tfVersion, partnerID string, disableTerraformPartnerID
+@@ -109,11 +111,11 @@ func userAgent(userAgent, tfVersion, partnerID string, disableTerraformPartnerID
  	}
 
  	// only one pid can be interpreted currently

diff --git a/patches/0007-Make-storage-account-resource_group_name-optional-in.patch b/patches/0007-Make-storage-account-resource_group_name-optional-in.patch
@@ -7,10 +7,10 @@ Subject: [PATCH] Make storage account resource_group_name optional in data
 Look up resource_group_name by using `storageClient.FindAccount` as storage account names should be unique, and resolve back to the resource group it belongs to.
 
 diff --git a/internal/services/storage/storage_account_data_source.go b/internal/services/storage/storage_account_data_source.go
-index efac78a79d..4eec1fae57 100644
+index 0267fa95bd..cb80352076 100644
 --- a/internal/services/storage/storage_account_data_source.go
 +++ b/internal/services/storage/storage_account_data_source.go
-@@ -39,7 +39,8 @@ func dataSourceStorageAccount() *pluginsdk.Resource {
+@@ -38,7 +38,8 @@ func dataSourceStorageAccount() *pluginsdk.Resource {
  				ValidateFunc: validate.StorageAccountName,
  			},
 
@@ -20,7 +20,7 @@ index efac78a79d..4eec1fae57 100644
 
  			"location": commonschema.LocationComputed(),
 
-@@ -554,10 +555,27 @@ func dataSourceStorageAccount() *pluginsdk.Resource {
+@@ -546,10 +547,27 @@ func dataSourceStorageAccount() *pluginsdk.Resource {
 
  func dataSourceStorageAccountRead(d *pluginsdk.ResourceData, meta interface{}) error {
  	client := meta.(*clients.Client).Storage.ResourceManager.StorageAccounts

diff --git a/patches/0011-Avoid-ordering-container-registry-georeplications.patch b/patches/0011-Avoid-ordering-container-registry-georeplications.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] Avoid ordering container registry georeplications
 This looks like it might have been removed in error due to a bad merge at some point.
 
 diff --git a/internal/services/containers/container_registry_resource.go b/internal/services/containers/container_registry_resource.go
-index 6e83d72960..aa6c65567e 100644
+index 59aa921dbd..5630a6f69c 100644
 --- a/internal/services/containers/container_registry_resource.go
 +++ b/internal/services/containers/container_registry_resource.go
 @@ -7,7 +7,6 @@ import (

diff --git a/patches/0013-Update-documentation.patch b/patches/0013-Update-documentation.patch
@@ -262,7 +262,7 @@ index a2e59b2cc0..d9dc21a792 100644
    sku_name = "Developer_1"
  }
 diff --git a/website/docs/r/api_management_api.html.markdown b/website/docs/r/api_management_api.html.markdown
-index 57d9ed9a2d..5c797d632f 100644
+index f997403600..b10ea52bc4 100644
 --- a/website/docs/r/api_management_api.html.markdown
 +++ b/website/docs/r/api_management_api.html.markdown
 @@ -23,7 +23,7 @@ resource "azurerm_api_management" "example" {
@@ -274,7 +274,7 @@ index 57d9ed9a2d..5c797d632f 100644
 
    sku_name = "Developer_1"
  }
-@@ -132,7 +132,7 @@ A `license` block supports the following:
+@@ -131,7 +131,7 @@ A `license` block supports the following:
 
  A `oauth2_authorization` block supports the following:
 
@@ -283,7 +283,7 @@ index 57d9ed9a2d..5c797d632f 100644
 
  * `scope` - (Optional) Operations scope.
 
-@@ -140,7 +140,7 @@ A `oauth2_authorization` block supports the following:
+@@ -139,7 +139,7 @@ A `oauth2_authorization` block supports the following:
 
  A `openid_authentication` block supports the following:
 
@@ -1011,7 +1011,7 @@ index d847c69797..dc19703131 100644
 
  ```hcl
 diff --git a/website/docs/r/cosmosdb_account.html.markdown b/website/docs/r/cosmosdb_account.html.markdown
-index a2caed28ba..247137f83a 100644
+index 382f2a8765..afc7d9c295 100644
 --- a/website/docs/r/cosmosdb_account.html.markdown
 +++ b/website/docs/r/cosmosdb_account.html.markdown
 @@ -13,9 +13,9 @@ Manages a CosmosDB (formally DocumentDB) Account.
@@ -2645,7 +2645,7 @@ index 6786f8eb01..38823a0fd4 100644
    name     = "example-resources"
    location = "West Europe"
 diff --git a/website/docs/r/subnet.html.markdown b/website/docs/r/subnet.html.markdown
-index 71f4ee3d87..50ca25b9d1 100644
+index 5c1e613741..4f923d2e6f 100644
 --- a/website/docs/r/subnet.html.markdown
 +++ b/website/docs/r/subnet.html.markdown
 @@ -11,7 +11,7 @@ description: |-
@@ -2827,7 +2827,7 @@ index f96d4cc7bd..416bf679b8 100644
  ---
 
 diff --git a/website/docs/r/virtual_network.html.markdown b/website/docs/r/virtual_network.html.markdown
-index 0f81276d3a..4e07fa2450 100644
+index e21ea3967f..31c126c3e9 100644
 --- a/website/docs/r/virtual_network.html.markdown
 +++ b/website/docs/r/virtual_network.html.markdown
 @@ -11,10 +11,10 @@ description: |-

diff --git a/patches/0014-Fix-4.0-removed-resources.patch b/patches/0014-Fix-4.0-removed-resources.patch
@@ -4,18 +4,6 @@ Date: Wed, 28 Aug 2024 16:43:20 +0100
 Subject: [PATCH] Fix 4.0 removed resources
 
 
-diff --git a/internal/services/databricks/registration.go b/internal/services/databricks/registration.go
-index c1bf344a2b..dee7927610 100644
---- a/internal/services/databricks/registration.go
-+++ b/internal/services/databricks/registration.go
-@@ -44,7 +44,6 @@ func (r Registration) SupportedDataSources() map[string]*pluginsdk.Resource {
- func (r Registration) SupportedResources() map[string]*pluginsdk.Resource {
- 	resources := map[string]*pluginsdk.Resource{
- 		"azurerm_databricks_workspace":                                resourceDatabricksWorkspace(),
--		"azurerm_databricks_workspace_customer_managed_key":           resourceDatabricksWorkspaceCustomerManagedKey(), // TODO: Remove in 4.0
- 		"azurerm_databricks_workspace_root_dbfs_customer_managed_key": resourceDatabricksWorkspaceRootDbfsCustomerManagedKey(),
- 		"azurerm_databricks_virtual_network_peering":                  resourceDatabricksVirtualNetworkPeering(),
- 	}
 diff --git a/internal/services/network/registration.go b/internal/services/network/registration.go
 index 400e039770..d2ee01b9e4 100644
 --- a/internal/services/network/registration.go

diff --git a/provider/cmd/pulumi-resource-azure/bridge-metadata.json b/provider/cmd/pulumi-resource-azure/bridge-metadata.json
@@ -1821,7 +1821,12 @@
             },
             "azurerm_arc_machine": {
                 "current": "azure:arcmachine/arcMachine:ArcMachine",
-                "majorVersion": 6
+                "majorVersion": 6,
+                "fields": {
+                    "identity": {
+                        "maxItemsOne": true
+                    }
+                }
             },
             "azurerm_arc_machine_automanage_configuration_assignment": {
                 "current": "azure:arcmachine/automanageConfigurationAssignment:AutomanageConfigurationAssignment",
@@ -6216,6 +6221,10 @@
                     }
                 }
             },
+            "azurerm_databricks_workspace_customer_managed_key": {
+                "current": "azure:databricks/workspaceCustomerManagedKey:WorkspaceCustomerManagedKey",
+                "majorVersion": 6
+            },
             "azurerm_databricks_workspace_root_dbfs_customer_managed_key": {
                 "current": "azure:databricks/workspaceRootDbfsCustomerManagedKey:WorkspaceRootDbfsCustomerManagedKey",
                 "majorVersion": 6
@@ -7162,6 +7171,41 @@
                     }
                 }
             },
+            "azurerm_eventgrid_namespace": {
+                "current": "azure:eventgrid/namespace:Namespace",
+                "majorVersion": 6,
+                "fields": {
+                    "identity": {
+                        "maxItemsOne": true,
+                        "elem": {
+                            "fields": {
+                                "identity_ids": {
+                                    "maxItemsOne": false
+                                }
+                            }
+                        }
+                    },
+                    "inbound_ip_rule": {
+                        "maxItemsOne": false
+                    },
+                    "topic_spaces_configuration": {
+                        "maxItemsOne": false,
+                        "elem": {
+                            "fields": {
+                                "alternative_authentication_name_source": {
+                                    "maxItemsOne": false
+                                },
+                                "dynamic_routing_enrichment": {
+                                    "maxItemsOne": false
+                                },
+                                "static_routing_enrichment": {
+                                    "maxItemsOne": false
+                                }
+                            }
+                        }
+                    }
+                }
+            },
             "azurerm_eventgrid_system_topic": {
                 "current": "azure:eventgrid/systemTopic:SystemTopic",
                 "majorVersion": 6,