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

azurerm_servicebus_topic - added a status field to allow disabling the topic #150

Merged
merged 6 commits into from
Jul 5, 2017
Merged

azurerm_servicebus_topic - added a status field to allow disabling the topic #150

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
409f6c5
Cleaning up service bus namespaces
tombuildsstuff Jul 3, 2017
1c68d84
Service Bus Topic's can be disabled
tombuildsstuff Jul 4, 2017
20cca85
Refactoring
tombuildsstuff Jul 4, 2017
da0eb1e
Actually enabling disabled
tombuildsstuff Jul 4, 2017
55a30f0
Adding the new field to the docs
tombuildsstuff Jul 4, 2017
1eebdf4
Switching to use the azure wrappers
tombuildsstuff Jul 5, 2017
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
7 changes: 3 additions & 4 deletions azurerm/import_arm_servicebus_namespace_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
package azurerm

import (
"fmt"
"testing"

"github.com/hashicorp/terraform/helper/acctest"
Expand All @@ -12,18 +11,18 @@ func TestAccAzureRMServiceBusNamespace_importBasic(t *testing.T) {
resourceName := "azurerm_servicebus_namespace.test"

ri := acctest.RandInt()
config := fmt.Sprintf(testAccAzureRMServiceBusNamespace_basic, ri, ri)
config := testAccAzureRMServiceBusNamespace_basic(ri)

resource.Test(t, resource.TestCase{
PreCheck: func() { testAccPreCheck(t) },
Providers: testAccProviders,
CheckDestroy: testCheckAzureRMServiceBusNamespaceDestroy,
Steps: []resource.TestStep{
resource.TestStep{
{
Config: config,
},

resource.TestStep{
{
ResourceName: resourceName,
ImportState: true,
ImportStateVerify: true,
Expand Down
29 changes: 25 additions & 4 deletions azurerm/import_arm_servicebus_topic_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
package azurerm

import (
"fmt"
"testing"

"github.com/hashicorp/terraform/helper/acctest"
Expand All @@ -12,18 +11,40 @@ func TestAccAzureRMServiceBusTopic_importBasic(t *testing.T) {
resourceName := "azurerm_servicebus_topic.test"

ri := acctest.RandInt()
config := fmt.Sprintf(testAccAzureRMServiceBusTopic_basic, ri, ri, ri)
config := testAccAzureRMServiceBusTopic_basic(ri)

resource.Test(t, resource.TestCase{
PreCheck: func() { testAccPreCheck(t) },
Providers: testAccProviders,
CheckDestroy: testCheckAzureRMServiceBusTopicDestroy,
Steps: []resource.TestStep{
resource.TestStep{
{
Config: config,
},
{
ResourceName: resourceName,
ImportState: true,
ImportStateVerify: true,
},
},
})
}

func TestAccAzureRMServiceBusTopic_importBasicDisabled(t *testing.T) {
resourceName := "azurerm_servicebus_topic.test"

resource.TestStep{
ri := acctest.RandInt()
config := testAccAzureRMServiceBusTopic_basicDisabled(ri)

resource.Test(t, resource.TestCase{
PreCheck: func() { testAccPreCheck(t) },
Providers: testAccProviders,
CheckDestroy: testCheckAzureRMServiceBusTopicDestroy,
Steps: []resource.TestStep{
{
Config: config,
},
{
ResourceName: resourceName,
ImportState: true,
ImportStateVerify: true,
Expand Down
33 changes: 12 additions & 21 deletions azurerm/resource_arm_servicebus_namespace.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ import (

"github.com/Azure/azure-sdk-for-go/arm/servicebus"
"github.com/hashicorp/terraform/helper/schema"
"github.com/hashicorp/terraform/helper/validation"
)

// Default Authorization Rule/Policy created by Azure, used to populate the
Expand Down Expand Up @@ -40,10 +41,14 @@ func resourceArmServiceBusNamespace() *schema.Resource {
},

"sku": {
Type: schema.TypeString,
Required: true,
ForceNew: true,
ValidateFunc: validateServiceBusNamespaceSku,
Type: schema.TypeString,
Required: true,
ForceNew: true,
ValidateFunc: validation.StringInSlice([]string{
string(servicebus.Basic),
string(servicebus.Standard),
string(servicebus.Premium),
}, true),
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Good job with simplification 👍

DiffSuppressFunc: ignoreCaseDiffSuppressFunc,
},

Expand Down Expand Up @@ -83,7 +88,7 @@ func resourceArmServiceBusNamespace() *schema.Resource {
func resourceArmServiceBusNamespaceCreate(d *schema.ResourceData, meta interface{}) error {
client := meta.(*ArmClient)
namespaceClient := client.serviceBusNamespacesClient
log.Printf("[INFO] preparing arguments for Azure ARM ServiceBus Namespace creation.")
log.Printf("[INFO] preparing arguments for AzureRM ServiceBus Namespace creation.")

name := d.Get("name").(string)
location := d.Get("location").(string)
Expand Down Expand Up @@ -134,7 +139,7 @@ func resourceArmServiceBusNamespaceRead(d *schema.ResourceData, meta interface{}

resp, err := namespaceClient.Get(resGroup, name)
if err != nil {
return fmt.Errorf("Error making Read request on Azure ServiceBus Namespace %s: %+v", name, err)
return fmt.Errorf("Error making Read request on Azure ServiceBus Namespace '%s': %+v", name, err)
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

%q would add double quotes around the string for you + escaped it properly here.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

TIL, thanks!

}
if resp.StatusCode == http.StatusNotFound {
d.SetId("")
Expand Down Expand Up @@ -177,26 +182,12 @@ func resourceArmServiceBusNamespaceDelete(d *schema.ResourceData, meta interface
err = <-error

if resp.StatusCode != http.StatusNotFound {
return fmt.Errorf("Error issuing Azure ARM delete request of ServiceBus Namespace'%s': %+v", name, err)
return fmt.Errorf("Error issuing Azure ARM delete request of ServiceBus Namespace '%s': %+v", name, err)
}

return nil
}

func validateServiceBusNamespaceSku(v interface{}, k string) (ws []string, errors []error) {
value := strings.ToLower(v.(string))
skus := map[string]bool{
"basic": true,
"standard": true,
"premium": true,
}

if !skus[value] {
errors = append(errors, fmt.Errorf("ServiceBus Namespace SKU can only be Basic, Standard or Premium"))
}
return
}

func validateServiceBusNamespaceCapacity(v interface{}, k string) (ws []string, errors []error) {
value := v.(int)
capacities := map[int]bool{
Expand Down
72 changes: 22 additions & 50 deletions azurerm/resource_arm_servicebus_namespace_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,86 +43,56 @@ func TestAccAzureRMServiceBusNamespaceCapacity_validation(t *testing.T) {
}
}

func TestAccAzureRMServiceBusNamespaceSku_validation(t *testing.T) {
cases := []struct {
Value string
ErrCount int
}{
{
Value: "Basic",
ErrCount: 0,
},
{
Value: "Standard",
ErrCount: 0,
},
{
Value: "Premium",
ErrCount: 0,
},
{
Value: "Random",
ErrCount: 1,
},
}

for _, tc := range cases {
_, errors := validateServiceBusNamespaceSku(tc.Value, "azurerm_servicebus_namespace")

if len(errors) != tc.ErrCount {
t.Fatalf("Expected the Azure RM ServiceBus Namespace Sku to trigger a validation error")
}
}
}

func TestAccAzureRMServiceBusNamespace_basic(t *testing.T) {

resourceName := "azurerm_servicebus_namespace.test"
ri := acctest.RandInt()
config := fmt.Sprintf(testAccAzureRMServiceBusNamespace_basic, ri, ri)
config := testAccAzureRMServiceBusNamespace_basic(ri)

resource.Test(t, resource.TestCase{
PreCheck: func() { testAccPreCheck(t) },
Providers: testAccProviders,
CheckDestroy: testCheckAzureRMServiceBusNamespaceDestroy,
Steps: []resource.TestStep{
resource.TestStep{
{
Config: config,
Check: resource.ComposeTestCheckFunc(
testCheckAzureRMServiceBusNamespaceExists("azurerm_servicebus_namespace.test"),
testCheckAzureRMServiceBusNamespaceExists(resourceName),
),
},
},
})
}

func TestAccAzureRMServiceBusNamespace_readDefaultKeys(t *testing.T) {
resourceName := "azurerm_servicebus_namespace.test"
ri := acctest.RandInt()
config := fmt.Sprintf(testAccAzureRMServiceBusNamespace_basic, ri, ri)
config := testAccAzureRMServiceBusNamespace_basic(ri)

resource.Test(t, resource.TestCase{
PreCheck: func() { testAccPreCheck(t) },
Providers: testAccProviders,
CheckDestroy: testCheckAzureRMServiceBusNamespaceDestroy,
Steps: []resource.TestStep{
resource.TestStep{
{
Config: config,
Check: resource.ComposeTestCheckFunc(
testCheckAzureRMServiceBusNamespaceExists("azurerm_servicebus_namespace.test"),
testCheckAzureRMServiceBusNamespaceExists(resourceName),
resource.TestMatchResourceAttr(
"azurerm_servicebus_namespace.test", "default_primary_connection_string", regexp.MustCompile("Endpoint=.+")),
resourceName, "default_primary_connection_string", regexp.MustCompile("Endpoint=.+")),
resource.TestMatchResourceAttr(
"azurerm_servicebus_namespace.test", "default_secondary_connection_string", regexp.MustCompile("Endpoint=.+")),
resourceName, "default_secondary_connection_string", regexp.MustCompile("Endpoint=.+")),
resource.TestMatchResourceAttr(
"azurerm_servicebus_namespace.test", "default_primary_key", regexp.MustCompile(".+")),
resourceName, "default_primary_key", regexp.MustCompile(".+")),
resource.TestMatchResourceAttr(
"azurerm_servicebus_namespace.test", "default_secondary_key", regexp.MustCompile(".+")),
resourceName, "default_secondary_key", regexp.MustCompile(".+")),
),
},
},
})
}

func TestAccAzureRMServiceBusNamespace_NonStandardCasing(t *testing.T) {
resourceName := "azurerm_servicebus_namespace.test"

ri := acctest.RandInt()
config := testAccAzureRMServiceBusNamespaceNonStandardCasing(ri)
Expand All @@ -132,13 +102,13 @@ func TestAccAzureRMServiceBusNamespace_NonStandardCasing(t *testing.T) {
Providers: testAccProviders,
CheckDestroy: testCheckAzureRMServiceBusNamespaceDestroy,
Steps: []resource.TestStep{
resource.TestStep{
{
Config: config,
Check: resource.ComposeTestCheckFunc(
testCheckAzureRMServiceBusNamespaceExists("azurerm_servicebus_namespace.test"),
testCheckAzureRMServiceBusNamespaceExists(resourceName),
),
},
resource.TestStep{
{
Config: config,
PlanOnly: true,
ExpectNonEmptyPlan: false,
Expand Down Expand Up @@ -201,18 +171,20 @@ func testCheckAzureRMServiceBusNamespaceExists(name string) resource.TestCheckFu
}
}

var testAccAzureRMServiceBusNamespace_basic = `
func testAccAzureRMServiceBusNamespace_basic(rInt int) string {
return fmt.Sprintf(`
resource "azurerm_resource_group" "test" {
name = "acctestRG-%d"
location = "West US"
}
resource "azurerm_servicebus_namespace" "test" {
name = "acctestservicebusnamespace-%d"
location = "West US"
location = "${azurerm_resource_group.test.location}"
resource_group_name = "${azurerm_resource_group.test.name}"
sku = "basic"
}
`
`, rInt, rInt)
}

func testAccAzureRMServiceBusNamespaceNonStandardCasing(ri int) string {
return fmt.Sprintf(`
Expand All @@ -222,7 +194,7 @@ resource "azurerm_resource_group" "test" {
}
resource "azurerm_servicebus_namespace" "test" {
name = "acctestservicebusnamespace-%d"
location = "West US"
location = "${azurerm_resource_group.test.location}"
resource_group_name = "${azurerm_resource_group.test.name}"
sku = "Basic"
}
Expand Down
Loading