Merge pull request #2920 from clearbank/servicebus_capacity

Allow 0 capacity for servicebus
hashicorp · Mar 7, 2019 · 638d890 · 638d890
2 parents 0eb4095 + 269a113
commit 638d890
Show file tree

Hide file tree

Showing 3 changed files with 78 additions and 17 deletions.
diff --git a/azurerm/resource_arm_servicebus_namespace.go b/azurerm/resource_arm_servicebus_namespace.go
@@ -64,7 +64,8 @@ func resourceArmServiceBusNamespace() *schema.Resource {
 			"capacity": {
 				Type:         schema.TypeInt,
 				Optional:     true,
-				ValidateFunc: validate.IntInSlice([]int{1, 2, 4}),
+				Default:      0,
+				ValidateFunc: validate.IntInSlice([]int{0, 1, 2, 4}),
 			},
 
 			"default_primary_connection_string": {
@@ -93,20 +94,6 @@ func resourceArmServiceBusNamespace() *schema.Resource {
 
 			"tags": tagsSchema(),
 		},
-
-		CustomizeDiff: func(d *schema.ResourceDiff, v interface{}) error {
-
-			//If the SKU is not premium the API will always return 0 for capacity
-			//so lets only allow it to be set if the SKU is premium
-			if _, ok := d.GetOk("capacity"); ok {
-				sku := d.Get("sku").(string)
-				if !strings.EqualFold(sku, string(servicebus.Premium)) {
-					return fmt.Errorf("`capacity` can only be set for a Premium SKU")
-				}
-			}
-
-			return nil
-		},
 	}
 }
 
@@ -144,7 +131,13 @@ func resourceArmServiceBusNamespaceCreateUpdate(d *schema.ResourceData, meta int
 		Tags: expandTags(tags),
 	}
 
-	if capacity, ok := d.GetOk("capacity"); ok {
+	if capacity := d.Get("capacity"); capacity != nil {
+		if !strings.EqualFold(sku, string(servicebus.Premium)) && capacity.(int) > 0 {
+			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 or 4", sku)
+		}
 		parameters.Sku.Capacity = utils.Int32(int32(capacity.(int)))
 	}
 

diff --git a/azurerm/resource_arm_servicebus_namespace_test.go b/azurerm/resource_arm_servicebus_namespace_test.go
@@ -146,6 +146,40 @@ func TestAccAzureRMServiceBusNamespace_premium(t *testing.T) {
 	})
 }
 
+func TestAccAzureRMServiceBusNamespace_basicCapacity(t *testing.T) {
+	ri := tf.AccRandTimeInt()
+	config := testAccAzureRMServiceBusNamespace_basicCapacity(ri, testLocation())
+
+	resource.ParallelTest(t, resource.TestCase{
+		PreCheck:     func() { testAccPreCheck(t) },
+		Providers:    testAccProviders,
+		CheckDestroy: testCheckAzureRMServiceBusNamespaceDestroy,
+		Steps: []resource.TestStep{
+			{
+				Config:      config,
+				ExpectError: regexp.MustCompile("Service Bus SKU \"Basic\" only supports `capacity` of 0"),
+			},
+		},
+	})
+}
+
+func TestAccAzureRMServiceBusNamespace_premiumCapacity(t *testing.T) {
+	ri := tf.AccRandTimeInt()
+	config := testAccAzureRMServiceBusNamespace_premiumCapacity(ri, testLocation())
+
+	resource.ParallelTest(t, resource.TestCase{
+		PreCheck:     func() { testAccPreCheck(t) },
+		Providers:    testAccProviders,
+		CheckDestroy: testCheckAzureRMServiceBusNamespaceDestroy,
+		Steps: []resource.TestStep{
+			{
+				Config:      config,
+				ExpectError: regexp.MustCompile("Service Bus SKU \"Premium\" only supports `capacity` of 1, 2 or 4"),
+			},
+		},
+	})
+}
+
 func testCheckAzureRMServiceBusNamespaceDestroy(s *terraform.State) error {
 	client := testAccProvider.Meta().(*ArmClient).serviceBusNamespacesClient
 	ctx := testAccProvider.Meta().(*ArmClient).StopContext
@@ -263,3 +297,37 @@ resource "azurerm_servicebus_namespace" "test" {
 }
 `, rInt, location, rInt)
 }
+
+func testAccAzureRMServiceBusNamespace_basicCapacity(rInt int, location string) string {
+	return fmt.Sprintf(`
+resource "azurerm_resource_group" "test" {
+  name     = "acctestRG-%d"
+  location = "%s"
+}
+
+resource "azurerm_servicebus_namespace" "test" {
+  name                = "acctestservicebusnamespace-%d"
+  location            = "${azurerm_resource_group.test.location}"
+  resource_group_name = "${azurerm_resource_group.test.name}"
+  sku                 = "Basic"
+  capacity            = 1
+}
+`, rInt, location, rInt)
+}
+
+func testAccAzureRMServiceBusNamespace_premiumCapacity(rInt int, location string) string {
+	return fmt.Sprintf(`
+resource "azurerm_resource_group" "test" {
+  name     = "acctestRG-%d"
+  location = "%s"
+}
+
+resource "azurerm_servicebus_namespace" "test" {
+  name                = "acctestservicebusnamespace-%d"
+  location            = "${azurerm_resource_group.test.location}"
+  resource_group_name = "${azurerm_resource_group.test.name}"
+  sku                 = "Premium"
+  capacity            = 0
+}
+`, rInt, location, rInt)
+}
diff --git a/website/docs/r/servicebus_namespace.html.markdown b/website/docs/r/servicebus_namespace.html.markdown
@@ -44,7 +44,7 @@ The following arguments are supported:
 
 * `sku` - (Required) Defines which tier to use. Options are basic, standard or premium.
 
-* `capacity` - (Optional) Specifies the capacity, can only be set when `sku` is `Premium` namespace. Can be `1`, `2` or `4`.
+* `capacity` - (Optional) Specifies the capacity. When `sku` is `Premium` can be `1`, `2` or `4`. When `sku` is `Basic` or `Standard` can be `0` only.
 
 * `tags` - (Optional) A mapping of tags to assign to the resource.