instance: handle image label in CreateServer

Author: jerome-quere

api/instance/v1/instance_sdk.go

@@ -1429,7 +1429,7 @@ func (r *ListServersResponse) UnsafeAppend(res interface{}) (int, scw.SdkError)
 	return len(results.Servers), nil
 }
 
-type CreateServerRequest struct {
+type createServerRequest struct {
 	Zone scw.Zone `json:"-"`
 	// Name display the server name
 	Name string `json:"name,omitempty"`
@@ -1455,8 +1455,8 @@ type CreateServerRequest struct {
 	ComputeCluster string `json:"compute_cluster,omitempty"`
 }
 
-// CreateServer create server
-func (s *API) CreateServer(req *CreateServerRequest, opts ...scw.RequestOption) (*CreateServerResponse, error) {
+// createServer create server
+func (s *API) createServer(req *createServerRequest, opts ...scw.RequestOption) (*CreateServerResponse, error) {
 	var err error
 
 	if req.Organization == "" {

api/instance/v1/server_utils.go

@@ -7,22 +7,46 @@ import (
 	"net/http"
 	"time"
 
+	"github.com/scaleway/scaleway-sdk-go/api/marketplace/v1"
 	"github.com/scaleway/scaleway-sdk-go/internal/async"
 	"github.com/scaleway/scaleway-sdk-go/internal/errors"
+	"github.com/scaleway/scaleway-sdk-go/internal/uuid"
 	"github.com/scaleway/scaleway-sdk-go/scw"
 )
 
 type UpdateServerRequest updateServerRequest
 
-// UpdateServer updates a server
+type CreateServerRequest createServerRequest
+
+// 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 !uuid.IsUUID(req.Image) {
+		apiMarketplace := marketplace.NewAPI(s.client)
+		imageId, err := apiMarketplace.GetLocalImageIDByLabel(&marketplace.GetLocalImageIDByLabelRequest{
+			ImageLabel:     req.Image,
+			Zone:           req.Zone,
+			CommercialType: req.CommercialType,
+		})
+		if err != nil {
+			return nil, err
+		}
+		req.Image = imageId
+	}
+
+	return s.createServer((*createServerRequest)(req), opts...)
+}
+
+// UpdateServer updates a server.
 //
 // Note: Implementation is thread-safe.
 func (s *API) UpdateServer(req *UpdateServerRequest, opts ...scw.RequestOption) (*UpdateServerResponse, error) {
 	defer lockServer(req.Zone, req.ServerID).Unlock()
 	return s.updateServer((*updateServerRequest)(req), opts...)
 }
 
-// waitForServerRequest is used by waitForServer method
+// waitForServerRequest is used by waitForServer method.
 type waitForServerRequest struct {
 	ServerID string
 	Zone     scw.Zone
@@ -63,7 +87,7 @@ func (s *API) waitForServer(req *waitForServerRequest) (*Server, scw.SdkError) {
 	return server.(*Server), nil
 }
 
-// ServerActionAndWaitRequest is used by ServerActionAndWait method
+// ServerActionAndWaitRequest is used by ServerActionAndWait method.
 type ServerActionAndWaitRequest struct {
 	ServerID string
 	Zone     scw.Zone

api/instance/v1/server_utils_test.go

@@ -145,3 +145,28 @@ 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:          "ubuntu-bionic",
+	})
+
+	testhelpers.AssertNoError(t, err)
+	// this UUID might change when running the cassette later when the image "ubuntu-bionic" got a new version
+	testhelpers.Equals(t, "f974feac-abae-4365-b988-8ec7d1cec10d", res.Server.Image.ID)
+	err = instanceAPI.DeleteServer(&DeleteServerRequest{
+		Zone:     scw.ZoneFrPar1,
+		ServerID: res.Server.ID,
+	})
+	testhelpers.AssertNoError(t, err)
+}