Skip to content

Commit 4136566

Browse files
authored
fix(instance_server): default routed_ip_enabled to nil (#2410)
* fix(instance_server): default routed_ip_enabled to nil * update cassettes * update remaining cassettes * record flaky test * fix cassette validation
1 parent 2647ba3 commit 4136566

21 files changed

+13684
-13022
lines changed

scaleway/resource_instance_server.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -367,7 +367,7 @@ func resourceScalewayInstanceServerCreate(ctx context.Context, d *schema.Resourc
367367
SecurityGroup: expandStringPtr(expandZonedID(d.Get("security_group_id")).ID),
368368
DynamicIPRequired: scw.BoolPtr(d.Get("enable_dynamic_ip").(bool)),
369369
Tags: expandStrings(d.Get("tags")),
370-
RoutedIPEnabled: expandBoolPtr(d.Get("routed_ip_enabled")),
370+
RoutedIPEnabled: expandBoolPtr(getBool(d, "routed_ip_enabled")),
371371
}
372372

373373
enableIPv6, ok := d.GetOk("enable_ipv6")

scaleway/testdata/data-source-ipamip-instance-lb.cassette.yaml

Lines changed: 676 additions & 676 deletions
Large diffs are not rendered by default.

scaleway/testdata/data-source-ipamip-instance.cassette.yaml

Lines changed: 485 additions & 485 deletions
Large diffs are not rendered by default.

scaleway/testdata/data-source-vpc-public-gateway-dhcp-reservation-basic.cassette.yaml

Lines changed: 1062 additions & 846 deletions
Large diffs are not rendered by default.

scaleway/testdata/data-source-vpc-public-gateway-dhcp-reservation-static.cassette.yaml

Lines changed: 764 additions & 843 deletions
Large diffs are not rendered by default.

scaleway/testdata/instance-image-server-with-block-volume.cassette.yaml

Lines changed: 969 additions & 896 deletions
Large diffs are not rendered by default.

scaleway/testdata/instance-image-server-with-local-volume.cassette.yaml

Lines changed: 1095 additions & 1056 deletions
Large diffs are not rendered by default.

scaleway/testdata/instance-image-server.cassette.yaml

Lines changed: 543 additions & 543 deletions
Large diffs are not rendered by default.

scaleway/testdata/instance-server-block-external.cassette.yaml

Lines changed: 470 additions & 431 deletions
Large diffs are not rendered by default.

scaleway/testdata/instance-server-ip-migrate.cassette.yaml

Lines changed: 523 additions & 523 deletions
Large diffs are not rendered by default.

scaleway/testdata/instance-server-ip-removed.cassette.yaml

Lines changed: 281 additions & 281 deletions
Large diffs are not rendered by default.

scaleway/testdata/instance-server-private-network.cassette.yaml

Lines changed: 1507 additions & 1630 deletions
Large diffs are not rendered by default.

scaleway/testdata/instance-server-routed-ip-enable-with-ip.cassette.yaml

Lines changed: 277 additions & 277 deletions
Large diffs are not rendered by default.

scaleway/testdata/instance-server-routed-ip-enable.cassette.yaml

Lines changed: 237 additions & 237 deletions
Large diffs are not rendered by default.

scaleway/testdata/instance-server-with-reserved-ip.cassette.yaml

Lines changed: 768 additions & 885 deletions
Large diffs are not rendered by default.

scaleway/testdata/instance-snapshot-server-with-block-volume.cassette.yaml

Lines changed: 451 additions & 412 deletions
Large diffs are not rendered by default.

scaleway/testdata/instance-snapshot-server.cassette.yaml

Lines changed: 593 additions & 320 deletions
Large diffs are not rendered by default.

scaleway/testdata/lblb-with-private-networks-on-dhcp-config.cassette.yaml

Lines changed: 1146 additions & 949 deletions
Large diffs are not rendered by default.

scaleway/testdata/vpc-public-gateway-dhcp-entry-basic.cassette.yaml

Lines changed: 1018 additions & 907 deletions
Large diffs are not rendered by default.

scaleway/testdata/vpc-public-gateway-pat-rule-with-instance.cassette.yaml

Lines changed: 816 additions & 823 deletions
Large diffs are not rendered by default.

scaleway/validate_cassettes_test.go

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ import (
1111

1212
"github.com/aws/aws-sdk-go/service/sqs"
1313
"github.com/dnaeon/go-vcr/cassette"
14+
"github.com/stretchr/testify/assert"
1415
"github.com/stretchr/testify/require"
1516
)
1617

@@ -38,7 +39,7 @@ func TestAccScalewayCassettes_Validator(t *testing.T) {
3839
for name := range files {
3940
c, err := cassette.Load(fmt.Sprintf("%s%s", testDirectory, name))
4041
require.NoError(t, err)
41-
require.NoError(t, checkErrorCode(c))
42+
assert.NoError(t, checkErrorCode(c))
4243
}
4344
}
4445

0 commit comments

Comments
 (0)