Skip to content

Commit e0bb56d

Browse files
authored
fix(instance): get server-type instead of listing (#1959)
* fix(instance): get server-type instead of listing * update InstanceServer cassettes * update InstanceServers cassette * update lb cassette * update vpc cassettes * update instance root_volume_boot cassette * update instance snapshot cassettes * update instance image cassettes * update instance private-nic cassettes * update instance placement group cassette * update instance user-data cassette
1 parent af89512 commit e0bb56d

File tree

41 files changed

+24358
-26677
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

41 files changed

+24358
-26677
lines changed

scaleway/helpers_instance.go

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -193,21 +193,20 @@ func reachState(ctx context.Context, instanceAPI *instance.API, zone scw.Zone, s
193193

194194
// getServerType is a util to get a instance.ServerType by its commercialType
195195
func getServerType(ctx context.Context, apiInstance *instance.API, zone scw.Zone, commercialType string) *instance.ServerType {
196-
serverType := (*instance.ServerType)(nil)
197-
198-
serverTypesRes, err := apiInstance.ListServersTypes(&instance.ListServersTypesRequest{
196+
serverType, err := apiInstance.GetServerType(&instance.GetServerTypeRequest{
199197
Zone: zone,
198+
Name: commercialType,
200199
})
201200
if err != nil {
202201
tflog.Warn(ctx, fmt.Sprintf("cannot get server types: %s", err))
203202
} else {
204-
serverType = serverTypesRes.Servers[commercialType]
205203
if serverType == nil {
206204
tflog.Warn(ctx, fmt.Sprintf("unrecognized server type: %s", commercialType))
207205
}
206+
return serverType
208207
}
209208

210-
return serverType
209+
return nil
211210
}
212211

213212
// validateLocalVolumeSizes validates the total size of local volumes.

scaleway/testdata/data-source-instance-private-nic-basic.cassette.yaml

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

scaleway/testdata/data-source-instance-server-basic.cassette.yaml

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

scaleway/testdata/data-source-instance-servers-basic.cassette.yaml

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

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

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

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

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

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

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

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

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

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

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

scaleway/testdata/instance-placement-group-rename.cassette.yaml

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

0 commit comments

Comments
 (0)