Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

r/azurerm_servicebus_namespace - Allowed setting messaging units capacity to 16 for Premium SKU #10337

Merged
merged 1 commit into from
Jan 27, 2021
Merged

r/azurerm_servicebus_namespace - Allowed setting messaging units capacity to 16 for Premium SKU #10337

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions azurerm/internal/services/servicebus/servicebus_namespace_resource.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@ func resourceServiceBusNamespace() *schema.Resource {
Type: schema.TypeInt,
Optional: true,
Default: 0,
ValidateFunc: validation.IntInSlice([]int{0, 1, 2, 4, 8}),
ValidateFunc: validation.IntInSlice([]int{0, 1, 2, 4, 8, 16}),
},

"default_primary_connection_string": {
Expand Down Expand Up @@ -159,7 +159,7 @@ func resourceServiceBusNamespaceCreateUpdate(d *schema.ResourceData, meta interf
return fmt.Errorf("Service Bus SKU %q only supports `capacity` of 0", sku)
}
if strings.EqualFold(sku, string(servicebus.Premium)) && capacity.(int) == 0 {
return fmt.Errorf("Service Bus SKU %q only supports `capacity` of 1, 2, 4 or 8", sku)
return fmt.Errorf("Service Bus SKU %q only supports `capacity` of 1, 2, 4, 8 or 16", sku)
}
parameters.Sku.Capacity = utils.Int32(int32(capacity.(int)))
}
Expand Down
2 changes: 1 addition & 1 deletion azurerm/internal/services/servicebus/servicebus_namespace_resource_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -120,7 +120,7 @@ func TestAccAzureRMServiceBusNamespace_premiumCapacity(t *testing.T) {
data.ResourceTest(t, r, []resource.TestStep{
{
Config: r.premiumCapacity(data),
ExpectError: regexp.MustCompile("Service Bus SKU \"Premium\" only supports `capacity` of 1, 2, 4 or 8"),
ExpectError: regexp.MustCompile("Service Bus SKU \"Premium\" only supports `capacity` of 1, 2, 4, 8 or 16"),
},
})
}
Expand Down
2 changes: 1 addition & 1 deletion website/docs/r/servicebus_namespace.html.markdown
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ The following arguments are supported:

* `sku` - (Required) Defines which tier to use. Options are basic, standard or premium. Changing this forces a new resource to be created.

* `capacity` - (Optional) Specifies the capacity. When `sku` is `Premium`, capacity can be `1`, `2`, `4` or `8`. When `sku` is `Basic` or `Standard`, capacity can be `0` only.
* `capacity` - (Optional) Specifies the capacity. When `sku` is `Premium`, capacity can be `1`, `2`, `4`, `8` or `16`. When `sku` is `Basic` or `Standard`, capacity can be `0` only.

* `zone_redundant` - (Optional) Whether or not this resource is zone redundant. `sku` needs to be `Premium`. Defaults to `false`.

Expand Down