Skip to content
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

chore: remove deprecated marketplace/v1 #2020

Merged
merged 4 commits into from
Mar 14, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
6 changes: 3 additions & 3 deletions api/instance/v1/server_utils.go
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import (
"net/http"
"time"

"github.com/scaleway/scaleway-sdk-go/api/marketplace/v1"
"github.com/scaleway/scaleway-sdk-go/api/marketplace/v2"
"github.com/scaleway/scaleway-sdk-go/internal/async"
"github.com/scaleway/scaleway-sdk-go/internal/errors"
"github.com/scaleway/scaleway-sdk-go/scw"
Expand All @@ -24,15 +24,15 @@ func (s *API) CreateServer(req *CreateServerRequest, opts ...scw.RequestOption)
// If image is not a UUID we try to fetch it from marketplace.
if req.Image != "" && !validation.IsUUID(req.Image) {
apiMarketplace := marketplace.NewAPI(s.client)
imageID, err := apiMarketplace.GetLocalImageIDByLabel(&marketplace.GetLocalImageIDByLabelRequest{
image, err := apiMarketplace.GetLocalImageByLabel(&marketplace.GetLocalImageByLabelRequest{
ImageLabel: req.Image,
Zone: req.Zone,
CommercialType: req.CommercialType,
})
if err != nil {
return nil, err
}
req.Image = imageID
req.Image = image.ID
}

return s.createServer(req, opts...)
Expand Down
2 changes: 1 addition & 1 deletion api/instance/v1/server_utils_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -162,7 +162,7 @@ func TestAPI_CreateServer(t *testing.T) {

testhelpers.AssertNoError(t, err)
// this UUID might change when running the cassette later when the image "ubuntu_focal" got a new version
testhelpers.Equals(t, "365a8b9c-0c6e-4875-a887-dc3213db9e20", res.Server.Image.ID)
testhelpers.Equals(t, "1bed752e-f775-4ec2-b179-40af20ec1eec", res.Server.Image.ID)
err = instanceAPI.DeleteServer(&DeleteServerRequest{
Zone: scw.ZoneFrPar1,
ServerID: res.Server.ID,
Expand Down
745 changes: 60 additions & 685 deletions api/instance/v1/testdata/create-server.yaml

Large diffs are not rendered by default.

881 changes: 121 additions & 760 deletions api/instance/v1/testdata/image-wait-test.yaml

Large diffs are not rendered by default.

849 changes: 107 additions & 742 deletions api/instance/v1/testdata/snapshot-wait-test.yaml

Large diffs are not rendered by default.

221 changes: 0 additions & 221 deletions api/marketplace/v1/marketplace_sdk.go

This file was deleted.

93 changes: 0 additions & 93 deletions api/marketplace/v1/marketplace_utils.go

This file was deleted.

Loading
Loading