Skip to content

Commit

Permalink
Upgrade terraform-provider-azurerm to v3.99.0 (#1952)
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.98.0  to 3.99.0.
	Fixes #1947
  • Loading branch information
@thomas11
thomas11 committed Apr 15, 2024
1 parent d180f32 commit 9b8d12c
Show file tree
Hide file tree
Showing 189 changed files with 4,194 additions and 790 deletions.
6 changes: 3 additions & 3 deletions patches/0001-Client-options.patch
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ Subject: [PATCH 1/9] Client-options


diff --git a/internal/common/client_options.go b/internal/common/client_options.go
index be5e783620..8d7ccb0110 100644
index 3a7e72eeb7..f907a35d09 100644
--- a/internal/common/client_options.go
+++ b/internal/common/client_options.go
@@ -14,7 +14,6 @@ import (
Expand All @@ -16,7 +16,7 @@ index be5e783620..8d7ccb0110 100644
"github.com/hashicorp/terraform-provider-azurerm/internal/features"
"github.com/hashicorp/terraform-provider-azurerm/version"
)
@@ -96,12 +95,8 @@ func (o ClientOptions) ConfigureClient(c *autorest.Client, authorizer autorest.A
@@ -97,12 +96,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 be5e783620..8d7ccb0110 100644
userAgent = strings.TrimSpace(fmt.Sprintf("%s %s", userAgent, providerUserAgent))

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

// only one pid can be interpreted currently
Expand Down
24 changes: 12 additions & 12 deletions patches/0005-Modify-resources.patch
View file
Original file line number Diff line number Diff line change
Expand Up @@ -325,10 +325,10 @@ index fa43f4e9c8..9ddf246435 100644
string(disks.OperatingSystemTypesLinux),
}, false),
diff --git a/internal/services/compute/snapshot_resource.go b/internal/services/compute/snapshot_resource.go
index 0b0cd11d72..1918f4e937 100644
index 539c138df6..5446846a89 100644
--- a/internal/services/compute/snapshot_resource.go
+++ b/internal/services/compute/snapshot_resource.go
@@ -67,7 +67,7 @@ func resourceSnapshot() *pluginsdk.Resource {
@@ -68,7 +68,7 @@ func resourceSnapshot() *pluginsdk.Resource {
ValidateFunc: validation.StringInSlice([]string{
string(snapshots.DiskCreateOptionCopy),
string(snapshots.DiskCreateOptionImport),
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 4001cad641..835aecb2d8 100644
index bdbf31ad05..fb941af76c 100644
--- a/internal/services/cosmos/cosmosdb_account_resource.go
+++ b/internal/services/cosmos/cosmosdb_account_resource.go
@@ -13,6 +13,8 @@ import (
Expand All @@ -509,7 +509,7 @@ index 4001cad641..835aecb2d8 100644
},

"analytical_storage": {
@@ -286,7 +288,7 @@ func resourceCosmosDbAccount() *pluginsdk.Resource {
@@ -291,7 +293,7 @@ func resourceCosmosDbAccount() *pluginsdk.Resource {
string(cosmosdb.DatabaseAccountKindGlobalDocumentDB),
string(cosmosdb.DatabaseAccountKindMongoDB),
string(cosmosdb.DatabaseAccountKindParse),
Expand All @@ -518,7 +518,7 @@ index 4001cad641..835aecb2d8 100644
},

"ip_range_filter": func() *schema.Schema {
@@ -360,7 +362,7 @@ func resourceCosmosDbAccount() *pluginsdk.Resource {
@@ -387,7 +389,7 @@ func resourceCosmosDbAccount() *pluginsdk.Resource {
string(cosmosdb.DefaultConsistencyLevelEventual),
string(cosmosdb.DefaultConsistencyLevelSession),
string(cosmosdb.DefaultConsistencyLevelStrong),
Expand All @@ -527,7 +527,7 @@ index 4001cad641..835aecb2d8 100644
},

// This value can only change if the 'consistency_level' is set to 'BoundedStaleness'
@@ -419,8 +421,9 @@ func resourceCosmosDbAccount() *pluginsdk.Resource {
@@ -446,8 +448,9 @@ func resourceCosmosDbAccount() *pluginsdk.Resource {
Elem: &pluginsdk.Resource{
Schema: map[string]*pluginsdk.Schema{
"name": {
Expand Down Expand Up @@ -2469,7 +2469,7 @@ index b215edff58..4381151544 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 c6f3f221b2..6c460dddfe 100644
index e3acc874e6..53984fe280 100644
--- a/internal/services/storage/storage_account_resource.go
+++ b/internal/services/storage/storage_account_resource.go
@@ -13,6 +13,9 @@ import (
Expand All @@ -2482,7 +2482,7 @@ index c6f3f221b2..6c460dddfe 100644
"github.com/Azure/azure-sdk-for-go/services/storage/mgmt/2021-09-01/storage" // nolint: staticcheck
azautorest "github.com/Azure/go-autorest/autorest"
"github.com/hashicorp/go-azure-helpers/lang/pointer"
@@ -139,8 +142,9 @@ func resourceStorageAccount() *pluginsdk.Resource {
@@ -138,8 +141,9 @@ func resourceStorageAccount() *pluginsdk.Resource {
string(storage.KindBlockBlobStorage),
string(storage.KindFileStorage),
string(storage.KindStorageV2),
Expand All @@ -2494,7 +2494,7 @@ index c6f3f221b2..6c460dddfe 100644
},

"account_tier": {
@@ -150,7 +154,8 @@ func resourceStorageAccount() *pluginsdk.Resource {
@@ -149,7 +153,8 @@ func resourceStorageAccount() *pluginsdk.Resource {
ValidateFunc: validation.StringInSlice([]string{
string(storage.SkuTierStandard),
string(storage.SkuTierPremium),
Expand All @@ -2504,7 +2504,7 @@ index c6f3f221b2..6c460dddfe 100644
},

"account_replication_type": {
@@ -163,7 +168,8 @@ func resourceStorageAccount() *pluginsdk.Resource {
@@ -162,7 +167,8 @@ func resourceStorageAccount() *pluginsdk.Resource {
"RAGRS",
"GZRS",
"RAGZRS",
Expand All @@ -2514,7 +2514,7 @@ index c6f3f221b2..6c460dddfe 100644
},

// Only valid for FileStorage, BlobStorage & StorageV2 accounts, defaults to "Hot" in create function
@@ -174,7 +180,8 @@ func resourceStorageAccount() *pluginsdk.Resource {
@@ -173,7 +179,8 @@ func resourceStorageAccount() *pluginsdk.Resource {
ValidateFunc: validation.StringInSlice([]string{
string(storage.AccessTierCool),
string(storage.AccessTierHot),
Expand All @@ -2524,7 +2524,7 @@ index c6f3f221b2..6c460dddfe 100644
},

"azure_files_authentication": {
@@ -403,7 +410,8 @@ func resourceStorageAccount() *pluginsdk.Resource {
@@ -402,7 +409,8 @@ func resourceStorageAccount() *pluginsdk.Resource {
string(storage.BypassLogging),
string(storage.BypassMetrics),
string(storage.BypassNone),
Expand Down
51 changes: 23 additions & 28 deletions patches/0007-Update-documentation.patch
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1011,7 +1011,7 @@ index aeaa4514d6..0c02bc4313 100644

```hcl
diff --git a/website/docs/r/cosmosdb_account.html.markdown b/website/docs/r/cosmosdb_account.html.markdown
index 0970ddbe7e..51f934438d 100644
index e15f6badcf..84b98f43a1 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 @@ -1700,24 +1700,25 @@ index d9c71a1023..c1c041691e 100644
eventhub_endpoint_name = "events"
resource_group_name = azurerm_resource_group.example.name
diff --git a/website/docs/r/key_vault.html.markdown b/website/docs/r/key_vault.html.markdown
index 9413715a49..1b5b764080 100644
index 2b480185e6..42864de069 100644
--- a/website/docs/r/key_vault.html.markdown
+++ b/website/docs/r/key_vault.html.markdown
@@ -12,11 +12,9 @@ Manages a Key Vault.
@@ -12,12 +12,9 @@ Manages a Key Vault.

## Disclaimers

-~> **Note:** It's possible to define Key Vault Access Policies both within [the `azurerm_key_vault` resource](key_vault.html) via the `access_policy` block and by using [the `azurerm_key_vault_access_policy` resource](key_vault_access_policy.html). However it's not possible to use both methods to manage Access Policies within a KeyVault, since there'll be conflicts.
+~> **Note:** It's possible to define Key Vault Access Policies both within the `azurerm_key_vault` resource via the `access_policy` block and by using the `azurerm_key_vault_access_policy` resource. However it's not possible to use both methods to manage Access Policies within a KeyVault, since there'll be conflicts.

-<!-- TODO: Remove Note in 4.0 -->
-~> **Note:** It's possible to define Key Vault Certificate Contacts both within [the `azurerm_key_vault` resource](key_vault.html) via the `contact` block and by using [the `azurerm_key_vault_certificate_contacts` resource](key_vault_certificate_contacts.html). However it's not possible to use both methods to manage Certificate Contacts within a KeyVault, since there'll be conflicts.
-
-~> **Note:** Terraform will automatically recover a soft-deleted Key Vault during Creation if one is found - you can opt out of this using the `features` block within the Provider block.
+~> **Note:** It's possible to define Key Vault Certificate Contacts both within the `azurerm_key_vault` resource via the `contact` block and by using the `azurerm_key_vault_certificate_contacts` resource. However it's not possible to use both methods to manage Certificate Contacts within a KeyVault, since there'll be conflicts.

## Example Usage

@@ -83,7 +81,7 @@ The following arguments are supported:
@@ -84,7 +81,7 @@ The following arguments are supported:

---

Expand All @@ -1726,7 +1727,7 @@ index 9413715a49..1b5b764080 100644

-> **NOTE** Since `access_policy` can be configured both inline and via the separate `azurerm_key_vault_access_policy` resource, we have to explicitly set it to empty slice (`[]`) to remove it.

@@ -99,7 +97,7 @@ The following arguments are supported:
@@ -100,7 +97,7 @@ The following arguments are supported:

* `purge_protection_enabled` - (Optional) Is Purge Protection enabled for this Key Vault?

Expand Down Expand Up @@ -1755,22 +1756,19 @@ index 84fbd56f53..e46bf51e6c 100644
--> **NOTE:** Both Identifiers are unique to Terraform and don't map to an existing object within Azure.
+-> **NOTE:** Both Identifiers are unique to this provider and don't map to an existing object within Azure.
diff --git a/website/docs/r/key_vault_certificate.html.markdown b/website/docs/r/key_vault_certificate.html.markdown
index 89198d584b..d2c3bee09a 100644
index 89198d584b..f2ec1a778a 100644
--- a/website/docs/r/key_vault_certificate.html.markdown
+++ b/website/docs/r/key_vault_certificate.html.markdown
@@ -11,8 +11,11 @@ description: |-
@@ -11,8 +11,6 @@ description: |-

Manages a Key Vault Certificate.

+<<<<<<< HEAD
~> **Note:** The Azure Provider includes a Feature Toggle which will purge a Key Vault Certificate resource on destroy, rather than the default soft-delete. See [`purge_soft_deleted_certificates_on_destroy`](https://registry.terraform.io/providers/hashicorp/azurerm/latest/docs/guides/features-block#purge_soft_deleted_certificates_on_destroy) for more information.

+=======
+>>>>>>> 8d78c87098 (Update-documentation)
-~> **Note:** The Azure Provider includes a Feature Toggle which will purge a Key Vault Certificate resource on destroy, rather than the default soft-delete. See [`purge_soft_deleted_certificates_on_destroy`](https://registry.terraform.io/providers/hashicorp/azurerm/latest/docs/guides/features-block#purge_soft_deleted_certificates_on_destroy) for more information.
-
## Example Usage (Importing a PFX)

~> **Note:** this example assumed the PFX file is located in the same directory at `certificate-to-import.pfx`.
@@ -103,7 +106,7 @@ resource "azurerm_key_vault_certificate" "example" {
@@ -103,7 +101,7 @@ resource "azurerm_key_vault_certificate" "example" {
}
```

Expand All @@ -1780,21 +1778,18 @@ index 89198d584b..d2c3bee09a 100644
```hcl
data "azurerm_client_config" "current" {}
diff --git a/website/docs/r/key_vault_secret.html.markdown b/website/docs/r/key_vault_secret.html.markdown
index c6387f8e37..10ac1d0ad4 100644
index c6387f8e37..ab11365777 100644
--- a/website/docs/r/key_vault_secret.html.markdown
+++ b/website/docs/r/key_vault_secret.html.markdown
@@ -11,11 +11,14 @@ description: |-
@@ -11,11 +11,6 @@ description: |-

Manages a Key Vault Secret.

+<<<<<<< HEAD
~> **Note:** All arguments including the secret value will be stored in the raw state as plain-text.
[Read more about sensitive data in state](/docs/state/sensitive-data.html).

~> **Note:** The Azure Provider includes a Feature Toggle which will purge a Key Vault Secret resource on destroy, rather than the default soft-delete. See [`purge_soft_deleted_secrets_on_destroy`](https://registry.terraform.io/providers/hashicorp/azurerm/latest/docs/guides/features-block#purge_soft_deleted_secrets_on_destroy) for more information.

+=======
+>>>>>>> 8d78c87098 (Update-documentation)
-~> **Note:** All arguments including the secret value will be stored in the raw state as plain-text.
-[Read more about sensitive data in state](/docs/state/sensitive-data.html).
-
-~> **Note:** The Azure Provider includes a Feature Toggle which will purge a Key Vault Secret resource on destroy, rather than the default soft-delete. See [`purge_soft_deleted_secrets_on_destroy`](https://registry.terraform.io/providers/hashicorp/azurerm/latest/docs/guides/features-block#purge_soft_deleted_secrets_on_destroy) for more information.
-
## Example Usage

```hcl
Expand Down Expand Up @@ -2711,7 +2706,7 @@ index 06660e1381..3562812668 100644
-> **NOTE:** You must specify exact one of `blob_uri`, `managed_image_id` and `os_disk_snapshot_id`.

diff --git a/website/docs/r/signalr_service.html.markdown b/website/docs/r/signalr_service.html.markdown
index f2e1549d43..4836c3ef0a 100644
index ea6e5aa12e..596c16baba 100644
--- a/website/docs/r/signalr_service.html.markdown
+++ b/website/docs/r/signalr_service.html.markdown
@@ -14,8 +14,8 @@ Manages an Azure SignalR service.
Expand Down Expand Up @@ -2754,7 +2749,7 @@ index 8f57c91d06..e08781fa67 100644

```hcl
diff --git a/website/docs/r/storage_blob.html.markdown b/website/docs/r/storage_blob.html.markdown
index 04ca0f76e5..f0d311a601 100644
index d5b970d394..34cf87d1ae 100644
--- a/website/docs/r/storage_blob.html.markdown
+++ b/website/docs/r/storage_blob.html.markdown
@@ -65,8 +65,6 @@ The following arguments are supported:
Expand All @@ -2763,9 +2758,9 @@ index 04ca0f76e5..f0d311a601 100644

-~> **NOTE:** This property is intended to be used with the Terraform internal [filemd5](https://www.terraform.io/docs/configuration/functions/filemd5.html) and [md5](https://www.terraform.io/docs/configuration/functions/md5.html) functions when `source` or `source_content`, respectively, are defined.
-
* `source` - (Optional) An absolute path to a file on the local system. This field cannot be specified for Append blobs and cannot be specified if `source_content` or `source_uri` is specified. Changing this forces a new resource to be created.
* `encryption_scope` - (Optional) The encryption scope to use for this blob.

* `source_content` - (Optional) The content for this blob which should be defined inline. This field can only be specified for Block blobs and cannot be specified if `source` or `source_uri` is specified. Changing this forces a new resource to be created.
* `source` - (Optional) An absolute path to a file on the local system. This field cannot be specified for Append blobs and cannot be specified if `source_content` or `source_uri` is specified. Changing this forces a new resource to be created.
diff --git a/website/docs/r/storage_data_lake_gen2_path.html.markdown b/website/docs/r/storage_data_lake_gen2_path.html.markdown
index 6786f8eb01..38823a0fd4 100644
--- a/website/docs/r/storage_data_lake_gen2_path.html.markdown
Expand All @@ -2780,7 +2775,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 febf934234..d8187c43d6 100644
index eb2020be7a..6f8b64b8c3 100644
--- a/website/docs/r/subnet.html.markdown
+++ b/website/docs/r/subnet.html.markdown
@@ -11,7 +11,7 @@ description: |-
Expand Down
Loading

0 comments on commit 9b8d12c

Please sign in to comment.