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

+4-5
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

+649-1,201
Large diffs are not rendered by default.

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

+544-435
Large diffs are not rendered by default.

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

+653-525
Large diffs are not rendered by default.

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

+817-910
Large diffs are not rendered by default.

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

+761-1,010
Large diffs are not rendered by default.

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

+977-1,020
Large diffs are not rendered by default.

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

+1,163-1,157
Large diffs are not rendered by default.

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

+690-714
Large diffs are not rendered by default.

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

+419-443
Large diffs are not rendered by default.

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

+543-416
Large diffs are not rendered by default.

scaleway/testdata/instance-private-nic-tags.cassette.yaml

+331-292
Large diffs are not rendered by default.

scaleway/testdata/instance-server-additional-volumes-detach.cassette.yaml

+515-607
Large diffs are not rendered by default.

scaleway/testdata/instance-server-additional-volumes.cassette.yaml

+611-808
Large diffs are not rendered by default.

scaleway/testdata/instance-server-alter-tags.cassette.yaml

+286-222
Large diffs are not rendered by default.

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

+736-1,024
Large diffs are not rendered by default.

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

+215-161
Large diffs are not rendered by default.

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

+336-599
Large diffs are not rendered by default.

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

+289-279
Large diffs are not rendered by default.

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

+451-505
Large diffs are not rendered by default.

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

+393-490
Large diffs are not rendered by default.

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

+1,137-1,253
Large diffs are not rendered by default.

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

+1,456-1,585
Large diffs are not rendered by default.

scaleway/testdata/instance-server-root-volume-boot.cassette.yaml

+54-15
Large diffs are not rendered by default.

scaleway/testdata/instance-server-root-volume-id.cassette.yaml

+174-125
Large diffs are not rendered by default.

scaleway/testdata/instance-server-root-volume1.cassette.yaml

+352-420
Large diffs are not rendered by default.

scaleway/testdata/instance-server-server-with-block-non-default-zone.cassette.yaml

+384-374
Large diffs are not rendered by default.

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

+894-776
Large diffs are not rendered by default.

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

+605-697
Large diffs are not rendered by default.

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

+490-324
Large diffs are not rendered by default.

scaleway/testdata/instance-server-user-data-with-cloud-init-at-start.cassette.yaml

+397-543
Large diffs are not rendered by default.

scaleway/testdata/instance-server-user-data-without-cloud-init-at-start.cassette.yaml

+472-643
Large diffs are not rendered by default.

scaleway/testdata/instance-server-with-default-root-volume-and-additional-volume.cassette.yaml

+395-541
Large diffs are not rendered by default.

scaleway/testdata/instance-server-with-placement-group.cassette.yaml

+1,114-1,630
Large diffs are not rendered by default.

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

+880-981
Large diffs are not rendered by default.

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

+510-500
Large diffs are not rendered by default.

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

+425-415
Large diffs are not rendered by default.

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

+630-497
Large diffs are not rendered by default.

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

+885-797
Large diffs are not rendered by default.

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

+945-942
Large diffs are not rendered by default.

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

+776-796
Large diffs are not rendered by default.

0 commit comments

Comments
 (0)