Skip to content

Commit e5ff0f0

Browse files
nicolai86stack72
authored andcommitted
provider/scaleway: update sdk (hashicorp#9976)
the SDK updates includes an fix for the image cache, which might lead to wrong images ids being returned on lookup...
1 parent 3258aa9 commit e5ff0f0

4 files changed

Lines changed: 32 additions & 34 deletions

File tree

builtin/providers/scaleway/resource_scaleway_volume.go

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -76,9 +76,7 @@ func resourceScalewayVolumeRead(d *schema.ResourceData, m interface{}) error {
7676
return err
7777
}
7878
d.Set("name", volume.Name)
79-
if size, ok := volume.Size.(float64); ok {
80-
d.Set("size_in_gb", uint64(size)/gb)
81-
}
79+
d.Set("size_in_gb", uint64(volume.Size)/gb)
8280
d.Set("type", volume.VolumeType)
8381
d.Set("server", "")
8482
if volume.Server != nil {

builtin/providers/scaleway/resource_scaleway_volume_attachment.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ func resourceScalewayVolumeAttachmentCreate(d *schema.ResourceData, m interface{
7171

7272
// the API request requires most volume attributes to be unset to succeed
7373
for k, v := range volumes {
74-
v.Size = nil
74+
v.Size = 0
7575
v.CreationDate = ""
7676
v.Organization = ""
7777
v.ModificationDate = ""
@@ -192,7 +192,7 @@ func resourceScalewayVolumeAttachmentDelete(d *schema.ResourceData, m interface{
192192

193193
// the API request requires most volume attributes to be unset to succeed
194194
for k, v := range volumes {
195-
v.Size = nil
195+
v.Size = 0
196196
v.CreationDate = ""
197197
v.Organization = ""
198198
v.ModificationDate = ""

vendor/github.com/scaleway/scaleway-cli/pkg/api/api.go

Lines changed: 26 additions & 26 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/vendor.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1822,10 +1822,10 @@
18221822
"revisionTime": "2016-09-27T10:08:44Z"
18231823
},
18241824
{
1825-
"checksumSHA1": "YF6baE6Sl76/nVYo0JwJXCkJmGw=",
1825+
"checksumSHA1": "BfFS70stfaoDJYyCzky1Sr0D5UE=",
18261826
"path": "github.com/scaleway/scaleway-cli/pkg/api",
1827-
"revision": "88132ecdd39da62f7c73c5a8e1a383d7da5e0e09",
1828-
"revisionTime": "2016-10-27T15:40:24Z"
1827+
"revision": "790f00aee05c9264248f1090c062ac0513e5a191",
1828+
"revisionTime": "2016-11-07T15:30:35Z"
18291829
},
18301830
{
18311831
"checksumSHA1": "aU2+iXO1oHS4vBtAXXBgicA9YBY=",

0 commit comments

Comments
 (0)