Skip to content

Commit

Permalink
chore: bump sdk-go (#2089)
Browse files Browse the repository at this point in the history
* chore: bump sdk-go

* fix lb tests
  • Loading branch information
Codelax authored Aug 7, 2023
1 parent d6cb2d6 commit a554f2b
Show file tree
Hide file tree
Showing 5 changed files with 14 additions and 15 deletions.
2 changes: 1 addition & 1 deletion go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ require (
github.com/nats-io/jwt/v2 v2.4.1
github.com/nats-io/nats.go v1.28.0
github.com/robfig/cron/v3 v3.0.1
github.com/scaleway/scaleway-sdk-go v1.0.0-beta.20
github.com/scaleway/scaleway-sdk-go v1.0.0-beta.20.0.20230807090124-eefdeb5d74c7
github.com/stretchr/testify v1.8.4
)

Expand Down
4 changes: 2 additions & 2 deletions go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -173,8 +173,8 @@ github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZb
github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
github.com/robfig/cron/v3 v3.0.1 h1:WdRxkvbJztn8LMz/QEvLN5sBU+xKpSqwwUO1Pjr4qDs=
github.com/robfig/cron/v3 v3.0.1/go.mod h1:eQICP3HwyT7UooqI/z+Ov+PtYAWygg1TEWWzGIFLtro=
github.com/scaleway/scaleway-sdk-go v1.0.0-beta.20 h1:a9hSJdJcd16e0HoMsnFvaHvxB3pxSD+SC7+CISp7xY0=
github.com/scaleway/scaleway-sdk-go v1.0.0-beta.20/go.mod h1:fCa7OJZ/9DRTnOKmxvT6pn+LPWUptQAmHF/SBJUGEcg=
github.com/scaleway/scaleway-sdk-go v1.0.0-beta.20.0.20230807090124-eefdeb5d74c7 h1:vdxIGBnCDJLL/r0HjxVaxAA8xoGz3VT2BKxDbpIVXKw=
github.com/scaleway/scaleway-sdk-go v1.0.0-beta.20.0.20230807090124-eefdeb5d74c7/go.mod h1:fCa7OJZ/9DRTnOKmxvT6pn+LPWUptQAmHF/SBJUGEcg=
github.com/sergi/go-diff v1.2.0 h1:XU+rvMAioB0UC3q1MFrIQy4Vo5/4VsRDQQXHsEya6xQ=
github.com/sirupsen/logrus v1.7.0/go.mod h1:yWOB1SBYBC5VeMP7gHvWumXLIWorT60ONWic61uBYv0=
github.com/skeema/knownhosts v1.1.0 h1:Wvr9V0MxhjRbl3f9nMnKnFfiWTJmtECJ9Njkea3ysW0=
Expand Down
4 changes: 2 additions & 2 deletions scaleway/helpers_lb.go
Original file line number Diff line number Diff line change
Expand Up @@ -438,7 +438,7 @@ func expandLbPrivateNetworkStaticConfig(raw interface{}) *lbSDK.PrivateNetworkSt
return nil
}
return &lbSDK.PrivateNetworkStaticConfig{
IPAddress: expandStrings(raw),
IPAddress: expandStringsPtr(raw),
}
}

Expand All @@ -447,7 +447,7 @@ func flattenLbPrivateNetworkStaticConfig(cfg *lbSDK.PrivateNetworkStaticConfig)
return nil
}

return cfg.IPAddress
return *cfg.IPAddress
}

