Skip to content

Commit

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

---

- Upgrading terraform-provider-azurerm from 3.115.0  to 3.116.0.
	Fixes #2327
  • Loading branch information
@thomas11
thomas11 authored Aug 20, 2024
1 parent 044395a commit 79a5da6
Show file tree
Hide file tree
Showing 232 changed files with 20,978 additions and 1,305 deletions.
4 changes: 2 additions & 2 deletions patches/0007-Make-storage-account-resource_group_name-optional-in.patch
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ Subject: [PATCH] Make storage account resource_group_name optional in data
Look up resource_group_name by using `storageClient.FindAccount` as storage account names should be unique, and resolve back to the resource group it belongs to.

diff --git a/internal/services/storage/storage_account_data_source.go b/internal/services/storage/storage_account_data_source.go
index d9a1156241..b91b3cdc71 100644
index 8376b0c938..c9a4aca0ff 100644
--- a/internal/services/storage/storage_account_data_source.go
+++ b/internal/services/storage/storage_account_data_source.go
@@ -39,7 +39,8 @@ func dataSourceStorageAccount() *pluginsdk.Resource {
Expand All @@ -20,7 +20,7 @@ index d9a1156241..b91b3cdc71 100644

"location": commonschema.LocationComputed(),

@@ -550,10 +551,27 @@ func dataSourceStorageAccount() *pluginsdk.Resource {
@@ -554,10 +555,27 @@ func dataSourceStorageAccount() *pluginsdk.Resource {

func dataSourceStorageAccountRead(d *pluginsdk.ResourceData, meta interface{}) error {
client := meta.(*clients.Client).Storage.ResourceManager.StorageAccounts
Expand Down
71 changes: 31 additions & 40 deletions patches/0009-Make-fields-case-insensitive-for-backward-compatibil.patch
View file
Original file line number Diff line number Diff line change
Expand Up @@ -68,10 +68,18 @@ index 68b328649c..d39553248c 100644

"backup_blob_container_uri": {
diff --git a/internal/services/automation/automation_runbook_resource.go b/internal/services/automation/automation_runbook_resource.go
index d736332f2c..43f8066240 100644
index 4ed2210440..c2ac042ad2 100644
--- a/internal/services/automation/automation_runbook_resource.go
+++ b/internal/services/automation/automation_runbook_resource.go
@@ -134,7 +134,7 @@ func resourceAutomationRunbook() *pluginsdk.Resource {
@@ -21,6 +21,7 @@ import (
"github.com/hashicorp/terraform-provider-azurerm/helpers/azure"
"github.com/hashicorp/terraform-provider-azurerm/helpers/tf"
"github.com/hashicorp/terraform-provider-azurerm/internal/clients"
+ "github.com/hashicorp/terraform-provider-azurerm/internal/features"
"github.com/hashicorp/terraform-provider-azurerm/internal/services/automation/helper"
"github.com/hashicorp/terraform-provider-azurerm/internal/services/automation/validate"
"github.com/hashicorp/terraform-provider-azurerm/internal/tf/pluginsdk"
@@ -133,7 +134,7 @@ func resourceAutomationRunbook() *pluginsdk.Resource {
string(runbook.RunbookTypeEnumPowerShellWorkflow),
string(runbook.RunbookTypeEnumPowerShellSevenTwo),
string(runbook.RunbookTypeEnumScript),
Expand Down Expand Up @@ -177,19 +185,10 @@ index 67956f15c9..0b70ccb184 100644

"tags": tags.Schema(),
diff --git a/internal/services/compute/image_resource.go b/internal/services/compute/image_resource.go
index d1de175cb8..e8fd90b9df 100644
index 849e119542..790462f8e4 100644
--- a/internal/services/compute/image_resource.go
+++ b/internal/services/compute/image_resource.go
@@ -7,6 +7,8 @@ import (
"fmt"
"time"

+ "github.com/hashicorp/terraform-provider-azurerm/internal/features"
+
"github.com/hashicorp/go-azure-helpers/lang/pointer"
"github.com/hashicorp/go-azure-helpers/lang/response"
"github.com/hashicorp/go-azure-helpers/resourcemanager/commonids"
@@ -90,7 +92,7 @@ func resourceImage() *pluginsdk.Resource {
@@ -91,7 +91,7 @@ func resourceImage() *pluginsdk.Resource {
ValidateFunc: validation.StringInSlice([]string{
string(images.OperatingSystemTypesLinux),
string(images.OperatingSystemTypesWindows),
Expand All @@ -198,7 +197,7 @@ index d1de175cb8..e8fd90b9df 100644
},

"os_state": {
@@ -99,7 +101,7 @@ func resourceImage() *pluginsdk.Resource {
@@ -100,7 +100,7 @@ func resourceImage() *pluginsdk.Resource {
ValidateFunc: validation.StringInSlice([]string{
string(images.OperatingSystemStateTypesGeneralized),
string(images.OperatingSystemStateTypesSpecialized),
Expand All @@ -207,7 +206,7 @@ index d1de175cb8..e8fd90b9df 100644
},

"managed_disk_id": {
@@ -126,7 +128,7 @@ func resourceImage() *pluginsdk.Resource {
@@ -127,7 +127,7 @@ func resourceImage() *pluginsdk.Resource {
string(images.CachingTypesNone),
string(images.CachingTypesReadOnly),
string(images.CachingTypesReadWrite),
Expand All @@ -216,7 +215,7 @@ index d1de175cb8..e8fd90b9df 100644
},

"size_gb": {
@@ -179,7 +181,8 @@ func resourceImage() *pluginsdk.Resource {
@@ -188,7 +188,8 @@ func resourceImage() *pluginsdk.Resource {
string(images.CachingTypesNone),
string(images.CachingTypesReadOnly),
string(images.CachingTypesReadWrite),
Expand Down Expand Up @@ -314,10 +313,10 @@ index da09e66dfa..7413a4326e 100644

"dns_name_label": {
diff --git a/internal/services/containers/kubernetes_cluster_resource.go b/internal/services/containers/kubernetes_cluster_resource.go
index b442e4562e..dc92683147 100644
index ddbf84a8b6..4d52bb9960 100644
--- a/internal/services/containers/kubernetes_cluster_resource.go
+++ b/internal/services/containers/kubernetes_cluster_resource.go
@@ -1085,7 +1085,7 @@ func resourceKubernetesCluster() *pluginsdk.Resource {
@@ -1064,7 +1064,7 @@ func resourceKubernetesCluster() *pluginsdk.Resource {
ValidateFunc: validation.StringInSlice([]string{
string(managedclusters.LoadBalancerSkuBasic),
string(managedclusters.LoadBalancerSkuStandard),
Expand All @@ -339,7 +338,7 @@ index b141d14cfd..d15c245309 100644

"included_path": {
diff --git a/internal/services/cosmos/cosmosdb_account_resource.go b/internal/services/cosmos/cosmosdb_account_resource.go
index c2b02b3d19..69bc0b8687 100644
index 61deee1531..bc0e066bf9 100644
--- a/internal/services/cosmos/cosmosdb_account_resource.go
+++ b/internal/services/cosmos/cosmosdb_account_resource.go
@@ -13,6 +13,8 @@ import (
Expand Down Expand Up @@ -602,7 +601,7 @@ index 90e02d8080..a28b4f08e5 100644
"reuse_key": {
Type: pluginsdk.TypeBool,
diff --git a/internal/services/legacy/virtual_machine_resource.go b/internal/services/legacy/virtual_machine_resource.go
index 4f9cf43a06..56d568cd64 100644
index 14eff983ba..4cd96f99b2 100644
--- a/internal/services/legacy/virtual_machine_resource.go
+++ b/internal/services/legacy/virtual_machine_resource.go
@@ -13,6 +13,8 @@ import (
Expand Down Expand Up @@ -910,7 +909,7 @@ index bdf780b66a..5a0bb36d62 100644
ConflictsWith: []string{"release_criteria.0.recurrence.0.schedule.0.month_days", "release_criteria.0.recurrence.0.schedule.0.monthly"},
},
diff --git a/internal/services/logic/logic_app_standard_resource.go b/internal/services/logic/logic_app_standard_resource.go
index 0c29d3383e..4faec6e9f7 100644
index f217e09236..174e37316c 100644
--- a/internal/services/logic/logic_app_standard_resource.go
+++ b/internal/services/logic/logic_app_standard_resource.go
@@ -10,6 +10,8 @@ import (
Expand All @@ -932,10 +931,10 @@ index 0c29d3383e..4faec6e9f7 100644
},

"value": {
@@ -871,7 +874,8 @@ func schemaLogicAppStandardSiteConfig() *pluginsdk.Schema {
"v4.0",
@@ -872,7 +875,8 @@ func schemaLogicAppStandardSiteConfig() *pluginsdk.Schema {
"v5.0",
"v6.0",
"v8.0",
- }, false),
+ }, features.CaseInsensitive()),
+ DiffSuppressFunc: suppress.CaseDifferenceV2Only,
Expand Down Expand Up @@ -1043,7 +1042,7 @@ index 2766565528..acaa0496c4 100644
},
"hours": {
diff --git a/internal/services/mssql/mssql_database_resource.go b/internal/services/mssql/mssql_database_resource.go
index f2531818d2..bc63a0394c 100644
index 0e851a3faf..037ecf52ea 100644
--- a/internal/services/mssql/mssql_database_resource.go
+++ b/internal/services/mssql/mssql_database_resource.go
@@ -10,6 +10,8 @@ import (
Expand All @@ -1055,7 +1054,7 @@ index f2531818d2..bc63a0394c 100644
"github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/v5.0/sql" // nolint: staticcheck
"github.com/hashicorp/go-azure-helpers/lang/pointer"
"github.com/hashicorp/go-azure-helpers/lang/response"
@@ -1680,7 +1682,8 @@ func resourceMsSqlDatabaseSchema() map[string]*pluginsdk.Schema {
@@ -1683,7 +1685,8 @@ func resourceMsSqlDatabaseSchema() map[string]*pluginsdk.Schema {
"Sql_Injection",
"Sql_Injection_Vulnerability",
"Access_Anomaly",
Expand All @@ -1065,7 +1064,7 @@ index f2531818d2..bc63a0394c 100644
},
},

@@ -1691,7 +1694,7 @@ func resourceMsSqlDatabaseSchema() map[string]*pluginsdk.Schema {
@@ -1694,7 +1697,7 @@ func resourceMsSqlDatabaseSchema() map[string]*pluginsdk.Schema {
Optional: true,
Default: EmailAccountAdminsStatusDisabled,
ValidateFunc: validation.StringInSlice(PossibleValuesForEmailAccountAdminsStatus(),
Expand All @@ -1074,7 +1073,7 @@ index f2531818d2..bc63a0394c 100644
},

"email_addresses": {
@@ -1719,7 +1722,7 @@ func resourceMsSqlDatabaseSchema() map[string]*pluginsdk.Schema {
@@ -1722,7 +1725,7 @@ func resourceMsSqlDatabaseSchema() map[string]*pluginsdk.Schema {
Optional: true,
Default: string(serversecurityalertpolicies.SecurityAlertsPolicyStateDisabled),
ValidateFunc: validation.StringInSlice(serversecurityalertpolicies.PossibleValuesForSecurityAlertsPolicyState(),
Expand Down Expand Up @@ -1503,7 +1502,7 @@ index 6e880d1d78..ffd5969fa3 100644

"next_hop_in_ip_address": {
diff --git a/internal/services/network/virtual_network_gateway_connection_resource.go b/internal/services/network/virtual_network_gateway_connection_resource.go
index 8638551554..2407f6a968 100644
index 803d967899..3bbe66f793 100644
--- a/internal/services/network/virtual_network_gateway_connection_resource.go
+++ b/internal/services/network/virtual_network_gateway_connection_resource.go
@@ -9,6 +9,8 @@ import (
Expand Down Expand Up @@ -1621,18 +1620,10 @@ index 6e6d6f40ee..4b63964fc1 100644
},
},
diff --git a/internal/services/notificationhub/notification_hub_namespace_resource.go b/internal/services/notificationhub/notification_hub_namespace_resource.go
index abd8c6b3f6..55bc1b0b1d 100644
index 84673400f4..05d37cd939 100644
--- a/internal/services/notificationhub/notification_hub_namespace_resource.go
+++ b/internal/services/notificationhub/notification_hub_namespace_resource.go
@@ -6,6 +6,7 @@ package notificationhub
import (
"context"
"fmt"
+ "github.com/hashicorp/terraform-provider-azurerm/internal/features"
"log"
"strconv"
"time"
@@ -83,7 +84,7 @@ func resourceNotificationHubNamespace() *pluginsdk.Resource {
@@ -86,7 +86,7 @@ func resourceNotificationHubNamespace() *pluginsdk.Resource {
ValidateFunc: validation.StringInSlice([]string{
string(namespaces.NamespaceTypeMessaging),
string(namespaces.NamespaceTypeNotificationHub),
Expand Down Expand Up @@ -1840,7 +1831,7 @@ index 80b56994a3..b8954de4ac 100644
},
},
diff --git a/internal/services/servicebus/servicebus_namespace_resource.go b/internal/services/servicebus/servicebus_namespace_resource.go
index 539e6da6ac..2e8fd98ba6 100644
index 79d85622dd..eabd5fcd82 100644
--- a/internal/services/servicebus/servicebus_namespace_resource.go
+++ b/internal/services/servicebus/servicebus_namespace_resource.go
@@ -87,7 +87,8 @@ func resourceServiceBusNamespace() *pluginsdk.Resource {
Expand Down Expand Up @@ -2040,7 +2031,7 @@ index 16797800a2..6d74e94b4f 100644

"storage_account_access_key": {
diff --git a/internal/services/storage/storage_account_resource.go b/internal/services/storage/storage_account_resource.go
index e50321030b..14cb96f39e 100644
index 2343dc63c3..eadf3d2479 100644
--- a/internal/services/storage/storage_account_resource.go
+++ b/internal/services/storage/storage_account_resource.go
@@ -11,6 +11,8 @@ import (
Expand Down
30 changes: 15 additions & 15 deletions patches/0014-Update-documentation.patch
View file
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ index 5dbdb7d11e..2f4f4c2ff9 100644

```hcl
diff --git a/website/docs/d/kubernetes_cluster.html.markdown b/website/docs/d/kubernetes_cluster.html.markdown
index 156579b446..6fc17c21da 100644
index 1985203f44..6f8b7e8942 100644
--- a/website/docs/d/kubernetes_cluster.html.markdown
+++ b/website/docs/d/kubernetes_cluster.html.markdown
@@ -10,9 +10,6 @@ description: |-
Expand All @@ -87,7 +87,7 @@ index 156579b446..6fc17c21da 100644
## Example Usage

```hcl
@@ -222,19 +219,6 @@ The `kube_admin_config` and `kube_config` blocks export the following:
@@ -220,19 +217,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 @@ -1011,7 +1011,7 @@ index c824ba842e..4e2de96ed0 100644

```hcl
diff --git a/website/docs/r/cosmosdb_account.html.markdown b/website/docs/r/cosmosdb_account.html.markdown
index f1473d717c..8892c94822 100644
index 32e4c8a72b..aa7a58f5d6 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 @@ -1140,7 +1140,7 @@ index b10dc1693a..bfc5dfcfd7 100644
---

diff --git a/website/docs/r/cosmosdb_sql_container.html.markdown b/website/docs/r/cosmosdb_sql_container.html.markdown
index be6866ba9d..42950fef06 100644
index a89fc754f8..bdaf77a373 100644
--- a/website/docs/r/cosmosdb_sql_container.html.markdown
+++ b/website/docs/r/cosmosdb_sql_container.html.markdown
@@ -75,11 +75,11 @@ The following arguments are supported:
Expand All @@ -1150,8 +1150,8 @@ index be6866ba9d..42950fef06 100644
-* `throughput` - (Optional) The throughput of SQL container (RU/s). Must be set in increments of `100`. The minimum value is `400`. This must be set upon container creation otherwise it cannot be updated without a manual terraform destroy-apply.
+* `throughput` - (Optional) The throughput of SQL container (RU/s). Must be set in increments of `100`. The minimum value is `400`. This must be set upon container creation otherwise it cannot be updated without a manual resource destroy-apply.

-* `autoscale_settings` - (Optional) An `autoscale_settings` block as defined below. This must be set upon database creation otherwise it cannot be updated without a manual terraform destroy-apply. Requires `partition_key_path` to be set.
+* `autoscale_settings` - (Optional) An `autoscale_settings` block as defined below. This must be set upon database creation otherwise it cannot be updated without a manual destroy-apply. Requires `partition_key_path` to be set.
-* `autoscale_settings` - (Optional) An `autoscale_settings` block as defined below. This must be set upon database creation otherwise it cannot be updated without a manual terraform destroy-apply.
+* `autoscale_settings` - (Optional) An `autoscale_settings` block as defined below. This must be set upon database creation otherwise it cannot be updated without a manual destroy-apply.

-~> **Note:** Switching between autoscale and manual throughput is not supported via Terraform and must be completed via the Azure Portal and refreshed.
+~> **Note:** Switching between autoscale and manual throughput is not supported via this provider and must be completed via the Azure Portal and refreshed.
Expand Down 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 891137999d..4576e73562 100644
index bc488d45dd..341926fe41 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 891137999d..4576e73562 100644

```hcl
resource "azurerm_resource_group" "example" {
@@ -380,7 +374,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 @@ -1823,7 +1823,7 @@ index 891137999d..4576e73562 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.

@@ -438,7 +432,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 @@ -1832,7 +1832,7 @@ index 891137999d..4576e73562 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.

@@ -464,7 +458,7 @@ If `enable_auto_scaling` is set to `true`, then the following fields can also be
@@ -446,7 +440,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 891137999d..4576e73562 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.

@@ -703,8 +697,6 @@ A `network_profile` block supports the following:
@@ -685,8 +679,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 891137999d..4576e73562 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"]`.
@@ -1069,19 +1061,6 @@ The `kube_admin_config` and `kube_config` blocks export the following:
@@ -1047,19 +1039,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 All @@ -1871,7 +1871,7 @@ index 891137999d..4576e73562 100644

The `ingress_application_gateway` block exports the following:
diff --git a/website/docs/r/kubernetes_cluster_node_pool.html.markdown b/website/docs/r/kubernetes_cluster_node_pool.html.markdown
index 333a64b4c3..7c7c5d0124 100644
index ffd20bd6b8..3623d083ba 100644
--- a/website/docs/r/kubernetes_cluster_node_pool.html.markdown
+++ b/website/docs/r/kubernetes_cluster_node_pool.html.markdown
@@ -10,13 +10,11 @@ description: |-
Expand All @@ -1889,7 +1889,7 @@ index 333a64b4c3..7c7c5d0124 100644

```hcl
resource "azurerm_resource_group" "example" {
@@ -144,7 +142,7 @@ The following arguments are supported:
@@ -138,7 +136,7 @@ The following arguments are supported:

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

Expand All @@ -1898,7 +1898,7 @@ index 333a64b4c3..7c7c5d0124 100644

* `scale_down_mode` - (Optional) Specifies how the node pool should deal with scaled-down nodes. Allowed values are `Delete` and `Deallocate`. Defaults to `Delete`.

@@ -176,7 +174,7 @@ If `enable_auto_scaling` is set to `true`, then the following fields can also be
@@ -168,7 +166,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 within this Node Pool. Valid values are between `0` and `1000` (inclusive) for user pools and between `1` and `1000` (inclusive) for system pools and must be a value in the range `min_count` - `max_count`.

Expand Down
Loading

0 comments on commit 79a5da6

Please sign in to comment.