-
Notifications
You must be signed in to change notification settings - Fork 56
feat(instance): add a WaitForImage method #381
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.
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
Changes from all commits
Commits
Show all changes
8 commits
Select commit
Hold shift + click to select a range
df0745c
feat(instance): add a wait for image
jerome-quere 3a9458f
fix
jerome-quere c6e0a6e
fix
jerome-quere b75dc46
fix
jerome-quere 24f3087
fix
jerome-quere f1023ad
address comment
jerome-quere 8f6ff8e
address comment
jerome-quere 1cef070
fix
jerome-quere File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,50 @@ | ||
| package instance | ||
|
|
||
| import ( | ||
| "time" | ||
|
|
||
| "github.com/scaleway/scaleway-sdk-go/internal/async" | ||
| "github.com/scaleway/scaleway-sdk-go/internal/errors" | ||
| "github.com/scaleway/scaleway-sdk-go/scw" | ||
| ) | ||
|
|
||
| // WaitForImageRequest is used by WaitForImage method. | ||
| type WaitForImageRequest struct { | ||
| ImageID string | ||
| Zone scw.Zone | ||
| Timeout time.Duration | ||
| } | ||
|
|
||
| // WaitForImage wait for the image to be in a "terminal state" before returning. | ||
| func (s *API) WaitForImage(req *WaitForImageRequest) (*Image, error) { | ||
| if req.Timeout == 0 { | ||
| req.Timeout = defaultTimeout | ||
| } | ||
|
|
||
| terminalStatus := map[ImageState]struct{}{ | ||
| ImageStateAvailable: {}, | ||
| ImageStateError: {}, | ||
| } | ||
|
|
||
| image, err := async.WaitSync(&async.WaitSyncConfig{ | ||
| Get: func() (interface{}, bool, error) { | ||
| res, err := s.GetImage(&GetImageRequest{ | ||
| ImageID: req.ImageID, | ||
| Zone: req.Zone, | ||
| }) | ||
|
|
||
| if err != nil { | ||
| return nil, false, err | ||
| } | ||
| _, isTerminal := terminalStatus[res.Image.State] | ||
|
|
||
| return res.Image, isTerminal, err | ||
| }, | ||
| Timeout: req.Timeout, | ||
| IntervalStrategy: async.LinearIntervalStrategy(RetryInterval), | ||
| }) | ||
| if err != nil { | ||
| return nil, errors.Wrap(err, "waiting for image failed") | ||
| } | ||
| return image.(*Image), nil | ||
| } | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,80 @@ | ||
| package instance | ||
|
|
||
| import ( | ||
| "strings" | ||
| "testing" | ||
|
|
||
| "github.com/scaleway/scaleway-sdk-go/internal/testhelpers" | ||
| "github.com/scaleway/scaleway-sdk-go/internal/testhelpers/httprecorder" | ||
| ) | ||
|
|
||
| func TestWaitForImage(t *testing.T) { | ||
| client, r, err := httprecorder.CreateRecordedScwClient("image-wait-test") | ||
| testhelpers.AssertNoError(t, err) | ||
| defer func() { | ||
| testhelpers.AssertNoError(t, r.Stop()) // Make sure recorder is stopped once done with it | ||
| }() | ||
|
|
||
| instanceAPI := NewAPI(client) | ||
| imageName := "backup" | ||
| image, cleanup := createImage(t, instanceAPI, imageName) | ||
| defer cleanup() | ||
|
|
||
| res, err := instanceAPI.WaitForImage(&WaitForImageRequest{ | ||
| ImageID: image.ID, | ||
| }) | ||
|
|
||
| testhelpers.AssertNoError(t, err) | ||
| testhelpers.Equals(t, image.ID, res.ID) | ||
| testhelpers.Equals(t, ImageStateAvailable, res.State) | ||
| testhelpers.Equals(t, imageName, res.Name) | ||
| } | ||
|
|
||
| // createImage cis a helper that create an image. | ||
| // It return the newly created image and a cleanup function | ||
| func createImage(t *testing.T, instanceAPI *API, imageName string) (*Image, func()) { | ||
| serverRes, err := instanceAPI.CreateServer(&CreateServerRequest{ | ||
| CommercialType: "DEV1-M", | ||
| Image: "ubuntu-bionic", | ||
| }) | ||
| testhelpers.AssertNoError(t, err) | ||
|
|
||
| // Backup will create a snapshot for each volume + an image base on all snapshots. | ||
| backupRes, err := instanceAPI.ServerAction(&ServerActionRequest{ | ||
| ServerID: serverRes.Server.ID, | ||
| Action: ServerActionBackup, | ||
| Name: &imageName, | ||
| }) | ||
| testhelpers.AssertNoError(t, err) | ||
|
|
||
| tmp := strings.Split(backupRes.Task.HrefResult, "/") | ||
| imageID := tmp[2] | ||
| imageRes, err := instanceAPI.GetImage(&GetImageRequest{ | ||
| ImageID: imageID, | ||
| }) | ||
| testhelpers.AssertNoError(t, err) | ||
|
|
||
| return imageRes.Image, func() { | ||
| // Delete all created resources | ||
|
|
||
| err := instanceAPI.DeleteServer(&DeleteServerRequest{ | ||
| ServerID: serverRes.Server.ID, | ||
| }) | ||
| testhelpers.AssertNoError(t, err) | ||
|
|
||
| err = instanceAPI.DeleteVolume(&DeleteVolumeRequest{ | ||
| VolumeID: serverRes.Server.Volumes["0"].ID, | ||
| }) | ||
| testhelpers.AssertNoError(t, err) | ||
|
|
||
| err = instanceAPI.DeleteImage(&DeleteImageRequest{ | ||
| ImageID: imageRes.Image.ID, | ||
| }) | ||
| testhelpers.AssertNoError(t, err) | ||
|
|
||
| err = instanceAPI.DeleteSnapshot(&DeleteSnapshotRequest{ | ||
| SnapshotID: imageRes.Image.RootVolume.ID, | ||
| }) | ||
| testhelpers.AssertNoError(t, err) | ||
| } | ||
| } |
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I know instance doesn't use pointers here, but shouldn't it be better?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I want to stay consistent with
WaitForServer