func expandLbPrivateNetworkDHCPConfig(raw interface{}) *lbSDK.PrivateNetworkDHCPConfig {
Expand Down
13 changes: 7 additions & 6 deletions scaleway/helpers_lb_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ import (
"testing"

lbSDK "github.com/scaleway/scaleway-sdk-go/api/lb/v1"
"github.com/scaleway/scaleway-sdk-go/scw"
"github.com/stretchr/testify/assert"
)

Expand All @@ -22,25 +23,25 @@ func TestIsEqualPrivateNetwork(t *testing.T) {
},
{
name: "isEqualStatic",
A: &lbSDK.PrivateNetwork{PrivateNetworkID: "6ba7b810-9dad-11d1-80b4-00c04fd430c8", StaticConfig: &lbSDK.PrivateNetworkStaticConfig{IPAddress: []string{"172.16.0.100", "172.16.0.101"}}},
B: &lbSDK.PrivateNetwork{PrivateNetworkID: "6ba7b810-9dad-11d1-80b4-00c04fd430c8", StaticConfig: &lbSDK.PrivateNetworkStaticConfig{IPAddress: []string{"172.16.0.100", "172.16.0.101"}}},
A: &lbSDK.PrivateNetwork{PrivateNetworkID: "6ba7b810-9dad-11d1-80b4-00c04fd430c8", StaticConfig: &lbSDK.PrivateNetworkStaticConfig{IPAddress: scw.StringsPtr([]string{"172.16.0.100", "172.16.0.101"})}},
B: &lbSDK.PrivateNetwork{PrivateNetworkID: "6ba7b810-9dad-11d1-80b4-00c04fd430c8", StaticConfig: &lbSDK.PrivateNetworkStaticConfig{IPAddress: scw.StringsPtr([]string{"172.16.0.100", "172.16.0.101"})}},
expected: true,
},
{
name: "areNotEqualStatic",
A: &lbSDK.PrivateNetwork{PrivateNetworkID: "6ba7b810-9dad-11d1-80b4-00c04fd430c8", StaticConfig: &lbSDK.PrivateNetworkStaticConfig{IPAddress: []string{"172.16.0.100", "172.16.0.101"}}},
B: &lbSDK.PrivateNetwork{PrivateNetworkID: "6ba7b810-9dad-11d1-80b4-00c04fd430c8", StaticConfig: &lbSDK.PrivateNetworkStaticConfig{IPAddress: []string{"172.16.0.101", "172.16.0.101"}}},
A: &lbSDK.PrivateNetwork{PrivateNetworkID: "6ba7b810-9dad-11d1-80b4-00c04fd430c8", StaticConfig: &lbSDK.PrivateNetworkStaticConfig{IPAddress: scw.StringsPtr([]string{"172.16.0.100", "172.16.0.101"})}},
B: &lbSDK.PrivateNetwork{PrivateNetworkID: "6ba7b810-9dad-11d1-80b4-00c04fd430c8", StaticConfig: &lbSDK.PrivateNetworkStaticConfig{IPAddress: scw.StringsPtr([]string{"172.16.0.101", "172.16.0.101"})}},
expected: false,
},
{
name: "areNotEqualDHCPToStatic",
A: &lbSDK.PrivateNetwork{PrivateNetworkID: "6ba7b810-9dad-11d1-80b4-00c04fd430c8", DHCPConfig: &lbSDK.PrivateNetworkDHCPConfig{}},
B: &lbSDK.PrivateNetwork{PrivateNetworkID: "6ba7b810-9dad-11d1-80b4-00c04fd430c8", StaticConfig: &lbSDK.PrivateNetworkStaticConfig{IPAddress: []string{"172.16.0.101", "172.16.0.101"}}},
B: &lbSDK.PrivateNetwork{PrivateNetworkID: "6ba7b810-9dad-11d1-80b4-00c04fd430c8", StaticConfig: &lbSDK.PrivateNetworkStaticConfig{IPAddress: scw.StringsPtr([]string{"172.16.0.101", "172.16.0.101"})}},
expected: false,
},
{
name: "areNotEqualDHCPToStatic",
A: &lbSDK.PrivateNetwork{PrivateNetworkID: "6ba7b810-9dad-11d1-80b4-00c04fd430c8", StaticConfig: &lbSDK.PrivateNetworkStaticConfig{IPAddress: []string{"172.16.0.101", "172.16.0.101"}}},
A: &lbSDK.PrivateNetwork{PrivateNetworkID: "6ba7b810-9dad-11d1-80b4-00c04fd430c8", StaticConfig: &lbSDK.PrivateNetworkStaticConfig{IPAddress: scw.StringsPtr([]string{"172.16.0.101", "172.16.0.101"})}},
B: &lbSDK.PrivateNetwork{PrivateNetworkID: "6ba7b810-9dad-11d1-80b4-00c04fd430c8", DHCPConfig: &lbSDK.PrivateNetworkDHCPConfig{}},
expected: false,
},
Expand Down
6 changes: 2 additions & 4 deletions scaleway/resource_instance_snapshot.go
Original file line number Diff line number Diff line change
Expand Up @@ -119,10 +119,8 @@ func resourceScalewayInstanceSnapshotCreate(ctx context.Context, d *schema.Resou
volumeType := instance.SnapshotVolumeType(volumeType.(string))
req.VolumeType = volumeType
}
tags := expandStrings(d.Get("tags"))
if len(tags) > 0 {
req.Tags = tags
}

req.Tags = expandStringsPtr(d.Get("tags"))

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

0 comments on commit a554f2b

Please sign in to comment.