Skip to content

feat(instance): hide deprecated offers #1065

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
remyleone merged 2 commits into from
Jun 4, 2020
Merged

feat(instance): hide deprecated offers #1065

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b45ae36
feat(instance): hide deprecated offers
remyleone Jun 4, 2020
78960c5
Fix
remyleone Jun 4, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
33 changes: 22 additions & 11 deletions internal/namespaces/instance/v1/custom_server_type.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,17 +34,28 @@ var (
// - [APIGW-1932] hide deprecated instance for scw instance server-type list
func serverTypeListBuilder(c *core.Command) *core.Command {
deprecatedNames := map[string]struct{}{
"START1-L": {},
"START1-M": {},
"START1-S": {},
"START1-XS": {},
"VC1L": {},
"VC1M": {},
"VC1S": {},
"X64-120GB": {},
"X64-15GB": {},
"X64-30GB": {},
"X64-60GB": {},
"START1-L": {},
"START1-M": {},
"START1-S": {},
"START1-XS": {},
"VC1L": {},
"VC1M": {},
"VC1S": {},
"X64-120GB": {},
"X64-15GB": {},
"X64-30GB": {},
"X64-60GB": {},
"C1": {},
"C2M": {},
"C2L": {},
"C2S": {},
"ARM64-2GB": {},
"ARM64-4GB": {},
"ARM64-8GB": {},
"ARM64-16GB": {},
"ARM64-32GB": {},
"ARM64-64GB": {},
"ARM64-128GB": {},
}

c.Run = func(ctx context.Context, argsI interface{}) (interface{}, error) {
Expand Down
36 changes: 20 additions & 16 deletions ...rnal/namespaces/instance/v1/testdata/test-server-type-list-server-type-list.cassette.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ interactions:
form: {}
headers:
User-Agent:
- scaleway-sdk-go/v1.0.0-beta.6+dev (go1.13.6; darwin; amd64) cli-e2e-test
- scaleway-sdk-go/v1.0.0-beta.6+dev (go1.14.3; darwin; amd64) cli-e2e-test
url: https://api.scaleway.com/instance/v1/zones/fr-par-1/products/servers
method: GET
response:
Expand Down Expand Up @@ -304,17 +304,19 @@ interactions:
Content-Type:
- application/json
Date:
- Fri, 03 Apr 2020 17:55:51 GMT
- Thu, 04 Jun 2020 13:54:41 GMT
Link:
- </products/servers?page=1&per_page=50&>; rel="last"
Server:
- scaleway_api
- agw_listener_public_anycast
Strict-Transport-Security:
- max-age=63072000
X-Content-Type-Options:
- nosniff
X-Frame-Options:
- DENY
X-Request-Id:
- 4d7fab36-8923-4b67-9572-defccce6712e
X-Total-Count:
- "32"
status: 200 OK
Expand All @@ -325,48 +327,50 @@ interactions:
form: {}
headers:
User-Agent:
- scaleway-sdk-go/v1.0.0-beta.6+dev (go1.13.6; darwin; amd64) cli-e2e-test
- scaleway-sdk-go/v1.0.0-beta.6+dev (go1.14.3; darwin; amd64) cli-e2e-test
url: https://api.scaleway.com/instance/v1/zones/fr-par-1/products/servers/availability
method: GET
response:
body: '{"servers": {"ARM64-128GB": {"availability": "shortage"}, "ARM64-16GB":
{"availability": "shortage"}, "ARM64-2GB": {"availability": "scarce"}, "ARM64-32GB":
{"availability": "shortage"}, "ARM64-4GB": {"availability": "shortage"}, "ARM64-64GB":
{"availability": "shortage"}, "ARM64-8GB": {"availability": "shortage"}, "C1":
{"availability": "scarce"}, "ARM64-2GB": {"availability": "available"}, "ARM64-32GB":
{"availability": "shortage"}, "ARM64-4GB": {"availability": "available"}, "ARM64-64GB":
{"availability": "shortage"}, "ARM64-8GB": {"availability": "available"}, "C1":
{"availability": "available"}, "C2L": {"availability": "available"}, "C2M":
{"availability": "shortage"}, "C2S": {"availability": "available"}, "DEV1-L":
{"availability": "shortage"}, "DEV1-M": {"availability": "shortage"}, "DEV1-S":
{"availability": "available"}, "DEV1-XL": {"availability": "shortage"}, "GP1-L":
{"availability": "scarce"}, "C2S": {"availability": "available"}, "DEV1-L":
{"availability": "available"}, "DEV1-M": {"availability": "available"}, "DEV1-S":
{"availability": "available"}, "DEV1-XL": {"availability": "available"}, "GP1-L":
{"availability": "available"}, "GP1-M": {"availability": "available"}, "GP1-S":
{"availability": "available"}, "GP1-XL": {"availability": "available"}, "GP1-XS":
{"availability": "available"}, "RENDER-S": {"availability": "available"}, "START1-L":
{"availability": "shortage"}, "START1-M": {"availability": "shortage"}, "START1-S":
{"availability": "available"}, "START1-M": {"availability": "available"}, "START1-S":
{"availability": "available"}, "START1-XS": {"availability": "available"}, "VC1L":
{"availability": "shortage"}, "VC1M": {"availability": "shortage"}, "VC1S":
{"availability": "scarce"}, "X64-120GB": {"availability": "available"}, "X64-15GB":
{"availability": "available"}, "VC1M": {"availability": "available"}, "VC1S":
{"availability": "available"}, "X64-120GB": {"availability": "available"}, "X64-15GB":
{"availability": "available"}, "X64-30GB": {"availability": "available"}, "X64-60GB":
{"availability": "available"}}}'
headers:
Cache-Control:
- no-cache
Content-Length:
- "1330"
- "1341"
Content-Security-Policy:
- default-src 'none'; frame-ancestors 'none'
Content-Type:
- application/json
Date:
- Fri, 03 Apr 2020 17:55:52 GMT
- Thu, 04 Jun 2020 13:54:41 GMT
Link:
- </products/servers/availability?page=1&per_page=50&>; rel="last"
Server:
- scaleway_api
- agw_listener_public_anycast
Strict-Transport-Security:
- max-age=63072000
X-Content-Type-Options:
- nosniff
X-Frame-Options:
- DENY
X-Request-Id:
- 47a8d037-b2fc-4bcc-b065-8f0684f9a463
X-Total-Count:
- "32"
status: 200 OK
Expand Down
33 changes: 11 additions & 22 deletions ...rnal/namespaces/instance/v1/testdata/test-server-type-list-server-type-list.stdout.golden
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,22 +1,11 @@
NAME MONTHLY PRICE HOURLY PRICE LOCAL VOLUME SIZE CPU GPU RAM ARCH AVAILABILITY
ARM64-2GB € 2.99 € 0.006 50 GB 4 2.0 GiB arm64 low stock
ARM64-4GB € 5.99 € 0.012 100 GB 6 4.0 GiB arm64 out of stock
ARM64-8GB € 11.99 € 0.024 200 GB 8 8.0 GiB arm64 out of stock
ARM64-16GB € 34.99 € 0.07 200 GB 16 16 GiB arm64 out of stock
ARM64-32GB € 69.99 € 0.14 300 GB 32 32 GiB arm64 out of stock
ARM64-64GB € 139.99 € 0.28 400 GB 48 64 GiB arm64 out of stock
ARM64-128GB € 279.99 € 0.56 500 GB 64 128 GiB arm64 out of stock
C1 € 2.99 € 0.006 50 GB 4 2.0 GiB arm available
C2L € 23.99 € 0.048 50 GB 8 32 GiB x86_64 available
C2M € 17.99 € 0.036 50 GB 8 16 GiB x86_64 out of stock
C2S € 11.99 € 0.024 50 GB 4 8.0 GiB x86_64 available
DEV1-S € 2.99 € 0.006 20 GB 2 2.0 GiB x86_64 available
DEV1-M € 7.99 € 0.016 40 GB 3 4.0 GiB x86_64 out of stock
DEV1-L € 15.99 € 0.032 80 GB 4 8.0 GiB x86_64 out of stock
DEV1-XL € 23.99 € 0.048 120 GB 4 12 GiB x86_64 out of stock
GP1-XS € 39.00 € 0.078 150 GB 4 16 GiB x86_64 available
GP1-S € 79.00 € 0.158 300 GB 8 32 GiB x86_64 available
GP1-M € 159.00 € 0.318 600 GB 16 64 GiB x86_64 available
GP1-L € 299.00 € 0.598 600 GB 32 128 GiB x86_64 available
GP1-XL € 569.00 € 1.138 600 GB 48 256 GiB x86_64 available
RENDER-S € 499.99 € 1.00 400 GB 10 1 45 GiB x86_64 available
NAME MONTHLY PRICE HOURLY PRICE LOCAL VOLUME SIZE CPU GPU RAM ARCH AVAILABILITY
DEV1-S € 2.99 € 0.006 20 GB 2 2.0 GiB x86_64 available
DEV1-M € 7.99 € 0.016 40 GB 3 4.0 GiB x86_64 available
DEV1-L € 15.99 € 0.032 80 GB 4 8.0 GiB x86_64 available
DEV1-XL € 23.99 € 0.048 120 GB 4 12 GiB x86_64 available
GP1-XS € 39.00 € 0.078 150 GB 4 16 GiB x86_64 available
GP1-S € 79.00 € 0.158 300 GB 8 32 GiB x86_64 available
GP1-M € 159.00 € 0.318 600 GB 16 64 GiB x86_64 available
GP1-L € 299.00 € 0.598 600 GB 32 128 GiB x86_64 available
GP1-XL € 569.00 € 1.138 600 GB 48 256 GiB x86_64 available
RENDER-S € 499.99 € 1.00 400 GB 10 1 45 GiB x86_64 available