fix & refactor

cmd/instance_reset_password.go

@@ -7,8 +7,8 @@ import (
 	"github.com/google/uuid"
 	"github.com/spf13/cobra"
 
-	"github.com/exoscale/cli/pkg/account"
-	ego3 "github.com/exoscale/egoscale/v3"
+	"github.com/exoscale/cli/pkg/client"
+	"github.com/exoscale/cli/pkg/instance"
 	"github.com/exoscale/egoscale/v3/oapi"
 )
 
@@ -19,9 +19,7 @@ type instanceResetPasswordCmd struct {
 
 	Instance string `cli-arg:"#" cli-usage:"NAME|ID"`
 
-	// TODO
-	Force bool   `cli-short:"f" cli-usage:"don't prompt for confirmation"`
-	Zone  string `cli-short:"z" cli-usage:"instance zone"`
+	Zone string `cli-short:"z" cli-usage:"instance zone"`
 }
 
 func (c *instanceResetPasswordCmd) cmdAliases() []string { return gRemoveAlias }
@@ -43,42 +41,28 @@ func (c *instanceResetPasswordCmd) cmdRun(_ *cobra.Command, _ []string) error {
 		ctx = context.Background()
 	)
 
-	client, err := ego3.DefaultClient(ego3.ClientOptWithCredentials(
-		account.CurrentAccount.Key,
-		account.CurrentAccount.APISecret(),
-	))
+	v3Client, err := client.Get()
 	if err != nil {
 		return err
 	}
 
-	client.SetZone(oapi.ZoneName(c.Zone))
+	v3Client.SetZone(oapi.ZoneName(c.Zone))
 
 	instanceUUID, err := uuid.Parse(c.Instance)
 	if err != nil {
-		// TODO move this to a function named FindInstanceByName
-		instanceList, err := client.Compute().Instance().List(ctx, nil)
+		instance, err := instance.FindInstanceByName(ctx, &v3Client.Client, c.Instance)
 		if err != nil {
-			return fmt.Errorf("failed to list instances: %w", err)
+			return err
 		}
 
-		var instanceID uuid.NullUUID
-		for _, instance := range instanceList {
-			if *instance.Name == c.Instance {
-				instanceID = uuid.NullUUID{
-					UUID:  *instance.Id,
-					Valid: true,
-				}
-			}
-		}
-
-		if !instanceID.Valid {
+		if instance == nil {
 			return fmt.Errorf("unable to find instance by name %q", c.Instance)
 		}
 
-		instanceUUID = instanceID.UUID
+		instanceUUID = *instance.Id
 	}
 
-	_, err = client.Compute().Instance().ResetPassword(ctx, instanceUUID)
+	_, err = v3Client.Compute().Instance().ResetPassword(ctx, instanceUUID)
 	return err
 }
 

go.mod

@@ -1,7 +1,7 @@
 module github.com/exoscale/cli
 
 replace (
-	github.com/exoscale/egoscale/v3 => github.com/exoscale/egoscale/v3 v3.0.0-20230830145018-2a52db7bef92
+	github.com/exoscale/egoscale/v3 => github.com/exoscale/egoscale/v3 v3.0.0-20230830163612-a8c92b4e9a83
 	gopkg.ini/ini.v1 => github.com/go-ini/ini v1.42.0
 )
 

go.sum

@@ -174,8 +174,8 @@ github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7
 github.com/envoyproxy/protoc-gen-validate v0.6.2/go.mod h1:2t7qjJNvHPx8IjnBOzl9E9/baC+qXE/TeeyBRzgJDws=
 github.com/exoscale/egoscale v0.100.3 h1:tXALrvTcwhnS0PG28a6PBWEUwuAwrNwoMjpuPrNIgeA=
 github.com/exoscale/egoscale v0.100.3/go.mod h1:szh4hWSVh+ylgfti4AFR4mkRaCfUyUXSKS3PihlcOco=
