Fix for enabling agent level backups

cmd/ecloud/ecloud_instance.go

@@ -73,7 +73,7 @@
 
 	instances, err := service.GetInstances(params)
 	if err != nil {
 		return fmt.Errorf("Error retrieving instances: %s", err)
 	}
 
 	return output.CommandOutput(cmd, OutputECloudInstancesProvider(instances))
@@ -87,7 +87,7 @@
 		Example: "ans ecloud instance show i-abcdef12",
 		Args: func(cmd *cobra.Command, args []string) error {
 			if len(args) < 1 {
 				return errors.New("Missing instance")
 			}
 
 			return nil
@@ -141,8 +141,7 @@
 	cmd.Flags().String("resource-tier", "", "ID of resource tier to deploy to. A default tier is chosen if not specified")
 	cmd.Flags().String("ip-address", "", "IP address to allocate for DHCP")
 	cmd.Flags().Bool("enable-vm-backups", false, "Enable VM-level backups")
-	cmd.Flags().Bool("enable-agent-backups", false, "Enable agent-level backups, requires a backup gateway")
-	cmd.Flags().String("backup-gateway-id", "", "Backup gateway ID, for use with agent level backups")
+	cmd.Flags().String("backup-gateway-id", "", "Backup gateway ID, enables agent-level backups")
 	cmd.Flags().Bool("wait", false, "Specifies that the command should wait until the instance has been completely created")
 
 	return cmd
@@ -157,13 +156,12 @@
 	createRequest.HostGroupID, _ = cmd.Flags().GetString("host-group")
 	createRequest.ResourceTierID, _ = cmd.Flags().GetString("resource-tier")
 	createRequest.BackupEnabled, _ = cmd.Flags().GetBool("enable-vm-backups")
-	createRequest.BackupAgentEnabled, _ = cmd.Flags().GetBool("enable-agent-backups")
 	createRequest.BackupGatewayID, _ = cmd.Flags().GetString("backup-gateway-id")
 	createRequest.Name, _ = cmd.Flags().GetString("name")
 
 	if cmd.Flags().Changed("vcpu") {
 		if cmd.Flags().Changed("vcpu-sockets") || cmd.Flags().Changed("vcpu-cores-per-socket") {
 			return fmt.Errorf("Flag --vcpu is mutually exclusive with --vcpu-sockets and --vcpu-cores-per-socket")
 		}
 		createRequest.VCPUCores, _ = cmd.Flags().GetInt("vcpu")
 	} else {
@@ -182,10 +180,6 @@
 
 	imageFlag, _ := cmd.Flags().GetString("image")
 
-	if createRequest.BackupAgentEnabled && createRequest.BackupGatewayID == "" {
-		return fmt.Errorf("A backup gateway is required to use agent-level backups, please specify a backup gateway ID")
-	}
-
 	if strings.HasPrefix(imageFlag, "img-") {
 		createRequest.ImageID = imageFlag
 	} else {
@@ -199,15 +193,15 @@
 			},
 		})
 		if err != nil {
 			return fmt.Errorf("Error retrieving images: %s", err)
 		}
 
 		if len(images) == 0 {
 			return fmt.Errorf("Image not found with name '%s'", imageFlag)
 		}
 
 		if len(images) > 1 {
 			return fmt.Errorf("Expected 1 image, got %d images", len(images))
 		}
 
 		createRequest.ImageID = images[0].ID
@@ -218,20 +212,20 @@
 
 	instanceID, err := service.CreateInstance(createRequest)
 	if err != nil {
 		return fmt.Errorf("Error creating instance: %s", err)
 	}
 
 	waitFlag, _ := cmd.Flags().GetBool("wait")
 	if waitFlag {
 		err := helper.WaitForCommand(InstanceResourceSyncStatusWaitFunc(service, instanceID, ecloud.SyncStatusComplete))
 		if err != nil {
 			return fmt.Errorf("Error waiting for instance sync: %s", err)
 		}
 	}
 
 	instance, err := service.GetInstance(instanceID)
 	if err != nil {
 		return fmt.Errorf("Error retrieving new instance: %s", err)
 	}
 
 	return output.CommandOutput(cmd, OutputECloudInstancesProvider([]ecloud.Instance{instance}))
