Skip to content

Commit 2bbaf01

Browse files
remyleoneremyleone
authored
chore: bump sdk (#572)
1 parent d65f9ed commit 2bbaf01

18 files changed

+46
-49
lines changed

‎go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ require (
77
github.com/hashicorp/terraform-plugin-sdk v1.0.0
88
github.com/mitchellh/go-homedir v1.1.0
99
github.com/nicolai86/scaleway-sdk v0.0.0-20181024210327-b20018e944c4
10-
github.com/scaleway/scaleway-sdk-go v1.0.0-beta.6.0.20200625143330-d3e0c6c20474
10+
github.com/scaleway/scaleway-sdk-go v1.0.0-beta.6.0.20200923142616-ae5d7880b199
1111
github.com/stretchr/testify v1.3.0
1212
golang.org/x/crypto v0.0.0-20190820162420-60c769a6c586
1313
golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7

‎go.sum

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -183,6 +183,8 @@ github.com/posener/complete v1.2.1 h1:LrvDIY//XNo65Lq84G/akBuMGlawHvGBABv8f/ZN6D
183183
github.com/posener/complete v1.2.1/go.mod h1:6gapUrK/U1TAN7ciCoNRIdVC5sbdBTUh1DKN0g6uH7E=
184184
github.com/scaleway/scaleway-sdk-go v1.0.0-beta.6.0.20200625143330-d3e0c6c20474 h1:IkOChjasZthcGbr7j/7+KDneeQb/dcwQp+GeHLpiXNE=
185185
github.com/scaleway/scaleway-sdk-go v1.0.0-beta.6.0.20200625143330-d3e0c6c20474/go.mod h1:CJJ5VAbozOl0yEw7nHB9+7BXTJbIn6h7W+f6Gau5IP8=
186+
github.com/scaleway/scaleway-sdk-go v1.0.0-beta.6.0.20200923142616-ae5d7880b199 h1:SVgNpFhrq0iOwzD4y881l0Bp7FwNTTjHhMmK/05vERw=
187+
github.com/scaleway/scaleway-sdk-go v1.0.0-beta.6.0.20200923142616-ae5d7880b199/go.mod h1:CJJ5VAbozOl0yEw7nHB9+7BXTJbIn6h7W+f6Gau5IP8=
186188
github.com/sergi/go-diff v1.0.0 h1:Kpca3qRNrduNnOQeazBd0ysaKrUJiIuISHxogkT9RPQ=
187189
github.com/sergi/go-diff v1.0.0/go.mod h1:0CfEIISq7TuYL3j771MWULgwwjU+GofnZX9QAmXWZgo=
188190
github.com/spf13/afero v1.2.2 h1:5jhuqJyZCZf2JRofRvN/nIFgIWNzPa3/Vz8mYylgbWc=

‎scaleway/data_source_instance_image.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -114,7 +114,7 @@ func dataSourceScalewayInstanceImageRead(d *schema.ResourceData, m interface{})
114114
return fmt.Errorf("%d images found with the same name %s and architecture %s in zone %s", len(res.Images), d.Get("name"), d.Get("architecture"), zone)
115115
}
116116
sort.Slice(res.Images, func(i, j int) bool {
117-
return res.Images[i].ModificationDate.After(res.Images[j].ModificationDate)
117+
return res.Images[i].ModificationDate.After(*res.Images[j].ModificationDate)
118118
})
119119
imageID = res.Images[0].ID
120120
}
@@ -138,8 +138,8 @@ func dataSourceScalewayInstanceImageRead(d *schema.ResourceData, m interface{})
138138
_ = d.Set("architecture", resp.Image.Arch)
139139
_ = d.Set("name", resp.Image.Name)
140140

