Skip to content

Commit

Permalink
Upgrade terraform-provider-azurerm to v4.10.0 (#2638)
Browse files Browse the repository at this point in the history
This PR was generated via `$ upgrade-provider pulumi/pulumi-azure
--kind=all --target-version=4.10.0`.

---

- Upgrading terraform-provider-azurerm from 4.9.0  to 4.10.0.
	Fixes #2637
  • Loading branch information
pulumi-bot authored Nov 19, 2024
1 parent d52b1be commit 85d2ff9
Show file tree
Hide file tree
Showing 232 changed files with 12,755 additions and 950 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,10 @@ Subject: [PATCH] Set frontdoor backend_pool_settings to computed


diff --git a/internal/services/frontdoor/frontdoor_resource.go b/internal/services/frontdoor/frontdoor_resource.go
index 35a5a39145..23b8a243df 100644
index 79700285a8..93eb8dd23f 100644
--- a/internal/services/frontdoor/frontdoor_resource.go
+++ b/internal/services/frontdoor/frontdoor_resource.go
@@ -2072,6 +2072,7 @@ func resourceFrontDoorSchema() map[string]*pluginsdk.Schema {
@@ -2067,6 +2067,7 @@ func resourceFrontDoorSchema() map[string]*pluginsdk.Schema {
"backend_pool_settings": {
Type: pluginsdk.TypeList,
Optional: true,
Expand Down
4 changes: 2 additions & 2 deletions patches/0006-Make-shared-features-config-optional.patch
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,10 @@ Modified in fork in https://github.com/pulumi/terraform-provider-azurerm/commit/
This originally included a conditional block to only set the SharedFeatures config if it had a value but this seems to have been lost during the provider config being refactored in https://github.com/hashicorp/terraform-provider-azurerm/commit/57bcf134131514ffcc962f20b12f993fad7d6060#diff-58d6a027753b50994deb7e11e4a99dde423f35844986019bd9cea5e0c94aba22

diff --git a/internal/provider/features.go b/internal/provider/features.go
index e39c3ce0c7..aac9b65f19 100644
index 0becb67ac8..f43ffd2766 100644
--- a/internal/provider/features.go
+++ b/internal/provider/features.go
@@ -403,7 +403,7 @@ func schemaFeatures(supportLegacyTestSuite bool) *pluginsdk.Schema {
@@ -425,7 +425,7 @@ func schemaFeatures(supportLegacyTestSuite bool) *pluginsdk.Schema {

return &pluginsdk.Schema{
Type: pluginsdk.TypeList,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ 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 8376b0c938..c9a4aca0ff 100644
index efac78a79d..4eec1fae57 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 {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ Subject: [PATCH] Remove vm platform_fault_domain required_with
Applies to both Windows and Linux.

diff --git a/internal/services/compute/linux_virtual_machine_resource.go b/internal/services/compute/linux_virtual_machine_resource.go
index a92e1ec8bd..a5f7996bdc 100644
index 3c4cde6ea2..433b20b500 100644
--- a/internal/services/compute/linux_virtual_machine_resource.go
+++ b/internal/services/compute/linux_virtual_machine_resource.go
@@ -372,7 +372,6 @@ func resourceLinuxVirtualMachine() *pluginsdk.Resource {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,11 @@ Subject: [PATCH] Remove function_app_schema use_dotnet_isolated_runtime


diff --git a/internal/services/appservice/helpers/function_app_schema.go b/internal/services/appservice/helpers/function_app_schema.go
index ca7d021db9..7ca516bf9c 100644
index d0380954e9..fb9daddb26 100644
--- a/internal/services/appservice/helpers/function_app_schema.go
+++ b/internal/services/appservice/helpers/function_app_schema.go
@@ -1084,10 +1084,11 @@ func linuxFunctionAppStackSchema() *pluginsdk.Schema {
Description: "The version of .Net. Possible values are `3.1`, `6.0` and `7.0`",
@@ -1085,10 +1085,11 @@ func linuxFunctionAppStackSchema() *pluginsdk.Schema {
Description: "The version of .Net. Possible values are `3.1`, `6.0`, `7.0`, `8.0` and `9.0`",
},

+ // FORK: Removed default value due to pulumi-azure#1227
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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 1623d7f838..dc11e3ed26 100644
index 6e83d72960..aa6c65567e 100644
--- a/internal/services/containers/container_registry_resource.go
+++ b/internal/services/containers/container_registry_resource.go
@@ -7,7 +7,6 @@ import (
Expand All @@ -17,7 +17,7 @@ index 1623d7f838..dc11e3ed26 100644
"strings"
"time"

@@ -770,11 +769,6 @@ func resourceContainerRegistryRead(d *pluginsdk.ResourceData, meta interface{})
@@ -711,11 +710,6 @@ func resourceContainerRegistryRead(d *pluginsdk.ResourceData, meta interface{})
}
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ index b4df3f33be..fc4838204d 100644
if model := resp.Model; model != nil {
if props := model.Properties; props != nil {
diff --git a/internal/services/servicebus/servicebus_topic_resource.go b/internal/services/servicebus/servicebus_topic_resource.go
index 164a0ac21d..17aab56f03 100644
index 0c7c4b4fb2..bedc1f1795 100644
--- a/internal/services/servicebus/servicebus_topic_resource.go
+++ b/internal/services/servicebus/servicebus_topic_resource.go
@@ -45,6 +45,8 @@ func resourceServiceBusTopic() *pluginsdk.Resource {
Expand All @@ -58,7 +58,7 @@ index 164a0ac21d..17aab56f03 100644
func resourceServiceBusTopicSchema() map[string]*pluginsdk.Schema {
schema := map[string]*pluginsdk.Schema{
"name": {
@@ -138,6 +140,16 @@ func resourceServiceBusTopicSchema() map[string]*pluginsdk.Schema {
@@ -135,6 +137,16 @@ func resourceServiceBusTopicSchema() map[string]*pluginsdk.Schema {
Type: pluginsdk.TypeBool,
Optional: true,
},
Expand All @@ -74,8 +74,8 @@ index 164a0ac21d..17aab56f03 100644
+ },
}

if !features.FourPointOhBeta() {
@@ -310,6 +322,10 @@ func resourceServiceBusTopicRead(d *pluginsdk.ResourceData, meta interface{}) er
return schema
@@ -259,6 +271,10 @@ func resourceServiceBusTopicRead(d *pluginsdk.ResourceData, meta interface{}) er
d.Set("name", id.TopicName)
d.Set("namespace_id", topics.NewNamespaceID(id.SubscriptionId, id.ResourceGroupName, id.NamespaceName).ID())

Expand Down
2 changes: 1 addition & 1 deletion patches/0013-Update-documentation.patch
Original file line number Diff line number Diff line change
Expand Up @@ -638,7 +638,7 @@ index e9013a8f1a..f3f07aa79a 100644
To find the Analytics Item ID you can query the REST API using the [`az rest` CLI command](https://docs.microsoft.com/cli/azure/reference-index?view=azure-cli-latest#az-rest), e.g.

diff --git a/website/docs/r/automation_job_schedule.html.markdown b/website/docs/r/automation_job_schedule.html.markdown
index cf1fbfa577..42f3ef7f89 100644
index 3eb1e84dd0..e2cfe213d7 100644
--- a/website/docs/r/automation_job_schedule.html.markdown
+++ b/website/docs/r/automation_job_schedule.html.markdown
@@ -14,7 +14,7 @@ Links an Automation Runbook and Schedule.
Expand Down
37 changes: 37 additions & 0 deletions provider/cmd/pulumi-resource-azure/bridge-metadata.json
Original file line number Diff line number Diff line change
Expand Up @@ -2472,6 +2472,9 @@
"fields": {
"ip_configuration": {
"maxItemsOne": true
},
"zones": {
"maxItemsOne": false
}
}
},
Expand Down Expand Up @@ -14923,6 +14926,14 @@
"current": "azure:netapp/accountEncryption:AccountEncryption",
"majorVersion": 6
},
"azurerm_netapp_backup_policy": {
"current": "azure:netapp/backupPolicy:BackupPolicy",
"majorVersion": 6
},
"azurerm_netapp_backup_vault": {
"current": "azure:netapp/backupVault:BackupVault",
"majorVersion": 6
},
"azurerm_netapp_pool": {
"current": "azure:netapp/pool:Pool",
"majorVersion": 6
Expand Down Expand Up @@ -14967,6 +14978,9 @@
"current": "azure:netapp/volume:Volume",
"majorVersion": 6,
"fields": {
"data_protection_backup_policy": {
"maxItemsOne": true
},
"data_protection_replication": {
"maxItemsOne": true
},
Expand Down Expand Up @@ -24141,6 +24155,9 @@
"fields": {
"ip_configuration": {
"maxItemsOne": false
},
"zones": {
"maxItemsOne": false
}
}
},
Expand Down Expand Up @@ -25934,6 +25951,15 @@
}
}
},
"azurerm_key_vault_managed_hardware_security_module_key": {
"current": "azure:keyvault/getManagedHardwareSecurityModuleKey:getManagedHardwareSecurityModuleKey",
"majorVersion": 6,
"fields": {
"key_opts": {
"maxItemsOne": false
}
}
},
"azurerm_key_vault_managed_hardware_security_module_role_definition": {
"current": "azure:keyvault/getManagedHardwareSecurityModuleRoleDefinition:getManagedHardwareSecurityModuleRoleDefinition",
"majorVersion": 6,
Expand Down Expand Up @@ -27841,6 +27867,14 @@
"current": "azure:netapp/getAccountEncryption:getAccountEncryption",
"majorVersion": 6
},
"azurerm_netapp_backup_policy": {
"current": "azure:netapp/getBackupPolicy:getBackupPolicy",
"majorVersion": 6
},
"azurerm_netapp_backup_vault": {
"current": "azure:netapp/getBackupVault:getBackupVault",
"majorVersion": 6
},
"azurerm_netapp_pool": {
"current": "azure:netapp/getPool:getPool",
"majorVersion": 6
Expand Down Expand Up @@ -27885,6 +27919,9 @@
"current": "azure:netapp/getVolume:getVolume",
"majorVersion": 6,
"fields": {
"data_protection_backup_policy": {
"maxItemsOne": false
},
"data_protection_replication": {
"maxItemsOne": false
},
Expand Down
Loading

0 comments on commit 85d2ff9

Please sign in to comment.