Skip to content

Commit be98e95

Browse files
ArcturusZhangArcturusZhang
committed
Rename ip_masks -> ip_rules, azurerm_servicebus_namespace_network_rule -> azurerm_servicebus_namespace_network_rule_set
1 parent ce9d86b commit be98e95

9 files changed

+92
-104
lines changed

‎azurerm/internal/services/servicebus/parse/namespace_network_rule.go ‎azurerm/internal/services/servicebus/parse/namespace_network_rule_set.go

+7-7
Original file line numberDiff line numberDiff line change
@@ -6,32 +6,32 @@ import (
66
"github.com/terraform-providers/terraform-provider-azurerm/azurerm/helpers/azure"
77
)
88

9-
type ServiceBusNamespaceNetworkRuleId struct {
9+
type ServiceBusNamespaceNetworkRuleSetId struct {
1010
Name string
1111
NamespaceName string
1212
ResourceGroup string
1313
}
1414

15-
func ServiceBusNamespaceNetworkRuleID(input string) (*ServiceBusNamespaceNetworkRuleId, error) {
15+
func ServiceBusNamespaceNetworkRuleSetID(input string) (*ServiceBusNamespaceNetworkRuleSetId, error) {
1616
id, err := azure.ParseAzureResourceID(input)
1717
if err != nil {
18-
return nil, fmt.Errorf("unable to parse Service Bus Namespace Network Rule ID %q: %+v", input, err)
18+
return nil, fmt.Errorf("unable to parse Service Bus Namespace Network Rule Set ID %q: %+v", input, err)
1919
}
2020

21-
rule := ServiceBusNamespaceNetworkRuleId{
21+
rule := ServiceBusNamespaceNetworkRuleSetId{
2222
ResourceGroup: id.ResourceGroup,
2323
}
2424

2525
if rule.Name, err = id.PopSegment("networkrulesets"); err != nil {
26-
return nil, fmt.Errorf("unable to parse Service Bus Namespace Network Rule ID %q: %+v", input, err)
26+
return nil, fmt.Errorf("unable to parse Service Bus Namespace Network Rule Set ID %q: %+v", input, err)
2727
}
2828

2929
if rule.NamespaceName, err = id.PopSegment("namespaces"); err != nil {
30-
return nil, fmt.Errorf("unable to parse Service Bus Namespace Network Rule ID %q: %+v", input, err)
30+
return nil, fmt.Errorf("unable to parse Service Bus Namespace Network Rule Set ID %q: %+v", input, err)
3131
}
3232

3333
if err := id.ValidateNoEmptySegments(input); err != nil {
34-
return nil, fmt.Errorf("unable to parse Service Bus Namespace Network Rule ID %q: %+v", input, err)
34+
return nil, fmt.Errorf("unable to parse Service Bus Namespace Network Rule Set ID %q: %+v", input, err)
3535
}
3636

3737
return &rule, nil

‎azurerm/internal/services/servicebus/parse/namespace_network_rule_test.go ‎azurerm/internal/services/servicebus/parse/namespace_network_rule_set_test.go

+3-3
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ func TestServiceBusNamespaceNetworkRuleID(t *testing.T) {
77
Name string
88
Input string
99
Error bool
10-
Expected *ServiceBusNamespaceNetworkRuleId
10+
Expected *ServiceBusNamespaceNetworkRuleSetId
1111
}{
1212
{
1313
Name: "Empty",
@@ -47,7 +47,7 @@ func TestServiceBusNamespaceNetworkRuleID(t *testing.T) {
4747
{
4848
Name: "Service Bus Namespace Network Rule ID",
4949
Input: "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/resGroup1/providers/Microsoft.ServiceBus/namespaces/namespace1/networkrulesets/default",
50-
Expected: &ServiceBusNamespaceNetworkRuleId{
50+
Expected: &ServiceBusNamespaceNetworkRuleSetId{
5151
Name: "default",
5252
NamespaceName: "namespace1",
5353
ResourceGroup: "resGroup1",
@@ -63,7 +63,7 @@ func TestServiceBusNamespaceNetworkRuleID(t *testing.T) {
6363
for _, v := range testData {
6464
t.Logf("[DEBUG] Testing %q", v.Name)
6565

66-
actual, err := ServiceBusNamespaceNetworkRuleID(v.Input)
66+
actual, err := ServiceBusNamespaceNetworkRuleSetID(v.Input)
6767
if err != nil {
6868
if v.Error {
6969
continue

‎azurerm/internal/services/servicebus/registration.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ func (r Registration) SupportedResources() map[string]*schema.Resource {
3333
return map[string]*schema.Resource{
3434
"azurerm_servicebus_namespace": resourceArmServiceBusNamespace(),
3535
"azurerm_servicebus_namespace_authorization_rule": resourceArmServiceBusNamespaceAuthorizationRule(),
36-
"azurerm_servicebus_namespace_network_rule": resourceServiceBusNamespaceNetworkRule(),
36+
"azurerm_servicebus_namespace_network_rule_set": resourceServiceBusNamespaceNetworkRuleSet(),
3737
"azurerm_servicebus_queue": resourceArmServiceBusQueue(),
3838
"azurerm_servicebus_queue_authorization_rule": resourceArmServiceBusQueueAuthorizationRule(),
3939
"azurerm_servicebus_subscription": resourceArmServiceBusSubscription(),

‎azurerm/internal/services/servicebus/resource_arm_servicebus_namespace_network_rule.go ‎azurerm/internal/services/servicebus/resource_arm_servicebus_namespace_network_rule_set.go

+24-24
Original file line numberDiff line numberDiff line change
@@ -21,15 +21,15 @@ import (
2121
"github.com/terraform-providers/terraform-provider-azurerm/azurerm/utils"
2222
)
2323

24-
func resourceServiceBusNamespaceNetworkRule() *schema.Resource {
24+
func resourceServiceBusNamespaceNetworkRuleSet() *schema.Resource {
2525
return &schema.Resource{
26-
Create: resourceServiceBusNamespaceNetworkRuleCreateUpdate,
27-
Read: resourceServiceBusNamespaceNetworkRuleRead,
28-
Update: resourceServiceBusNamespaceNetworkRuleCreateUpdate,
29-
Delete: resourceServiceBusNamespaceNetworkRuleDelete,
26+
Create: resourceServiceBusNamespaceNetworkRuleSetCreateUpdate,
27+
Read: resourceServiceBusNamespaceNetworkRuleSetRead,
28+
Update: resourceServiceBusNamespaceNetworkRuleSetCreateUpdate,
29+
Delete: resourceServiceBusNamespaceNetworkRuleSetDelete,
3030

3131
Importer: azSchema.ValidateResourceIDPriorToImport(func(id string) error {
32-
_, err := parse.ServiceBusNamespaceNetworkRuleID(id)
32+
_, err := parse.ServiceBusNamespaceNetworkRuleSetID(id)
3333
return err
3434
}),
3535

@@ -60,7 +60,7 @@ func resourceServiceBusNamespaceNetworkRule() *schema.Resource {
6060
}, false),
6161
},
6262

63-
"ip_masks": {
63+
"ip_rules": {
6464
Type: schema.TypeSet,
6565
Optional: true,
6666
Elem: &schema.Schema{
@@ -93,7 +93,7 @@ func resourceServiceBusNamespaceNetworkRule() *schema.Resource {
9393
}
9494
}
9595

96-
func resourceServiceBusNamespaceNetworkRuleCreateUpdate(d *schema.ResourceData, meta interface{}) error {
96+
func resourceServiceBusNamespaceNetworkRuleSetCreateUpdate(d *schema.ResourceData, meta interface{}) error {
9797
client := meta.(*clients.Client).ServiceBus.NamespacesClientPreview
9898
ctx, cancel := timeouts.ForCreateUpdate(meta.(*clients.Client).StopContext, d)
9999
defer cancel()
@@ -105,59 +105,59 @@ func resourceServiceBusNamespaceNetworkRuleCreateUpdate(d *schema.ResourceData,
105105
existing, err := client.GetNetworkRuleSet(ctx, resourceGroup, namespaceName)
106106
if err != nil {
107107
if !utils.ResponseWasNotFound(existing.Response) {
108-
return fmt.Errorf("failed to check for presence of existing Service Bus Namespace Network Rule (Namespace %q / Resource Group %q): %+v", namespaceName, resourceGroup, err)
108+
return fmt.Errorf("failed to check for presence of existing Service Bus Namespace Network Rule Set (Namespace %q / Resource Group %q): %+v", namespaceName, resourceGroup, err)
109109
}
110110
}
111111

112112
// This resource is unique to the corresponding service bus namespace.
113113
// It will be created automatically along with the namespace, therefore we check whether this resource is identical to a "deleted" one
114114
if !CheckNetworkRuleNullified(existing) {
115-
return tf.ImportAsExistsError("azurerm_servicebus_namespace_network_rule", *existing.ID)
115+
return tf.ImportAsExistsError("azurerm_servicebus_namespace_network_rule_set", *existing.ID)
116116
}
117117
}
118118

119119
parameters := servicebus.NetworkRuleSet{
120120
NetworkRuleSetProperties: &servicebus.NetworkRuleSetProperties{
121121
DefaultAction: servicebus.DefaultAction(d.Get("default_action").(string)),
122122
VirtualNetworkRules: expandServiceBusNamespaceVirtualNetworkRules(d.Get("network_rules").(*schema.Set).List()),
123-
IPRules: expandServiceBusNamespaceIPRules(d.Get("ip_masks").(*schema.Set).List()),
123+
IPRules: expandServiceBusNamespaceIPRules(d.Get("ip_rules").(*schema.Set).List()),
124124
},
125125
}
126126

127127
if _, err := client.CreateOrUpdateNetworkRuleSet(ctx, resourceGroup, namespaceName, parameters); err != nil {
128-
return fmt.Errorf("failed to create Service Bus Namespace Network Rule (Namespace %q / Resource Group %q): %+v", namespaceName, resourceGroup, err)
128+
return fmt.Errorf("failed to create Service Bus Namespace Network Rule Set (Namespace %q / Resource Group %q): %+v", namespaceName, resourceGroup, err)
129129
}
130130

131131
resp, err := client.GetNetworkRuleSet(ctx, resourceGroup, namespaceName)
132132
if err != nil {
133-
return fmt.Errorf("failed to retrieve Service Bus Namespace Network Rule (Namespace %q / Resource Group %q): %+v", namespaceName, resourceGroup, err)
133+
return fmt.Errorf("failed to retrieve Service Bus Namespace Network Rule Set (Namespace %q / Resource Group %q): %+v", namespaceName, resourceGroup, err)
134134
}
135135
if resp.ID == nil || *resp.ID == "" {
136-
return fmt.Errorf("cannot read Service Bus Namespace Network Rule (Namespace %q / Resource Group %q) ID", namespaceName, resourceGroup)
136+
return fmt.Errorf("cannot read Service Bus Namespace Network Rule Set (Namespace %q / Resource Group %q) ID", namespaceName, resourceGroup)
137137
}
138138
d.SetId(*resp.ID)
139139

140-
return resourceServiceBusNamespaceNetworkRuleRead(d, meta)
140+
return resourceServiceBusNamespaceNetworkRuleSetRead(d, meta)
141141
}
142142

143-
func resourceServiceBusNamespaceNetworkRuleRead(d *schema.ResourceData, meta interface{}) error {
143+
func resourceServiceBusNamespaceNetworkRuleSetRead(d *schema.ResourceData, meta interface{}) error {
144144
client := meta.(*clients.Client).ServiceBus.NamespacesClientPreview
145145
ctx, cancel := timeouts.ForRead(meta.(*clients.Client).StopContext, d)
146146
defer cancel()
147147

148-
id, err := parse.ServiceBusNamespaceNetworkRuleID(d.Id())
148+
id, err := parse.ServiceBusNamespaceNetworkRuleSetID(d.Id())
149149
if err != nil {
150150
return err
151151
}
152152

153153
resp, err := client.GetNetworkRuleSet(ctx, id.ResourceGroup, id.NamespaceName)
154154
if err != nil {
155155
if utils.ResponseWasNotFound(resp.Response) {
156-
log.Printf("[INFO] Service Bus Namespace Network Rule %q does not exist - removing from state", d.Id())
156+
log.Printf("[INFO] Service Bus Namespace Network Rule Set %q does not exist - removing from state", d.Id())
157157
d.SetId("")
158158
return nil
159159
}
160-
return fmt.Errorf("failed to read Service Bus Namespace Network Rule %q (Namespace %q / Resource Group %q): %+v", id.Name, id.NamespaceName, id.ResourceGroup, err)
160+
return fmt.Errorf("failed to read Service Bus Namespace Network Rule Set %q (Namespace %q / Resource Group %q): %+v", id.Name, id.NamespaceName, id.ResourceGroup, err)
161161
}
162162

163163
d.Set("namespace_name", id.NamespaceName)
@@ -170,20 +170,20 @@ func resourceServiceBusNamespaceNetworkRuleRead(d *schema.ResourceData, meta int
170170
return fmt.Errorf("failed to set `network_rules`: %+v", err)
171171
}
172172

173-
if err := d.Set("ip_masks", flattenServiceBusNamespaceIPRules(props.IPRules)); err != nil {
174-
return fmt.Errorf("failed to set `ip_masks`: %+v", err)
173+
if err := d.Set("ip_rules", flattenServiceBusNamespaceIPRules(props.IPRules)); err != nil {
174+
return fmt.Errorf("failed to set `ip_rules`: %+v", err)
175175
}
176176
}
177177

178178
return nil
179179
}
180180

181-
func resourceServiceBusNamespaceNetworkRuleDelete(d *schema.ResourceData, meta interface{}) error {
181+
func resourceServiceBusNamespaceNetworkRuleSetDelete(d *schema.ResourceData, meta interface{}) error {
182182
client := meta.(*clients.Client).ServiceBus.NamespacesClientPreview
183183
ctx, cancel := timeouts.ForDelete(meta.(*clients.Client).StopContext, d)
184184
defer cancel()
185185

186-
id, err := parse.ServiceBusNamespaceNetworkRuleID(d.Id())
186+
id, err := parse.ServiceBusNamespaceNetworkRuleSetID(d.Id())
187187
if err != nil {
188188
return err
189189
}
@@ -198,7 +198,7 @@ func resourceServiceBusNamespaceNetworkRuleDelete(d *schema.ResourceData, meta i
198198
}
199199

200200
if _, err := client.CreateOrUpdateNetworkRuleSet(ctx, id.ResourceGroup, id.NamespaceName, parameters); err != nil {
201-
return fmt.Errorf("failed to delete Service Bus Namespace Network Rule %q (Namespace %q / Resource Group %q): %+v", id.Name, id.NamespaceName, id.ResourceGroup, err)
201+
return fmt.Errorf("failed to delete Service Bus Namespace Network Rule Set %q (Namespace %q / Resource Group %q): %+v", id.Name, id.NamespaceName, id.ResourceGroup, err)
202202
}
203203

204204
return nil

‎azurerm/internal/services/servicebus/tests/resource_arm_servicebus_namespace_network_rule_test.go ‎azurerm/internal/services/servicebus/tests/resource_arm_servicebus_namespace_network_rule_set_test.go

+16-16
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ import (
1414
)
1515

1616
func TestAccAzureRMServiceBusNamespaceNetworkRule_basic(t *testing.T) {
17-
data := acceptance.BuildTestData(t, "azurerm_servicebus_namespace_network_rule", "test")
17+
data := acceptance.BuildTestData(t, "azurerm_servicebus_namespace_network_rule_set", "test")
1818

1919
resource.ParallelTest(t, resource.TestCase{
2020
PreCheck: func() { acceptance.PreCheck(t) },
@@ -33,7 +33,7 @@ func TestAccAzureRMServiceBusNamespaceNetworkRule_basic(t *testing.T) {
3333
}
3434

3535
func TestAccAzureRMServiceBusNamespaceNetworkRule_complete(t *testing.T) {
36-
data := acceptance.BuildTestData(t, "azurerm_servicebus_namespace_network_rule", "test")
36+
data := acceptance.BuildTestData(t, "azurerm_servicebus_namespace_network_rule_set", "test")
3737

3838
resource.ParallelTest(t, resource.TestCase{
3939
PreCheck: func() { acceptance.PreCheck(t) },
@@ -52,7 +52,7 @@ func TestAccAzureRMServiceBusNamespaceNetworkRule_complete(t *testing.T) {
5252
}
5353

5454
func TestAccAzureRMServiceBusNamespaceNetworkRule_update(t *testing.T) {
55-
data := acceptance.BuildTestData(t, "azurerm_servicebus_namespace_network_rule", "test")
55+
data := acceptance.BuildTestData(t, "azurerm_servicebus_namespace_network_rule_set", "test")
5656

5757
resource.ParallelTest(t, resource.TestCase{
5858
PreCheck: func() { acceptance.PreCheck(t) },
@@ -85,7 +85,7 @@ func TestAccAzureRMServiceBusNamespaceNetworkRule_update(t *testing.T) {
8585
}
8686

8787
func TestAccAzureRMServiceBusNamespaceNetworkRule_requiresImport(t *testing.T) {
88-
data := acceptance.BuildTestData(t, "azurerm_servicebus_namespace_network_rule", "test")
88+
data := acceptance.BuildTestData(t, "azurerm_servicebus_namespace_network_rule_set", "test")
8989

9090
resource.ParallelTest(t, resource.TestCase{
9191
PreCheck: func() { acceptance.PreCheck(t) },
@@ -110,17 +110,17 @@ func testCheckAzureRMServiceBusNamespaceNetworkRuleExists(resourceName string) r
110110

111111
rs, ok := s.RootModule().Resources[resourceName]
112112
if !ok {
113-
return fmt.Errorf("Service Bus Namespace Network Rule not found: %s", resourceName)
113+
return fmt.Errorf("Service Bus Namespace Network Rule Set not found: %s", resourceName)
114114
}
115115

116-
id, err := parse.ServiceBusNamespaceNetworkRuleID(rs.Primary.ID)
116+
id, err := parse.ServiceBusNamespaceNetworkRuleSetID(rs.Primary.ID)
117117
if err != nil {
118118
return err
119119
}
120120

121121
if resp, err := client.GetNetworkRuleSet(ctx, id.ResourceGroup, id.NamespaceName); err != nil {
122122
if utils.ResponseWasNotFound(resp.Response) {
123-
return fmt.Errorf("Service Bus Namespace Network Rule (Namespace %q / Resource Group %q) does not exist", id.NamespaceName, id.ResourceGroup)
123+
return fmt.Errorf("Service Bus Namespace Network Rule Set (Namespace %q / Resource Group %q) does not exist", id.NamespaceName, id.ResourceGroup)
124124
}
125125
return fmt.Errorf("failed to GetNetworkRuleSet on ServiceBus.NamespacesClientPreview: %+v", err)
126126
}
@@ -134,11 +134,11 @@ func testCheckAzureRMServiceBusNamespaceNetworkRuleDestroy(s *terraform.State) e
134134
ctx := acceptance.AzureProvider.Meta().(*clients.Client).StopContext
135135

136136
for _, rs := range s.RootModule().Resources {
137-
if rs.Type != "azurerm_servicebus_namespace_network_rule" {
137+
if rs.Type != "azurerm_servicebus_namespace_network_rule_set" {
138138
continue
139139
}
140140

141-
id, err := parse.ServiceBusNamespaceNetworkRuleID(rs.Primary.ID)
141+
id, err := parse.ServiceBusNamespaceNetworkRuleSetID(rs.Primary.ID)
142142
if err != nil {
143143
return err
144144
}
@@ -153,7 +153,7 @@ func testCheckAzureRMServiceBusNamespaceNetworkRuleDestroy(s *terraform.State) e
153153
}
154154

155155
if !servicebus.CheckNetworkRuleNullified(resp) {
156-
return fmt.Errorf("the Service Bus Namespace Network Rule (Namespace %q / Resource Group %q) still exists", id.NamespaceName, id.ResourceGroup)
156+
return fmt.Errorf("the Service Bus Namespace Network Rule Set (Namespace %q / Resource Group %q) still exists", id.NamespaceName, id.ResourceGroup)
157157
}
158158
}
159159

@@ -165,7 +165,7 @@ func testAccAzureRMServiceBusNamespaceNetworkRule_basic(data acceptance.TestData
165165
return fmt.Sprintf(`
166166
%s
167167
168-
resource "azurerm_servicebus_namespace_network_rule" "test" {
168+
resource "azurerm_servicebus_namespace_network_rule_set" "test" {
169169
namespace_name = azurerm_servicebus_namespace.test.name
170170
resource_group_name = azurerm_resource_group.test.name
171171
@@ -184,7 +184,7 @@ func testAccAzureRMServiceBusNamespaceNetworkRule_complete(data acceptance.TestD
184184
return fmt.Sprintf(`
185185
%s
186186
187-
resource "azurerm_servicebus_namespace_network_rule" "test" {
187+
resource "azurerm_servicebus_namespace_network_rule_set" "test" {
188188
namespace_name = azurerm_servicebus_namespace.test.name
189189
resource_group_name = azurerm_resource_group.test.name
190190
@@ -195,7 +195,7 @@ resource "azurerm_servicebus_namespace_network_rule" "test" {
195195
ignore_missing_vnet_service_endpoint = false
196196
}
197197
198-
ip_masks = ["1.1.1.1"]
198+
ip_rules = ["1.1.1.1"]
199199
}
200200
`, template)
201201
}
@@ -244,9 +244,9 @@ func testAccAzureRMServiceBusNamespaceNetworkRule_requiresImport(data acceptance
244244
return fmt.Sprintf(`
245245
%s
246246
247-
resource "azurerm_servicebus_namespace_network_rule" "import" {
248-
namespace_name = azurerm_servicebus_namespace_network_rule.test.namespace_name
249-
resource_group_name = azurerm_servicebus_namespace_network_rule.test.resource_group_name
247+
resource "azurerm_servicebus_namespace_network_rule_set" "import" {
248+
namespace_name = azurerm_servicebus_namespace_network_rule_set.test.namespace_name
249+
resource_group_name = azurerm_servicebus_namespace_network_rule_set.test.resource_group_name
250250
}
251251
`, template)
252252
}

‎azurerm/internal/services/servicebus/validate/namespace_network_rule.go

-34
This file was deleted.

‎azurerm/internal/services/servicebus/validate/namespace_network_rule_set.go

+22
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
package validate
2+
3+
import (
4+
"fmt"
5+
6+
"github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/services/servicebus/parse"
7+
)
8+
9+
func ServiceBusNamespaceNetworkRuleSetID(i interface{}, k string) (warnings []string, errors []error) {
10+
v, ok := i.(string)
11+
if !ok {
12+
errors = append(errors, fmt.Errorf("expected type of %q to be string", k))
13+
return
14+
}
15+
16+
if _, err := parse.ServiceBusNamespaceNetworkRuleSetID(v); err != nil {
17+
errors = append(errors, fmt.Errorf("cannot parse %q as a Service Bus Namespace Network Rule Set ID: %+v", k, err))
18+
return
19+
}
20+
21+
return warnings, errors
22+
}

0 commit comments

Comments
 (0)