Add ScalewayImageIdentifier

Author: Quentin Perez

pkg/api/api.go

@@ -233,6 +233,14 @@ type ScalewayImage struct {
 	// FIXME: extra_volumes
 }
 
+// ScalewayImageIdentifier represents a Scaleway Image Identifier
+type ScalewayImageIdentifier struct {
+	Identifier string
+	Arch       string
+	Region     string
+	Owner      string
+}
+
 // ScalewayOneImage represents the response of a GET /images/UUID API call
 type ScalewayOneImage struct {
 	Image ScalewayImage `json:"image,omitempty"`
@@ -1810,24 +1818,30 @@ func (s *ScalewayAPI) GetSnapshotID(needle string) (string, error) {
 }
 
 // GetImageID returns exactly one image matching or dies
-func (s *ScalewayAPI) GetImageID(needle string, exitIfMissing bool) (string, string, error) {
+func (s *ScalewayAPI) GetImageID(needle string, exitIfMissing bool) (*ScalewayImageIdentifier, error) {
 	// Parses optional type prefix, i.e: "image:name" -> "name"
 	_, needle = parseNeedle(needle)
 
 	images, err := s.ResolveImage(needle)
 	if err != nil {
-		return "", "", fmt.Errorf("Unable to resolve image %s: %s", needle, err)
+		return nil, fmt.Errorf("Unable to resolve image %s: %s", needle, err)
 	}
 	if len(images) == 1 {
-		return images[0].Identifier, images[0].Arch, nil
+		return &ScalewayImageIdentifier{
+			Identifier: images[0].Identifier,
+			Arch:       images[0].Arch,
+			// FIXME region, owner hardcoded
+			Region: "fr-1",
+			Owner:  "",
+		}, nil
 	}
 	if len(images) == 0 {
 		if exitIfMissing {
-			return "", "", fmt.Errorf("No such image: %s", needle)
+			return nil, fmt.Errorf("No such image: %s", needle)
 		}
-		return "", "", nil
+		return nil, nil
 	}
-	return "", "", showResolverResults(needle, images)
+	return nil, showResolverResults(needle, images)
 }
 
 // GetSecurityGroups returns a ScalewaySecurityGroups

pkg/api/helpers.go

@@ -349,8 +349,10 @@ func CreateServer(api *ScalewayAPI, c *ConfigCreateServer) (string, error) {
 		}
 	}
 	// FIXME build images only on ARM ?
-	archImage, imageID := "arm", ""
-
+	imageIdentifier := &ScalewayImageIdentifier{
+		Arch:   "arm",
+		Region: "fr-1",
+	}
 	server.Name = c.Name
 	inheritingVolume := false
 	_, err := humanize.ParseBytes(c.ImageName)
@@ -365,12 +367,12 @@ func CreateServer(api *ScalewayAPI, c *ConfigCreateServer) (string, error) {
 		// Use an existing image
 		// FIXME: handle snapshots
 		inheritingVolume = true
-		imageID, archImage, err = api.GetImageID(c.ImageName, false)
+		imageIdentifier, err = api.GetImageID(c.ImageName, false)
 		if err != nil {
 			return "", err
 		}
-		if imageID != "" {
-			server.Image = &imageID
+		if imageIdentifier.Identifier != "" {
+			server.Image = &imageIdentifier.Identifier
 		} else {
 			snapshotID, err := api.GetSnapshotID(c.ImageName)
 			if err != nil {
@@ -387,7 +389,7 @@ func CreateServer(api *ScalewayAPI, c *ConfigCreateServer) (string, error) {
 		}
 	}
 	if c.Bootscript != "" {
-		bootscript, err := api.GetBootscriptID(c.Bootscript, archImage)
+		bootscript, err := api.GetBootscriptID(c.Bootscript, imageIdentifier.Arch)
 		if err != nil {
 			return "", err
 		}

pkg/commands/history.go

@@ -22,17 +22,17 @@ type HistoryArgs struct {
 
 // RunHistory is the handler for 'scw history'
 func RunHistory(ctx CommandContext, args HistoryArgs) error {
-	imageID, _, err := ctx.API.GetImageID(args.Image, true)
+	imageID, err := ctx.API.GetImageID(args.Image, true)
 	if err != nil {
 		return err
 	}
-	image, err := ctx.API.GetImage(imageID)
+	image, err := ctx.API.GetImage(imageID.Identifier)
 	if err != nil {
-		return fmt.Errorf("cannot get image %s: %v", imageID, err)
+		return fmt.Errorf("cannot get image %s: %v", imageID.Identifier, err)
 	}
 
 	if args.Quiet {
-		fmt.Fprintln(ctx.Stdout, imageID)
+		fmt.Fprintln(ctx.Stdout, imageID.Identifier)
 		return nil
 	}
 

pkg/commands/ps.go

@@ -82,11 +82,11 @@ func RunPs(ctx CommandContext, args PsArgs) error {
 					goto skipServer
 				}
 			case "image":
-				imageID, _, err := ctx.API.GetImageID(value, true)
+				imageID, err := ctx.API.GetImageID(value, true)
 				if err != nil {
 					goto skipServer
 				}
-				if imageID != server.Image.Identifier {
+				if imageID.Identifier != server.Image.Identifier {
 					goto skipServer
 				}
 			case "ip":

pkg/commands/rmi.go

@@ -19,12 +19,12 @@ type RmiArgs struct {
 func RunRmi(ctx CommandContext, args RmiArgs) error {
 	hasError := false
 	for _, needle := range args.Images {
-		image, _, err := ctx.API.GetImageID(needle, true)
+		image, err := ctx.API.GetImageID(needle, true)
 		if err != nil {
 			return err
 		}
-		if err = ctx.API.DeleteImage(image); err != nil {
-			logrus.Errorf("failed to delete image %s: %s", image, err)
+		if err = ctx.API.DeleteImage(image.Identifier); err != nil {
+			logrus.Errorf("failed to delete image %s: %s", image.Identifier, err)
 			hasError = true
 		} else {
 			fmt.Fprintln(ctx.Stdout, needle)