Skip to content

Commit

Permalink
Upgrade terraform-provider-azurerm to v3.115.0 (#2319)
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.114.0  to 3.115.0.
	Fixes #2317
  • Loading branch information
@danielrbradley
danielrbradley authored Aug 12, 2024
1 parent e6713f8 commit 0de4866
Show file tree
Hide file tree
Showing 304 changed files with 4,518 additions and 3,105 deletions.
22 changes: 11 additions & 11 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 @@ -240,7 +240,7 @@ index c7166c707e..be69574aa5 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 6478ffa1d2..db6625b9f4 100644
index a24ea85041..bdf4ab1e31 100644
--- a/internal/services/compute/virtual_machine_data_disk_attachment_resource.go
+++ b/internal/services/compute/virtual_machine_data_disk_attachment_resource.go
@@ -6,6 +6,7 @@ package compute
Expand Down Expand Up @@ -272,7 +272,7 @@ index 6478ffa1d2..db6625b9f4 100644

"write_accelerator_enabled": {
diff --git a/internal/services/containers/container_group_resource.go b/internal/services/containers/container_group_resource.go
index 90d0401de9..ab2f77e8d2 100644
index da09e66dfa..7413a4326e 100644
--- a/internal/services/containers/container_group_resource.go
+++ b/internal/services/containers/container_group_resource.go
@@ -11,6 +11,8 @@ import (
Expand Down Expand Up @@ -314,10 +314,10 @@ index 90d0401de9..ab2f77e8d2 100644

"dns_name_label": {
diff --git a/internal/services/containers/kubernetes_cluster_resource.go b/internal/services/containers/kubernetes_cluster_resource.go
index 785c03beb0..a101de9925 100644
index b442e4562e..dc92683147 100644
--- a/internal/services/containers/kubernetes_cluster_resource.go
+++ b/internal/services/containers/kubernetes_cluster_resource.go
@@ -1086,7 +1086,7 @@ func resourceKubernetesCluster() *pluginsdk.Resource {
@@ -1085,7 +1085,7 @@ func resourceKubernetesCluster() *pluginsdk.Resource {
ValidateFunc: validation.StringInSlice([]string{
string(managedclusters.LoadBalancerSkuBasic),
string(managedclusters.LoadBalancerSkuStandard),
Expand All @@ -339,7 +339,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 37c2a62d71..9d12a303f8 100644
index c2b02b3d19..69bc0b8687 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 @@ -387,7 +387,7 @@ index 37c2a62d71..9d12a303f8 100644
},
},
diff --git a/internal/services/cosmos/cosmosdb_gremlin_graph_resource.go b/internal/services/cosmos/cosmosdb_gremlin_graph_resource.go
index 38f00d87fe..7c7b046cd2 100644
index 3c9047ae2f..b5486fd5a6 100644
--- a/internal/services/cosmos/cosmosdb_gremlin_graph_resource.go
+++ b/internal/services/cosmos/cosmosdb_gremlin_graph_resource.go
@@ -10,6 +10,8 @@ import (
Expand All @@ -398,7 +398,7 @@ index 38f00d87fe..7c7b046cd2 100644
+
"github.com/hashicorp/go-azure-helpers/lang/response"
"github.com/hashicorp/go-azure-helpers/resourcemanager/commonschema"
"github.com/hashicorp/go-azure-sdk/resource-manager/cosmosdb/2023-04-15/cosmosdb"
"github.com/hashicorp/go-azure-sdk/resource-manager/cosmosdb/2024-05-15/cosmosdb"
@@ -132,6 +134,7 @@ func resourceCosmosDbGremlinGraph() *pluginsdk.Resource {
string(cosmosdb.IndexingModeNone),
string(cosmosdb.IndexingModeLazy),
Expand Down Expand Up @@ -1738,7 +1738,7 @@ index 5f1de4952f..1d4cc0f40a 100644

"target_disk_encryption_set_id": {
diff --git a/internal/services/redis/redis_cache_resource.go b/internal/services/redis/redis_cache_resource.go
index 20aa7733a0..aad84df4f5 100644
index d2072b15db..4d16a57269 100644
--- a/internal/services/redis/redis_cache_resource.go
+++ b/internal/services/redis/redis_cache_resource.go
@@ -97,7 +97,8 @@ func resourceRedisCache() *pluginsdk.Resource {
Expand All @@ -1752,7 +1752,7 @@ index 20aa7733a0..aad84df4f5 100644

"minimum_tls_version": {
diff --git a/internal/services/redis/redis_linked_server_resource.go b/internal/services/redis/redis_linked_server_resource.go
index ff302107f2..a8916e78f2 100644
index 9f187d24f2..2f87cd21f5 100644
--- a/internal/services/redis/redis_linked_server_resource.go
+++ b/internal/services/redis/redis_linked_server_resource.go
@@ -6,6 +6,7 @@ package redis
Expand Down Expand Up @@ -2040,7 +2040,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 eeaab93684..bb11eabc05 100644
index e50321030b..14cb96f39e 100644
--- a/internal/services/storage/storage_account_resource.go
+++ b/internal/services/storage/storage_account_resource.go
@@ -11,6 +11,8 @@ import (
Expand Down Expand Up @@ -2106,7 +2106,7 @@ index eeaab93684..bb11eabc05 100644
},

"azure_files_authentication": {
@@ -357,8 +366,9 @@ func resourceStorageAccount() *pluginsdk.Resource {
@@ -370,8 +379,9 @@ func resourceStorageAccount() *pluginsdk.Resource {
Optional: true,
Computed: true,
Elem: &pluginsdk.Schema{
Expand Down
80 changes: 36 additions & 44 deletions patches/0014-Update-documentation.patch
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1946,19 +1946,18 @@ index e4518f2e9a..1d953d6407 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 ed31892957..6d21326467 100644
index 10758be329..9ab632bb82 100644
--- a/website/docs/r/linux_virtual_machine_scale_set.html.markdown
+++ b/website/docs/r/linux_virtual_machine_scale_set.html.markdown
@@ -12,15 +12,11 @@ Manages a Linux Virtual Machine Scale Set.

@@ -13,14 +13,11 @@ Manages a Linux Virtual Machine Scale Set.
## Disclaimers

--> **NOTE:** As of the **v2.86.0** (November 19, 2021) release of the provider this resource will only create Virtual Machine Scale Sets with the **Uniform** Orchestration Mode. For Virtual Machine Scale Sets with **Flexible** orchestration mode, use [`azurerm_orchestrated_virtual_machine_scale_set`](orchestrated_virtual_machine_scale_set.html). Flexible orchestration mode is recommended for workloads on Azure.
-> **Note:** As of the **v2.86.0** (November 19, 2021) release of the provider this resource will only create Virtual Machine Scale Sets with the **Uniform** Orchestration Mode. For Virtual Machine Scale Sets with **Flexible** orchestration mode, use [`azurerm_orchestrated_virtual_machine_scale_set`](orchestrated_virtual_machine_scale_set.html). Flexible orchestration mode is recommended for workloads on Azure.
-
--> **NOTE:** All arguments including the administrator login and password will be stored in the raw state as plain-text. [Read more about sensitive data in state](/docs/state/sensitive-data.html).
--> **Note:** All arguments including the administrator login and password will be stored in the raw state as plain-text. [Read more about sensitive data in state](/docs/state/sensitive-data.html).
-
--> **NOTE:** Terraform will automatically update & reimage the nodes in the Scale Set (if Required) during an Update - this behaviour can be configured [using the `features` setting within the Provider block](https://registry.terraform.io/providers/hashicorp/azurerm/latest/docs/guides/features-block).
+-> **NOTE:** This provider will automatically update & reimage the nodes in the Scale Set (if Required) during an Update - this behaviour can be configured using the `features` setting within the Provider block.
--> **Note:** Terraform will automatically update & reimage the nodes in the Scale Set (if Required) during an Update - this behaviour can be configured [using the `features` setting within the Provider block](https://registry.terraform.io/providers/hashicorp/azurerm/latest/docs/guides/features-block).
+rraform will automatically update & reimage the nodes in the Scale Set (if Required) during an Update - this behaviour can be configured [using the `features` setting within the Provider block](https://registry.terraform.io/providers/hashicorp/azurerm/latest/docs/guides/features-block).

## Example Usage

Expand All @@ -1967,32 +1966,29 @@ index ed31892957..6d21326467 100644

```hcl
locals {
@@ -100,7 +96,7 @@ resource "azurerm_linux_virtual_machine_scale_set" "example" {
@@ -100,7 +97,7 @@ resource "azurerm_linux_virtual_machine_scale_set" "example" {

* `instances` - (Optional) The number of Virtual Machines in the Scale Set. Defaults to `0`.

--> **NOTE:** If you are using AutoScaling, you may wish to use [Terraform's `ignore_changes` functionality](https://www.terraform.io/language/meta-arguments/lifecycle#ignore_changess) to ignore changes to this field.
--> **Note:** If you are using AutoScaling, you may wish to use [Terraform's `ignore_changes` functionality](https://www.terraform.io/language/meta-arguments/lifecycle#ignore_changess) to ignore changes to this field.
+-> **NOTE:** If you're using AutoScaling, you may wish to use [`Ignore Changes` functionality](https://www.pulumi.com/docs/intro/concepts/programming-model/#ignorechanges) to ignore changes to this field.

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

@@ -350,20 +346,12 @@ An `extension` block supports the following:
@@ -358,8 +355,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.
-> **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.

--> **NOTE:** Rather than defining JSON inline [you can use the `jsonencode` interpolation function](https://www.terraform.io/docs/configuration/functions/jsonencode.html) to define this in a cleaner way.
-
-* `protected_settings_from_key_vault` - (Optional) A `protected_settings_from_key_vault` block as defined below.
--> **Note:** Rather than defining JSON inline [you can use the `jsonencode` interpolation function](https://www.terraform.io/docs/configuration/functions/jsonencode.html) to define this in a cleaner way.
-
-~> **Note:** `protected_settings_from_key_vault` cannot be used with `protected_settings`
-
* `provision_after_extensions` - (Optional) An ordered list of Extension names which this should be provisioned after.
* `protected_settings_from_key_vault` - (Optional) A `protected_settings_from_key_vault` block as defined below.

* `settings` - (Optional) A JSON String which specifies Settings for the Extension.
~> **Note:** `protected_settings_from_key_vault` cannot be used with `protected_settings`
@@ -370,8 +365,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.
-> **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.

--> **NOTE:** Rather than defining JSON inline [you can use the `jsonencode` interpolation function](https://www.terraform.io/docs/configuration/functions/jsonencode.html) to define this in a cleaner way.
--> **Note:** Rather than defining JSON inline [you can use the `jsonencode` interpolation function](https://www.terraform.io/docs/configuration/functions/jsonencode.html) to define this in a cleaner way.
-
---

Expand Down Expand Up @@ -2775,7 +2771,7 @@ index 6786f8eb01..38823a0fd4 100644
name = "example-resources"
location = "West Europe"
diff --git a/website/docs/r/subnet.html.markdown b/website/docs/r/subnet.html.markdown
index 3d6cb51972..0a9d65a29a 100644
index c46df6182b..a86947e5e9 100644
--- a/website/docs/r/subnet.html.markdown
+++ b/website/docs/r/subnet.html.markdown
@@ -11,7 +11,7 @@ description: |-
Expand Down Expand Up @@ -3062,23 +3058,22 @@ 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 0cd4f20871..4071837e34 100644
index 934a2d1b6b..34ab38e6d8 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,15 @@ Manages a Windows Virtual Machine Scale Set.
@@ -12,17 +12,17 @@ Manages a Windows Virtual Machine Scale Set.

## Disclaimers

--> **NOTE:** As of the **v2.86.0** (November 19, 2021) release of the provider this resource will only create Virtual Machine Scale Sets with the **Uniform** Orchestration Mode. For Virtual Machine Scale Sets with **Flexible** orchestration mode, use [`azurerm_orchestrated_virtual_machine_scale_set`](orchestrated_virtual_machine_scale_set.html). Flexible orchestration mode is recommended for workloads on Azure.
+~> **NOTE:**: All arguments including the administrator login and password will be stored in the raw state as plain-text.
--> **Note:** As of the **v2.86.0** (November 19, 2021) release of the provider this resource will only create Virtual Machine Scale Sets with the **Uniform** Orchestration Mode. For Virtual Machine Scale Sets with **Flexible** orchestration mode, use [`azurerm_orchestrated_virtual_machine_scale_set`](orchestrated_virtual_machine_scale_set.html). Flexible orchestration mode is recommended for workloads on Azure.
+-> **Note:** This resource will only create Virtual Machine Scale Sets with the **Uniform** Orchestration Mode. For Virtual Machine Scale Sets with **Flexible** orchestration mode, use [`azurerm_orchestrated_virtual_machine_scale_set`](orchestrated_virtual_machine_scale_set.html). Flexible orchestration mode is recommended for workloads on Azure.

--> **NOTE:** All arguments including the administrator login and password will be stored in the raw state as plain-text. [Read more about sensitive data in state](/docs/state/sensitive-data.html).
+-> **NOTE:** This provider will automatically update & reimage the nodes in the Scale Set (if Required) during an Update - this behaviour can be configured using the `features` setting within the Provider block.
-> **Note:** All arguments including the administrator login and password will be stored in the raw state as plain-text. [Read more about sensitive data in state](/docs/state/sensitive-data.html).

--> **NOTE:** Terraform will automatically update & reimage the nodes in the Scale Set (if Required) during an Update - this behaviour can be configured [using the `features` setting within the Provider block](https://registry.terraform.io/providers/hashicorp/azurerm/latest/docs/guides/features-block).
-
--> **NOTE:** This resource does not support Unmanaged Disks. If you need to use Unmanaged Disks you can continue to use [the `azurerm_virtual_machine_scale_set` resource](virtual_machine_scale_set.html) instead
+[~> **NOTE:** This resource does not support Unmanaged Disks. If you need to use Unmanaged Disks you can continue to use the `azurerm_virtual_machine_scale_set` resource instead
--> **Note:** Terraform will automatically update & reimage the nodes in the Scale Set (if Required) during an Update - this behaviour can be configured [using the `features` setting within the Provider block](https://registry.terraform.io/providers/hashicorp/azurerm/latest/docs/guides/features-block).
+-> **Note:** This provider will automatically update & reimage the nodes in the Scale Set (if Required) during an Update - this behaviour can be configured [using the `features` setting within the Provider block](https://registry.terraform.io/providers/hashicorp/azurerm/latest/docs/guides/features-block).
-> **Note:** This resource does not support Unmanaged Disks. If you need to use Unmanaged Disks you can continue to use [the `azurerm_virtual_machine_scale_set` resource](virtual_machine_scale_set.html) instead

## Example Usage

Expand All @@ -3087,32 +3082,29 @@ index 0cd4f20871..4071837e34 100644

```hcl
provider "azurerm" {
@@ -97,7 +95,7 @@ resource "azurerm_windows_virtual_machine_scale_set" "example" {
@@ -97,7 +97,7 @@ resource "azurerm_windows_virtual_machine_scale_set" "example" {

* `instances` - (Required) The number of Virtual Machines in the Scale Set.

--> **NOTE:** If you're using AutoScaling, you may wish to use [Terraform's `ignore_changes` functionality](https://www.terraform.io/language/meta-arguments/lifecycle#ignore_changess) to ignore changes to this field.
--> **Note:** If you're using AutoScaling, you may wish to use [Terraform's `ignore_changes` functionality](https://www.terraform.io/language/meta-arguments/lifecycle#ignore_changess) to ignore changes to this field.
+-> **NOTE:** If you're using AutoScaling, you may wish to use [`Ignore Changes` functionality](https://www.pulumi.com/docs/intro/concepts/programming-model/#ignorechanges) to ignore changes to this field.

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

@@ -339,20 +337,12 @@ An `extension` block supports the following:
@@ -347,8 +347,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.
-> **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.

--> **NOTE:** Rather than defining JSON inline [you can use the `jsonencode` interpolation function](https://www.terraform.io/docs/configuration/functions/jsonencode.html) to define this in a cleaner way.
-
-* `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`
--> **Note:** Rather than defining JSON inline [you can use the `jsonencode` interpolation function](https://www.terraform.io/docs/configuration/functions/jsonencode.html) to define this in a cleaner way.
-
* `provision_after_extensions` - (Optional) An ordered list of Extension names which this should be provisioned after.
* `protected_settings_from_key_vault` - (Optional) A `protected_settings_from_key_vault` block as defined below.

* `settings` - (Optional) A JSON String which specifies Settings for the Extension.
~> **Note:** `protected_settings_from_key_vault` cannot be used with `protected_settings`
@@ -359,8 +357,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.
-> **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.

--> **NOTE:** Rather than defining JSON inline [you can use the `jsonencode` interpolation function](https://www.terraform.io/docs/configuration/functions/jsonencode.html) to define this in a cleaner way.
--> **Note:** Rather than defining JSON inline [you can use the `jsonencode` interpolation function](https://www.terraform.io/docs/configuration/functions/jsonencode.html) to define this in a cleaner way.
-
---

Expand Down
Loading

0 comments on commit 0de4866

Please sign in to comment.