Skip to content

Commit

Permalink
Upgrade terraform-provider-azurerm to v3.101.0 (#1986)
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`.

---

- Upgrading terraform-provider-azurerm from 3.100.0  to 3.101.0.
	Fixes #1980
  • Loading branch information
danielrbradley committed Apr 29, 2024
1 parent d7b08cf commit 1ed777f
Show file tree
Hide file tree
Showing 143 changed files with 1,695 additions and 1,290 deletions.
8 changes: 4 additions & 4 deletions patches/0001-Client-options.patch
Original file line number Diff line number Diff line change
Expand Up @@ -5,18 +5,18 @@ Subject: [PATCH] Client-options


diff --git a/internal/common/client_options.go b/internal/common/client_options.go
index 3a7e72eeb7..f907a35d09 100644
index 4b2d3a5a5b..451c27f7f2 100644
--- a/internal/common/client_options.go
+++ b/internal/common/client_options.go
@@ -14,7 +14,6 @@ import (
@@ -13,7 +13,6 @@ import (
"github.com/hashicorp/go-azure-sdk/sdk/auth"
"github.com/hashicorp/go-azure-sdk/sdk/client"
"github.com/hashicorp/go-azure-sdk/sdk/environments"
- "github.com/hashicorp/terraform-plugin-sdk/v2/meta"
"github.com/hashicorp/terraform-provider-azurerm/internal/features"
"github.com/hashicorp/terraform-provider-azurerm/version"
)
@@ -97,12 +96,8 @@ func (o ClientOptions) ConfigureClient(c *autorest.Client, authorizer autorest.A
@@ -94,12 +93,8 @@ func (o ClientOptions) ConfigureClient(c *autorest.Client, authorizer autorest.A
}

func userAgent(userAgent, tfVersion, partnerID string, disableTerraformPartnerID bool) string {
Expand All @@ -31,7 +31,7 @@ index 3a7e72eeb7..f907a35d09 100644
userAgent = strings.TrimSpace(fmt.Sprintf("%s %s", userAgent, providerUserAgent))

// append the CloudShell version to the user agent if it exists
@@ -111,11 +106,11 @@ func userAgent(userAgent, tfVersion, partnerID string, disableTerraformPartnerID
@@ -108,11 +103,11 @@ func userAgent(userAgent, tfVersion, partnerID string, disableTerraformPartnerID
}

// only one pid can be interpreted currently
Expand Down
4 changes: 2 additions & 2 deletions patches/0002-Shared-features.patch
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,10 @@ Subject: [PATCH] Shared-features


diff --git a/internal/features/four_point_oh.go b/internal/features/four_point_oh.go
index 4387a9c18f..4013a59e46 100644
index d3723a3480..4953bff3b7 100644
--- a/internal/features/four_point_oh.go
+++ b/internal/features/four_point_oh.go
@@ -44,3 +44,9 @@ func FourPointOh() bool {
@@ -40,3 +40,9 @@ func FourPointOh() bool {
func FourPointOhBeta() bool {
return FourPointOh() || false
}
Expand Down
22 changes: 11 additions & 11 deletions patches/0005-Modify-resources.patch
Original file line number Diff line number Diff line change
Expand Up @@ -338,7 +338,7 @@ index 539c138df6..5446846a89 100644

"incremental_enabled": {
diff --git a/internal/services/compute/virtual_machine_data_disk_attachment_resource.go b/internal/services/compute/virtual_machine_data_disk_attachment_resource.go
index 4852606790..219bed8e64 100644
index db0a760341..fe30ade2d5 100644
--- a/internal/services/compute/virtual_machine_data_disk_attachment_resource.go
+++ b/internal/services/compute/virtual_machine_data_disk_attachment_resource.go
@@ -5,6 +5,7 @@ package compute
Expand All @@ -350,9 +350,9 @@ index 4852606790..219bed8e64 100644
"time"

@@ -71,7 +72,8 @@ func resourceVirtualMachineDataDiskAttachment() *pluginsdk.Resource {
string(compute.CachingTypesNone),
string(compute.CachingTypesReadOnly),
string(compute.CachingTypesReadWrite),
string(virtualmachines.CachingTypesNone),
string(virtualmachines.CachingTypesReadOnly),
string(virtualmachines.CachingTypesReadWrite),
- }, false),
+ }, features.CaseInsensitive()),
+ DiffSuppressFunc: suppress.CaseDifferenceV2Only,
Expand All @@ -361,8 +361,8 @@ index 4852606790..219bed8e64 100644
"create_option": {
@@ -82,7 +84,8 @@ func resourceVirtualMachineDataDiskAttachment() *pluginsdk.Resource {
ValidateFunc: validation.StringInSlice([]string{
string(compute.DiskCreateOptionTypesAttach),
string(compute.DiskCreateOptionTypesEmpty),
string(virtualmachines.DiskCreateOptionTypesAttach),
string(virtualmachines.DiskCreateOptionTypesEmpty),
- }, false),
+ }, features.CaseInsensitive()),
+ DiffSuppressFunc: suppress.CaseDifferenceV2Only,
Expand Down Expand Up @@ -457,10 +457,10 @@ index 46644dc374..1a8604d4a8 100644

return nil
diff --git a/internal/services/containers/kubernetes_cluster_resource.go b/internal/services/containers/kubernetes_cluster_resource.go
index 3891945e1e..899ce51bdc 100644
index e80f81e97d..caea1a9856 100644
--- a/internal/services/containers/kubernetes_cluster_resource.go
+++ b/internal/services/containers/kubernetes_cluster_resource.go
@@ -1062,7 +1062,7 @@ func resourceKubernetesCluster() *pluginsdk.Resource {
@@ -1060,7 +1060,7 @@ func resourceKubernetesCluster() *pluginsdk.Resource {
ValidateFunc: validation.StringInSlice([]string{
string(managedclusters.LoadBalancerSkuBasic),
string(managedclusters.LoadBalancerSkuStandard),
Expand Down Expand Up @@ -1058,7 +1058,7 @@ index dbbf9132fb..2e56c94e0e 100644
},
},
diff --git a/internal/services/loganalytics/log_analytics_workspace_resource.go b/internal/services/loganalytics/log_analytics_workspace_resource.go
index 6cb3af7347..7b36437f13 100644
index b98942039f..6d29439643 100644
--- a/internal/services/loganalytics/log_analytics_workspace_resource.go
+++ b/internal/services/loganalytics/log_analytics_workspace_resource.go
@@ -6,6 +6,8 @@ package loganalytics
Expand Down Expand Up @@ -1832,7 +1832,7 @@ index 5687410c2c..c265864390 100644

"sa_datasize": {
diff --git a/internal/services/network/virtual_network_gateway_resource.go b/internal/services/network/virtual_network_gateway_resource.go
index 780d029fc3..2802730704 100644
index 055b16308d..487608122e 100644
--- a/internal/services/network/virtual_network_gateway_resource.go
+++ b/internal/services/network/virtual_network_gateway_resource.go
@@ -6,6 +6,7 @@ package network
Expand Down Expand Up @@ -1979,7 +1979,7 @@ index d68d5963fa..5da4ee2bdc 100644

"administrator_login": {
diff --git a/internal/services/recoveryservices/recovery_services_vault_resource.go b/internal/services/recoveryservices/recovery_services_vault_resource.go
index 3adbbcfa45..5551e72662 100644
index b25ef6d5c9..a585a495ad 100644
--- a/internal/services/recoveryservices/recovery_services_vault_resource.go
+++ b/internal/services/recoveryservices/recovery_services_vault_resource.go
@@ -10,6 +10,8 @@ import (
Expand Down
12 changes: 6 additions & 6 deletions patches/0007-Update-documentation.patch
Original file line number Diff line number Diff line change
Expand Up @@ -1794,7 +1794,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 fced2e6d2c..dbbd8ca642 100644
index fda716b4de..0b6c51fbdd 100644
--- a/website/docs/r/kubernetes_cluster.html.markdown
+++ b/website/docs/r/kubernetes_cluster.html.markdown
@@ -10,15 +10,9 @@ description: |-
Expand All @@ -1814,7 +1814,7 @@ index fced2e6d2c..dbbd8ca642 100644

```hcl
resource "azurerm_resource_group" "example" {
@@ -392,7 +386,7 @@ A `default_node_pool` block supports the following:
@@ -386,7 +380,7 @@ A `default_node_pool` block supports the following:

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

Expand All @@ -1823,7 +1823,7 @@ index fced2e6d2c..dbbd8ca642 100644

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

@@ -450,7 +444,7 @@ A `default_node_pool` block supports the following:
@@ -444,7 +438,7 @@ A `default_node_pool` block supports the following:

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

Expand All @@ -1832,7 +1832,7 @@ index fced2e6d2c..dbbd8ca642 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.

@@ -476,7 +470,7 @@ If `enable_auto_scaling` is set to `true`, then the following fields can also be
@@ -470,7 +464,7 @@ If `enable_auto_scaling` is set to `true`, then the following fields can also be

* `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 @@ -1841,7 +1841,7 @@ index fced2e6d2c..dbbd8ca642 100644

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

@@ -715,8 +709,6 @@ A `network_profile` block supports the following:
@@ -709,8 +703,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 @@ -1850,7 +1850,7 @@ index fced2e6d2c..dbbd8ca642 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"]`.
@@ -1061,19 +1053,6 @@ The `kube_admin_config` and `kube_config` blocks export the following:
@@ -1055,19 +1047,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
2 changes: 1 addition & 1 deletion patches/0008-expose-provider.patch
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: aq17 <aqiu@pulumi.com>
Date: Thu, 25 May 2023 10:33:39 -0700
Subject: [PATCH 8/9] expose-provider
Subject: [PATCH] expose-provider


diff --git a/shim/shim.go b/shim/shim.go
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Ramon Quitales <ramon@pulumi.com>
Date: Wed, 9 Aug 2023 13:05:13 -1000
Subject: [PATCH 9/9] remove defaults backup retention policies
Subject: [PATCH] remove defaults backup retention policies

Fixes #1318

Expand Down
Loading

0 comments on commit 1ed777f

Please sign in to comment.