Skip to content

fix(instance): optional image field #4202

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
merged 2 commits into from
Oct 17, 2024
Merged

fix(instance): optional image field #4202

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
6be0302
fix(instance): optional image field
kindermoumoute Oct 17, 2024
28b6083
fix: bump dependency
kindermoumoute Oct 17, 2024
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 go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ require (
github.com/mattn/go-isatty v0.0.20
github.com/moby/buildkit v0.13.2
github.com/opencontainers/go-digest v1.0.0
github.com/scaleway/scaleway-sdk-go v1.0.0-beta.30.0.20241016074915-cfe16eadece2
github.com/scaleway/scaleway-sdk-go v1.0.0-beta.30.0.20241017133226-2eefb481a740
github.com/skratchdot/open-golang v0.0.0-20200116055534-eef842397966
github.com/spf13/cobra v1.8.1
github.com/spf13/pflag v1.0.5
Expand Down
4 changes: 2 additions & 2 deletions go.sum
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -465,8 +465,8 @@ github.com/rogpeppe/go-internal v1.11.0/go.mod h1:ddIwULY96R17DhadqLgMfk9H9tvdUz
github.com/russross/blackfriday/v2 v2.1.0/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM=
github.com/sabhiram/go-gitignore v0.0.0-20210923224102-525f6e181f06 h1:OkMGxebDjyw0ULyrTYWeN0UNCCkmCWfjPnIA2W6oviI=
github.com/sabhiram/go-gitignore v0.0.0-20210923224102-525f6e181f06/go.mod h1:+ePHsJ1keEjQtpvf9HHw0f4ZeJ0TLRsxhunSI2hYJSs=
github.com/scaleway/scaleway-sdk-go v1.0.0-beta.30.0.20241016074915-cfe16eadece2 h1:RJiIfnp9Jh35YJswV5soHKu+pKFHJkrSJlX7zyobfI4=
github.com/scaleway/scaleway-sdk-go v1.0.0-beta.30.0.20241016074915-cfe16eadece2/go.mod h1:3jrRJM7638J+P33hKy9MBvfOBxNo8pEGNQQoIv65Ihg=
github.com/scaleway/scaleway-sdk-go v1.0.0-beta.30.0.20241017133226-2eefb481a740 h1:6znLikGwSaarp3QCambwHFyYde3Qm4bcmyumsWhkZWA=
github.com/scaleway/scaleway-sdk-go v1.0.0-beta.30.0.20241017133226-2eefb481a740/go.mod h1:3jrRJM7638J+P33hKy9MBvfOBxNo8pEGNQQoIv65Ihg=
github.com/sclevine/spec v1.4.0 h1:z/Q9idDcay5m5irkZ28M7PtQM4aOISzOpj4bUPkDee8=
github.com/sclevine/spec v1.4.0/go.mod h1:LvpgJaFyvQzRvc1kaDs0bulYwzC70PbiYjC4QnFHkOM=
github.com/secure-systems-lab/go-securesystemslib v0.8.0 h1:mr5An6X45Kb2nddcFlbmfHkLguCE9laoZCUzEEpIZXA=
Expand Down
4 changes: 2 additions & 2 deletions internal/namespaces/instance/v1/custom_server_create_builder.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -171,11 +171,11 @@ func (sb *ServerBuilder) AddImage(image string) (*ServerBuilder, error) {
image = localImage.ID
}

sb.createReq.Image = image
sb.createReq.Image = &image

getImageResponse, err := sb.apiInstance.GetImage(&instance.GetImageRequest{
Zone: sb.createReq.Zone,
ImageID: sb.createReq.Image,
ImageID: *(sb.createReq.Image),
})
if err != nil {
logger.Warningf("cannot get image %s: %s", sb.createReq.Image, err)
Expand Down
Loading