@@ -245,7 +239,7 @@
 		Example: "ans ecloud instance update i-abcdef12 --name \"my instance\"",
 		Args: func(cmd *cobra.Command, args []string) error {
 			if len(args) < 1 {
 				return errors.New("Missing instance")
 			}
 
 			return nil
@@ -274,7 +268,7 @@
 
 	if cmd.Flags().Changed("vcpu") {
 		if cmd.Flags().Changed("vcpu-sockets") || cmd.Flags().Changed("vcpu-cores-per-socket") {
 			return fmt.Errorf("Flag --vcpu is mutually exclusive with --vcpu-sockets and --vcpu-cores-per-socket")
 		}
 		patchRequest.VCPUCores, _ = cmd.Flags().GetInt("vcpu")
 	} else {
@@ -333,7 +327,7 @@
 		Example: "ans ecloud instance delete i-abcdef12",
 		Args: func(cmd *cobra.Command, args []string) error {
 			if len(args) < 1 {
 				return errors.New("Missing instance")
 			}
 
 			return nil
@@ -374,7 +368,7 @@
 		Example: "ans ecloud instance lock i-abcdef12",
 		Args: func(cmd *cobra.Command, args []string) error {
 			if len(args) < 1 {
 				return errors.New("Missing instance")
 			}
 
 			return nil
@@ -401,7 +395,7 @@
 		Example: "ans ecloud instance unlock i-abcdef12",
 		Args: func(cmd *cobra.Command, args []string) error {
 			if len(args) < 1 {
 				return errors.New("Missing instance")
 			}
 
 			return nil
@@ -428,7 +422,7 @@
 		Example: "ans ecloud instance start i-abcdef12",
 		Args: func(cmd *cobra.Command, args []string) error {
 			if len(args) < 1 {
 				return errors.New("Missing instance")
 			}
 
 			return nil
@@ -469,7 +463,7 @@
 		Example: "ans ecloud instance stop i-abcdef12",
 		Args: func(cmd *cobra.Command, args []string) error {
 			if len(args) < 1 {
 				return errors.New("Missing instance")
 			}
 
 			return nil
@@ -523,7 +517,7 @@
 		Example: "ans ecloud instance restart i-abcdef12",
 		Args: func(cmd *cobra.Command, args []string) error {
 			if len(args) < 1 {
 				return errors.New("Missing instance")
 			}
 
 			return nil
@@ -577,7 +571,7 @@
 		Example: "ans ecloud instance ssh i-abcdef12",
 		Args: func(cmd *cobra.Command, args []string) error {
 			if len(args) < 1 {
 				return errors.New("Missing instance")
 			}
 
 			return nil
@@ -599,22 +593,22 @@
 	if internal {
 		nics, err := service.GetInstanceNICs(args[0], connection.APIRequestParameters{})
 		if err != nil {
 			return fmt.Errorf("Error retrieving instance NICs: %s", err)
 		}
 
 		if len(nics) < 1 {
 			return fmt.Errorf("No floating IPs found for instance")
 		}
 
 		ipAddress = nics[0].IPAddress
 	} else {
 		fips, err := service.GetInstanceFloatingIPs(args[0], connection.APIRequestParameters{})
 		if err != nil {
 			return fmt.Errorf("Error retrieving instance floating IPs: %s", err)
 		}
 
 		if len(fips) < 1 {
 			return fmt.Errorf("No floating IPs found for instance")
 		}
 
 		ipAddress = fips[0].IPAddress
@@ -641,7 +635,7 @@
 		Example: "ans ecloud instance migrate i-abcdef12 --resource-tier rt-abcdef12",
 		Args: func(cmd *cobra.Command, args []string) error {
 			if len(args) < 1 {
 				return errors.New("Missing instance")
 			}
 
 			return nil
@@ -699,7 +693,7 @@
 		Example: "ans ecloud instance encrypt i-abcdef12",
 		Args: func(cmd *cobra.Command, args []string) error {
 			if len(args) < 1 {
 				return errors.New("Missing instance")
 			}
 
 			return nil
@@ -739,7 +733,7 @@
 		Example: "ans ecloud instance decrypt i-abcdef12",
 		Args: func(cmd *cobra.Command, args []string) error {
 			if len(args) < 1 {
 				return errors.New("Missing instance")
 			}
 
 			return nil
@@ -789,7 +783,7 @@
 			case *ecloud.InstanceNotFoundError:
 				return true, nil
 			default:
 				return false, fmt.Errorf("Failed to retrieve instance [%s]: %s", instanceID, err)
 			}
 		}
 

cmd/ecloud/ecloud_vpnprofilegroup.go

@@ -14,7 +14,7 @@
 func ecloudVPNProfileGroupRootCmd(f factory.ClientFactory) *cobra.Command {
 	cmd := &cobra.Command{
 		Use:   "vpnprofilegroup",
-		Short: "sub-commands relating to VPN sessions",
+		Short: "sub-commands relating to VPN profile groups",
 	}
 
 	// Child commands
@@ -27,8 +27,8 @@
 func ecloudVPNProfileGroupListCmd(f factory.ClientFactory) *cobra.Command {
 	cmd := &cobra.Command{
 		Use:     "list",
-		Short:   "Lists VPN sessions",
-		Long:    "This command lists VPN sessions",
+		Short:   "Lists VPN profile groups",
+		Long:    "This command lists VPN profile groups",
 		Example: "ans ecloud vpnprofilegroup list",
 		RunE:    ecloudCobraRunEFunc(f, ecloudVPNProfileGroupList),
 	}
@@ -48,7 +48,7 @@
 
 	sessions, err := service.GetVPNProfileGroups(params)
 	if err != nil {
 		return fmt.Errorf("Error retrieving VPN sessions: %s", err)
 	}
 
 	return output.CommandOutput(cmd, OutputECloudVPNProfileGroupsProvider(sessions))
@@ -57,12 +57,12 @@
 func ecloudVPNProfileGroupShowCmd(f factory.ClientFactory) *cobra.Command {
 	return &cobra.Command{
 		Use:     "show <session: id>...",
-		Short:   "Shows a VPN session",
-		Long:    "This command shows one or more VPN sessions",
+		Short:   "Shows a VPN profile group",
+		Long:    "This command shows one or more VPN profile groups",
 		Example: "ans ecloud vpnprofilegroup show vpns-abcdef12",
 		Args: func(cmd *cobra.Command, args []string) error {
 			if len(args) < 1 {
 				return errors.New("Missing VPN session")
 			}
 
 			return nil

go.mod

@@ -5,7 +5,7 @@ go 1.22.0
 toolchain go1.23.2
 
 require (
-	github.com/ans-group/sdk-go v1.22.0
+	github.com/ans-group/sdk-go v1.22.1
 	github.com/blang/semver v3.5.1+incompatible
 	github.com/golang/mock v1.6.0
 	github.com/iancoleman/strcase v0.3.0

go.sum

@@ -1,7 +1,7 @@
 github.com/ans-group/go-durationstring v1.2.0 h1:UJIuQATkp0t1rBvZsHRwki33YHV9E+Ulro+3NbMB7MM=
 github.com/ans-group/go-durationstring v1.2.0/go.mod h1:QGF9Mdpq9058QXaut8r55QWu6lcHX6i/GvF1PZVkV6o=
-github.com/ans-group/sdk-go v1.22.0 h1:/eD8CCYkHjqTje+WqfYLNSot2NmjACFrGRqtdMsM5Do=
-github.com/ans-group/sdk-go v1.22.0/go.mod h1:Dx34ZUbyHNniHAKsDy/vp8q8hQC5L51ub2sv9We7d8E=
+github.com/ans-group/sdk-go v1.22.1 h1:3wfYuWXPldIzKT393+yxQBPjP+O0kPZHzsD1q6zm/+E=
+github.com/ans-group/sdk-go v1.22.1/go.mod h1:Dx34ZUbyHNniHAKsDy/vp8q8hQC5L51ub2sv9We7d8E=
 github.com/blang/semver v3.5.1+incompatible h1:cQNTCjp13qL8KC3Nbxr/y2Bqb63oX6wdnnjpJbkM4JQ=
 github.com/blang/semver v3.5.1+incompatible/go.mod h1:kRBLl5iJ+tD4TcOOxsy/0fnwebNt5EWlYSAyrTnjyyk=
 github.com/cpuguy83/go-md2man/v2 v2.0.4/go.mod h1:tgQtvFlXSQOSOSIRvRPT7W67SCa46tRHOmNcaadrF8o=