From bf7875c4f564289f1a0ec549025d747584ab73dd Mon Sep 17 00:00:00 2001 From: Steph Date: Wed, 1 Jun 2022 14:43:30 +0200 Subject: [PATCH 1/2] extend regex char limit for event hub auth rule name --- internal/services/eventhub/validate/eventhub_names.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/internal/services/eventhub/validate/eventhub_names.go b/internal/services/eventhub/validate/eventhub_names.go index 2f2da949a5f3..49e599feea0e 100644 --- a/internal/services/eventhub/validate/eventhub_names.go +++ b/internal/services/eventhub/validate/eventhub_names.go @@ -31,7 +31,7 @@ func ValidateEventHubConsumerName() pluginsdk.SchemaValidateFunc { func ValidateEventHubAuthorizationRuleName() pluginsdk.SchemaValidateFunc { return validation.StringMatch( - regexp.MustCompile("^[a-zA-Z0-9]([-._a-zA-Z0-9]{0,48}[a-zA-Z0-9])?$"), - "The authorization rule name can contain only letters, numbers, periods, hyphens and underscores. The name must start and end with a letter or number and be up to 50 characters long.", + regexp.MustCompile("^[a-zA-Z0-9]([-._a-zA-Z0-9]{0,62}[a-zA-Z0-9])?$"), + "The authorization rule name can contain only letters, numbers, periods, hyphens and underscores. The name must start and end with a letter or number and be up to 60 characters long.", ) } From b2ed901f382de6f4d6c03b88dac63a84762da293 Mon Sep 17 00:00:00 2001 From: Steph Date: Wed, 1 Jun 2022 14:58:04 +0200 Subject: [PATCH 2/2] doc fixes --- internal/services/eventhub/validate/eventhub_names.go | 2 +- .../docs/r/policy_subscription_policy_exemption.html.markdown | 2 +- website/docs/r/storage_share.html.markdown | 4 +--- 3 files changed, 3 insertions(+), 5 deletions(-) diff --git a/internal/services/eventhub/validate/eventhub_names.go b/internal/services/eventhub/validate/eventhub_names.go index 49e599feea0e..ed1d5b01801e 100644 --- a/internal/services/eventhub/validate/eventhub_names.go +++ b/internal/services/eventhub/validate/eventhub_names.go @@ -31,7 +31,7 @@ func ValidateEventHubConsumerName() pluginsdk.SchemaValidateFunc { func ValidateEventHubAuthorizationRuleName() pluginsdk.SchemaValidateFunc { return validation.StringMatch( - regexp.MustCompile("^[a-zA-Z0-9]([-._a-zA-Z0-9]{0,62}[a-zA-Z0-9])?$"), + regexp.MustCompile("^[a-zA-Z0-9]([-._a-zA-Z0-9]{0,58}[a-zA-Z0-9])?$"), "The authorization rule name can contain only letters, numbers, periods, hyphens and underscores. The name must start and end with a letter or number and be up to 60 characters long.", ) } diff --git a/website/docs/r/policy_subscription_policy_exemption.html.markdown b/website/docs/r/policy_subscription_policy_exemption.html.markdown index 8c16d07f698a..b7022584d0c7 100644 --- a/website/docs/r/policy_subscription_policy_exemption.html.markdown +++ b/website/docs/r/policy_subscription_policy_exemption.html.markdown @@ -32,7 +32,7 @@ resource "azurerm_subscription_policy_assignment" "example" { resource "azurerm_subscription_policy_exemption" "example" { name = "exampleExemption" - resource_group_id = data.azurerm_subscription.example.id + subscription_id = data.azurerm_subscription.example.id policy_assignment_id = azurerm_subscription_policy_assignment.example.id exemption_category = "Mitigated" } diff --git a/website/docs/r/storage_share.html.markdown b/website/docs/r/storage_share.html.markdown index 2efc002b1f41..d26136906b7e 100644 --- a/website/docs/r/storage_share.html.markdown +++ b/website/docs/r/storage_share.html.markdown @@ -54,7 +54,7 @@ The following arguments are supported: * `storage_account_name` - (Required) Specifies the storage account in which to create the share. Changing this forces a new resource to be created. -* `access_tier` - (Optional) The access tier of the File Share. Possible values are `Hot`, `Cool` and `TransactionOptimized`. +* `access_tier` - (Optional) The access tier of the File Share. Possible values are `Hot`, `Cool` and `TransactionOptimized`, `Premium`. * `acl` - (Optional) One or more `acl` blocks as defined below. @@ -66,8 +66,6 @@ The following arguments are supported: * `metadata` - (Optional) A mapping of MetaData for this File Share. -* `access_tier` - (Optional) The tier of the File Share. Can be one of `Hot`, `Cool`, `TransactionOptimized`, `Premium`. - --- A `acl` block supports the following: