Skip to content

Commit

Permalink
Updates as requested in PR
Browse files Browse the repository at this point in the history
  • Loading branch information
@katbyte
katbyte committed Jul 7, 2018
1 parent d58103e commit d88b999
Show file tree
Hide file tree
Showing 7 changed files with 213 additions and 193 deletions.
75 changes: 73 additions & 2 deletions azurerm/helpers/azure/servicebus.go
View file
Original file line number Diff line number Diff line change
@@ -1,18 +1,89 @@
package azure

import (
"fmt"
"log"
"regexp"

"github.com/hashicorp/terraform/helper/schema"
"github.com/hashicorp/terraform/helper/validation"

"github.com/Azure/azure-sdk-for-go/services/servicebus/mgmt/2017-04-01/servicebus"
)

//validation
func ValidateServiceBusNamespaceName() schema.SchemaValidateFunc {
return validation.StringMatch(
regexp.MustCompile("^[a-zA-Z][-a-zA-Z0-9]{0,100}[a-zA-Z0-9]$"),
"The namespace can contain only letters, numbers, and hyphens. The namespace must start with a letter, and it must end with a letter or number.",
regexp.MustCompile("^[a-zA-Z][-a-zA-Z0-9]{4,48}[a-zA-Z0-9]$"),
"The namespace name can contain only letters, numbers, and hyphens. The namespace must start with a letter, and it must end with a letter or number and be between 6 and 50 characters long.",
)
}

func ValidateServiceBusTopicName() schema.SchemaValidateFunc {
return validation.StringMatch(
regexp.MustCompile("^[a-zA-Z][-._a-zA-Z0-9]{0,258}([a-zA-Z0-9])?$"),
"The topic name can contain only letters, numbers, periods, hyphens and underscores. The namespace must start with a letter, and it must end with a letter or number and be less then 260 characters long.",
)
}

func ValidateServiceBusAuthorizationRuleName() schema.SchemaValidateFunc {
return validation.StringMatch(
regexp.MustCompile("^[a-zA-Z0-9][-._a-zA-Z0-9]{0,48}([a-zA-Z0-9])?$"),
"The name can contain only letters, numbers, periods, hyphens and underscores. The name must start and end with a letter or number and be less the 50 characters long.",
)
}

func ExpandServiceBusAuthorizationRuleRights(d *schema.ResourceData) *[]servicebus.AccessRights {
rights := []servicebus.AccessRights{}

if d.Get("manage").(bool) {
//manage implies all, so just return it
rights = append(rights, []servicebus.AccessRights{servicebus.Listen, servicebus.Send, servicebus.Manage}...)
return &rights
}

if d.Get("listen").(bool) {
rights = append(rights, servicebus.Listen)
}

if d.Get("send").(bool) {
rights = append(rights, servicebus.Send)
}

return &rights
}

func FlattenServiceBusAuthorizationRuleRights(rights *[]servicebus.AccessRights) (listen bool, send bool, manage bool) {
//zero (initial) value for a bool in go is false

if rights != nil {
for _, right := range *rights {
switch right {
case servicebus.Listen:
listen = true
case servicebus.Send:
send = true
case servicebus.Manage:
manage = true
default:
log.Printf("[DEBUG] Unknown Authorization Rule Right '%s'", right)
}
}
}

return
}

//shared schema

func ServiceBusAuthorizationRuleCustomizeDiff(d *schema.ResourceDiff, _ interface{}) error {
_, hasListen := d.GetOk("listen")
_, hasSend := d.GetOk("send")
_, hasManage := d.GetOk("manage")

if !hasListen && !hasSend && !hasManage {
return fmt.Errorf("One of the `listen`, `send` or `manage` properties needs to be set")
}

return nil
}
107 changes: 41 additions & 66 deletions azurerm/resource_arm_servicebus_namespace_authorization_rule.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,12 +6,14 @@ import (

"github.com/Azure/azure-sdk-for-go/services/servicebus/mgmt/2017-04-01/servicebus"
"github.com/hashicorp/terraform/helper/schema"
"github.com/hashicorp/terraform/helper/validation"
"github.com/terraform-providers/terraform-provider-azurerm/azurerm/helpers/azure"
"github.com/terraform-providers/terraform-provider-azurerm/azurerm/helpers/set"
"github.com/terraform-providers/terraform-provider-azurerm/azurerm/utils"
)

func resourceArmServiceAuthRuleSchemaFrom(schema map[string]*schema.Schema) map[string]*schema.Schema {
return schema
}

