Skip to content

Commit a554f2b

Browse files
CodelaxCodelax
authored
chore: bump sdk-go (#2089)
* chore: bump sdk-go * fix lb tests
1 parent d6cb2d6 commit a554f2b

File tree

5 files changed

+14
-15
lines changed

5 files changed

+14
-15
lines changed

‎go.mod

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ require (
1616
github.com/nats-io/jwt/v2 v2.4.1
1717
github.com/nats-io/nats.go v1.28.0
1818
github.com/robfig/cron/v3 v3.0.1
19-
github.com/scaleway/scaleway-sdk-go v1.0.0-beta.20
19+
github.com/scaleway/scaleway-sdk-go v1.0.0-beta.20.0.20230807090124-eefdeb5d74c7
2020
github.com/stretchr/testify v1.8.4
2121
)
2222

‎go.sum

+2-2
Original file line numberDiff line numberDiff line change
@@ -173,8 +173,8 @@ github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZb
173173
github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
174174
github.com/robfig/cron/v3 v3.0.1 h1:WdRxkvbJztn8LMz/QEvLN5sBU+xKpSqwwUO1Pjr4qDs=
175175
github.com/robfig/cron/v3 v3.0.1/go.mod h1:eQICP3HwyT7UooqI/z+Ov+PtYAWygg1TEWWzGIFLtro=
176-
github.com/scaleway/scaleway-sdk-go v1.0.0-beta.20 h1:a9hSJdJcd16e0HoMsnFvaHvxB3pxSD+SC7+CISp7xY0=
177-
github.com/scaleway/scaleway-sdk-go v1.0.0-beta.20/go.mod h1:fCa7OJZ/9DRTnOKmxvT6pn+LPWUptQAmHF/SBJUGEcg=
176+
github.com/scaleway/scaleway-sdk-go v1.0.0-beta.20.0.20230807090124-eefdeb5d74c7 h1:vdxIGBnCDJLL/r0HjxVaxAA8xoGz3VT2BKxDbpIVXKw=
177+
github.com/scaleway/scaleway-sdk-go v1.0.0-beta.20.0.20230807090124-eefdeb5d74c7/go.mod h1:fCa7OJZ/9DRTnOKmxvT6pn+LPWUptQAmHF/SBJUGEcg=
178178
github.com/sergi/go-diff v1.2.0 h1:XU+rvMAioB0UC3q1MFrIQy4Vo5/4VsRDQQXHsEya6xQ=
179179
github.com/sirupsen/logrus v1.7.0/go.mod h1:yWOB1SBYBC5VeMP7gHvWumXLIWorT60ONWic61uBYv0=
180180
github.com/skeema/knownhosts v1.1.0 h1:Wvr9V0MxhjRbl3f9nMnKnFfiWTJmtECJ9Njkea3ysW0=

‎scaleway/helpers_lb.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -438,7 +438,7 @@ func expandLbPrivateNetworkStaticConfig(raw interface{}) *lbSDK.PrivateNetworkSt
438438
return nil
439439
}
440440
return &lbSDK.PrivateNetworkStaticConfig{
441-
IPAddress: expandStrings(raw),
441+
IPAddress: expandStringsPtr(raw),
442442
}
443443
}
444444

@@ -447,7 +447,7 @@ func flattenLbPrivateNetworkStaticConfig(cfg *lbSDK.PrivateNetworkStaticConfig)
447447
return nil
448448
}
449449

450-
return cfg.IPAddress
450+
return *cfg.IPAddress
451451
}
452452