141-
_ = d.Set("creation_date", flattenTime(&resp.Image.CreationDate))
142-
_ = d.Set("modification_date", flattenTime(&resp.Image.ModificationDate))
141+
_ = d.Set("creation_date", flattenTime(resp.Image.CreationDate))
142+
_ = d.Set("modification_date", flattenTime(resp.Image.ModificationDate))
143143
_ = d.Set("public", resp.Image.Public)
144144
_ = d.Set("from_server_id", resp.Image.FromServer)
145145
_ = d.Set("state", resp.Image.State.String())

‎scaleway/resource_baremetal_server.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -138,7 +138,7 @@ func resourceScalewayBaremetalServerCreate(d *schema.ResourceData, m interface{}
138138
server, err := baremetalAPI.CreateServer(&baremetal.CreateServerRequest{
139139
Zone: zone,
140140
Name: expandOrGenerateString(d.Get("name"), "bm"),
141-
OrganizationID: d.Get("organization_id").(string),
141+
OrganizationID: expandStringPtr(d.Get("organization_id")),
142142
Description: d.Get("description").(string),
143143
OfferID: offerID.ID,
144144
Tags: expandStrings(d.Get("tags")),

‎scaleway/resource_instance_placement_group.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ func resourceScalewayInstancePlacementGroupCreate(d *schema.ResourceData, m inte
6363
res, err := instanceApi.CreatePlacementGroup(&instance.CreatePlacementGroupRequest{
6464
Zone: zone,
6565
Name: expandOrGenerateString(d.Get("name"), "pg"),
66-
Organization: d.Get("organization_id").(string),
66+
Organization: expandStringPtr(d.Get("organization_id")),
6767
PolicyMode: instance.PlacementGroupPolicyMode(d.Get("policy_mode").(string)),
6868
PolicyType: instance.PlacementGroupPolicyType(d.Get("policy_type").(string)),
6969
})

‎scaleway/resource_instance_security_group.go

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -91,15 +91,10 @@ func resourceScalewayInstanceSecurityGroupCreate(d *schema.ResourceData, m inter
9191
return err
9292
}
9393

94-
organizationID, err := organizationID(d, meta)
95-
if err != nil {
96-
return err
97-
}
98-
9994
res, err := instanceApi.CreateSecurityGroup(&instance.CreateSecurityGroupRequest{
10095
Name: expandOrGenerateString(d.Get("name"), "sg"),
10196
Zone: zone,
102-
Organization: organizationID,
97+
Organization: expandStringPtr(d.Get("organization_id")),
10398
Description: d.Get("description").(string),
10499
Stateful: d.Get("stateful").(bool),
105100
InboundDefaultPolicy: instance.SecurityGroupPolicy(d.Get("inbound_default_policy").(string)),

‎scaleway/resource_instance_server.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -248,7 +248,7 @@ func resourceScalewayInstanceServerCreate(d *schema.ResourceData, m interface{})
248248
req := &instance.CreateServerRequest{
249249
Zone: zone,
250250
Name: expandOrGenerateString(d.Get("name"), "srv"),
251-
Organization: d.Get("organization_id").(string),
251+
Organization: expandStringPtr(d.Get("organization_id")),
252252
Image: image.ID,
253253
CommercialType: commercialType,
254254
EnableIPv6: d.Get("enable_ipv6").(bool),

‎scaleway/resource_instance_volume.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ func resourceScalewayInstanceVolumeCreate(d *schema.ResourceData, m interface{})
8181
Zone: zone,
8282
Name: expandOrGenerateString(d.Get("name"), "vol"),
8383
VolumeType: instance.VolumeVolumeType(d.Get("type").(string)),
84-
Organization: d.Get("organization_id").(string),
84+
Organization: expandStringPtr(d.Get("organization_id")),
8585
}
8686

8787
if size, ok := d.GetOk("size_in_gb"); ok {

‎scaleway/resource_k8s_cluster_beta.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -357,7 +357,7 @@ func resourceScalewayK8SClusterBetaCreate(d *schema.ResourceData, m interface{})
357357

358358
req := &k8s.CreateClusterRequest{
359359
Region: region,
360-
OrganizationID: d.Get("organization_id").(string),
360+
OrganizationID: expandStringPtr(d.Get("organization_id")),
361361
Name: expandOrGenerateString(d.Get("name"), "cluster"),
362362
Description: description.(string),
363363
Cni: k8s.CNI(d.Get("cni").(string)),

‎scaleway/resource_lb_backend_beta.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -243,7 +243,7 @@ func resourceScalewayLbBackendBetaCreate(d *schema.ResourceData, m interface{})
243243

244244
createReq := &lb.CreateBackendRequest{
245245
Region: region,
246-
LbID: LbID,
246+
LBID: LbID,
247247
Name: expandOrGenerateString(d.Get("name"), "lb-bkd"),
248248
ForwardProtocol: expandLbProtocol(d.Get("forward_protocol")),
249249
ForwardPort: int32(d.Get("forward_port").(int)),
@@ -297,7 +297,7 @@ func resourceScalewayLbBackendBetaRead(d *schema.ResourceData, m interface{}) er
297297
return err
298298
}
299299

300-
_ = d.Set("lb_id", newRegionalId(region, res.Lb.ID))
300+
_ = d.Set("lb_id", newRegionalId(region, res.LB.ID))
301301
_ = d.Set("name", res.Name)
302302
_ = d.Set("forward_protocol", flattenLbProtocol(res.ForwardProtocol))
303303
_ = d.Set("forward_port", res.ForwardPort)

‎scaleway/resource_lb_beta.go

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -64,10 +64,10 @@ func resourceScalewayLbBetaCreate(d *schema.ResourceData, m interface{}) error {
6464
return err
6565
}
6666

67-
createReq := &lb.CreateLbRequest{
67+
createReq := &lb.CreateLBRequest{
6868
Region: region,
6969
IPID: scw.StringPtr(expandID(d.Get("ip_id").(string))),
70-
OrganizationID: d.Get("organization_id").(string),
70+
OrganizationID: expandStringPtr(d.Get("organization_id")),
7171
Name: expandOrGenerateString(d.Get("name"), "lb"),
7272
Type: d.Get("type").(string),
7373
}
@@ -77,16 +77,16 @@ func resourceScalewayLbBetaCreate(d *schema.ResourceData, m interface{}) error {
7777
createReq.Tags = append(createReq.Tags, tag.(string))
7878
}
7979
}
80-
res, err := lbAPI.CreateLb(createReq)
80+
res, err := lbAPI.CreateLB(createReq)
8181
if err != nil {
8282
return err
8383
}
8484

8585
d.SetId(newRegionalId(region, res.ID))
8686

87-
_, err = lbAPI.WaitForLb(&lb.WaitForLbRequest{
87+
_, err = lbAPI.WaitForLb(&lb.WaitForLBRequest{
8888
Region: region,
89-
LbID: res.ID,
89+
LBID: res.ID,
9090
Timeout: scw.TimeDurationPtr(InstanceServerWaitForTimeout),
9191
})
9292
if err != nil {
@@ -102,9 +102,9 @@ func resourceScalewayLbBetaRead(d *schema.ResourceData, m interface{}) error {
102102
return err
103103
}
104104

105-
res, err := lbAPI.GetLb(&lb.GetLbRequest{
105+
res, err := lbAPI.GetLB(&lb.GetLBRequest{
106106
Region: region,
107-
LbID: ID,
107+
LBID: ID,
108108
})
109109

110110
if err != nil {
@@ -135,14 +135,14 @@ func resourceScalewayLbBetaUpdate(d *schema.ResourceData, m interface{}) error {
135135

136136
if d.HasChange("name") || d.HasChange("tags") {
137137

138-
req := &lb.UpdateLbRequest{
138+
req := &lb.UpdateLBRequest{
139139
Region: region,
140-
LbID: ID,
140+
LBID: ID,
141141
Name: d.Get("name").(string),
142142
Tags: expandStrings(d.Get("tags")),
143143
}
144144

145-
_, err = lbAPI.UpdateLb(req)
145+
_, err = lbAPI.UpdateLB(req)
146146
if err != nil {
147147
return err
148148
}
@@ -157,18 +157,18 @@ func resourceScalewayLbBetaDelete(d *schema.ResourceData, m interface{}) error {
157157
return err
158158
}
159159

160-
err = lbAPI.DeleteLb(&lb.DeleteLbRequest{
160+
err = lbAPI.DeleteLB(&lb.DeleteLBRequest{
161161
Region: region,
162-
LbID: ID,
162+
LBID: ID,
163163
ReleaseIP: false,
164164
})
165165

166166
if err != nil && !is404Error(err) {
167167
return err
168168
}
169169

170-
_, err = lbAPI.WaitForLb(&lb.WaitForLbRequest{
171-
LbID: ID,
170+
_, err = lbAPI.WaitForLb(&lb.WaitForLBRequest{
171+
LBID: ID,
172172
Region: region,
173173
Timeout: scw.TimeDurationPtr(LbWaitForTimeout),
174174
})

‎scaleway/resource_lb_beta_test.go

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -25,14 +25,14 @@ func testSweepLB(region string) error {
2525
lbAPI := lb.NewAPI(scwClient)
2626

2727
l.Debugf("sweeper: destroying the lbs in (%s)", region)
28-
listLBs, err := lbAPI.ListLbs(&lb.ListLbsRequest{}, scw.WithAllPages())
28+
listLBs, err := lbAPI.ListLBs(&lb.ListLBsRequest{}, scw.WithAllPages())
2929
if err != nil {
3030
return fmt.Errorf("error listing lbs in (%s) in sweeper: %s", region, err)
3131
}
3232

33-
for _, l := range listLBs.Lbs {
34-
err := lbAPI.DeleteLb(&lb.DeleteLbRequest{
35-
LbID: l.ID,
33+
for _, l := range listLBs.LBs {
34+
err := lbAPI.DeleteLB(&lb.DeleteLBRequest{
35+
LBID: l.ID,
3636
ReleaseIP: true,
3737
})
3838
if err != nil {
@@ -94,8 +94,8 @@ func testAccCheckScalewayLbBetaExists(n string) resource.TestCheckFunc {
9494
return err
9595
}
9696

97-
_, err = lbAPI.GetLb(&lb.GetLbRequest{
98-
LbID: ID,
97+
_, err = lbAPI.GetLB(&lb.GetLBRequest{
98+
LBID: ID,
9999
Region: region,
100100
})
101101

@@ -118,9 +118,9 @@ func testAccCheckScalewayLbBetaDestroy(s *terraform.State) error {
118118
return err
119119
}
120120

121-
_, err = lbAPI.GetLb(&lb.GetLbRequest{
121+
_, err = lbAPI.GetLB(&lb.GetLBRequest{
122122
Region: region,
123-
LbID: ID,
123+
LBID: ID,
124124
})
125125

126126
// If no error resource still exist

‎scaleway/resource_lb_certificate_beta.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -113,7 +113,7 @@ func resourceScalewayLbCertificateBetaCreate(d *schema.ResourceData, m interface
113113

114114
createReq := &lb.CreateCertificateRequest{
115115
Region: region,
116-
LbID: lbID,
116+
LBID: lbID,
117117
Name: expandOrGenerateString(d.Get("name"), "lb-cert"),
118118
Letsencrypt: expandLbLetsEncrypt(d.Get("letsencrypt")),
119119
CustomCertificate: expandLbCustomCertificate(d.Get("custom_certificate")),
@@ -156,8 +156,8 @@ func resourceScalewayLbCertificateBetaRead(d *schema.ResourceData, m interface{}
156156
_ = d.Set("common_name", res.CommonName)
157157
_ = d.Set("subject_alternative_name", res.SubjectAlternativeName)
158158
_ = d.Set("fingerprint", res.Fingerprint)
159-
_ = d.Set("not_valid_before", flattenTime(&res.NotValidBefore))
160-
_ = d.Set("not_valid_after", flattenTime(&res.NotValidAfter))
159+
_ = d.Set("not_valid_before", flattenTime(res.NotValidBefore))
160+
_ = d.Set("not_valid_after", flattenTime(res.NotValidAfter))
161161
_ = d.Set("status", res.Status)
162162
return nil
163163
}

‎scaleway/resource_lb_frontend_beta.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -156,7 +156,7 @@ func resourceScalewayLbFrontendBetaCreate(d *schema.ResourceData, m interface{})
156156

157157
res, err := lbAPI.CreateFrontend(&lb.CreateFrontendRequest{
158158
Region: region,
159-
LbID: LbID,
159+
LBID: LbID,
160160
Name: expandOrGenerateString(d.Get("name"), "lb-frt"),
161161
InboundPort: int32(d.Get("inbound_port").(int)),
162162
BackendID: expandID(d.Get("backend_id")),
@@ -196,7 +196,7 @@ func resourceScalewayLbFrontendBetaRead(d *schema.ResourceData, m interface{}) e
196196
return err
197197
}
198198

199-
_ = d.Set("lb_id", newRegionalId(region, res.Lb.ID))
199+
_ = d.Set("lb_id", newRegionalId(region, res.LB.ID))
200200
_ = d.Set("backend_id", newRegionalId(region, res.Backend.ID))
201201
_ = d.Set("name", res.Name)
202202
_ = d.Set("inbound_port", int(res.InboundPort))

‎scaleway/resource_lb_ip_beta.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ func resourceScalewayLbIPBetaCreate(d *schema.ResourceData, m interface{}) error
4747

4848
createReq := &lb.CreateIPRequest{
4949
Region: region,
50-
OrganizationID: d.Get("organization_id").(string),
50+
OrganizationID: expandStringPtr(d.Get("organization_id")),
5151
Reverse: expandStringPtr(d.Get("reverse")),
5252
}
5353

@@ -85,7 +85,7 @@ func resourceScalewayLbIPBetaRead(d *schema.ResourceData, m interface{}) error {
8585
_ = d.Set("ip_id", res.ID)
8686
_ = d.Set("ip_address", res.IPAddress)
8787
_ = d.Set("reverse", res.Reverse)
88-
_ = d.Set("lb_ip", flattenStringPtr(res.LbID))
88+
_ = d.Set("lb_ip", flattenStringPtr(res.LBID))
8989

9090
return nil
9191
}

‎scaleway/resource_lb_ip_beta_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ func testSweepLBIP(region string) error {
3131
}
3232

3333
for _, ip := range listIPs.IPs {
34-
if ip.LbID == nil {
34+
if ip.LBID == nil {
3535
err := lbAPI.ReleaseIP(&lb.ReleaseIPRequest{
3636
IPID: ip.ID,
3737
})

‎scaleway/resource_rdb_instance_beta.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -126,7 +126,7 @@ func resourceScalewayRdbInstanceBetaCreate(d *schema.ResourceData, m interface{}
126126

127127
createReq := &rdb.CreateInstanceRequest{
128128
Region: region,
129-
OrganizationID: d.Get("organization_id").(string),
129+
OrganizationID: expandStringPtr(d.Get("organization_id")),
130130
Name: expandOrGenerateString(d.Get("name"), "rdb"),
131131
NodeType: d.Get("node_type").(string),
132132
Engine: d.Get("engine").(string),

‎scaleway/resource_registry_namespace_beta.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ func resourceScalewayRegistryNamespaceBetaCreate(d *schema.ResourceData, m inter
5252

5353
ns, err := api.CreateNamespace(&registry.CreateNamespaceRequest{
5454
Region: region,
55-
OrganizationID: d.Get("organization_id").(string),
55+
OrganizationID: expandStringPtr(d.Get("organization_id")),
5656
Name: d.Get("name").(string),
5757
Description: d.Get("description").(string),
5858
IsPublic: d.Get("is_public").(bool),

0 commit comments

Comments
 (0)