fix(instance): let the backend resolve marketplace images

api/instance/v1/instance_sdk.go

@@ -4400,9 +4400,9 @@ func (s *API) ListServers(req *ListServersRequest, opts ...scw.RequestOption) (*
 	return &resp, nil
 }
 
-// createServer: Create a new Instance of the specified commercial type in the specified zone. Pay attention to the volumes parameter, which takes an object which can be used in different ways to achieve different behaviors.
+// CreateServer: Create a new Instance of the specified commercial type in the specified zone. Pay attention to the volumes parameter, which takes an object which can be used in different ways to achieve different behaviors.
 // Get more information in the [Technical Information](#technical-information) section of the introduction.
-func (s *API) createServer(req *CreateServerRequest, opts ...scw.RequestOption) (*CreateServerResponse, error) {
+func (s *API) CreateServer(req *CreateServerRequest, opts ...scw.RequestOption) (*CreateServerResponse, error) {
 	var err error
 
 	if req.Zone == "" {

api/instance/v1/instance_sdk_server_test.go

@@ -8,6 +8,31 @@ import (
 	"github.com/scaleway/scaleway-sdk-go/scw"
 )
 
+func TestAPI_CreateServer(t *testing.T) {
+	client, r, err := httprecorder.CreateRecordedScwClient("create-server")
+	testhelpers.AssertNoError(t, err)
+	defer func() {
+		testhelpers.AssertNoError(t, r.Stop()) // Make sure recorder is stopped once done with it
+	}()
+
+	instanceAPI := NewAPI(client)
+
+	res, err := instanceAPI.CreateServer(&CreateServerRequest{
+		Zone:           scw.ZoneFrPar1,
+		CommercialType: "GP1-XS",
+		Image:          scw.StringPtr("ubuntu_focal"),
+	})
+
+	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, "9c41e95b-add2-4ef8-b1b1-af8899748eda", res.Server.Image.ID)
+	err = instanceAPI.DeleteServer(&DeleteServerRequest{
+		Zone:     scw.ZoneFrPar1,
+		ServerID: res.Server.ID,
+	})
+	testhelpers.AssertNoError(t, err)
+}
+
 func TestServerUpdate(t *testing.T) {
 	client, r, err := httprecorder.CreateRecordedScwClient("server-test")
 	testhelpers.AssertNoError(t, err)

api/instance/v1/server_utils.go

@@ -7,37 +7,16 @@ import (
 	"net/http"
 	"time"
 
-	"github.com/scaleway/scaleway-sdk-go/api/marketplace/v2"
 	"github.com/scaleway/scaleway-sdk-go/errors"
 	"github.com/scaleway/scaleway-sdk-go/internal/async"
 	"github.com/scaleway/scaleway-sdk-go/scw"
-	"github.com/scaleway/scaleway-sdk-go/validation"
 )
 
 const (
 	defaultTimeout       = 5 * time.Minute
 	defaultRetryInterval = 5 * time.Second
 )
 
-// CreateServer creates a server.
-func (s *API) CreateServer(req *CreateServerRequest, opts ...scw.RequestOption) (*CreateServerResponse, error) {
-	// If image is not a UUID we try to fetch it from marketplace.
-	if req.Image != nil && !validation.IsUUID(*req.Image) {
-		apiMarketplace := marketplace.NewAPI(s.client)
-		image, err := apiMarketplace.GetLocalImageByLabel(&marketplace.GetLocalImageByLabelRequest{
-			ImageLabel:     *req.Image,
-			Zone:           req.Zone,
-			CommercialType: req.CommercialType,
-		})
-		if err != nil {
-			return nil, err
-		}
-		req.Image = scw.StringPtr(image.ID)
-	}
-
-	return s.createServer(req, opts...)
-}
-
 // UpdateServer updates a server.
 //
 // Note: Implementation is thread-safe.

api/instance/v1/server_utils_test.go

@@ -141,28 +141,3 @@ func TestAPI_AllServerUserData(t *testing.T) {
 		}
 	}
 }
-
-func TestAPI_CreateServer(t *testing.T) {
-	client, r, err := httprecorder.CreateRecordedScwClient("create-server")
-	testhelpers.AssertNoError(t, err)
-	defer func() {
-		testhelpers.AssertNoError(t, r.Stop()) // Make sure recorder is stopped once done with it
-	}()
-
-	instanceAPI := NewAPI(client)
-
-	res, err := instanceAPI.CreateServer(&CreateServerRequest{
-		Zone:           scw.ZoneFrPar1,
-		CommercialType: "GP1-XS",
-		Image:          scw.StringPtr("ubuntu_focal"),
-	})
-
-	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, "9c41e95b-add2-4ef8-b1b1-af8899748eda", res.Server.Image.ID)
-	err = instanceAPI.DeleteServer(&DeleteServerRequest{
-		Zone:     scw.ZoneFrPar1,
-		ServerID: res.Server.ID,
-	})
-	testhelpers.AssertNoError(t, err)
-}