Skip to content

Commit a15c99e

Browse files
author
Brett Mack
committed
Code cleanup to address PR comments
1 parent b6abb91 commit a15c99e

5 files changed

Lines changed: 20 additions & 41 deletions

File tree

‎builtin/providers/vcd/resource_vcd_dnat.go‎

Lines changed: 5 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,11 @@ import (
44
"fmt"
55
"github.com/hashicorp/terraform/helper/schema"
66
"github.com/hmrc/vmware-govcd"
7-
"strings"
87
)
98

109
func resourceVcdDNAT() *schema.Resource {
1110
return &schema.Resource{
1211
Create: resourceVcdDNATCreate,
13-
Update: resourceVcdDNATUpdate,
1412
Delete: resourceVcdDNATDelete,
1513
Read: resourceVcdDNATRead,
1614

@@ -24,16 +22,19 @@ func resourceVcdDNAT() *schema.Resource {
2422
"external_ip": &schema.Schema{
2523
Type: schema.TypeString,
2624
Required: true,
25+
ForceNew: true,
2726
},
2827

2928
"port": &schema.Schema{
3029
Type: schema.TypeInt,
3130
Required: true,
31+
ForceNew: true,
3232
},
3333

3434
"internal_ip": &schema.Schema{
3535
Type: schema.TypeString,
3636
Required: true,
37+
ForceNew: true,
3738
},
3839
},
3940
}
@@ -78,10 +79,6 @@ func resourceVcdDNATCreate(d *schema.ResourceData, meta interface{}) error {
7879
return nil
7980
}
8081

81-
func resourceVcdDNATUpdate(d *schema.ResourceData, meta interface{}) error {
82-
return nil
83-
}
84-
8582
func resourceVcdDNATRead(d *schema.ResourceData, meta interface{}) error {
8683
vcd_client := meta.(*govcd.VCDClient)
8784
e, err := vcd_client.OrgVdc.FindEdgeGateway(d.Get("edge_gateway").(string))
@@ -90,13 +87,12 @@ func resourceVcdDNATRead(d *schema.ResourceData, meta interface{}) error {
9087
return fmt.Errorf("Unable to find edge gateway: %#v", err)
9188
}
9289

93-
idSplit := strings.Split(d.Id(), "_")
9490
var found bool
9591

9692
for _, r := range e.EdgeGateway.Configuration.EdgeGatewayServiceConfiguration.NatService.NatRule {
9793
if r.RuleType == "DNAT" &&
98-
r.GatewayNatRule.OriginalIP == idSplit[0] &&
99-
r.GatewayNatRule.OriginalPort == idSplit[1] {
94+
r.GatewayNatRule.OriginalIP == d.Get("external_ip").(string) &&
95+
r.GatewayNatRule.OriginalPort == getPortString(d.Get("port").(int)) {
10096
found = true
10197
d.Set("internal_ip", r.GatewayNatRule.TranslatedIP)
10298
}

‎builtin/providers/vcd/resource_vcd_network.go‎

Lines changed: 11 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@ import (
1515
func resourceVcdNetwork() *schema.Resource {
1616
return &schema.Resource{
1717
Create: resourceVcdNetworkCreate,
18-
Update: resourceVcdNetworkUpdate,
1918
Read: resourceVcdNetworkRead,
2019
Delete: resourceVcdNetworkDelete,
2120

@@ -29,51 +28,60 @@ func resourceVcdNetwork() *schema.Resource {
2928
"fence_mode": &schema.Schema{
3029
Type: schema.TypeString,
3130
Optional: true,
31+
ForceNew: true,
3232
Default: "natRouted",
3333
},
3434

3535
"edge_gateway": &schema.Schema{
3636
Type: schema.TypeString,
3737
Required: true,
38+
ForceNew: true,
3839
},
3940

4041
"netmask": &schema.Schema{
4142
Type: schema.TypeString,
4243
Optional: true,
44+
ForceNew: true,
4345
Default: "255.255.255.0",
4446
},
4547

4648
"gateway": &schema.Schema{
4749
Type: schema.TypeString,
4850
Required: true,
51+
ForceNew: true,
4952
},
5053

5154
"dns1": &schema.Schema{
5255
Type: schema.TypeString,
5356
Optional: true,
57+
ForceNew: true,
5458
Default: "8.8.8.8",
5559
},
5660

5761
"dns2": &schema.Schema{
5862
Type: schema.TypeString,
5963
Optional: true,
64+
ForceNew: true,
6065
Default: "8.8.4.4",
6166
},
6267

6368
"dns_suffix": &schema.Schema{
6469
Type: schema.TypeString,
6570
Optional: true,
71+
ForceNew: true,
6672
},
6773

6874
"href": &schema.Schema{
6975
Type: schema.TypeString,
7076
Optional: true,
7177
Computed: true,
78+
ForceNew: true,
7279
},
7380

7481
"dhcp_pool": &schema.Schema{
7582
Type: schema.TypeSet,
7683
Optional: true,
84+
ForceNew: true,
7785
Elem: &schema.Resource{
7886
Schema: map[string]*schema.Schema{
7987
"start_address": &schema.Schema{
@@ -92,6 +100,7 @@ func resourceVcdNetwork() *schema.Resource {
92100
"static_ip_pool": &schema.Schema{
93101
Type: schema.TypeSet,
94102
Optional: true,
103+
ForceNew: true,
95104
Elem: &schema.Resource{
96105
Schema: map[string]*schema.Schema{
97106
"start_address": &schema.Schema{
@@ -119,10 +128,7 @@ func resourceVcdNetworkCreate(d *schema.ResourceData, meta interface{}) error {
119128

120129
edgeGateway, err := vcd_client.OrgVdc.FindEdgeGateway(d.Get("edge_gateway").(string))
121130

122-
ipRanges, err := expandIpRange(d.Get("static_ip_pool").(*schema.Set).List())
123-
if err != nil {
124-
fmt.Printf("error: %v\n", err)
125-
}
131+
ipRanges := expandIpRange(d.Get("static_ip_pool").(*schema.Set).List())
126132

127133
newnetwork := &types.OrgVDCNetwork{
128134
Xmlns: "http://www.vmware.com/vcloud/v1.5",
@@ -187,14 +193,6 @@ func resourceVcdNetworkCreate(d *schema.ResourceData, meta interface{}) error {
187193
return resourceVcdNetworkRead(d, meta)
188194
}
189195

190-
func resourceVcdNetworkUpdate(d *schema.ResourceData, meta interface{}) error {
191-
192-
vcd_client := meta.(*govcd.VCDClient)
193-
194-
log.Printf("[DEBUG] VCD Client configuration: %#v", vcd_client)
195-
return nil
196-
}
197-
198196
func resourceVcdNetworkRead(d *schema.ResourceData, meta interface{}) error {
199197
vcd_client := meta.(*govcd.VCDClient)
200198
log.Printf("[DEBUG] VCD Client configuration: %#v", vcd_client)

‎builtin/providers/vcd/resource_vcd_snat.go‎

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@ import (
99
func resourceVcdSNAT() *schema.Resource {
1010
return &schema.Resource{
1111
Create: resourceVcdSNATCreate,
12-
Update: resourceVcdSNATUpdate,
1312
Delete: resourceVcdSNATDelete,
1413
Read: resourceVcdSNATRead,
1514

@@ -23,11 +22,13 @@ func resourceVcdSNAT() *schema.Resource {
2322
"external_ip": &schema.Schema{
2423
Type: schema.TypeString,
2524
Required: true,
25+
ForceNew: true,
2626
},
2727

2828
"internal_ip": &schema.Schema{
2929
Type: schema.TypeString,
3030
Required: true,
31+
ForceNew: true,
3132
},
3233
},
3334
}
@@ -67,10 +68,6 @@ func resourceVcdSNATCreate(d *schema.ResourceData, meta interface{}) error {
6768
return nil
6869
}
6970

70-
func resourceVcdSNATUpdate(d *schema.ResourceData, meta interface{}) error {
71-
return nil
72-
}
73-
7471
func resourceVcdSNATRead(d *schema.ResourceData, meta interface{}) error {
7572
vcd_client := meta.(*govcd.VCDClient)
7673
e, err := vcd_client.OrgVdc.FindEdgeGateway(d.Get("edge_gateway").(string))

‎builtin/providers/vcd/resource_vcd_vapp.go‎

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -150,18 +150,6 @@ func resourceVcdVAppCreate(d *schema.ResourceData, meta interface{}) error {
150150
return err
151151
}
152152

153-
// err = resource.Retry(4*time.Minute, func() error {
154-
// err = vcd_client.OrgVdc.InstantiateVAppTemplate(createvapp)
155-
//
156-
// if err != nil {
157-
// return fmt.Errorf("Error: %#v", err)
158-
// }
159-
// return nil
160-
// })
161-
// if err != nil {
162-
// return err
163-
// }
164-
165153
vapp, err := vcd_client.OrgVdc.FindVAppByName(d.Get("name").(string))
166154

167155
err = retryCall(4, func() error {

‎builtin/providers/vcd/structure.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ import (
77
"time"
88
)
99

10-
func expandIpRange(configured []interface{}) (types.IPRanges, error) {
10+
func expandIpRange(configured []interface{}) types.IPRanges {
1111
ipRange := make([]*types.IPRange, 0, len(configured))
1212

1313
for _, ipRaw := range configured {
@@ -25,7 +25,7 @@ func expandIpRange(configured []interface{}) (types.IPRanges, error) {
2525
IPRange: ipRange,
2626
}
2727

28-
return ipRanges, nil
28+
return ipRanges
2929
}
3030

3131
func expandFirewallRules(configured []interface{}, gateway *types.EdgeGateway) ([]*types.FirewallRule, error) {

0 commit comments

Comments
 (0)