Skip to content

Commit

Permalink
Upgrade terraform-provider-azurerm to v3.83.0 (#1475)
Browse files Browse the repository at this point in the history 
This PR was generated via `$ upgrade-provider pulumi/pulumi-azure`.

---

- Upgrading terraform-provider-azurerm from 3.82.0  to 3.83.0.
	Fixes #1472
  • Loading branch information
@guineveresaenger
guineveresaenger authored Dec 2, 2023
1 parent 615041d commit b23fdb8
Show file tree
Hide file tree
Showing 101 changed files with 2,101 additions and 357 deletions.
36 changes: 18 additions & 18 deletions patches/0005-Modify-resources.patch
View file
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,7 @@ index e79b7af93d..5007dd743e 100644
},
data.ImportStep(),
diff --git a/internal/services/automation/automation_runbook_resource.go b/internal/services/automation/automation_runbook_resource.go
index 5f4be4fda1..c3192c3534 100644
index 96c9b1457f..4389d6623d 100644
--- a/internal/services/automation/automation_runbook_resource.go
+++ b/internal/services/automation/automation_runbook_resource.go
@@ -8,6 +8,8 @@ import (
Expand All @@ -126,7 +126,7 @@ index 5f4be4fda1..c3192c3534 100644

"log_progress": {
diff --git a/internal/services/automation/automation_schedule_resource.go b/internal/services/automation/automation_schedule_resource.go
index ee91d677ed..752a5838cc 100644
index 1de7c1b4e8..e65fb4dcb2 100644
--- a/internal/services/automation/automation_schedule_resource.go
+++ b/internal/services/automation/automation_schedule_resource.go
@@ -6,6 +6,7 @@ package automation
Expand Down Expand Up @@ -457,10 +457,10 @@ index 12b8af4999..f83e49383a 100644

return nil
diff --git a/internal/services/containers/kubernetes_cluster_resource.go b/internal/services/containers/kubernetes_cluster_resource.go
index e64009a4d1..f6c0a5249d 100644
index 6f97e6d3b4..fdea3b5850 100644
--- a/internal/services/containers/kubernetes_cluster_resource.go
+++ b/internal/services/containers/kubernetes_cluster_resource.go
@@ -1130,7 +1130,7 @@ func resourceKubernetesCluster() *pluginsdk.Resource {
@@ -1129,7 +1129,7 @@ func resourceKubernetesCluster() *pluginsdk.Resource {
ValidateFunc: validation.StringInSlice([]string{
string(managedclusters.LoadBalancerSkuBasic),
string(managedclusters.LoadBalancerSkuStandard),
Expand Down Expand Up @@ -488,7 +488,7 @@ index b141d14cfd..0e3d2fd1b2 100644
string(documentdb.IndexingModeConsistent),
string(documentdb.IndexingModeNone),
diff --git a/internal/services/cosmos/cosmosdb_account_resource.go b/internal/services/cosmos/cosmosdb_account_resource.go
index f24fbbd52b..059d5ec745 100644
index afc749ddda..bd89df88d5 100644
--- a/internal/services/cosmos/cosmosdb_account_resource.go
+++ b/internal/services/cosmos/cosmosdb_account_resource.go
@@ -7,6 +7,7 @@ import (
Expand Down Expand Up @@ -644,7 +644,7 @@ index b3cb1e5f84..7cb1c42d70 100644
"interval_in_seconds": {
Type: pluginsdk.TypeInt,
diff --git a/internal/services/firewall/firewall_policy_resource.go b/internal/services/firewall/firewall_policy_resource.go
index 102a0874e1..9f30c6075f 100644
index 31a7e5d33f..e3cef43845 100644
--- a/internal/services/firewall/firewall_policy_resource.go
+++ b/internal/services/firewall/firewall_policy_resource.go
@@ -8,6 +8,8 @@ import (
Expand Down Expand Up @@ -783,7 +783,7 @@ index fb8b7d1541..b39f1f7391 100644
string(devices.EncodingAvro),
string(devices.EncodingAvroDeflate),
diff --git a/internal/services/keyvault/key_vault_certificate_resource.go b/internal/services/keyvault/key_vault_certificate_resource.go
index 840abaa824..cfb3a0b5a7 100644
index aacbc3d280..797af5e1f3 100644
--- a/internal/services/keyvault/key_vault_certificate_resource.go
+++ b/internal/services/keyvault/key_vault_certificate_resource.go
@@ -9,6 +9,8 @@ import (
Expand Down Expand Up @@ -1263,7 +1263,7 @@ index 2766565528..b7af892e01 100644
},
"hours": {
diff --git a/internal/services/mssql/mssql_database_resource.go b/internal/services/mssql/mssql_database_resource.go
index 0a4bac92ea..02d4e8b299 100644
index c5ccff259e..36072681a6 100644
--- a/internal/services/mssql/mssql_database_resource.go
+++ b/internal/services/mssql/mssql_database_resource.go
@@ -6,6 +6,7 @@ package mssql
Expand All @@ -1274,7 +1274,7 @@ index 0a4bac92ea..02d4e8b299 100644
"log"
"strings"
"time"
@@ -1416,7 +1417,8 @@ func resourceMsSqlDatabaseSchema() map[string]*pluginsdk.Schema {
@@ -1405,7 +1406,8 @@ func resourceMsSqlDatabaseSchema() map[string]*pluginsdk.Schema {
"Sql_Injection",
"Sql_Injection_Vulnerability",
"Access_Anomaly",
Expand All @@ -1283,17 +1283,17 @@ index 0a4bac92ea..02d4e8b299 100644
+ DiffSuppressFunc: suppress.CaseDifferenceV2Only,
},
},

@@ -1427,7 +1429,7 @@ func resourceMsSqlDatabaseSchema() map[string]*pluginsdk.Schema {
@@ -1416,7 +1418,7 @@ func resourceMsSqlDatabaseSchema() map[string]*pluginsdk.Schema {
Optional: true,
Default: EmailAccountAdminsStatusDisabled,
ValidateFunc: validation.StringInSlice(PossibleValuesForEmailAccountAdminsStatus(),
- false),
+ features.CaseInsensitive()),
},

"email_addresses": {
@@ -1455,7 +1457,7 @@ func resourceMsSqlDatabaseSchema() map[string]*pluginsdk.Schema {
@@ -1444,7 +1446,7 @@ func resourceMsSqlDatabaseSchema() map[string]*pluginsdk.Schema {
Optional: true,
Default: string(serversecurityalertpolicies.SecurityAlertsPolicyStateDisabled),
ValidateFunc: validation.StringInSlice(serversecurityalertpolicies.PossibleValuesForSecurityAlertsPolicyState(),
Expand Down Expand Up @@ -1346,7 +1346,7 @@ index b91613028e..aeb5794f82 100644
},
},
diff --git a/internal/services/mssql/mssql_server_security_alert_policy_resource.go b/internal/services/mssql/mssql_server_security_alert_policy_resource.go
index 3721fdf0cc..844099d8d4 100644
index 95a9635019..6cf10653d9 100644
--- a/internal/services/mssql/mssql_server_security_alert_policy_resource.go
+++ b/internal/services/mssql/mssql_server_security_alert_policy_resource.go
@@ -5,6 +5,8 @@ package mssql
Expand All @@ -1369,7 +1369,7 @@ index 3721fdf0cc..844099d8d4 100644

"storage_account_access_key": {
diff --git a/internal/services/mysql/mysql_server_resource.go b/internal/services/mysql/mysql_server_resource.go
index bbde139d1a..3e246bebd3 100644
index 99b9550833..80cfadc5d3 100644
--- a/internal/services/mysql/mysql_server_resource.go
+++ b/internal/services/mysql/mysql_server_resource.go
@@ -6,6 +6,8 @@ package mysql
Expand Down Expand Up @@ -2005,7 +2005,7 @@ index f5a509fd86..03b6351a59 100644

func (PortalDashboardResource) hiddenTitle(data acceptance.TestData) string {
diff --git a/internal/services/postgres/postgresql_server_resource.go b/internal/services/postgres/postgresql_server_resource.go
index e138d3b137..8977222901 100644
index d68d5963fa..5da4ee2bdc 100644
--- a/internal/services/postgres/postgresql_server_resource.go
+++ b/internal/services/postgres/postgresql_server_resource.go
@@ -6,6 +6,8 @@ package postgres
Expand Down Expand Up @@ -2079,7 +2079,7 @@ index 531538f052..614e6bec69 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 146d008911..b1b3a3dde4 100644
index 594f325888..fb78d561f6 100644
--- a/internal/services/redis/redis_cache_resource.go
+++ b/internal/services/redis/redis_cache_resource.go
@@ -6,6 +6,7 @@ package redis
Expand Down Expand Up @@ -2525,7 +2525,7 @@ index d95e1d0bc9..9a853ede4b 100644
if !ok {
return fmt.Errorf("could not determine Storage domain suffix for environment %q", meta.(*clients.Client).Account.Environment.Name)
diff --git a/internal/services/storage/storage_account_resource.go b/internal/services/storage/storage_account_resource.go
index 247f846e54..8f470d665e 100644
index 423b0dc3c9..ed33b92c78 100644
--- a/internal/services/storage/storage_account_resource.go
+++ b/internal/services/storage/storage_account_resource.go
@@ -6,6 +6,8 @@ package storage
Expand Down
30 changes: 15 additions & 15 deletions patches/0007-Update-documentation.patch
View file
Original file line number Diff line number Diff line change
Expand Up @@ -245,7 +245,7 @@ index 4cc96679d7..510129c9ff 100644

The deprecated field `start_task.environment` will be removed in favour of the `start_task.common_environment_properties` properties.
diff --git a/website/docs/r/api_management.html.markdown b/website/docs/r/api_management.html.markdown
index c72b307358..30e46ba6b5 100644
index 8c6820ff59..6a4850690a 100644
--- a/website/docs/r/api_management.html.markdown
+++ b/website/docs/r/api_management.html.markdown
@@ -31,7 +31,7 @@ resource "azurerm_api_management" "example" {
Expand Down Expand Up @@ -1795,7 +1795,7 @@ index c6387f8e37..10ac1d0ad4 100644

```hcl
diff --git a/website/docs/r/kubernetes_cluster.html.markdown b/website/docs/r/kubernetes_cluster.html.markdown
index e97a5c8f0c..2659438e09 100644
index 06705f0efa..299ac83d56 100644
--- a/website/docs/r/kubernetes_cluster.html.markdown
+++ b/website/docs/r/kubernetes_cluster.html.markdown
@@ -10,15 +10,9 @@ description: |-
Expand Down Expand Up @@ -1922,14 +1922,14 @@ index 656e81119f..b9a4cae44f 100644
scope = "/subscriptions/00000000-0000-0000-0000-000000000000"

diff --git a/website/docs/r/linux_virtual_machine.html.markdown b/website/docs/r/linux_virtual_machine.html.markdown
index a5d030fd37..54fcbc24a1 100644
index c6e638189d..54fcbc24a1 100644
--- a/website/docs/r/linux_virtual_machine.html.markdown
+++ b/website/docs/r/linux_virtual_machine.html.markdown
@@ -12,9 +12,9 @@ Manages a Linux Virtual Machine.

## Disclaimers

--> **Note** Terraform will automatically remove the OS Disk by default - this behaviour can be configured [using the `features` setting within the Provider block](https://registry.terraform.io/providers/hashicorp/azurerm/latest/docs#features).
--> **Note** Terraform will automatically remove the OS Disk by default - 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 remove the OS Disk by default - this behaviour can be configured using the `features` configuration within the Provider configuration 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).
Expand All @@ -1947,7 +1947,7 @@ index a5d030fd37..54fcbc24a1 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 e04bb382cd..c7eeb5a18b 100644
index 8d4115f936..c7eeb5a18b 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.
Expand All @@ -1958,7 +1958,7 @@ index e04bb382cd..c7eeb5a18b 100644
-
--> **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#features).
--> **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.

## Example Usage
Expand Down Expand Up @@ -2403,7 +2403,7 @@ index 0cea957b79..afd6bbc42f 100644
* `cross_region_restore_enabled` - (Optional) Is cross region restore enabled for this Vault? Only can be `true`, when `storage_mode_type` is `GeoRedundant`. Defaults to `false`.

diff --git a/website/docs/r/redis_cache.html.markdown b/website/docs/r/redis_cache.html.markdown
index d08cf04e42..3cca951edc 100644
index 7dd1cc421b..8862c65667 100644
--- a/website/docs/r/redis_cache.html.markdown
+++ b/website/docs/r/redis_cache.html.markdown
@@ -15,7 +15,7 @@ Manages a Redis Cache.
Expand All @@ -2415,7 +2415,7 @@ index d08cf04e42..3cca951edc 100644

```hcl
resource "azurerm_resource_group" "example" {
@@ -154,7 +154,7 @@ redis_configuration {
@@ -156,7 +156,7 @@ redis_configuration {
* `rdb_backup_max_snapshot_count` - (Optional) The maximum number of snapshots to create as a backup. Only supported for Premium SKUs.
* `rdb_storage_connection_string` - (Optional) The Connection String to the Storage Account. Only supported for Premium SKUs. In the format: `DefaultEndpointsProtocol=https;BlobEndpoint=${azurerm_storage_account.example.primary_blob_endpoint};AccountName=${azurerm_storage_account.example.name};AccountKey=${azurerm_storage_account.example.primary_access_key}`.

Expand Down Expand Up @@ -3038,14 +3038,14 @@ index 3efa150d43..2029b1f009 100644

## Example Usage
diff --git a/website/docs/r/windows_virtual_machine.html.markdown b/website/docs/r/windows_virtual_machine.html.markdown
index f75fa2be26..e8c1cde1e8 100644
index d7465ead24..e8c1cde1e8 100644
--- a/website/docs/r/windows_virtual_machine.html.markdown
+++ b/website/docs/r/windows_virtual_machine.html.markdown
@@ -12,9 +12,9 @@ Manages a Windows Virtual Machine.

## Disclaimers

--> **Note** Terraform will automatically remove the OS Disk by default - this behaviour can be configured [using the `features` setting within the Provider block](https://registry.terraform.io/providers/hashicorp/azurerm/latest/docs#features).
--> **Note** Terraform will automatically remove the OS Disk by default - 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 remove the OS Disk by default - 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).
Expand All @@ -3063,7 +3063,7 @@ index f75fa2be26..e8c1cde1e8 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 a3c35a96f5..8d314152aa 100644
index 62bcb654c6..ae15668114 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.
Expand All @@ -3076,10 +3076,10 @@ index a3c35a96f5..8d314152aa 100644
--> **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:** 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#features).
--> **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:** 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

## Example Usage

Expand All @@ -3088,7 +3088,7 @@ index a3c35a96f5..8d314152aa 100644

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

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

Expand All @@ -3097,7 +3097,7 @@ index a3c35a96f5..8d314152aa 100644

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

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

Expand Down
13 changes: 13 additions & 0 deletions provider/cmd/pulumi-resource-azure/bridge-metadata.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28132,6 +28132,10 @@
"current": "azure:compute/getSshPublicKey:getSshPublicKey",
"majorVersion": 5
},
"azurerm_stack_hci_cluster": {
"current": "azure:stack/getHciCluster:getHciCluster",
"majorVersion": 5
},
"azurerm_storage_account": {
"current": "azure:storage/getAccount:getAccount",
"majorVersion": 5,
Expand Down Expand Up @@ -30791,6 +30795,7 @@
"azure:sql/getDatabase:getDatabase": "azurerm_sql_database",
"azure:sql/getServer:getServer": "azurerm_sql_server",
"azure:sql/getSqlManagedInstance:getSqlManagedInstance": "azurerm_sql_managed_instance",
"azure:stack/getHciCluster:getHciCluster": "azurerm_stack_hci_cluster",
"azure:storage/getAccount:getAccount": "azurerm_storage_account",
"azure:storage/getAccountBlobContainerSAS:getAccountBlobContainerSAS": "azurerm_storage_account_blob_container_sas",
"azure:storage/getAccountSAS:getAccountSAS": "azurerm_storage_account_sas",
Expand Down Expand Up @@ -42578,6 +42583,7 @@
"autoGeneratedDomainNameLabelScope": "auto_generated_domain_name_label_scope",
"azureMonitorWorkspaceIntegrations": "azure_monitor_workspace_integrations",
"deterministicOutboundIpEnabled": "deterministic_outbound_ip_enabled",
"grafanaMajorVersion": "grafana_major_version",
"grafanaVersion": "grafana_version",
"outboundIps": "outbound_ip",
"publicNetworkAccessEnabled": "public_network_access_enabled",
Expand Down Expand Up @@ -53514,6 +53520,7 @@
"startHourUtc": "start_hour_utc"
},
"azure:redis/CacheRedisConfiguration:CacheRedisConfiguration": {
"activeDirectoryAuthenticationEnabled": "active_directory_authentication_enabled",
"aofBackupEnabled": "aof_backup_enabled",
"aofStorageConnectionString0": "aof_storage_connection_string_0",
"aofStorageConnectionString1": "aof_storage_connection_string_1",
Expand Down Expand Up @@ -55120,6 +55127,12 @@
"serverName": "server_name",
"subnetId": "subnet_id"
},
"azure:stack/getHciCluster:getHciCluster": {
"automanageConfigurationId": "automanage_configuration_id",
"clientId": "client_id",
"resourceGroupName": "resource_group_name",
"tenantId": "tenant_id"
},
"azure:stack/hciCluster:HciCluster": {
"automanageConfigurationId": "automanage_configuration_id",
"clientId": "client_id",
Expand Down
Loading

0 comments on commit b23fdb8

Please sign in to comment.