453453
func expandLbPrivateNetworkDHCPConfig(raw interface{}) *lbSDK.PrivateNetworkDHCPConfig {

‎scaleway/helpers_lb_test.go

+7-6
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ import (
44
"testing"
55

66
lbSDK "github.com/scaleway/scaleway-sdk-go/api/lb/v1"
7+
"github.com/scaleway/scaleway-sdk-go/scw"
78
"github.com/stretchr/testify/assert"
89
)
910

@@ -22,25 +23,25 @@ func TestIsEqualPrivateNetwork(t *testing.T) {
2223
},
2324
{
2425
name: "isEqualStatic",
25-
A: &lbSDK.PrivateNetwork{PrivateNetworkID: "6ba7b810-9dad-11d1-80b4-00c04fd430c8", StaticConfig: &lbSDK.PrivateNetworkStaticConfig{IPAddress: []string{"172.16.0.100", "172.16.0.101"}}},
26-
B: &lbSDK.PrivateNetwork{PrivateNetworkID: "6ba7b810-9dad-11d1-80b4-00c04fd430c8", StaticConfig: &lbSDK.PrivateNetworkStaticConfig{IPAddress: []string{"172.16.0.100", "172.16.0.101"}}},
26+
A: &lbSDK.PrivateNetwork{PrivateNetworkID: "6ba7b810-9dad-11d1-80b4-00c04fd430c8", StaticConfig: &lbSDK.PrivateNetworkStaticConfig{IPAddress: scw.StringsPtr([]string{"172.16.0.100", "172.16.0.101"})}},
27+
B: &lbSDK.PrivateNetwork{PrivateNetworkID: "6ba7b810-9dad-11d1-80b4-00c04fd430c8", StaticConfig: &lbSDK.PrivateNetworkStaticConfig{IPAddress: scw.StringsPtr([]string{"172.16.0.100", "172.16.0.101"})}},
2728
expected: true,
2829
},
2930
{
3031
name: "areNotEqualStatic",
31-
A: &lbSDK.PrivateNetwork{PrivateNetworkID: "6ba7b810-9dad-11d1-80b4-00c04fd430c8", StaticConfig: &lbSDK.PrivateNetworkStaticConfig{IPAddress: []string{"172.16.0.100", "172.16.0.101"}}},
32-
B: &lbSDK.PrivateNetwork{PrivateNetworkID: "6ba7b810-9dad-11d1-80b4-00c04fd430c8", StaticConfig: &lbSDK.PrivateNetworkStaticConfig{IPAddress: []string{"172.16.0.101", "172.16.0.101"}}},
32+
A: &lbSDK.PrivateNetwork{PrivateNetworkID: "6ba7b810-9dad-11d1-80b4-00c04fd430c8", StaticConfig: &lbSDK.PrivateNetworkStaticConfig{IPAddress: scw.StringsPtr([]string{"172.16.0.100", "172.16.0.101"})}},
33+
B: &lbSDK.PrivateNetwork{PrivateNetworkID: "6ba7b810-9dad-11d1-80b4-00c04fd430c8", StaticConfig: &lbSDK.PrivateNetworkStaticConfig{IPAddress: scw.StringsPtr([]string{"172.16.0.101", "172.16.0.101"})}},
3334
expected: false,
3435
},
3536
{
3637
name: "areNotEqualDHCPToStatic",
3738
A: &lbSDK.PrivateNetwork{PrivateNetworkID: "6ba7b810-9dad-11d1-80b4-00c04fd430c8", DHCPConfig: &lbSDK.PrivateNetworkDHCPConfig{}},
38-
B: &lbSDK.PrivateNetwork{PrivateNetworkID: "6ba7b810-9dad-11d1-80b4-00c04fd430c8", StaticConfig: &lbSDK.PrivateNetworkStaticConfig{IPAddress: []string{"172.16.0.101", "172.16.0.101"}}},
39+
B: &lbSDK.PrivateNetwork{PrivateNetworkID: "6ba7b810-9dad-11d1-80b4-00c04fd430c8", StaticConfig: &lbSDK.PrivateNetworkStaticConfig{IPAddress: scw.StringsPtr([]string{"172.16.0.101", "172.16.0.101"})}},
3940
expected: false,
4041
},
4142
{
4243
name: "areNotEqualDHCPToStatic",
43-
A: &lbSDK.PrivateNetwork{PrivateNetworkID: "6ba7b810-9dad-11d1-80b4-00c04fd430c8", StaticConfig: &lbSDK.PrivateNetworkStaticConfig{IPAddress: []string{"172.16.0.101", "172.16.0.101"}}},
44+
A: &lbSDK.PrivateNetwork{PrivateNetworkID: "6ba7b810-9dad-11d1-80b4-00c04fd430c8", StaticConfig: &lbSDK.PrivateNetworkStaticConfig{IPAddress: scw.StringsPtr([]string{"172.16.0.101", "172.16.0.101"})}},
4445
B: &lbSDK.PrivateNetwork{PrivateNetworkID: "6ba7b810-9dad-11d1-80b4-00c04fd430c8", DHCPConfig: &lbSDK.PrivateNetworkDHCPConfig{}},
4546
expected: false,
4647
},

‎scaleway/resource_instance_snapshot.go

+2-4
Original file line numberDiff line numberDiff line change
@@ -119,10 +119,8 @@ func resourceScalewayInstanceSnapshotCreate(ctx context.Context, d *schema.Resou
119119
volumeType := instance.SnapshotVolumeType(volumeType.(string))
120120
req.VolumeType = volumeType
121121
}
122-
tags := expandStrings(d.Get("tags"))
123-
if len(tags) > 0 {
124-
req.Tags = tags
125-
}
122+
123+
req.Tags = expandStringsPtr(d.Get("tags"))
126124

127125
if volumeID, volumeIDExist := d.GetOk("volume_id"); volumeIDExist {
128126
req.VolumeID = scw.StringPtr(expandZonedID(volumeID).ID)

0 commit comments

Comments
 (0)