v0.0.10: refine lcl command

Author: benburkert

api/api.go

@@ -228,7 +228,7 @@ func getServicePath(orgSlug, serviceSlug string) string {
 func (s *Session) GetService(ctx context.Context, orgSlug, serviceSlug string) (*Service, error) {
 	var svc Service
 	if err := s.get(ctx, getServicePath(orgSlug, serviceSlug), &svc); err != nil {
-		if err == NotFoundErr {
+		if errors.Is(err, NotFoundErr) {
 			return nil, nil
 		}
 		return nil, err
@@ -248,7 +248,11 @@ func (s *Session) get(ctx context.Context, path string, out any) error {
 		return err
 	}
 	if res.StatusCode != http.StatusOK {
-		return StatusCodeError(res.StatusCode)
+		var errorsRes *Error
+		if err = json.NewDecoder(res.Body).Decode(&errorsRes); err != nil {
+			return err
+		}
+		return fmt.Errorf("%w: %s", StatusCodeError(res.StatusCode), errorsRes.Title)
 	}
 	return json.NewDecoder(res.Body).Decode(out)
 }
@@ -274,7 +278,11 @@ func (s *Session) post(ctx context.Context, path string, in, out any) error {
 		return err
 	}
 	if res.StatusCode != http.StatusOK {
-		return fmt.Errorf("unexpected response code: %d", res.StatusCode)
+		var errorsRes *Error
+		if err = json.NewDecoder(res.Body).Decode(&errorsRes); err != nil {
+			return err
+		}
+		return fmt.Errorf("%w: %s", StatusCodeError(res.StatusCode), errorsRes.Title)
 	}
 	return json.NewDecoder(res.Body).Decode(out)
 }
@@ -351,4 +359,4 @@ type StatusCodeError int
 const NotFoundErr = StatusCodeError(http.StatusNotFound)
 
 func (err StatusCodeError) StatusCode() int { return int(err) }
-func (err StatusCodeError) Error() string   { return fmt.Sprintf("unexpected response code: %d", err) }
+func (err StatusCodeError) Error() string   { return fmt.Sprintf("unexpected %d status response", err) }

auth/auth_test.go

@@ -8,6 +8,10 @@ import (
 	"github.com/anchordotdev/cli/api/apitest"
 )
 
+var (
+	_ = flag.Bool("update", false, "ignored")
+)
+
 var srv = &apitest.Server{
 	Host:    "api.anchor.lcl.host",
 	RootDir: "../..",

auth/models/signin.go

@@ -77,7 +77,7 @@ type SignInChecker struct {
 }
 
 func (m *SignInChecker) Init() tea.Cmd {
-	m.spinner = ui.Spinner()
+	m.spinner = ui.WaitingSpinner()
 
 	return m.spinner.Tick
 }

auth/whoami_test.go

@@ -34,7 +34,7 @@ func TestWhoAmI(t *testing.T) {
 		cfg.Keyring.MockMode = true
 
 		var err error
-		if cfg.API.Token, err = srv.GeneratePAT("example@example.com"); err != nil {
+		if cfg.API.Token, err = srv.GeneratePAT("anky@anchor.dev"); err != nil {
 			t.Fatal(err)
 		}
 
@@ -47,7 +47,7 @@ func TestWhoAmI(t *testing.T) {
 			t.Fatal(err)
 		}
 
-		if want, got := "Hello example@example.com!\n", buf.String(); want != got {
+		if want, got := "Hello anky@anchor.dev!\n", buf.String(); want != got {
 			t.Errorf("want output %q, got %q", want, got)
 		}
 	})

cert/models/provision.go

@@ -18,7 +18,7 @@ type Provision struct {
 }
 
 func (m *Provision) Init() tea.Cmd {
-	m.spinner = ui.Spinner()
+	m.spinner = ui.WaitingSpinner()
 
 	return m.spinner.Tick
 }

cli.go

@@ -25,7 +25,7 @@ type Config struct {
 		Subdomain string `desc:"Subdomain for lcl.host diagnostic service." flag:"subdomain" env:"SUBDOMAIN" json:"subdomain" toml:"subdomain"`
 
 		DiagnosticAddr string `default:":4433" desc:"Local server address" flag:"addr,a" env:"ADDR" json:"address" toml:"address"`
-		LclHostURL     string `default:"https://lcl.host" env:"LCL_HOST_URL"`
+		LclHostURL     string `default:"https://lcl.anchor.systems" env:"LCL_HOST_URL"`
 
 		Detect struct {
 			PackageManager string `desc:"Package manager to use for integrating Anchor." flag:"package-manager" env:"PACKAGE_MANAGER" json:"package_manager" toml:"package-manager"`

cmd/anchor/main.go

@@ -90,7 +90,7 @@ var (
 				},
 			},
 			{
-				UI: trust.Sync{Config: cfg}.UI(),
+				UI: trust.Command{Config: cfg}.UI(),
 
 				Name:  "trust",
 				Use:   "trust [org[/realm[/ca]]]",

command.go

@@ -53,11 +53,12 @@ func (c *Command) Execute(ctx context.Context, cfg *Config) error {
 
 func (c *Command) cobraCommand(ctx context.Context, cfgv reflect.Value) *cobra.Command {
 	cmd := &cobra.Command{
-		Use:     c.Use,
-		Short:   c.Short,
-		Long:    c.Long,
-		GroupID: c.Group,
-		Hidden:  c.Hidden,
+		Use:          c.Use,
+		Short:        c.Short,
+		Long:         c.Long,
+		GroupID:      c.Group,
+		Hidden:       c.Hidden,
+		SilenceUsage: true,
 	}
 
 	if c.Preflight != nil {

detection/detection_test.go

@@ -10,6 +10,7 @@ import (
 var (
 	_ = flag.Bool("prism-verbose", false, "ignored")
 	_ = flag.Bool("prism-proxy", false, "ignored")
+	_ = flag.Bool("update", false, "ignored")
 )
 
 func TestScore_String(t *testing.T) {

diagnostic/server_test.go

@@ -16,6 +16,7 @@ import (
 var (
 	_ = flag.Bool("prism-verbose", false, "ignored")
 	_ = flag.Bool("prism-proxy", false, "ignored")
+	_ = flag.Bool("update", false, "ignored")
 )
 
 func TestServerSupportsDualProtocols(t *testing.T) {