-github.com/exoscale/egoscale/v3 v3.0.0-20230830145018-2a52db7bef92 h1:4D1a9tFXBHtj7in2KS6m09St6AwlM9cl3mZvjDt0N3k=
-github.com/exoscale/egoscale/v3 v3.0.0-20230830145018-2a52db7bef92/go.mod h1:bndUz/cWlSOuQwTUcbROmnY/Q0SxvAJ3iDtZAJxFmW4=
+github.com/exoscale/egoscale/v3 v3.0.0-20230830163612-a8c92b4e9a83 h1:pm14BWcj0Lrq2QhByCA9OdEBswnNX30uyztNi0hiITM=
+github.com/exoscale/egoscale/v3 v3.0.0-20230830163612-a8c92b4e9a83/go.mod h1:bndUz/cWlSOuQwTUcbROmnY/Q0SxvAJ3iDtZAJxFmW4=
 github.com/exoscale/openapi-cli-generator v1.1.0 h1:fYjmPqHR5vxlOBrbvde7eo7bISNQIFxsGn4A5/acwKA=
 github.com/exoscale/openapi-cli-generator v1.1.0/go.mod h1:TZBnbT7f3hJ5ImyUphJwRM+X5xF/zCQZ6o8a42gQeTs=
 github.com/fatih/camelcase v1.0.0 h1:hxNvNX/xYBp0ovncs8WyWZrOrpBNub/JfaMvbURyft8=

pkg/client/client.go

@@ -0,0 +1,13 @@
+package client
+
+import (
+	"github.com/exoscale/cli/pkg/account"
+	egov3 "github.com/exoscale/egoscale/v3"
+)
+
+func Get() (*egov3.ZonedClient, error) {
+	return egov3.DefaultClient(egov3.ClientOptWithCredentials(
+		account.CurrentAccount.Key,
+		account.CurrentAccount.APISecret(),
+	))
+}

pkg/instance/instance.go

@@ -0,0 +1,24 @@
+package instance
+
+import (
+	"context"
+	"fmt"
+
+	egov3 "github.com/exoscale/egoscale/v3"
+	"github.com/exoscale/egoscale/v3/oapi"
+)
+
+func FindInstanceByName(ctx context.Context, client *egov3.Client, name string) (*oapi.InstancesListElement, error) {
+	instanceList, err := client.Compute().Instance().List(ctx, nil)
+	if err != nil {
+		return nil, fmt.Errorf("failed to list instances: %w", err)
+	}
+
+	for _, instance := range instanceList {
+		if *instance.Name == name {
+			return &instance, nil
+		}
+	}
+
+	return nil, nil
+}

vendor/modules.txt

@@ -193,7 +193,7 @@ github.com/exoscale/egoscale/v2
 github.com/exoscale/egoscale/v2/api
 github.com/exoscale/egoscale/v2/oapi
 github.com/exoscale/egoscale/version
-# github.com/exoscale/egoscale/v3 v3.0.0-00010101000000-000000000000 => github.com/exoscale/egoscale/v3 v3.0.0-20230830145018-2a52db7bef92
+# github.com/exoscale/egoscale/v3 v3.0.0-00010101000000-000000000000 => github.com/exoscale/egoscale/v3 v3.0.0-20230830163612-a8c92b4e9a83
 ## explicit; go 1.20
 github.com/exoscale/egoscale/v3
 github.com/exoscale/egoscale/v3/api/compute
@@ -584,5 +584,5 @@ gopkg.in/yaml.v2
 # gopkg.in/yaml.v3 v3.0.1
 ## explicit
 gopkg.in/yaml.v3
-# github.com/exoscale/egoscale/v3 => github.com/exoscale/egoscale/v3 v3.0.0-20230830145018-2a52db7bef92
+# github.com/exoscale/egoscale/v3 => github.com/exoscale/egoscale/v3 v3.0.0-20230830163612-a8c92b4e9a83
 # gopkg.ini/ini.v1 => github.com/go-ini/ini v1.42.0