Skip to content

Commit

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

## Manual edits

1. Resolved a simple conflict in
`upstream/website/docs/r/api_management_api_policy.html.markdown`.
2. Ignored deprecated resource `azurerm_network_packet_capture` by
adding it to `IgnoreMappings` because it failed the build with _"could
not find docs"_.

(2) is a bit odd because the resource isn't in the current version of
the pulumi provider at all. (Otherwise, we couldn't just remove it.) I
assume that due to upstream [azurerm_network_packet_capture - deprecate
resource for
5.0](hashicorp/terraform-provider-azurerm#28324),
which changed the version gates for the resource, it was newly included
but we don't want it.

---

- Upgrading terraform-provider-azurerm from 4.14.0  to 4.15.0.
	Fixes #2925
  • Loading branch information
@thomas11
thomas11 authored Jan 13, 2025
1 parent f277f4f commit 0aa3ff2
Show file tree
Hide file tree
Showing 472 changed files with 30,921 additions and 1,384 deletions.
2 changes: 1 addition & 1 deletion patches/0010-Remove-function_app_schema-use_dotnet_isolated_runti.patch
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ 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 d427fb0398..85361052e4 100644
index d99d6e9160..9a77ff31e8 100644
--- a/internal/services/appservice/helpers/function_app_schema.go
+++ b/internal/services/appservice/helpers/function_app_schema.go
@@ -1085,10 +1085,11 @@ func linuxFunctionAppStackSchema() *pluginsdk.Schema {
Expand Down
8 changes: 4 additions & 4 deletions patches/0012-Ensure-servicebus-queue-topic-have-namespaces-and-RG.patch
View file
Original file line number Diff line number Diff line change
Expand Up @@ -46,10 +46,10 @@ 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 0c7c4b4fb2..bedc1f1795 100644
index 18586f4085..112c5116af 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 {
@@ -44,6 +44,8 @@ func resourceServiceBusTopic() *pluginsdk.Resource {
}
}

Expand All @@ -58,7 +58,7 @@ index 0c7c4b4fb2..bedc1f1795 100644
func resourceServiceBusTopicSchema() map[string]*pluginsdk.Schema {
schema := map[string]*pluginsdk.Schema{
"name": {
@@ -135,6 +137,16 @@ func resourceServiceBusTopicSchema() map[string]*pluginsdk.Schema {
@@ -134,6 +136,16 @@ func resourceServiceBusTopicSchema() map[string]*pluginsdk.Schema {
Type: pluginsdk.TypeBool,
Optional: true,
},
Expand All @@ -75,7 +75,7 @@ index 0c7c4b4fb2..bedc1f1795 100644
}

return schema
@@ -259,6 +271,10 @@ func resourceServiceBusTopicRead(d *pluginsdk.ResourceData, meta interface{}) er
@@ -245,6 +257,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
21 changes: 11 additions & 10 deletions patches/0013-Update-documentation.patch
View file
Original file line number Diff line number Diff line change
Expand Up @@ -216,7 +216,7 @@ index dfd7e805a5..9d33203dbb 100644
* `container_name` - Name of the container.

diff --git a/website/docs/d/storage_account_sas.html.markdown b/website/docs/d/storage_account_sas.html.markdown
index a078984a7b..1dff00245c 100644
index 44a68ad68c..db0e31fef4 100644
--- a/website/docs/d/storage_account_sas.html.markdown
+++ b/website/docs/d/storage_account_sas.html.markdown
@@ -78,7 +78,7 @@ output "sas_url_query_string" {
Expand All @@ -227,7 +227,7 @@ index a078984a7b..1dff00245c 100644
+* `connection_string` - (Required) The connection string for the storage account to which this SAS applies. Typically directly from the `primary_connection_string` attribute of a `azurerm_storage_account` resource.
* `https_only` - (Optional) Only permit `https` access. If `false`, both `http` and `https` are permitted. Defaults to `true`.
* `ip_addresses` - (Optional) IP address, or a range of IP addresses, from which to accept requests. When specifying a range, note that the range is inclusive.
* `signed_version` - (Optional) Specifies the signed storage service version to use to authorize requests made with this account SAS. Defaults to `2017-07-29`.
* `signed_version` - (Optional) Specifies the signed storage service version to use to authorize requests made with this account SAS. Defaults to `2022-11-02`.
diff --git a/website/docs/guides/3.0-upgrade-guide.html.markdown b/website/docs/guides/3.0-upgrade-guide.html.markdown
index 9a676c124f..684bf153a7 100644
--- a/website/docs/guides/3.0-upgrade-guide.html.markdown
Expand Down Expand Up @@ -306,14 +306,15 @@ index 5c171b3703..9c893da103 100644
}

diff --git a/website/docs/r/api_management_api_policy.html.markdown b/website/docs/r/api_management_api_policy.html.markdown
index 820a09f089..d8d31e7ce2 100644
index e77172e1eb..d8d31e7ce2 100644
--- a/website/docs/r/api_management_api_policy.html.markdown
+++ b/website/docs/r/api_management_api_policy.html.markdown
@@ -45,7 +45,7 @@ The following arguments are supported:
@@ -45,8 +45,7 @@ The following arguments are supported:

* `resource_group_name` - (Required) The name of the Resource Group in which the API Management Service exists. Changing this forces a new resource to be created.

-* `xml_content` - (Optional) The XML Content for this Policy as a string. An XML file can be used here with Terraform's [file function](https://www.terraform.io/docs/configuration/functions/file.html) that is similar to Microsoft's `PolicyFilePath` option.
-* `xml_content` - (Optional) The XML Content for this Policy as a string. An XML file can be used here with Terraform's [file function](https://www.terraform.io/docs/configuration/functions/file.html) that is similar to Microsoft's `PolicyFilePath` option. If you need to pass variables into your XML file, use Terraform's [templatefile function](https://developer.hashicorp.com/terraform/language/functions/templatefile).
-
+* `xml_content` - (Optional) The XML Content for this Policy as a string.

* `xml_link` - (Optional) A link to a Policy XML Document, which must be publicly available.
Expand Down Expand Up @@ -1849,7 +1850,7 @@ index 656e81119f..b9a4cae44f 100644
scope = "/subscriptions/00000000-0000-0000-0000-000000000000"

diff --git a/website/docs/r/linux_virtual_machine.html.markdown b/website/docs/r/linux_virtual_machine.html.markdown
index 8cd9fd75f2..dda1a1fd9d 100644
index 630069700a..c3aedcc200 100644
--- a/website/docs/r/linux_virtual_machine.html.markdown
+++ b/website/docs/r/linux_virtual_machine.html.markdown
@@ -12,9 +12,9 @@ Manages a Linux Virtual Machine.
Expand Down Expand Up @@ -2300,7 +2301,7 @@ index c82917be5a..131701e1d9 100644
* `cross_region_restore_enabled` - (Optional) Is cross region restore enabled for this Vault? Only can be `true`, when `storage_mode_type` is `GeoRedundant`. Defaults to `false`.

diff --git a/website/docs/r/redis_cache.html.markdown b/website/docs/r/redis_cache.html.markdown
index a90100d447..af92891cf8 100644
index f613043486..21d73ac845 100644
--- a/website/docs/r/redis_cache.html.markdown
+++ b/website/docs/r/redis_cache.html.markdown
@@ -15,7 +15,7 @@ Manages a Redis Cache.
Expand All @@ -2312,7 +2313,7 @@ index a90100d447..af92891cf8 100644

```hcl
resource "azurerm_resource_group" "example" {
@@ -160,7 +160,7 @@ redis_configuration {
@@ -162,7 +162,7 @@ redis_configuration {
* `rdb_backup_max_snapshot_count` - (Optional) The maximum number of snapshots to create as a backup. Only supported for Premium SKUs.
* `rdb_storage_connection_string` - (Optional) The Connection String to the Storage Account. Only supported for Premium SKUs. In the format: `DefaultEndpointsProtocol=https;BlobEndpoint=${azurerm_storage_account.example.primary_blob_endpoint};AccountName=${azurerm_storage_account.example.name};AccountKey=${azurerm_storage_account.example.primary_access_key}`.

Expand Down Expand Up @@ -2827,7 +2828,7 @@ index f96d4cc7bd..416bf679b8 100644
---

diff --git a/website/docs/r/virtual_network.html.markdown b/website/docs/r/virtual_network.html.markdown
index e21ea3967f..31c126c3e9 100644
index 5e8b4fb424..6494b3d882 100644
--- a/website/docs/r/virtual_network.html.markdown
+++ b/website/docs/r/virtual_network.html.markdown
@@ -11,10 +11,10 @@ description: |-
Expand All @@ -2846,7 +2847,7 @@ index e21ea3967f..31c126c3e9 100644

## Example Usage
diff --git a/website/docs/r/windows_virtual_machine.html.markdown b/website/docs/r/windows_virtual_machine.html.markdown
index 45781e8d0b..7a87d33337 100644
index bfd90952ef..1320d334ff 100644
--- a/website/docs/r/windows_virtual_machine.html.markdown
+++ b/website/docs/r/windows_virtual_machine.html.markdown
@@ -12,9 +12,9 @@ Manages a Windows Virtual Machine.
Expand Down
18 changes: 0 additions & 18 deletions patches/0014-Fix-4.0-removed-resources.patch
View file

This file was deleted.

148 changes: 145 additions & 3 deletions provider/cmd/pulumi-resource-azure/bridge-metadata.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1819,6 +1819,25 @@
}
}
},
"azurerm_arc_kubernetes_provisioned_cluster": {
"current": "azure:arckubernetes/provisionedCluster:ProvisionedCluster",
"majorVersion": 6,
"fields": {
"azure_active_directory": {
"maxItemsOne": true,
"elem": {
"fields": {
"admin_group_object_ids": {
"maxItemsOne": false
}
}
}
},
"identity": {
"maxItemsOne": true
}
}
},
"azurerm_arc_machine": {
"current": "azure:arcmachine/arcMachine:ArcMachine",
"majorVersion": 6,
Expand Down Expand Up @@ -2655,6 +2674,9 @@
"node_placement": {
"maxItemsOne": false
},
"security_profile": {
"maxItemsOne": true
},
"start_task": {
"maxItemsOne": true,
"elem": {
Expand Down Expand Up @@ -3209,7 +3231,19 @@
},
"azurerm_cdn_frontdoor_profile": {
"current": "azure:cdn/frontdoorProfile:FrontdoorProfile",
"majorVersion": 6
"majorVersion": 6,
"fields": {
"identity": {
"maxItemsOne": true,
"elem": {
"fields": {
"identity_ids": {
"maxItemsOne": false
}
}
}
}
}
},
"azurerm_cdn_frontdoor_route": {
"current": "azure:cdn/frontdoorRoute:FrontdoorRoute",
Expand Down Expand Up @@ -6654,6 +6688,32 @@
}
}
},
"azurerm_dynatrace_tag_rules": {
"current": "azure:dynatrace/tagRules:TagRules",
"majorVersion": 6,
"fields": {
"log_rule": {
"maxItemsOne": true,
"elem": {
"fields": {
"filtering_tag": {
"maxItemsOne": false
}
}
}
},
"metric_rule": {
"maxItemsOne": true,
"elem": {
"fields": {
"filtering_tag": {
"maxItemsOne": false
}
}
}
}
}
},
"azurerm_elastic_cloud_elasticsearch": {
"current": "azure:elasticcloud/elasticsearch:Elasticsearch",
"majorVersion": 6,
Expand Down Expand Up @@ -9350,6 +9410,22 @@
}
}
},
"cors": {
"maxItemsOne": true,
"elem": {
"fields": {
"allowed_headers": {
"maxItemsOne": false
},
"allowed_methods": {
"maxItemsOne": false
},
"allowed_origins": {
"maxItemsOne": false
}
}
}
},
"identity": {
"maxItemsOne": true,
"elem": {
Expand All @@ -9362,6 +9438,9 @@
},
"private_endpoint": {
"maxItemsOne": false
},
"storage": {
"maxItemsOne": true
}
}
},
Expand Down Expand Up @@ -10608,6 +10687,16 @@
"fields": {
"depends_on": {
"maxItemsOne": false
},
"post_build": {
"maxItemsOne": true,
"elem": {
"fields": {
"substitute_from": {
"maxItemsOne": false
}
}
}
}
}
}
Expand Down Expand Up @@ -13014,6 +13103,14 @@
"current": "azure:machinelearning/workspaceNetworkOutboundRuleFqdn:WorkspaceNetworkOutboundRuleFqdn",
"majorVersion": 6
},
"azurerm_machine_learning_workspace_network_outbound_rule_private_endpoint": {
"current": "azure:machinelearning/workspaceNetworkOutboundRulePrivateEndpoint:WorkspaceNetworkOutboundRulePrivateEndpoint",
"majorVersion": 6
},
"azurerm_machine_learning_workspace_network_outbound_rule_service_tag": {
"current": "azure:machinelearning/workspaceNetworkOutboundRuleServiceTag:WorkspaceNetworkOutboundRuleServiceTag",
"majorVersion": 6
},
"azurerm_maintenance_assignment_dedicated_host": {
"current": "azure:maintenance/assignmentDedicatedHost:AssignmentDedicatedHost",
"majorVersion": 6
Expand Down Expand Up @@ -14646,6 +14743,9 @@
"current": "azure:mssql/managedInstance:ManagedInstance",
"majorVersion": 6,
"fields": {
"azure_active_directory_administrator": {
"maxItemsOne": true
},
"identity": {
"maxItemsOne": true,
"elem": {
Expand Down Expand Up @@ -18423,7 +18523,14 @@
}
},
"network_interface": {
"maxItemsOne": false
"maxItemsOne": false,
"elem": {
"fields": {
"recovery_load_balancer_backend_address_pool_ids": {
"maxItemsOne": false
}
}
}
},
"unmanaged_disk": {
"maxItemsOne": false
Expand Down Expand Up @@ -24471,7 +24578,19 @@
},
"azurerm_cdn_frontdoor_profile": {
"current": "azure:cdn/getFrontdoorProfile:getFrontdoorProfile",
"majorVersion": 6
"majorVersion": 6,
"fields": {
"identity": {
"maxItemsOne": true,
"elem": {
"fields": {
"identity_ids": {
"maxItemsOne": false
}
}
}
}
}
},
"azurerm_cdn_frontdoor_rule_set": {
"current": "azure:cdn/getFrontdoorRuleSet:getFrontdoorRuleSet",
Expand Down Expand Up @@ -25683,6 +25802,22 @@
}
}
},
"cors": {
"maxItemsOne": false,
"elem": {
"fields": {
"allowed_headers": {
"maxItemsOne": false
},
"allowed_methods": {
"maxItemsOne": false
},
"allowed_origins": {
"maxItemsOne": false
}
}
}
},
"identity": {
"maxItemsOne": false,
"elem": {
Expand All @@ -25695,6 +25830,9 @@
},
"private_endpoint": {
"maxItemsOne": false
},
"storage": {
"maxItemsOne": false
}
}
},
Expand Down Expand Up @@ -26234,6 +26372,10 @@
}
}
},
"azurerm_kubernetes_fleet_manager": {
"current": "azure:containerservice/getFleetManager:getFleetManager",
"majorVersion": 6
},
"azurerm_kubernetes_node_pool_snapshot": {
"current": "azure:containerservice/getKubernetesNodePoolSnapshot:getKubernetesNodePoolSnapshot",
"majorVersion": 6
Expand Down
Loading

0 comments on commit 0aa3ff2

Please sign in to comment.