func resourceArmServiceBusNamespaceAuthorizationRule() *schema.Resource {
return &schema.Resource{
Create: resourceArmServiceBusNamespaceAuthorizationRuleCreateUpdate,
Expand All @@ -23,11 +25,12 @@ func resourceArmServiceBusNamespaceAuthorizationRule() *schema.Resource {
State: schema.ImportStatePassthrough,
},

Schema: map[string]*schema.Schema{
Schema: resourceArmServiceAuthRuleSchemaFrom(map[string]*schema.Schema{
"name": {
Type: schema.TypeString,
Required: true,
ForceNew: true,
Type: schema.TypeString,
Required: true,
ForceNew: true,
ValidateFunc: azure.ValidateServiceBusAuthorizationRuleName(),
},

"namespace_name": {
Expand All @@ -39,19 +42,22 @@ func resourceArmServiceBusNamespaceAuthorizationRule() *schema.Resource {

"resource_group_name": resourceGroupNameSchema(),

"rights": {
Type: schema.TypeSet,
Required: true,
MinItems: 1,
Elem: &schema.Schema{
Type: schema.TypeString,
ValidateFunc: validation.StringInSlice([]string{
string(servicebus.Listen),
string(servicebus.Send),
string(servicebus.Manage),
}, true),
},
Set: set.HashStringIgnoreCase,
"listen": {
Type: schema.TypeBool,
Optional: true,
Computed: true, //because we set this to true if managed is chosen
},

"send": {
Type: schema.TypeBool,
Optional: true,
Computed: true, //because we set this to true if managed is chosen
},

"manage": {
Type: schema.TypeBool,
Optional: true,
Default: false,
},

"primary_key": {
Expand All @@ -77,19 +83,9 @@ func resourceArmServiceBusNamespaceAuthorizationRule() *schema.Resource {
Computed: true,
Sensitive: true,
},
},
}),

CustomizeDiff: func(diff *schema.ResourceDiff, v interface{}) error {
rights := diff.Get("rights").(*schema.Set)

if rights.Contains(string(servicebus.Manage)) {
if !rights.Contains(string(servicebus.Listen)) || !rights.Contains(string(servicebus.Manage)) {
return fmt.Errorf("In order to allow the 'Manage' right - both the 'Listen' and 'Send' rights must be present")
}
}

return nil
},
CustomizeDiff: azure.ServiceBusAuthorizationRuleCustomizeDiff,
}
}

Expand All @@ -106,7 +102,7 @@ func resourceArmServiceBusNamespaceAuthorizationRuleCreateUpdate(d *schema.Resou
parameters := servicebus.SBAuthorizationRule{
Name: &name,
SBAuthorizationRuleProperties: &servicebus.SBAuthorizationRuleProperties{
Rights: expandServiceBusAuthorizationRuleRights(d),
Rights: azure.ExpandServiceBusAuthorizationRuleRights(d),
},
}

Expand Down Expand Up @@ -140,7 +136,7 @@ func resourceArmServiceBusNamespaceAuthorizationRuleRead(d *schema.ResourceData,

resGroup := id.ResourceGroup
namespaceName := id.Path["namespaces"]
name := id.Path["AuthorizationRules"] //this is slightly different this topic, authorization is capitalized
name := id.Path["AuthorizationRules"] //this is slightly different then a topic rule (Authorization vs authorization)

resp, err := client.GetAuthorizationRule(ctx, resGroup, namespaceName, name)
if err != nil {
Expand All @@ -151,17 +147,20 @@ func resourceArmServiceBusNamespaceAuthorizationRuleRead(d *schema.ResourceData,
return fmt.Errorf("Error making Read request on Azure ServiceBus Namespace Authorization Rule %s: %+v", name, err)
}

keysResp, err := client.ListKeys(ctx, resGroup, namespaceName, name)
if err != nil {
return fmt.Errorf("Error making Read request on Azure ServiceBus Namespace Authorization Rule List Keys %s: %+v", name, err)
}

d.Set("name", name)
d.Set("namespace_name", namespaceName)
d.Set("resource_group_name", resGroup)

if err := d.Set("rights", flattenServiceBusAuthorizationRuleRights(resp.Rights)); err != nil {
return fmt.Errorf("Error flattening rights: %+v", err)
if properties := resp.SBAuthorizationRuleProperties; properties != nil {
listen, send, manage := azure.FlattenServiceBusAuthorizationRuleRights(properties.Rights)
d.Set("listen", listen)
d.Set("send", send)
d.Set("manage", manage)
}

keysResp, err := client.ListKeys(ctx, resGroup, namespaceName, name)
if err != nil {
return fmt.Errorf("Error making Read request on Azure ServiceBus Namespace Authorization Rule List Keys %s: %+v", name, err)
}

d.Set("primary_key", keysResp.PrimaryKey)
Expand All @@ -183,35 +182,11 @@ func resourceArmServiceBusNamespaceAuthorizationRuleDelete(d *schema.ResourceDat

resGroup := id.ResourceGroup
namespaceName := id.Path["namespaces"]
name := id.Path["AuthorizationRules"]
name := id.Path["AuthorizationRules"] //this is slightly different then topic (Authorization vs authorization)

_, err = client.DeleteAuthorizationRule(ctx, resGroup, namespaceName, name)

if err != nil {
if _, err = client.DeleteAuthorizationRule(ctx, resGroup, namespaceName, name); err != nil {
return fmt.Errorf("Error issuing Azure ARM delete request of ServiceBus Namespace Authorization Rule %q (Resource Group %q): %+v", name, resGroup, err)
}

return nil
}

func flattenServiceBusAuthorizationRuleRights(rights *[]servicebus.AccessRights) *schema.Set {
slice := make([]interface{}, 0, 0)

if rights != nil {
for _, r := range *rights {
slice = append(slice, string(r))
}
}

return schema.NewSet(set.HashStringIgnoreCase, slice)
}

func expandServiceBusAuthorizationRuleRights(d *schema.ResourceData) *[]servicebus.AccessRights {
rights := make([]servicebus.AccessRights, 0)

for _, v := range d.Get("rights").(*schema.Set).List() {
rights = append(rights, servicebus.AccessRights(v.(string)))
}

return &rights
}
Loading

0 comments on commit d88b999

Please sign in to comment.