Skip to content

fix(server_create): pass down error on bad image label #2370

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
Monitob merged 2 commits into from
Jun 24, 2022
Merged

fix(server_create): pass down error on bad image label #2370

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
5d9b0b9
fix(instance): pass down error on bad image label for server create c…
Codelax Jun 24, 2022
3a76e03
update goldens
Codelax Jun 24, 2022
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
2 changes: 1 addition & 1 deletion internal/namespaces/instance/v1/custom_server_create.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -231,7 +231,7 @@ func instanceServerCreateRun(ctx context.Context, argsI interface{}) (i interfac
CommercialType: serverReq.CommercialType,
})
if err != nil {
return nil, fmt.Errorf("bad image label '%s' for %s", args.Image, serverReq.CommercialType)
return nil, err
}
serverReq.Image = imageID
default:
Expand Down
4 changes: 2 additions & 2 deletions ...amespaces/instance/v1/testdata/test-create-server-errors-error-invalid-image-label.golden
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
🎲🎲🎲 EXIT CODE: 1 🎲🎲🎲
🟥🟥🟥 STDERR️️ 🟥🟥🟥️
Bad image label 'macos' for DEV1-S
Scaleway-sdk-go: couldn't find a matching image for the given label (macos), zone (fr-par-1) and commercial type (DEV1-S)
🟥🟥🟥 JSON STDERR 🟥🟥🟥
{
"error": "bad image label 'macos' for DEV1-S"
"error": "scaleway-sdk-go: couldn't find a matching image for the given label (macos), zone (fr-par-1) and commercial type (DEV1-S)"
}
4 changes: 2 additions & 2 deletions ...espaces/instance/v1/testdata/test-create-server-errors-error-invalid-instance-type.golden
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
🎲🎲🎲 EXIT CODE: 1 🎲🎲🎲
🟥🟥🟥 STDERR️️ 🟥🟥🟥️
Bad image label 'ubuntu_bionic' for MACBOOK1-S
Scaleway-sdk-go: couldn't find a matching image for the given label (ubuntu_bionic), zone (fr-par-1) and commercial type (MACBOOK1-S): couldn't find compatible local image for this image version (47d38b1a-71a9-4f29-80bc-2dbb7bda7f9f)
🟥🟥🟥 JSON STDERR 🟥🟥🟥
{
"error": "bad image label 'ubuntu_bionic' for MACBOOK1-S"
"error": "scaleway-sdk-go: couldn't find a matching image for the given label (ubuntu_bionic), zone (fr-par-1) and commercial type (MACBOOK1-S): couldn't find compatible local image for this image version (47d38b1a-71a9-4f29-80bc-2dbb7bda7f9f)"
}