Add zone redundancy for service bus namespace

azurerm/data_source_servicebus_namespace.go

@@ -61,13 +61,19 @@ func dataSourceArmServiceBusNamespace() *schema.Resource {
 				Sensitive: true,
 			},
 
+			"zone_redundant": {
+				Type:     schema.TypeBool,
+				Computed: true,
+			},
+
 			"tags": tags.SchemaDataSource(),
 		},
 	}
 }
 
 func dataSourceArmServiceBusNamespaceRead(d *schema.ResourceData, meta interface{}) error {
-	client := meta.(*ArmClient).ServiceBus.NamespacesClient
+	client := meta.(*ArmClient).ServiceBus.NamespacesClientPreview
+	clientStable := meta.(*ArmClient).ServiceBus.NamespacesClient
 	ctx := meta.(*ArmClient).StopContext
 
 	name := d.Get("name").(string)
@@ -93,7 +99,11 @@ func dataSourceArmServiceBusNamespaceRead(d *schema.ResourceData, meta interface
 		d.Set("capacity", sku.Capacity)
 	}
 
-	keys, err := client.ListKeys(ctx, resourceGroup, name, serviceBusNamespaceDefaultAuthorizationRule)
+	if properties := resp.SBNamespaceProperties; properties != nil {
+		d.Set("zone_redundant", properties.ZoneRedundant)
+	}
+
+	keys, err := clientStable.ListKeys(ctx, resourceGroup, name, serviceBusNamespaceDefaultAuthorizationRule)
 	if err != nil {
 		log.Printf("[WARN] Unable to List default keys for Namespace %q (Resource Group %q): %+v", name, resourceGroup, err)
 	} else {

azurerm/internal/services/servicebus/client.go

@@ -1,13 +1,15 @@
 package servicebus
 
 import (
+	servicebusPreview "github.com/Azure/azure-sdk-for-go/services/preview/servicebus/mgmt/2018-01-01-preview/servicebus"
 	"github.com/Azure/azure-sdk-for-go/services/servicebus/mgmt/2017-04-01/servicebus"
 	"github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/common"
 )
 
 type Client struct {
 	QueuesClient            *servicebus.QueuesClient
 	NamespacesClient        *servicebus.NamespacesClient
+	NamespacesClientPreview *servicebusPreview.NamespacesClient
 	TopicsClient            *servicebus.TopicsClient
 	SubscriptionsClient     *servicebus.SubscriptionsClient
 	SubscriptionRulesClient *servicebus.RulesClient
@@ -21,6 +23,9 @@ func BuildClient(o *common.ClientOptions) *Client {
 	NamespacesClient := servicebus.NewNamespacesClientWithBaseURI(o.ResourceManagerEndpoint, o.SubscriptionId)
 	o.ConfigureClient(&NamespacesClient.Client, o.ResourceManagerAuthorizer)
 
+	NamespacesClientPreview := servicebusPreview.NewNamespacesClientWithBaseURI(o.ResourceManagerEndpoint, o.SubscriptionId)
+	o.ConfigureClient(&NamespacesClientPreview.Client, o.ResourceManagerAuthorizer)
+
 	TopicsClient := servicebus.NewTopicsClientWithBaseURI(o.ResourceManagerEndpoint, o.SubscriptionId)
 	o.ConfigureClient(&TopicsClient.Client, o.ResourceManagerAuthorizer)
 
@@ -33,6 +38,7 @@ func BuildClient(o *common.ClientOptions) *Client {
 	return &Client{
 		QueuesClient:            &QueuesClient,
 		NamespacesClient:        &NamespacesClient,
+		NamespacesClientPreview: &NamespacesClientPreview,
 		TopicsClient:            &TopicsClient,
 		SubscriptionsClient:     &SubscriptionsClient,
 		SubscriptionRulesClient: &SubscriptionRulesClient,

azurerm/resource_arm_servicebus_namespace.go

@@ -12,7 +12,7 @@ import (
 	"github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/features"
 	"github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/tags"
 
-	"github.com/Azure/azure-sdk-for-go/services/servicebus/mgmt/2017-04-01/servicebus"
+	"github.com/Azure/azure-sdk-for-go/services/preview/servicebus/mgmt/2018-01-01-preview/servicebus"
 	"github.com/hashicorp/terraform/helper/schema"
 	"github.com/hashicorp/terraform/helper/validation"
 	"github.com/terraform-providers/terraform-provider-azurerm/azurerm/helpers/response"
@@ -96,13 +96,19 @@ func resourceArmServiceBusNamespace() *schema.Resource {
 				Sensitive: true,
 			},
 
+			"zone_redundant": {
+				Type:     schema.TypeBool,
+				Optional: true,
+				ForceNew: true,
+			},
+
 			"tags": tags.Schema(),
 		},
 	}
 }
 
 func resourceArmServiceBusNamespaceCreateUpdate(d *schema.ResourceData, meta interface{}) error {
-	client := meta.(*ArmClient).ServiceBus.NamespacesClient
+	client := meta.(*ArmClient).ServiceBus.NamespacesClientPreview
 	ctx := meta.(*ArmClient).StopContext
 
 	log.Printf("[INFO] preparing arguments for AzureRM ServiceBus Namespace creation.")
@@ -145,6 +151,13 @@ func resourceArmServiceBusNamespaceCreateUpdate(d *schema.ResourceData, meta int
 		parameters.Sku.Capacity = utils.Int32(int32(capacity.(int)))
 	}
 
+	if zoneRedundant, ok := d.GetOkExists("zone_redundant"); ok {
+		properties := servicebus.SBNamespaceProperties{
+			ZoneRedundant: utils.Bool(zoneRedundant.(bool)),
+		}
+		parameters.SBNamespaceProperties = &properties
+	}
+
 	future, err := client.CreateOrUpdate(ctx, resourceGroup, name, parameters)
 	if err != nil {
 		return err
@@ -169,7 +182,8 @@ func resourceArmServiceBusNamespaceCreateUpdate(d *schema.ResourceData, meta int
 }
 
 func resourceArmServiceBusNamespaceRead(d *schema.ResourceData, meta interface{}) error {
-	client := meta.(*ArmClient).ServiceBus.NamespacesClient
+	client := meta.(*ArmClient).ServiceBus.NamespacesClientPreview
+	clientStable := meta.(*ArmClient).ServiceBus.NamespacesClient
 	ctx := meta.(*ArmClient).StopContext
 
 	id, err := azure.ParseAzureResourceID(d.Id())
@@ -199,7 +213,11 @@ func resourceArmServiceBusNamespaceRead(d *schema.ResourceData, meta interface{}
 		d.Set("capacity", sku.Capacity)
 	}
 
-	keys, err := client.ListKeys(ctx, resourceGroup, name, serviceBusNamespaceDefaultAuthorizationRule)
+	if properties := resp.SBNamespaceProperties; properties != nil {
+		d.Set("zone_redundant", properties.ZoneRedundant)
+	}
+
+	keys, err := clientStable.ListKeys(ctx, resourceGroup, name, serviceBusNamespaceDefaultAuthorizationRule)
 	if err != nil {
 		log.Printf("[WARN] Unable to List default keys for Namespace %q (Resource Group %q): %+v", name, resourceGroup, err)
 	} else {
@@ -213,7 +231,7 @@ func resourceArmServiceBusNamespaceRead(d *schema.ResourceData, meta interface{}
 }
 
 func resourceArmServiceBusNamespaceDelete(d *schema.ResourceData, meta interface{}) error {
-	client := meta.(*ArmClient).ServiceBus.NamespacesClient
+	client := meta.(*ArmClient).ServiceBus.NamespacesClientPreview
 	ctx := meta.(*ArmClient).StopContext
 
 	id, err := azure.ParseAzureResourceID(d.Id())

azurerm/resource_arm_servicebus_namespace_test.go

@@ -181,8 +181,34 @@ func TestAccAzureRMServiceBusNamespace_premiumCapacity(t *testing.T) {
 	})
 }
 
+func TestAccAzureRMServiceBusNamespace_zoneRedundant(t *testing.T) {
+	resourceName := "azurerm_servicebus_namespace.test"
+	ri := tf.AccRandTimeInt()
+	config := testAccAzureRMServiceBusNamespace_zoneRedundant(ri, testLocation())
+
+	resource.ParallelTest(t, resource.TestCase{
+		PreCheck:     func() { testAccPreCheck(t) },
+		Providers:    testAccProviders,
+		CheckDestroy: testCheckAzureRMServiceBusNamespaceDestroy,
+		Steps: []resource.TestStep{
+			{
+				Config: config,
+				Check: resource.ComposeTestCheckFunc(
+					testCheckAzureRMServiceBusNamespaceExists(resourceName),
+					resource.TestCheckResourceAttr(resourceName, "zone_redundant", "true"),
+				),
+			},
+			{
+				ResourceName:      resourceName,
+				ImportState:       true,
+				ImportStateVerify: true,
+			},
+		},
+	})
+}
+
 func testCheckAzureRMServiceBusNamespaceDestroy(s *terraform.State) error {
-	client := testAccProvider.Meta().(*ArmClient).ServiceBus.NamespacesClient
+	client := testAccProvider.Meta().(*ArmClient).ServiceBus.NamespacesClientPreview
 	ctx := testAccProvider.Meta().(*ArmClient).StopContext
 
 	for _, rs := range s.RootModule().Resources {
@@ -221,7 +247,7 @@ func testCheckAzureRMServiceBusNamespaceExists(resourceName string) resource.Tes
 			return fmt.Errorf("Bad: no resource group found in state for Service Bus Namespace: %s", namespaceName)
 		}
 
-		client := testAccProvider.Meta().(*ArmClient).ServiceBus.NamespacesClient
+		client := testAccProvider.Meta().(*ArmClient).ServiceBus.NamespacesClientPreview
 		ctx := testAccProvider.Meta().(*ArmClient).StopContext
 
 		resp, err := client.Get(ctx, resourceGroup, namespaceName)
@@ -332,3 +358,21 @@ resource "azurerm_servicebus_namespace" "test" {
 }
 `, rInt, location, rInt)
 }
+
+func testAccAzureRMServiceBusNamespace_zoneRedundant(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            = 1
+  zone_redundant      = true
+}
+`, rInt, location, rInt)
+}