Skip to content

Commit 492a5f3

Browse files
nicolai86nicolai86
authored
Merge pull request scaleway#54 from terraform-providers/update-dependency
update the dependecy for scaleway sdk
2 parents 5c61352 + 62ead2b commit 492a5f3

23 files changed

+292
-280
lines changed

‎scaleway/resource_ip.go

+10-10
Original file line numberDiff line numberDiff line change
@@ -42,21 +42,21 @@ func resourceScalewayIPCreate(d *schema.ResourceData, m interface{}) error {
4242
scaleway := m.(*Client).scaleway
4343

4444
mu.Lock()
45-
resp, err := scaleway.NewIP()
45+
ip, err := scaleway.CreateIP()
4646
mu.Unlock()
4747
if err != nil {
4848
return err
4949
}
5050

51-
d.SetId(resp.IP.ID)
51+
d.SetId(ip.ID)
5252
return resourceScalewayIPUpdate(d, m)
5353
}
5454

5555
func resourceScalewayIPRead(d *schema.ResourceData, m interface{}) error {
5656
scaleway := m.(*Client).scaleway
5757
log.Printf("[DEBUG] Reading IP\n")
5858

59-
resp, err := scaleway.GetIP(d.Id())
59+
ip, err := scaleway.GetIP(d.Id())
6060
if err != nil {
6161
log.Printf("[DEBUG] Error reading ip: %q\n", err)
6262
if serr, ok := err.(api.APIError); ok {
@@ -68,12 +68,12 @@ func resourceScalewayIPRead(d *schema.ResourceData, m interface{}) error {
6868
return err
6969
}
7070

71-
d.Set("ip", resp.IP.Address)
72-
if resp.IP.Server != nil {
73-
d.Set("server", resp.IP.Server.Identifier)
71+
d.Set("ip", ip.Address)
72+
if ip.Server != nil {
73+
d.Set("server", ip.Server.Identifier)
7474
}
75-
if resp.IP.Reverse != nil {
76-
d.Set("reverse", *resp.IP.Reverse)
75+
if ip.Reverse != nil {
76+
d.Set("reverse", *ip.Reverse)
7777
}
7878
return nil
7979
}
@@ -93,8 +93,8 @@ func resourceScalewayIPUpdate(d *schema.ResourceData, m interface{}) error {
9393
if err != nil {
9494
return err
9595
}
96-
if ip.IP.Reverse != nil {
97-
d.Set("reverse", *ip.IP.Reverse)
96+
if ip.Reverse != nil {
97+
d.Set("reverse", *ip.Reverse)
9898
} else {
9999
d.Set("reverse", "")
100100
}

‎scaleway/resource_ip_test.go

+4-4
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ func testSweepIP(region string) error {
3030
return fmt.Errorf("Error describing IPs in Sweeper: %s", err)
3131
}
3232

33-
for _, ip := range ips.IPS {
33+
for _, ip := range ips {
3434
if err := scaleway.DeleteIP(ip.ID); err != nil {
3535
return fmt.Errorf("Error deleting ip in Sweeper: %s", err)
3636
}
@@ -143,7 +143,7 @@ func testAccCheckScalewayIPExists(n string) resource.TestCheckFunc {
143143
return err
144144
}
145145

146-
if ip.IP.ID != rs.Primary.ID {
146+
if ip.ID != rs.Primary.ID {
147147
return fmt.Errorf("Record not found")
148148
}
149149

@@ -171,8 +171,8 @@ func testAccCheckScalewayIPAttachment(n string, check func(string) bool, msg str
171171
}
172172

173173
var serverID = ""
174-
if ip.IP.Server != nil {
175-
serverID = ip.IP.Server.Identifier
174+
if ip.Server != nil {
175+
serverID = ip.Server.Identifier
176176
}
177177
if !check(serverID) {
178178
return fmt.Errorf("IP check failed: %q", msg)

‎scaleway/resource_security_group.go

+9-19
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package scaleway
22

33
import (
4-
"fmt"
4+
"errors"
55
"log"
66

77
"github.com/hashicorp/terraform/helper/schema"
@@ -53,7 +53,7 @@ func resourceScalewaySecurityGroupCreate(d *schema.ResourceData, m interface{})
5353
EnableDefaultSecurity: d.Get("enable_default_security").(bool),
5454
}
5555

56-
err := scaleway.PostSecurityGroup(req)
56+
group, err := scaleway.CreateSecurityGroup(req)
5757
if err != nil {
5858
if serr, ok := err.(api.APIError); ok {
5959
log.Printf("[DEBUG] Error creating security group: %q\n", serr.APIMessage)
@@ -62,28 +62,18 @@ func resourceScalewaySecurityGroupCreate(d *schema.ResourceData, m interface{})
6262
return err
6363
}
6464

65-
resp, err := scaleway.GetSecurityGroups()
66-
if err != nil {
67-
return err
68-
}
69-
70-
for _, group := range resp.SecurityGroups {
71-
if group.Name == req.Name {
72-
d.SetId(group.ID)
73-
break
74-
}
75-
}
65+
d.SetId(group.ID)
7666

7767
if d.Id() == "" {
78-
return fmt.Errorf("Failed to find created security group.")
68+
return errors.New("failed to find created security group")
7969
}
8070

8171
return resourceScalewaySecurityGroupRead(d, m)
8272
}
8373

8474
func resourceScalewaySecurityGroupRead(d *schema.ResourceData, m interface{}) error {
8575
scaleway := m.(*Client).scaleway
86-
resp, err := scaleway.GetASecurityGroup(d.Id())
76+
group, err := scaleway.GetSecurityGroup(d.Id())
8777

8878
if err != nil {
8979
if serr, ok := err.(api.APIError); ok {
@@ -98,9 +88,9 @@ func resourceScalewaySecurityGroupRead(d *schema.ResourceData, m interface{}) er
9888
return err
9989
}
10090

101-
d.Set("name", resp.SecurityGroups.Name)
102-
d.Set("description", resp.SecurityGroups.Description)
103-
d.Set("enable_default_security", resp.SecurityGroups.EnableDefaultSecurity)
91+
d.Set("name", group.Name)
92+
d.Set("description", group.Description)
93+
d.Set("enable_default_security", group.EnableDefaultSecurity)
10494

10595
return nil
10696
}
@@ -117,7 +107,7 @@ func resourceScalewaySecurityGroupUpdate(d *schema.ResourceData, m interface{})
117107
Description: d.Get("description").(string),
118108
}
119109

120-
if err := scaleway.PutSecurityGroup(req, d.Id()); err != nil {
110+
if _, err := scaleway.UpdateSecurityGroup(req, d.Id()); err != nil {
121111
log.Printf("[DEBUG] Error reading security group: %q\n", err)
122112

123113
return err

‎scaleway/resource_security_group_rule.go

+8-8
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@ func resourceScalewaySecurityGroupRuleCreate(d *schema.ResourceData, m interface
8484
DestPortFrom: d.Get("port").(int),
8585
}
8686

87-
rule, err := scaleway.PostSecurityGroupRule(d.Get("security_group").(string), req)
87+
rule, err := scaleway.CreateSecurityGroupRule(d.Get("security_group").(string), req)
8888
if err != nil {
8989
if serr, ok := err.(api.APIError); ok {
9090
log.Printf("[DEBUG] Error creating Security Group Rule: %q\n", serr.APIMessage)
@@ -104,7 +104,7 @@ func resourceScalewaySecurityGroupRuleCreate(d *schema.ResourceData, m interface
104104

105105
func resourceScalewaySecurityGroupRuleRead(d *schema.ResourceData, m interface{}) error {
106106
scaleway := m.(*Client).scaleway
107-
rule, err := scaleway.GetASecurityGroupRule(d.Get("security_group").(string), d.Id())
107+
rule, err := scaleway.GetSecurityGroupRule(d.Get("security_group").(string), d.Id())
108108

109109
if err != nil {
110110
if serr, ok := err.(api.APIError); ok {
@@ -119,11 +119,11 @@ func resourceScalewaySecurityGroupRuleRead(d *schema.ResourceData, m interface{}
119119
return err
120120
}
121121

122-
d.Set("action", rule.Rules.Action)
123-
d.Set("direction", rule.Rules.Direction)
124-
d.Set("ip_range", rule.Rules.IPRange)
125-
d.Set("protocol", rule.Rules.Protocol)
126-
d.Set("port", rule.Rules.DestPortFrom)
122+
d.Set("action", rule.Action)
123+
d.Set("direction", rule.Direction)
124+
d.Set("ip_range", rule.IPRange)
125+
d.Set("protocol", rule.Protocol)
126+
d.Set("port", rule.DestPortFrom)
127127

128128
return nil
129129
}
@@ -142,7 +142,7 @@ func resourceScalewaySecurityGroupRuleUpdate(d *schema.ResourceData, m interface
142142
DestPortFrom: d.Get("port").(int),
143143
}
144144

145-
if err := scaleway.PutSecurityGroupRule(req, d.Get("security_group").(string), d.Id()); err != nil {
145+
if _, err := scaleway.UpdateSecurityGroupRule(req, d.Get("security_group").(string), d.Id()); err != nil {
146146
log.Printf("[DEBUG] error updating Security Group Rule: %q", err)
147147

148148
return err

‎scaleway/resource_security_group_rule_test.go

+18-18
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ import (
1010
)
1111

1212
func TestAccScalewaySecurityGroupRule_Basic(t *testing.T) {
13-
var group api.SecurityGroups
13+
var group api.SecurityGroup
1414

1515
resource.Test(t, resource.TestCase{
1616
PreCheck: func() { testAccPreCheck(t) },
@@ -40,7 +40,7 @@ func TestAccScalewaySecurityGroupRule_Basic(t *testing.T) {
4040
}
4141

4242
func TestAccScalewaySecurityGroupRule_Count(t *testing.T) {
43-
var group api.SecurityGroups
43+
var group api.SecurityGroup
4444

4545
resource.Test(t, resource.TestCase{
4646
PreCheck: func() { testAccPreCheck(t) },
@@ -59,7 +59,7 @@ func TestAccScalewaySecurityGroupRule_Count(t *testing.T) {
5959
})
6060
}
6161

62-
func testAccCheckScalewaySecurityGroupsExists(n string, group *api.SecurityGroups) resource.TestCheckFunc {
62+
func testAccCheckScalewaySecurityGroupsExists(n string, group *api.SecurityGroup) resource.TestCheckFunc {
6363
return func(s *terraform.State) error {
6464
rs, ok := s.RootModule().Resources[n]
6565
if !ok {
@@ -71,14 +71,14 @@ func testAccCheckScalewaySecurityGroupsExists(n string, group *api.SecurityGroup
7171
}
7272

7373
conn := testAccProvider.Meta().(*Client).scaleway
74-
resp, err := conn.GetASecurityGroup(rs.Primary.ID)
74+
resp, err := conn.GetSecurityGroup(rs.Primary.ID)
7575

7676
if err != nil {
7777
return err
7878
}
7979

80-
if resp.SecurityGroups.ID == rs.Primary.ID {
81-
*group = resp.SecurityGroups
80+
if resp.ID == rs.Primary.ID {
81+
*group = *resp
8282
return nil
8383
}
8484

@@ -100,8 +100,8 @@ func testAccCheckScalewaySecurityGroupRuleDestroy(s *terraform.State) error {
100100
}
101101

102102
all_err := true
103-
for _, group := range groups.SecurityGroups {
104-
_, err := client.GetASecurityGroupRule(group.ID, rs.Primary.ID)
103+
for _, group := range groups {
104+
_, err := client.GetSecurityGroupRule(group.ID, rs.Primary.ID)
105105
all_err = all_err && err != nil
106106
}
107107

@@ -113,40 +113,40 @@ func testAccCheckScalewaySecurityGroupRuleDestroy(s *terraform.State) error {
113113
return nil
114114
}
115115

116-
func testAccCheckScalewaySecurityGroupRuleAttributes(n string, group *api.SecurityGroups) resource.TestCheckFunc {
116+
func testAccCheckScalewaySecurityGroupRuleAttributes(n string, group *api.SecurityGroup) resource.TestCheckFunc {
117117
return func(s *terraform.State) error {
118118
rs, ok := s.RootModule().Resources[n]
119119
if !ok {
120120
return fmt.Errorf("Unknown resource: %s", n)
121121
}
122122

123123
client := testAccProvider.Meta().(*Client).scaleway
124-
rule, err := client.GetASecurityGroupRule(group.ID, rs.Primary.ID)
124+
rule, err := client.GetSecurityGroupRule(group.ID, rs.Primary.ID)
125125
if err != nil {
126126
return err
127127
}
128128

129-
if rule.Rules.Action != "accept" {
129+
if rule.Action != "accept" {
130130
return fmt.Errorf("Wrong rule action")
131131
}
132-
if rule.Rules.Direction != "inbound" {
132+
if rule.Direction != "inbound" {
133133
return fmt.Errorf("wrong rule direction")
134134
}
135-
if rule.Rules.IPRange != "0.0.0.0/0" {
135+
if rule.IPRange != "0.0.0.0/0" {
136136
return fmt.Errorf("wrong rule IP Range")
137137
}
138-
if rule.Rules.Protocol != "TCP" {
138+
if rule.Protocol != "TCP" {
139139
return fmt.Errorf("wrong rule protocol")
140140
}
141-
if rule.Rules.DestPortFrom != 80 {
141+
if rule.DestPortFrom != 80 {
142142
return fmt.Errorf("Wrong port")
143143
}
144144

145145
return nil
146146
}
147147
}
148148

149-
func testAccCheckScalewaySecurityGroupRuleExists(n string, group *api.SecurityGroups) resource.TestCheckFunc {
149+
func testAccCheckScalewaySecurityGroupRuleExists(n string, group *api.SecurityGroup) resource.TestCheckFunc {
150150
return func(s *terraform.State) error {
151151
rs, ok := s.RootModule().Resources[n]
152152

@@ -159,13 +159,13 @@ func testAccCheckScalewaySecurityGroupRuleExists(n string, group *api.SecurityGr
159159
}
160160

161161
client := testAccProvider.Meta().(*Client).scaleway
162-
rule, err := client.GetASecurityGroupRule(group.ID, rs.Primary.ID)
162+
rule, err := client.GetSecurityGroupRule(group.ID, rs.Primary.ID)
163163

164164
if err != nil {
165165
return err
166166
}
167167

168-
if rule.Rules.ID != rs.Primary.ID {
168+
if rule.ID != rs.Primary.ID {
169169
return fmt.Errorf("Record not found")
170170
}
171171

‎scaleway/resource_security_group_test.go

+7-7
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ func testSweepSecurityGroup(region string) error {
3030
return fmt.Errorf("Error describing security groups in Sweeper: %s", err)
3131
}
3232

33-
for _, sg := range sgs.SecurityGroups {
33+
for _, sg := range sgs {
3434
if sg.OrganizationDefault {
3535
continue
3636
}
@@ -70,7 +70,7 @@ func testAccCheckScalewaySecurityGroupDestroy(s *terraform.State) error {
7070
continue
7171
}
7272

73-
_, err := client.GetASecurityGroup(rs.Primary.ID)
73+
_, err := client.GetSecurityGroup(rs.Primary.ID)
7474

7575
if err == nil {
7676
return fmt.Errorf("Security Group still exists")
@@ -88,15 +88,15 @@ func testAccCheckScalewaySecurityGroupAttributes(n string) resource.TestCheckFun
8888
}
8989

9090
client := testAccProvider.Meta().(*Client).scaleway
91-
group, err := client.GetASecurityGroup(rs.Primary.ID)
91+
group, err := client.GetSecurityGroup(rs.Primary.ID)
9292
if err != nil {
9393
return err
9494
}
9595

96-
if group.SecurityGroups.Name != "public" {
96+
if group.Name != "public" {
9797
return fmt.Errorf("Security Group has wrong name")
9898
}
99-
if group.SecurityGroups.Description != "public gateway" {
99+
if group.Description != "public gateway" {
100100
return fmt.Errorf("Security Group has wrong description")
101101
}
102102

@@ -117,13 +117,13 @@ func testAccCheckScalewaySecurityGroupExists(n string) resource.TestCheckFunc {
117117
}
118118

119119
client := testAccProvider.Meta().(*Client).scaleway
120-
group, err := client.GetASecurityGroup(rs.Primary.ID)
120+
group, err := client.GetSecurityGroup(rs.Primary.ID)
121121

122122
if err != nil {
123123
return err
124124
}
125125

126-
if group.SecurityGroups.ID != rs.Primary.ID {
126+
if group.ID != rs.Primary.ID {
127127
return fmt.Errorf("Record not found")
128128
}
129129

0 commit comments

Comments
 (0)