Skip to content

Commit b88751a

Browse files
Upgrade terraform-provider-azurerm to v4.8.0 (#2596)
This PR was generated via `$ upgrade-provider pulumi/pulumi-azure --upstream-provider-name=terraform-provider-azurerm --kind=provider --target-version=4.8.0`. --- - Upgrading terraform-provider-azurerm from 4.7.0 to 4.8.0. Fixes #2595 Fixes #2593 Fixes #2591
1 parent c81e97a commit b88751a

File tree

210 files changed

+15077
-465
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

210 files changed

+15077
-465
lines changed

patches/0001-Set-user-agent-in-client-options.patch

Lines changed: 7 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -6,25 +6,19 @@ Subject: [PATCH] Set user agent in client options
66
Use Pulumi-specific user agent which includes the current provider version number.
77

88
diff --git a/internal/common/client_options.go b/internal/common/client_options.go
9-
index 2495f52a4e..d27416056d 100644
9+
index 4e13bed1d8..bb2705e3e0 100644
1010
--- a/internal/common/client_options.go
1111
+++ b/internal/common/client_options.go
12-
@@ -95,12 +95,8 @@ func (o ClientOptions) ConfigureClient(c *autorest.Client, authorizer autorest.A
13-
}
14-
15-
func userAgent(userAgent, tfVersion, partnerID string, disableTerraformPartnerID bool) string {
16-
- tfUserAgent := fmt.Sprintf("HashiCorp Terraform/%s (+https://www.terraform.io)", tfVersion)
17-
-
18-
- providerUserAgent := fmt.Sprintf("%s terraform-provider-azurerm/%s", tfUserAgent, version.ProviderVersion)
19-
- if features.FourPointOhBeta() {
20-
- providerUserAgent = fmt.Sprintf("%s terraform-provider-azurerm/%s+4.0-beta", tfUserAgent, version.ProviderVersion)
21-
- }
12+
@@ -104,6 +104,8 @@ func userAgent(userAgent, tfVersion, partnerID string, disableTerraformPartnerID
13+
if features.FivePointOhBeta() {
14+
providerUserAgent = fmt.Sprintf("%s terraform-provider-azurerm/%s+5.0-beta", tfUserAgent, version.ProviderVersion)
15+
}
2216
+ // FORK: this gives us the ability to add a Pulumi Specific user agent
23-
+ providerUserAgent := fmt.Sprintf("pulumi-azure/%s", version.ProviderVersion)
17+
+ providerUserAgent = fmt.Sprintf("pulumi-azure/%s", version.ProviderVersion)
2418
userAgent = strings.TrimSpace(fmt.Sprintf("%s %s", userAgent, providerUserAgent))
2519

2620
// append the CloudShell version to the user agent if it exists
27-
@@ -109,11 +105,11 @@ func userAgent(userAgent, tfVersion, partnerID string, disableTerraformPartnerID
21+
@@ -112,11 +114,11 @@ func userAgent(userAgent, tfVersion, partnerID string, disableTerraformPartnerID
2822
}
2923

3024
// only one pid can be interpreted currently

patches/0013-Update-documentation.patch

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -997,7 +997,7 @@ index ed1f00c577..a4568c1ce0 100644
997997
---
998998

999999
diff --git a/website/docs/r/container_registry.html.markdown b/website/docs/r/container_registry.html.markdown
1000-
index caea0a5547..24ef646efd 100644
1000+
index d847c69797..dc19703131 100644
10011001
--- a/website/docs/r/container_registry.html.markdown
10021002
+++ b/website/docs/r/container_registry.html.markdown
10031003
@@ -11,9 +11,6 @@ description: |-
@@ -1011,7 +1011,7 @@ index caea0a5547..24ef646efd 100644
10111011

10121012
```hcl
10131013
diff --git a/website/docs/r/cosmosdb_account.html.markdown b/website/docs/r/cosmosdb_account.html.markdown
1014-
index 64b2e38ac6..2eca0a52b4 100644
1014+
index a2caed28ba..247137f83a 100644
10151015
--- a/website/docs/r/cosmosdb_account.html.markdown
10161016
+++ b/website/docs/r/cosmosdb_account.html.markdown
10171017
@@ -13,9 +13,9 @@ Manages a CosmosDB (formally DocumentDB) Account.
@@ -1247,7 +1247,7 @@ index 57bd6350d7..475c3612b1 100644
12471247
## Example Usage
12481248

12491249
diff --git a/website/docs/r/data_factory_linked_service_azure_sql_database.html.markdown b/website/docs/r/data_factory_linked_service_azure_sql_database.html.markdown
1250-
index 50191cc54d..d60be5528a 100644
1250+
index 10bf80eccf..906cd35f7a 100644
12511251
--- a/website/docs/r/data_factory_linked_service_azure_sql_database.html.markdown
12521252
+++ b/website/docs/r/data_factory_linked_service_azure_sql_database.html.markdown
12531253
@@ -10,7 +10,6 @@ description: |-
@@ -1722,7 +1722,7 @@ index c6387f8e37..ab11365777 100644
17221722

17231723
```hcl
17241724
diff --git a/website/docs/r/kubernetes_cluster.html.markdown b/website/docs/r/kubernetes_cluster.html.markdown
1725-
index b07c98d470..3c63cb314e 100644
1725+
index 07e4ab531d..3da8903e82 100644
17261726
--- a/website/docs/r/kubernetes_cluster.html.markdown
17271727
+++ b/website/docs/r/kubernetes_cluster.html.markdown
17281728
@@ -10,15 +10,9 @@ description: |-
@@ -1742,7 +1742,7 @@ index b07c98d470..3c63cb314e 100644
17421742

17431743
```hcl
17441744
resource "azurerm_resource_group" "example" {
1745-
@@ -360,7 +354,7 @@ A `default_node_pool` block supports the following:
1745+
@@ -366,7 +360,7 @@ A `default_node_pool` block supports the following:
17461746

17471747
-> **Note:** This requires that the `type` is set to `VirtualMachineScaleSets`.
17481748

@@ -1751,7 +1751,7 @@ index b07c98d470..3c63cb314e 100644
17511751

17521752
* `host_encryption_enabled` - (Optional) Should the nodes in the Default Node Pool have host encryption enabled? `temporary_name_for_rotation` must be specified when changing this property.
17531753

1754-
@@ -416,7 +410,7 @@ A `default_node_pool` block supports the following:
1754+
@@ -422,7 +416,7 @@ A `default_node_pool` block supports the following:
17551755

17561756
* `tags` - (Optional) A mapping of tags to assign to the Node Pool.
17571757

@@ -1760,7 +1760,7 @@ index b07c98d470..3c63cb314e 100644
17601760

17611761
* `ultra_ssd_enabled` - (Optional) Used to specify whether the UltraSSD is enabled in the Default Node Pool. Defaults to `false`. See [the documentation](https://docs.microsoft.com/azure/aks/use-ultra-disks) for more information. `temporary_name_for_rotation` must be specified when attempting a change.
17621762

1763-
@@ -440,7 +434,7 @@ If `auto_scaling_enabled` is set to `true`, then the following fields can also b
1763+
@@ -446,7 +440,7 @@ If `auto_scaling_enabled` is set to `true`, then the following fields can also b
17641764

17651765
* `node_count` - (Optional) The initial number of nodes which should exist in this Node Pool. If specified this must be between `1` and `1000` and between `min_count` and `max_count`.
17661766

@@ -1769,7 +1769,7 @@ index b07c98d470..3c63cb314e 100644
17691769

17701770
-> **Note:** If `auto_scaling_enabled` is set to `false` both `min_count` and `max_count` fields need to be set to `null` or omitted from the configuration.
17711771

1772-
@@ -671,8 +665,6 @@ A `network_profile` block supports the following:
1772+
@@ -677,8 +671,6 @@ A `network_profile` block supports the following:
17731773

17741774
~> **Note:** This range should not be used by any network element on or connected to this VNet. Service address CIDR must be smaller than /12. `docker_bridge_cidr`, `dns_service_ip` and `service_cidr` should all be empty or all should be set.
17751775

@@ -1778,7 +1778,7 @@ index b07c98d470..3c63cb314e 100644
17781778
* `ip_versions` - (Optional) Specifies a list of IP versions the Kubernetes Cluster will use to assign IP addresses to its nodes and pods. Possible values are `IPv4` and/or `IPv6`. `IPv4` must always be specified. Changing this forces a new resource to be created.
17791779

17801780
->**Note:** To configure dual-stack networking `ip_versions` should be set to `["IPv4", "IPv6"]`.
1781-
@@ -1037,19 +1029,6 @@ The `kube_admin_config` and `kube_config` blocks export the following:
1781+
@@ -1045,19 +1037,6 @@ The `kube_admin_config` and `kube_config` blocks export the following:
17821782

17831783
* `password` - A password or token used to authenticate to the Kubernetes cluster.
17841784

@@ -2383,7 +2383,7 @@ index e309cf6054..f8e08c7c38 100644
23832383
-> **Note:** Adding or Removing a Preview Feature will re-register the Resource Provider.
23842384

23852385
diff --git a/website/docs/r/role_definition.html.markdown b/website/docs/r/role_definition.html.markdown
2386-
index 299a7df471..694d38f903 100644
2386+
index 7ecef7c850..d023c4f409 100644
23872387
--- a/website/docs/r/role_definition.html.markdown
23882388
+++ b/website/docs/r/role_definition.html.markdown
23892389
@@ -20,7 +20,7 @@ data "azurerm_subscription" "primary" {
@@ -2395,7 +2395,7 @@ index 299a7df471..694d38f903 100644
23952395

23962396
permissions {
23972397
actions = ["*"]
2398-
@@ -90,4 +90,4 @@ Role Definitions can be imported using the `resource id`, e.g.
2398+
@@ -120,4 +120,4 @@ Role Definitions can be imported using the `resource id`, e.g.
23992399
terraform import azurerm_role_definition.example "/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.Authorization/roleDefinitions/00000000-0000-0000-0000-000000000000|/subscriptions/00000000-0000-0000-0000-000000000000"
24002400
```
24012401

patches/0014-Fix-4.0-removed-resources.patch

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,10 +17,10 @@ index c1bf344a2b..dee7927610 100644
1717
"azurerm_databricks_virtual_network_peering": resourceDatabricksVirtualNetworkPeering(),
1818
}
1919
diff --git a/internal/services/network/registration.go b/internal/services/network/registration.go
20-
index e3b217bfb4..c89871dbbe 100644
20+
index 400e039770..d2ee01b9e4 100644
2121
--- a/internal/services/network/registration.go
2222
+++ b/internal/services/network/registration.go
23-
@@ -128,7 +128,6 @@ func (r Registration) SupportedResources() map[string]*pluginsdk.Resource {
23+
@@ -129,7 +129,6 @@ func (r Registration) SupportedResources() map[string]*pluginsdk.Resource {
2424
"azurerm_network_interface_nat_rule_association": resourceNetworkInterfaceNatRuleAssociation(),
2525
"azurerm_network_interface_security_group_association": resourceNetworkInterfaceSecurityGroupAssociation(),
2626

provider/cmd/pulumi-resource-azure/bridge-metadata.json

Lines changed: 35 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12909,6 +12909,10 @@
1290912909
}
1291012910
}
1291112911
},
12912+
"azurerm_machine_learning_workspace_network_outbound_rule_fqdn": {
12913+
"current": "azure:machinelearning/workspaceNetworkOutboundRuleFqdn:WorkspaceNetworkOutboundRuleFqdn",
12914+
"majorVersion": 6
12915+
},
1291212916
"azurerm_maintenance_assignment_dedicated_host": {
1291312917
"current": "azure:maintenance/assignmentDedicatedHost:AssignmentDedicatedHost",
1291412918
"majorVersion": 6
@@ -15688,6 +15692,16 @@
1568815692
"priority_mix": {
1568915693
"maxItemsOne": true
1569015694
},
15695+
"sku_profile": {
15696+
"maxItemsOne": true,
15697+
"elem": {
15698+
"fields": {
15699+
"vm_sizes": {
15700+
"maxItemsOne": false
15701+
}
15702+
}
15703+
}
15704+
},
1569115705
"source_image_reference": {
1569215706
"maxItemsOne": true
1569315707
},
@@ -18972,6 +18986,10 @@
1897218986
}
1897318987
}
1897418988
},
18989+
"azurerm_stack_hci_extension": {
18990+
"current": "azure:stack/hciExtension:HciExtension",
18991+
"majorVersion": 6
18992+
},
1897518993
"azurerm_stack_hci_logical_network": {
1897618994
"current": "azure:stack/hciLogicalNetwork:HciLogicalNetwork",
1897718995
"majorVersion": 6,
@@ -18994,6 +19012,15 @@
1899419012
}
1899519013
}
1899619014
},
19015+
"azurerm_stack_hci_marketplace_gallery_image": {
19016+
"current": "azure:stack/hciMarketplaceGalleryImage:HciMarketplaceGalleryImage",
19017+
"majorVersion": 6,
19018+
"fields": {
19019+
"identifier": {
19020+
"maxItemsOne": true
19021+
}
19022+
}
19023+
},
1899719024
"azurerm_stack_hci_storage_path": {
1899819025
"current": "azure:stack/hciStoragePath:HciStoragePath",
1899919026
"majorVersion": 6
@@ -20165,6 +20192,10 @@
2016520192
}
2016620193
}
2016720194
},
20195+
"azurerm_trusted_signing_account": {
20196+
"current": "azure:trustedsigning/account:Account",
20197+
"majorVersion": 6
20198+
},
2016820199
"azurerm_user_assigned_identity": {
2016920200
"current": "azure:authorization/userAssignedIdentity:UserAssignedIdentity",
2017020201
"majorVersion": 6
@@ -29757,6 +29788,10 @@
2975729788
}
2975829789
}
2975929790
},
29791+
"azurerm_virtual_network_peering": {
29792+
"current": "azure:network/getVirtualNetworkPeering:getVirtualNetworkPeering",
29793+
"majorVersion": 6
29794+
},
2976029795
"azurerm_virtual_wan": {
2976129796
"current": "azure:network/getVirtualWan:getVirtualWan",
2976229797
"majorVersion": 6,

0 commit comments

Comments
 (0)