Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Upgrade terraform-provider-azurerm to v4.8.0 #2596

Merged
merged 2 commits into from
Nov 4, 2024
Merged

Upgrade terraform-provider-azurerm to v4.8.0 #2596

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b435510
make tfgen
danielrbradley Nov 4, 2024
8138bcd
make build_sdks
danielrbradley Nov 4, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 7 additions & 13 deletions patches/0001-Set-user-agent-in-client-options.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,25 +6,19 @@ 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 2495f52a4e..d27416056d 100644
index 4e13bed1d8..bb2705e3e0 100644
--- a/internal/common/client_options.go
+++ b/internal/common/client_options.go
@@ -95,12 +95,8 @@ func (o ClientOptions) ConfigureClient(c *autorest.Client, authorizer autorest.A
}

func userAgent(userAgent, tfVersion, partnerID string, disableTerraformPartnerID bool) string {
- tfUserAgent := fmt.Sprintf("HashiCorp Terraform/%s (+https://www.terraform.io)", tfVersion)
-
- providerUserAgent := fmt.Sprintf("%s terraform-provider-azurerm/%s", tfUserAgent, version.ProviderVersion)
- if features.FourPointOhBeta() {
- providerUserAgent = fmt.Sprintf("%s terraform-provider-azurerm/%s+4.0-beta", tfUserAgent, version.ProviderVersion)
- }
@@ -104,6 +104,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)
}
+ // FORK: this gives us the ability to add a Pulumi Specific user agent
+ providerUserAgent := fmt.Sprintf("pulumi-azure/%s", version.ProviderVersion)
+ providerUserAgent = fmt.Sprintf("pulumi-azure/%s", version.ProviderVersion)
userAgent = strings.TrimSpace(fmt.Sprintf("%s %s", userAgent, providerUserAgent))

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

// only one pid can be interpreted currently
Expand Down
22 changes: 11 additions & 11 deletions patches/0013-Update-documentation.patch
View file
Open in desktop
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 caea0a5547..24ef646efd 100644
index d847c69797..dc19703131 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 caea0a5547..24ef646efd 100644

```hcl
diff --git a/website/docs/r/cosmosdb_account.html.markdown b/website/docs/r/cosmosdb_account.html.markdown
index 64b2e38ac6..2eca0a52b4 100644
index a2caed28ba..247137f83a 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 @@ -1247,7 +1247,7 @@ index 57bd6350d7..475c3612b1 100644
## Example Usage

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
index 50191cc54d..d60be5528a 100644
index 10bf80eccf..906cd35f7a 100644
--- 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
@@ -10,7 +10,6 @@ description: |-
Expand Down Expand Up @@ -1722,7 +1722,7 @@ index c6387f8e37..ab11365777 100644

```hcl
diff --git a/website/docs/r/kubernetes_cluster.html.markdown b/website/docs/r/kubernetes_cluster.html.markdown
index b07c98d470..3c63cb314e 100644
index 07e4ab531d..3da8903e82 100644
--- a/website/docs/r/kubernetes_cluster.html.markdown
+++ b/website/docs/r/kubernetes_cluster.html.markdown
@@ -10,15 +10,9 @@ description: |-
Expand All @@ -1742,7 +1742,7 @@ index b07c98d470..3c63cb314e 100644

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

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

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

* `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.

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

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

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

* `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.

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

* `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`.

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

-> **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.

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

~> **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.

Expand All @@ -1778,7 +1778,7 @@ index b07c98d470..3c63cb314e 100644
* `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.

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

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

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

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

permissions {
actions = ["*"]
@@ -90,4 +90,4 @@ Role Definitions can be imported using the `resource id`, e.g.
@@ -120,4 +120,4 @@ Role Definitions can be imported using the `resource id`, e.g.
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"
```

Expand Down
4 changes: 2 additions & 2 deletions patches/0014-Fix-4.0-removed-resources.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,10 +17,10 @@ index c1bf344a2b..dee7927610 100644
"azurerm_databricks_virtual_network_peering": resourceDatabricksVirtualNetworkPeering(),
}
diff --git a/internal/services/network/registration.go b/internal/services/network/registration.go
index e3b217bfb4..c89871dbbe 100644
index 400e039770..d2ee01b9e4 100644
--- a/internal/services/network/registration.go
+++ b/internal/services/network/registration.go
@@ -128,7 +128,6 @@ func (r Registration) SupportedResources() map[string]*pluginsdk.Resource {
@@ -129,7 +129,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
35 changes: 35 additions & 0 deletions provider/cmd/pulumi-resource-azure/bridge-metadata.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12909,6 +12909,10 @@
}
}
},
"azurerm_machine_learning_workspace_network_outbound_rule_fqdn": {
"current": "azure:machinelearning/workspaceNetworkOutboundRuleFqdn:WorkspaceNetworkOutboundRuleFqdn",
"majorVersion": 6
},
"azurerm_maintenance_assignment_dedicated_host": {
"current": "azure:maintenance/assignmentDedicatedHost:AssignmentDedicatedHost",
"majorVersion": 6
Expand Down Expand Up @@ -15688,6 +15692,16 @@
"priority_mix": {
"maxItemsOne": true
},
"sku_profile": {
"maxItemsOne": true,
"elem": {
"fields": {
"vm_sizes": {
"maxItemsOne": false
}
}
}
},
"source_image_reference": {
"maxItemsOne": true
},
Expand Down Expand Up @@ -18972,6 +18986,10 @@
}
}
},
"azurerm_stack_hci_extension": {
"current": "azure:stack/hciExtension:HciExtension",
"majorVersion": 6
},
"azurerm_stack_hci_logical_network": {
"current": "azure:stack/hciLogicalNetwork:HciLogicalNetwork",
"majorVersion": 6,
Expand All @@ -18994,6 +19012,15 @@
}
}
},
"azurerm_stack_hci_marketplace_gallery_image": {
"current": "azure:stack/hciMarketplaceGalleryImage:HciMarketplaceGalleryImage",
"majorVersion": 6,
"fields": {
"identifier": {
"maxItemsOne": true
}
}
},
"azurerm_stack_hci_storage_path": {
"current": "azure:stack/hciStoragePath:HciStoragePath",
"majorVersion": 6
Expand Down Expand Up @@ -20165,6 +20192,10 @@
}
}
},
"azurerm_trusted_signing_account": {
"current": "azure:trustedsigning/account:Account",
"majorVersion": 6
},
"azurerm_user_assigned_identity": {
"current": "azure:authorization/userAssignedIdentity:UserAssignedIdentity",
"majorVersion": 6
Expand Down Expand Up @@ -29757,6 +29788,10 @@
}
}
},
"azurerm_virtual_network_peering": {
"current": "azure:network/getVirtualNetworkPeering:getVirtualNetworkPeering",
"majorVersion": 6
},
"azurerm_virtual_wan": {
"current": "azure:network/getVirtualWan:getVirtualWan",
"majorVersion": 6,
Expand Down
Loading
Loading