Skip to content

Commit

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

---

- Upgrading terraform-provider-azurerm from 4.2.0  to 4.3.0.
	Fixes #2410
  • Loading branch information
@danielrbradley
danielrbradley authored Sep 30, 2024
1 parent b7ccc7a commit be9e008
Show file tree
Hide file tree
Showing 312 changed files with 32,424 additions and 482 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 b2517a4611..43700d4ca3 100644
index ca7d021db9..7ca516bf9c 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 {
Expand Down
20 changes: 10 additions & 10 deletions patches/0013-Update-documentation.patch
View file
Original file line number Diff line number Diff line change
Expand Up @@ -997,7 +997,7 @@ index ed1f00c577..a4568c1ce0 100644
---

diff --git a/website/docs/r/container_registry.html.markdown b/website/docs/r/container_registry.html.markdown
index 01a845deab..6d790e8b1a 100644
index caea0a5547..24ef646efd 100644
--- a/website/docs/r/container_registry.html.markdown
+++ b/website/docs/r/container_registry.html.markdown
@@ -11,9 +11,6 @@ description: |-
Expand All @@ -1011,7 +1011,7 @@ index 01a845deab..6d790e8b1a 100644

```hcl
diff --git a/website/docs/r/cosmosdb_account.html.markdown b/website/docs/r/cosmosdb_account.html.markdown
index a9a31d7c49..c66eae0fc0 100644
index 64b2e38ac6..2eca0a52b4 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.
Expand Down Expand Up @@ -1874,7 +1874,7 @@ index 9a6128b0cf..98691c4977 100644
```hcl
resource "azurerm_resource_group" "example" {
diff --git a/website/docs/r/linux_virtual_machine_scale_set.html.markdown b/website/docs/r/linux_virtual_machine_scale_set.html.markdown
index 096a2239d2..82264e43b7 100644
index 767e1f5694..74a0645cdf 100644
--- a/website/docs/r/linux_virtual_machine_scale_set.html.markdown
+++ b/website/docs/r/linux_virtual_machine_scale_set.html.markdown
@@ -13,14 +13,11 @@ Manages a Linux Virtual Machine Scale Set.
Expand Down Expand Up @@ -1903,7 +1903,7 @@ index 096a2239d2..82264e43b7 100644

* `sku` - (Required) The Virtual Machine SKU for the Scale Set, such as `Standard_F2`.

@@ -354,8 +351,6 @@ An `extension` block supports the following:
@@ -356,8 +353,6 @@ An `extension` block supports the following:

-> **Note:** Keys within the `protected_settings` block are notoriously case-sensitive, where the casing required (e.g. TitleCase vs snakeCase) depends on the Extension being used. Please refer to the documentation for the specific Virtual Machine Extension you're looking to use for more information.

Expand All @@ -1912,7 +1912,7 @@ index 096a2239d2..82264e43b7 100644
* `protected_settings_from_key_vault` - (Optional) A `protected_settings_from_key_vault` block as defined below.

~> **Note:** `protected_settings_from_key_vault` cannot be used with `protected_settings`
@@ -366,8 +361,6 @@ An `extension` block supports the following:
@@ -368,8 +363,6 @@ An `extension` block supports the following:

-> **Note:** Keys within the `settings` block are notoriously case-sensitive, where the casing required (e.g. TitleCase vs snakeCase) depends on the Extension being used. Please refer to the documentation for the specific Virtual Machine Extension you're looking to use for more information.

Expand Down Expand Up @@ -2619,7 +2619,7 @@ index 90c61ffe39..0bcae5bfb2 100644

resource "azurerm_signalr_service" "example" {
diff --git a/website/docs/r/storage_blob.html.markdown b/website/docs/r/storage_blob.html.markdown
index d5b970d394..34cf87d1ae 100644
index bdc3186e4c..f20305321e 100644
--- a/website/docs/r/storage_blob.html.markdown
+++ b/website/docs/r/storage_blob.html.markdown
@@ -65,8 +65,6 @@ The following arguments are supported:
Expand All @@ -2630,7 +2630,7 @@ index d5b970d394..34cf87d1ae 100644
-
* `encryption_scope` - (Optional) The encryption scope to use for this blob.

* `source` - (Optional) An absolute path to a file on the local system. This field cannot be specified for Append blobs and cannot be specified if `source_content` or `source_uri` is specified. Changing this forces a new resource to be created.
* `source` - (Optional) An absolute path to a file on the local system. This field cannot be specified for Append blobs and cannot be specified if `source_content` or `source_uri` is specified.
diff --git a/website/docs/r/storage_data_lake_gen2_path.html.markdown b/website/docs/r/storage_data_lake_gen2_path.html.markdown
index 6786f8eb01..38823a0fd4 100644
--- a/website/docs/r/storage_data_lake_gen2_path.html.markdown
Expand Down Expand Up @@ -2871,7 +2871,7 @@ index 45781e8d0b..7a87d33337 100644
```hcl
provider "azurerm" {
diff --git a/website/docs/r/windows_virtual_machine_scale_set.html.markdown b/website/docs/r/windows_virtual_machine_scale_set.html.markdown
index ea1c14e83e..2ba2c339ad 100644
index 56f2efcd7d..29d7c7e31f 100644
--- a/website/docs/r/windows_virtual_machine_scale_set.html.markdown
+++ b/website/docs/r/windows_virtual_machine_scale_set.html.markdown
@@ -12,17 +12,17 @@ Manages a Windows Virtual Machine Scale Set.
Expand Down Expand Up @@ -2904,7 +2904,7 @@ index ea1c14e83e..2ba2c339ad 100644

* `sku` - (Required) The Virtual Machine SKU for the Scale Set, such as `Standard_F2`.

@@ -343,8 +343,6 @@ An `extension` block supports the following:
@@ -345,8 +345,6 @@ An `extension` block supports the following:

-> **Note:** Keys within the `protected_settings` block are notoriously case-sensitive, where the casing required (e.g. TitleCase vs snakeCase) depends on the Extension being used. Please refer to the documentation for the specific Virtual Machine Extension you're looking to use for more information.

Expand All @@ -2913,7 +2913,7 @@ index ea1c14e83e..2ba2c339ad 100644
* `protected_settings_from_key_vault` - (Optional) A `protected_settings_from_key_vault` block as defined below.

~> **Note:** `protected_settings_from_key_vault` cannot be used with `protected_settings`
@@ -355,8 +353,6 @@ An `extension` block supports the following:
@@ -357,8 +355,6 @@ An `extension` block supports the following:

-> **Note:** Keys within the `settings` block are notoriously case-sensitive, where the casing required (e.g. TitleCase vs snakeCase) depends on the Extension being used. Please refer to the documentation for the specific Virtual Machine Extension you're looking to use for more information.

Expand Down
16 changes: 2 additions & 14 deletions patches/0014-Fix-4.0-removed-resources.patch
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,23 +16,11 @@ index c1bf344a2b..dee7927610 100644
"azurerm_databricks_workspace_root_dbfs_customer_managed_key": resourceDatabricksWorkspaceRootDbfsCustomerManagedKey(),
"azurerm_databricks_virtual_network_peering": resourceDatabricksVirtualNetworkPeering(),
}
diff --git a/internal/services/monitor/registration.go b/internal/services/monitor/registration.go
index 269a7ee157..dfe684d0c2 100644
--- a/internal/services/monitor/registration.go
+++ b/internal/services/monitor/registration.go
@@ -77,7 +77,6 @@ func (r Registration) SupportedResources() map[string]*pluginsdk.Resource {
"azurerm_monitor_action_group": resourceMonitorActionGroup(),
"azurerm_monitor_activity_log_alert": resourceMonitorActivityLogAlert(),
"azurerm_monitor_diagnostic_setting": resourceMonitorDiagnosticSetting(),
- "azurerm_monitor_log_profile": resourceMonitorLogProfile(),
"azurerm_monitor_metric_alert": resourceMonitorMetricAlert(),
"azurerm_monitor_private_link_scope": resourceMonitorPrivateLinkScope(),
"azurerm_monitor_private_link_scoped_service": resourceMonitorPrivateLinkScopedService(),
diff --git a/internal/services/network/registration.go b/internal/services/network/registration.go
index 02205df6e2..da3e36ea42 100644
index e3b217bfb4..c89871dbbe 100644
--- a/internal/services/network/registration.go
+++ b/internal/services/network/registration.go
@@ -127,7 +127,6 @@ func (r Registration) SupportedResources() map[string]*pluginsdk.Resource {
@@ -128,7 +128,6 @@ func (r Registration) SupportedResources() map[string]*pluginsdk.Resource {
"azurerm_network_interface_nat_rule_association": resourceNetworkInterfaceNatRuleAssociation(),
"azurerm_network_interface_security_group_association": resourceNetworkInterfaceSecurityGroupAssociation(),

Expand Down
173 changes: 173 additions & 0 deletions provider/cmd/pulumi-resource-azure/bridge-metadata.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,10 @@
"current": "azure:securitycenter/advancedThreatProtection:AdvancedThreatProtection",
"majorVersion": 6
},
"azurerm_advisor_suppression": {
"current": "azure:advisor/suppression:Suppression",
"majorVersion": 6
},
"azurerm_ai_services": {
"current": "azure:cognitive/aIServices:AIServices",
"majorVersion": 6,
Expand Down Expand Up @@ -5941,6 +5945,54 @@
}
}
},
"azurerm_data_protection_backup_policy_mysql_flexible_server": {
"current": "azure:dataprotection/backupPolicyMysqlFlexibleServer:BackupPolicyMysqlFlexibleServer",
"majorVersion": 6,
"fields": {
"backup_repeating_time_intervals": {
"maxItemsOne": false
},
"default_retention_rule": {
"maxItemsOne": true,
"elem": {
"fields": {
"life_cycle": {
"maxItemsOne": false
}
}
}
},
"retention_rule": {
"maxItemsOne": false,
"elem": {
"fields": {
"criteria": {
"maxItemsOne": true,
"elem": {
"fields": {
"days_of_week": {
"maxItemsOne": false
},
"months_of_year": {
"maxItemsOne": false
},
"scheduled_backup_times": {
"maxItemsOne": false
},
"weeks_of_month": {
"maxItemsOne": false
}
}
}
},
"life_cycle": {
"maxItemsOne": false
}
}
}
}
}
},
"azurerm_data_protection_backup_policy_postgresql": {
"current": "azure:dataprotection/backupPolicyPostgresql:BackupPolicyPostgresql",
"majorVersion": 6,
Expand Down Expand Up @@ -9947,6 +9999,10 @@
}
}
},
"azurerm_key_vault_managed_hardware_security_module_key_rotation_policy": {
"current": "azure:keyvault/managedHardwareSecurityModuleKeyRotationPolicy:ManagedHardwareSecurityModuleKeyRotationPolicy",
"majorVersion": 6
},
"azurerm_key_vault_managed_hardware_security_module_role_assignment": {
"current": "azure:keyvault/managedHardwareSecurityModuleRoleAssignment:ManagedHardwareSecurityModuleRoleAssignment",
"majorVersion": 6
Expand Down Expand Up @@ -18777,6 +18833,79 @@
}
}
},
"azurerm_stack_hci_deployment_setting": {
"current": "azure:stack/hciDeploymentSetting:HciDeploymentSetting",
"majorVersion": 6,
"fields": {
"arc_resource_ids": {
"maxItemsOne": false
},
"scale_unit": {
"maxItemsOne": false,
"elem": {
"fields": {
"cluster": {
"maxItemsOne": true
},
"host_network": {
"maxItemsOne": true,
"elem": {
"fields": {
"intent": {
"maxItemsOne": false,
"elem": {
"fields": {
"adapter": {
"maxItemsOne": false
},
"adapter_property_override": {
"maxItemsOne": true
},
"qos_policy_override": {
"maxItemsOne": true
},
"traffic_type": {
"maxItemsOne": false
},
"virtual_switch_configuration_override": {
"maxItemsOne": true
}
}
}
},
"storage_network": {
"maxItemsOne": false
}
}
}
},
"infrastructure_network": {
"maxItemsOne": false,
"elem": {
"fields": {
"dns_server": {
"maxItemsOne": false
},
"ip_pool": {
"maxItemsOne": false
}
}
}
},
"optional_service": {
"maxItemsOne": true
},
"physical_node": {
"maxItemsOne": false
},
"storage": {
"maxItemsOne": true
}
}
}
}
}
},
"azurerm_stack_hci_logical_network": {
"current": "azure:stack/hciLogicalNetwork:HciLogicalNetwork",
"majorVersion": 6,
Expand All @@ -18799,6 +18928,10 @@
}
}
},
"azurerm_stack_hci_storage_path": {
"current": "azure:stack/hciStoragePath:HciStoragePath",
"majorVersion": 6
},
"azurerm_static_site": {
"current": "azure:appservice/staticSite:StaticSite",
"majorVersion": 6,
Expand Down Expand Up @@ -29452,6 +29585,46 @@
}
}
},
"azurerm_vpn_server_configuration": {
"current": "azure:network/getVpnServerConfiguration:getVpnServerConfiguration",
"majorVersion": 6,
"fields": {
"azure_active_directory_authentication": {
"maxItemsOne": false
},
"client_revoked_certificate": {
"maxItemsOne": false
},
"client_root_certificate": {
"maxItemsOne": false
},
"ipsec_policy": {
"maxItemsOne": false
},
"radius": {
"maxItemsOne": false,
"elem": {
"fields": {
"client_root_certificate": {
"maxItemsOne": false
},
"server": {
"maxItemsOne": false
},
"server_root_certificate": {
"maxItemsOne": false
}
}
}
},
"vpn_authentication_types": {
"maxItemsOne": false
},
"vpn_protocols": {
"maxItemsOne": false
}
}
},
"azurerm_web_application_firewall_policy": {
"current": "azure:waf/getFirewallPolicy:getFirewallPolicy",
"majorVersion": 6
Expand Down
Loading

0 comments on commit be9e008

Please sign in to comment.