update govultr and add image_id support (#169)

Author: mamclaughlin

cmd/bareMetal.go

@@ -36,6 +36,7 @@ func BareMetal() *cobra.Command {
 
 	bareMetalCmd.AddCommand(
 		BareMetalApp(),
+		BareMetalImage(),
 		bareMetalBandwidth,
 		bareMetalCreate,
 		bareMetalDelete,
@@ -64,6 +65,7 @@ func BareMetal() *cobra.Command {
 	bareMetalCreate.Flags().StringP("label", "l", "", "(optional) The label to assign to the server.")
 	bareMetalCreate.Flags().StringSliceP("ssh", "k", []string{}, "(optional) Comma separated list of SSH key IDs that will be added to the server.")
 	bareMetalCreate.Flags().IntP("app", "a", 0, "(optional) ID of the application that will be installed on the server.")
+	bareMetalCreate.Flags().StringP("image", "", "", "(optional) Image ID of the application that will be installed on the server.")
 	bareMetalCreate.Flags().StringP("userdata", "u", "", "(optional) A generic data store, which some provisioning tools and cloud operating systems use as a configuration file.")
 	bareMetalCreate.Flags().StringP("notify", "n", "", "(optional) Whether an activation email will be sent when the server is ready. Possible values: 'yes', 'no'. Defaults to 'yes'.")
 	bareMetalCreate.Flags().StringP("hostname", "m", "", "(optional) The hostname to assign to the server.")
@@ -103,6 +105,7 @@ var bareMetalCreate = &cobra.Command{
 		tag, _ := cmd.Flags().GetString("tag")
 		ripv4, _ := cmd.Flags().GetString("ripv4")
 		pxe, _ := cmd.Flags().GetBool("persistent_pxe")
+		image, _ := cmd.Flags().GetString("image")
 
 		options := &govultr.BareMetalCreate{
 			StartupScriptID: script,
@@ -116,6 +119,7 @@ var bareMetalCreate = &cobra.Command{
 			OsID:            osID,
 			Region:          region,
 			AppID:           app,
+			ImageID:         image,
 			PersistentPxe:   govultr.BoolToBoolPtr(pxe),
 		}
 
@@ -131,7 +135,7 @@ var bareMetalCreate = &cobra.Command{
 			options.EnableIPv6 = govultr.BoolToBoolPtr(true)
 		}
 
-		osOptions := map[string]interface{}{"app_id": app, "snapshot_id": snapshot, "os_id": osID}
+		osOptions := map[string]interface{}{"app_id": app, "snapshot_id": snapshot, "os_id": osID, "image_id": image}
 		osOption, err := optionCheckBM(osOptions)
 
 		if err != nil {
@@ -141,7 +145,7 @@ var bareMetalCreate = &cobra.Command{
 
 		// If no osOptions were selected and osID has a real value then set the osOptions to os_id
 		if osOption == "" && osID == 0 {
-			fmt.Printf("error creating bare metal server : an app, snapshot, or os ID must be provided\n")
+			fmt.Printf("error creating bare metal server : an app, image, snapshot, or os ID must be provided\n")
 			os.Exit(1)
 		}
 

cmd/bareMetalImage.go

@@ -0,0 +1,64 @@
+// Copyright © 2019 The Vultr-cli Authors
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package cmd
+
+import (
+	"context"
+	"errors"
+	"fmt"
+	"os"
+
+	"github.com/spf13/cobra"
+	"github.com/vultr/govultr/v2"
+)
+
+// BareMetalImage represents the baremetal image commands
+func BareMetalImage() *cobra.Command {
+	bareMetalImageCmd := &cobra.Command{
+		Use:     "image",
+		Short:   "image is used to access bare metal server image commands",
+		Aliases: []string{"i"},
+	}
+
+	bareMetalImageCmd.AddCommand(bareMetalImageChange, bareMetalAppChangeList)
+
+	return bareMetalImageCmd
+}
+
+var bareMetalImageChange = &cobra.Command{
+	Use:     "change <bareMetalID> <imageID>",
+	Short:   "Change a bare metal server's application",
+	Aliases: []string{"c"},
+	Args: func(cmd *cobra.Command, args []string) error {
+		if len(args) < 2 {
+			return errors.New("please provide a bareMetalID and imageID")
+		}
+		return nil
+	},
+	Run: func(cmd *cobra.Command, args []string) {
+		imageID := args[1]
+		options := &govultr.BareMetalUpdate{
+			ImageID: imageID,
+		}
+
+		_, err := client.BareMetalServer.Update(context.TODO(), args[0], options)
+		if err != nil {
+			fmt.Printf("%v\n", err)
+			os.Exit(1)
+		}
+
+		fmt.Println("bare metal server's application changed")
+	},
+}

cmd/instance.go

@@ -69,6 +69,7 @@ func Instance() *cobra.Command {
 	instanceCreate.Flags().StringArrayP("ssh-keys", "s", []string{}, "ssh keys you want to assign to the instance")
 	instanceCreate.Flags().BoolP("auto-backup", "b", false, "enable auto backups | true or false")
 	instanceCreate.Flags().IntP("app", "a", 0, "application ID you want this instance to have")
+	instanceCreate.Flags().StringP("image", "", "", "(optional) image ID of the application that will be installed on the server.")
 	instanceCreate.Flags().StringP("userdata", "u", "", "plain text userdata you want to give this instance which the CLI will base64 encode")
 	instanceCreate.Flags().BoolP("notify", "n", true, "notify when instance has been created | true or false")
 	instanceCreate.Flags().BoolP("ddos", "d", false, "enable ddos protection | true or false")
@@ -109,6 +110,17 @@ func Instance() *cobra.Command {
 	appUpdate.MarkFlagRequired("app")
 	instanceCmd.AddCommand(appCMD)
 
+	// Sub commands for Image
+	imageCMD := &cobra.Command{
+		Use:   "image",
+		Short: "update image for an instance",
+		Long:  ``,
+	}
+	imageCMD.AddCommand(imageUpdate, appUpdateList)
+	imageUpdate.Flags().StringP("image", "", "", "application image ID you wish to use")
+	imageUpdate.MarkFlagRequired("image")
+	instanceCmd.AddCommand(imageCMD)
+
 	// Sub commands for Backup
 	backupCMD := &cobra.Command{
 		Use:   "backup",
@@ -538,6 +550,33 @@ var osUpdateList = &cobra.Command{
 	},
 }
 
+var imageUpdate = &cobra.Command{
+	Use:   "change <instanceID>",
+	Short: "changes application",
+	Long:  ``,
+	Args: func(cmd *cobra.Command, args []string) error {
+		if len(args) < 1 {
+			return errors.New("please provide an instanceID")
+		}
+		return nil
+	},
+	Run: func(cmd *cobra.Command, args []string) {
+		id := args[0]
+		imageID, _ := cmd.Flags().GetString("image")
+
+		options := &govultr.InstanceUpdateReq{
+			ImageID: imageID,
+		}
+
+		if err := client.Instance.Update(context.TODO(), id, options); err != nil {
+			fmt.Printf("error updating application : %v\n", err)
+			os.Exit(1)
+		}
+
+		fmt.Println("Updated Application")
+	},
+}
+
 var appUpdate = &cobra.Command{
 	Use:   "change <instanceID>",
 	Short: "changes application",
@@ -992,6 +1031,7 @@ var instanceCreate = &cobra.Command{
 		ssh, _ := cmd.Flags().GetStringArray("ssh-keys")
 		backup, _ := cmd.Flags().GetBool("auto-backup")
 		app, _ := cmd.Flags().GetInt("app")
+		image, _ := cmd.Flags().GetString("image")
 		userData, _ := cmd.Flags().GetString("userdata")
 		notify, _ := cmd.Flags().GetBool("notify")
 		ddos, _ := cmd.Flags().GetBool("ddos")
@@ -1000,7 +1040,7 @@ var instanceCreate = &cobra.Command{
 		tag, _ := cmd.Flags().GetString("tag")
 		fwg, _ := cmd.Flags().GetString("firewall-group")
 
-		osOptions := map[string]interface{}{"iso_id": iso, "os_id": osID, "app_id": app, "snapshot_id": snapshot}
+		osOptions := map[string]interface{}{"iso_id": iso, "os_id": osID, "app_id": app, "snapshot_id": snapshot, "image_id": image}
 
 		if iso != "" {
 			osOptions["iso_id"] = iso
@@ -1033,13 +1073,14 @@ var instanceCreate = &cobra.Command{
 			ActivationEmail:      govultr.BoolToBoolPtr(false),
 			Backups:              "disabled",
 			EnablePrivateNetwork: govultr.BoolToBoolPtr(false),
+			ImageID:              image,
 		}
 
 		// If no osOptions were selected and osID has a real value then set the osOptions to os_id
 		if osOption == "os_id" && osID != 0 {
 			opt.OsID = osID
 		} else if osOption == "" && osID == 0 {
-			fmt.Printf("error creating instance: an os_id, snapshot_id, iso_id, or app_id must be provided\n")
+			fmt.Printf("error creating instance: an os_id, image_id, snapshot_id, iso_id, or app_id must be provided\n")
 			os.Exit(1)
 		}
 

cmd/printer/application.go

@@ -5,10 +5,10 @@ import (
 )
 
 func Application(apps []govultr.Application, meta *govultr.Meta) {
-	col := columns{"ID", "NAME", "SHORT NAME", "DEPLOY NAME"}
+	col := columns{"ID", "NAME", "SHORT NAME", "DEPLOY NAME", "TYPE", "VENDOR", "IMAGE ID"}
 	display(col)
 	for _, a := range apps {
-		display(columns{a.ID, a.Name, a.ShortName, a.DeployName})
+		display(columns{a.ID, a.Name, a.ShortName, a.DeployName, a.Type, a.Vendor, a.ImageID})
 	}
 
 	Meta(meta)

cmd/printer/instance.go

@@ -87,10 +87,10 @@ func OsList(os []govultr.OS) {
 }
 
 func AppList(app []govultr.Application) {
-	col := columns{"ID", "NAME", "SHORT NAME", "DEPLOY NAME"}
+	col := columns{"ID", "NAME", "SHORT NAME", "DEPLOY NAME", "TYPE", "VENDOR", "IMAGE ID"}
 	display(col)
 	for _, a := range app {
-		display(columns{a.ID, a.Name, a.ShortName, a.DeployName})
+		display(columns{a.ID, a.Name, a.ShortName, a.DeployName, a.Type, a.Vendor, a.ImageID})
 	}
 	flush()
 }

go.mod

@@ -3,8 +3,9 @@ module github.com/vultr/vultr-cli
 go 1.16
 
 require (
+	github.com/hashicorp/go-cleanhttp v0.5.2 // indirect
 	github.com/spf13/cobra v1.2.1
 	github.com/spf13/viper v1.8.1
-	github.com/vultr/govultr/v2 v2.6.0
+	github.com/vultr/govultr/v2 v2.7.1
 	golang.org/x/oauth2 v0.0.0-20210402161424-2e8d93401602
 )

go.sum

@@ -148,6 +148,8 @@ github.com/hashicorp/consul/sdk v0.1.1/go.mod h1:VKf9jXwCTEY1QZP2MOLRhb5i/I/ssyN
 github.com/hashicorp/errwrap v1.0.0/go.mod h1:YH+1FKiLXxHSkmPseP+kNlulaMuP3n2brvKWEqk/Jc4=
 github.com/hashicorp/go-cleanhttp v0.5.1 h1:dH3aiDG9Jvb5r5+bYHsikaOUIpcM0xvgMXVoDkXMzJM=
 github.com/hashicorp/go-cleanhttp v0.5.1/go.mod h1:JpRdi6/HCYpAwUzNwuwqhbovhLtngrth3wmdIIUrZ80=
+github.com/hashicorp/go-cleanhttp v0.5.2 h1:035FKYIWjmULyFRBKPs8TBQoi0x6d9G4xc9neXJWAZQ=
+github.com/hashicorp/go-cleanhttp v0.5.2/go.mod h1:kO/YDlP8L1346E6Sodw+PrpBSV4/SoxCXGY6BqNFT48=
 github.com/hashicorp/go-hclog v0.9.2 h1:CG6TE5H9/JXsFWJCfoIVpKFIkFe6ysEuHirp4DxCsHI=
 github.com/hashicorp/go-hclog v0.9.2/go.mod h1:5CU+agLiy3J7N7QjHK5d05KxGsuXiQLrjA0H7acj2lQ=
 github.com/hashicorp/go-immutable-radix v1.0.0/go.mod h1:0y9vanUI8NX6FsYoO3zeMjhV/C5i9g4Q3DwcSNZ4P60=
@@ -246,6 +248,10 @@ github.com/subosito/gotenv v1.2.0 h1:Slr1R9HxAlEKefgq5jn9U+DnETlIUa6HfgEzj0g5d7s
 github.com/subosito/gotenv v1.2.0/go.mod h1:N0PQaV/YGNqwC0u51sEeR/aUtSLEXKX9iv69rRypqCw=
 github.com/vultr/govultr/v2 v2.6.0 h1:Ev6oShSx5E0/lIapdSDdVJbOCQdKFJkcNqK2mKI68dI=
 github.com/vultr/govultr/v2 v2.6.0/go.mod h1:BvOhVe6/ZpjwcoL6/unkdQshmbS9VGbowI4QT+3DGVU=
+github.com/vultr/govultr/v2 v2.7.0 h1:Dl0PytGptFhR8S282plgt0Q3m6j/I4l+KA/JUpEanQc=
+github.com/vultr/govultr/v2 v2.7.0/go.mod h1:BvOhVe6/ZpjwcoL6/unkdQshmbS9VGbowI4QT+3DGVU=
+github.com/vultr/govultr/v2 v2.7.1 h1:uF9ERet++Gb+7Cqs3p1P6b6yebeaZqVd7t5P2uZCaJU=
+github.com/vultr/govultr/v2 v2.7.1/go.mod h1:BvOhVe6/ZpjwcoL6/unkdQshmbS9VGbowI4QT+3DGVU=
 github.com/yuin/goldmark v1.1.25/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
 github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
 github.com/yuin/goldmark v1.1.32/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=