a8338c0 refactor(cli): deduplicate deploy failure and remote helpers · gordon

M internal/adapters/in/cli/auth.go +24 -15


@@ -232,6 +232,15 @@ Examples:
232	232		return cmd
233	233		}
234	234
	235	+	func resolveRequiredRemote(flagToken string) (*remote.ResolvedRemote, error) {
	236	+	resolved, isRemote := remote.Resolve(remoteFlag, flagToken, insecureTLSFlag)
	237	+	if !isRemote {
	238	+	return nil, fmt.Errorf("no remote specified. Use --remote or 'gordon remotes use <name>'")
	239	+	}
	240	+
	241	+	return resolved, nil
	242	+	}
	243	+
235	244		func runAuthLoginWithToken(ctx context.Context, token string, out io.Writer) error {
236	245		token = strings.TrimSpace(token)
237	246		if token == "" {

@@ -239,9 +248,9 @@ func runAuthLoginWithToken(ctx context.Context, token string, out io.Writer) err
239	248		}
240	249
241	250		// Resolve remote — but use the new token (not the stored one) for verification.
242		-	resolved, isRemote := remote.Resolve(remoteFlag, "", insecureTLSFlag)
243		-	if !isRemote {
244		-	return fmt.Errorf("no remote specified. Use --remote or 'gordon remotes use <name>'")
	251	+	resolved, err := resolveRequiredRemote("")
	252	+	if err != nil {
	253	+	return err
245	254		}
246	255
247	256		client := remote.NewClient(resolved.URL, remoteClientOptions(token, resolved.InsecureTLS)...)

@@ -271,9 +280,9 @@ func runAuthLoginWithToken(ctx context.Context, token string, out io.Writer) err
271	280		}
272	281
273	282		func runAuthLoginVerify(ctx context.Context, out io.Writer) error {
274		-	resolved, isRemote := remote.Resolve(remoteFlag, tokenFlag, insecureTLSFlag)
275		-	if !isRemote {
276		-	return fmt.Errorf("no remote specified. Use --remote or 'gordon remotes use <name>'")
	283	+	resolved, err := resolveRequiredRemote(tokenFlag)
	284	+	if err != nil {
	285	+	return err
277	286		}
278	287		if resolved.Token == "" {
279	288		return fmt.Errorf("no token stored for remote '%s'; use: gordon auth login --token <token>", resolved.DisplayName())

@@ -317,9 +326,9 @@ Examples:
317	326		}
318	327
319	328		func runAuthShowToken(out io.Writer) error {
320		-	resolved, isRemote := remote.Resolve(remoteFlag, tokenFlag, insecureTLSFlag)
321		-	if !isRemote {
322		-	return fmt.Errorf("no remote specified. Use --remote or 'gordon remotes use <name>'")
	329	+	resolved, err := resolveRequiredRemote(tokenFlag)
	330	+	if err != nil {
	331	+	return err
323	332		}
324	333		if resolved.Token == "" {
325	334		return fmt.Errorf("no token found for remote '%s'", resolved.DisplayName())

@@ -355,9 +364,9 @@ Examples:
355	364		}
356	365
357	366		func runAuthLogout(out io.Writer) error {
358		-	resolved, isRemote := remote.Resolve(remoteFlag, tokenFlag, insecureTLSFlag)
359		-	if !isRemote {
360		-	return fmt.Errorf("no remote specified. Use --remote or 'gordon remotes use <name>'")
	367	+	resolved, err := resolveRequiredRemote(tokenFlag)
	368	+	if err != nil {
	369	+	return err
361	370		}
362	371		if resolved.Name == "" {
363	372		return fmt.Errorf("cannot logout from ad-hoc URL. Use 'gordon remotes add' to save this remote first")

@@ -700,9 +709,9 @@ Examples:
700	709
701	710		// runAuthStatus checks authentication status for the active remote.
702	711		func runAuthStatus(ctx context.Context) error {
703		-	resolved, isRemote := remote.Resolve(remoteFlag, tokenFlag, insecureTLSFlag)
704		-	if !isRemote {
705		-	return fmt.Errorf("no remote specified. Use --remote or 'gordon remotes use <name>'")
	712	+	resolved, err := resolveRequiredRemote(tokenFlag)
	713	+	if err != nil {
	714	+	return err
706	715		}
707	716
708	717		client := remote.NewClient(resolved.URL, remoteClientOptions(resolved.Token, resolved.InsecureTLS)...)

 	return cmd
 }
+func resolveRequiredRemote(flagToken string) (*remote.ResolvedRemote, error) {
+	resolved, isRemote := remote.Resolve(remoteFlag, flagToken, insecureTLSFlag)
+	if !isRemote {
+		return nil, fmt.Errorf("no remote specified. Use --remote or 'gordon remotes use <name>'")
+	}
+	return resolved, nil
+}
 func runAuthLoginWithToken(ctx context.Context, token string, out io.Writer) error {
 	token = strings.TrimSpace(token)
 	if token == "" {
 	}
 	// Resolve remote — but use the new token (not the stored one) for verification.
-	resolved, isRemote := remote.Resolve(remoteFlag, "", insecureTLSFlag)
+	resolved, err := resolveRequiredRemote("")
-	if !isRemote {
+	if err != nil {
-		return fmt.Errorf("no remote specified. Use --remote or 'gordon remotes use <name>'")
+		return err
 	}
 	client := remote.NewClient(resolved.URL, remoteClientOptions(token, resolved.InsecureTLS)...)
 }
 func runAuthLoginVerify(ctx context.Context, out io.Writer) error {
-	resolved, isRemote := remote.Resolve(remoteFlag, tokenFlag, insecureTLSFlag)
+	resolved, err := resolveRequiredRemote(tokenFlag)
-	if !isRemote {
+	if err != nil {
-		return fmt.Errorf("no remote specified. Use --remote or 'gordon remotes use <name>'")
+		return err
 	}
 	if resolved.Token == "" {
 		return fmt.Errorf("no token stored for remote '%s'; use: gordon auth login --token <token>", resolved.DisplayName())
 }
 func runAuthShowToken(out io.Writer) error {
-	resolved, isRemote := remote.Resolve(remoteFlag, tokenFlag, insecureTLSFlag)
+	resolved, err := resolveRequiredRemote(tokenFlag)
-	if !isRemote {
+	if err != nil {
-		return fmt.Errorf("no remote specified. Use --remote or 'gordon remotes use <name>'")
+		return err
 	}
 	if resolved.Token == "" {
 		return fmt.Errorf("no token found for remote '%s'", resolved.DisplayName())
 }
 func runAuthLogout(out io.Writer) error {
-	resolved, isRemote := remote.Resolve(remoteFlag, tokenFlag, insecureTLSFlag)
+	resolved, err := resolveRequiredRemote(tokenFlag)
-	if !isRemote {
+	if err != nil {
-		return fmt.Errorf("no remote specified. Use --remote or 'gordon remotes use <name>'")
+		return err
 	}
 	if resolved.Name == "" {
 		return fmt.Errorf("cannot logout from ad-hoc URL. Use 'gordon remotes add' to save this remote first")
 // runAuthStatus checks authentication status for the active remote.
 func runAuthStatus(ctx context.Context) error {
-	resolved, isRemote := remote.Resolve(remoteFlag, tokenFlag, insecureTLSFlag)
+	resolved, err := resolveRequiredRemote(tokenFlag)
-	if !isRemote {
+	if err != nil {
-		return fmt.Errorf("no remote specified. Use --remote or 'gordon remotes use <name>'")
+		return err
 	}
 	client := remote.NewClient(resolved.URL, remoteClientOptions(resolved.Token, resolved.InsecureTLS)...)

M internal/adapters/in/cli/deploy.go +1 -4


@@ -71,10 +71,7 @@ func runDeploy(ctx context.Context, deployer deployer, isRemote bool, deployDoma
71	71		messageDomain = result.Domain
72	72		}
73	73
74		-	containerID := result.ContainerID
75		-	if containerID != "" && len(containerID) > 12 {
76		-	containerID = containerID[:12]
77		-	}
	74	+	containerID := shortContainerID(result.ContainerID)
78	75
79	76		switch result.Status {
80	77		case "deployed":

 		messageDomain = result.Domain
 	}
-	containerID := result.ContainerID
+	containerID := shortContainerID(result.ContainerID)
-	if containerID != "" && len(containerID) > 12 {
-		containerID = containerID[:12]
-	}
 	switch result.Status {
 	case "deployed":

M internal/adapters/in/cli/deploy_error.go +4 -3


@@ -56,14 +56,15 @@ func structuredDeployFailure(err error) (error, bool) {
56	56
57	57		func renderDeployFailure(summary, cause, hint string, logs []string) string {
58	58		if summary == "" {
59		-	summary = "failed to deploy"
	59	+	summary = domain.DefaultDeployFailureSummary
60	60		}
61	61
62	62		var b strings.Builder
63		-	if summary == "failed to deploy" {
	63	+	if summary == domain.DefaultDeployFailureSummary {
64	64		b.WriteString(summary)
65	65		} else {
66		-	b.WriteString("failed to deploy: ")
	66	+	b.WriteString(domain.DefaultDeployFailureSummary)
	67	+	b.WriteString(": ")
67	68		b.WriteString(summary)
68	69		}
69	70

 func renderDeployFailure(summary, cause, hint string, logs []string) string {
 	if summary == "" {
-		summary = "failed to deploy"
+		summary = domain.DefaultDeployFailureSummary
 	}
 	var b strings.Builder
-	if summary == "failed to deploy" {
+	if summary == domain.DefaultDeployFailureSummary {
 		b.WriteString(summary)
 	} else {
-		b.WriteString("failed to deploy: ")
+		b.WriteString(domain.DefaultDeployFailureSummary)
+		b.WriteString(": ")
 		b.WriteString(summary)
 	}

M internal/adapters/in/cli/presentation.go +8 -0


@@ -63,3 +63,11 @@ func cliRenderWarning(msg string) string {
63	63		func cliRenderInfo(msg string) string {
64	64		return styles.RenderInfo(msg)
65	65		}
	66	+
	67	+	func shortContainerID(id string) string {
	68	+	if len(id) > 12 {
	69	+	return id[:12]
	70	+	}
	71	+
	72	+	return id
	73	+	}


@@ -63,3 +63,11 @@ func cliRenderWarning(msg string) string {
63	func cliRenderInfo(msg string) string {	63		func cliRenderInfo(msg string) string {
64	return styles.RenderInfo(msg)	64		return styles.RenderInfo(msg)
65	}	65		}
		66	+
		67	+	func shortContainerID(id string) string {
		68	+	if len(id) > 12 {
		69	+	return id[:12]
		70	+	}
		71	+
		72	+	return id
		73	+	}

M internal/adapters/in/cli/push.go +1 -4


@@ -681,10 +681,7 @@ func deployAfterPush(ctx context.Context, cp ControlPlane, pushDomain string, no
681	681		if err != nil {
682	682		return formatDeployFailure(err)
683	683		}
684		-	containerID := result.ContainerID
685		-	if len(containerID) > 12 {
686		-	containerID = containerID[:12]
687		-	}
	684	+	containerID := shortContainerID(result.ContainerID)
688	685		fmt.Println(styles.RenderSuccess(fmt.Sprintf("Deployed %s (container: %s)", pushDomain, containerID)))
689	686		return nil
690	687		}

 	if err != nil {
 		return formatDeployFailure(err)
 	}
-	containerID := result.ContainerID
+	containerID := shortContainerID(result.ContainerID)
-	if len(containerID) > 12 {
-		containerID = containerID[:12]
-	}
 	fmt.Println(styles.RenderSuccess(fmt.Sprintf("Deployed %s (container: %s)", pushDomain, containerID)))
 	return nil
 }

M internal/adapters/in/cli/rollback.go +1 -4


@@ -244,10 +244,7 @@ func deploySelectedTag(ctx context.Context, cp ControlPlane, route *domain.Route
244	244		}
245	245		return fmt.Errorf("failed to deploy (route reverted): %w", err)
246	246		}
247		-	containerID := result.ContainerID
248		-	if len(containerID) > 12 {
249		-	containerID = containerID[:12]
250		-	}
	247	+	containerID := shortContainerID(result.ContainerID)
251	248		fmt.Println(styles.RenderSuccess(fmt.Sprintf("Rolled back %s to %s (container: %s)", rollbackDomain, selectedTag, containerID)))
252	249		return nil
253	250		}

 		}
 		return fmt.Errorf("failed to deploy (route reverted): %w", err)
 	}
-	containerID := result.ContainerID
+	containerID := shortContainerID(result.ContainerID)
-	if len(containerID) > 12 {
-		containerID = containerID[:12]
-	}
 	fmt.Println(styles.RenderSuccess(fmt.Sprintf("Rolled back %s to %s (container: %s)", rollbackDomain, selectedTag, containerID)))
 	return nil
 }

M internal/domain/deploy_failure.go +3 -1

@@ -1,5 +1,7 @@
1	1		package domain
2	2
	3	+	const DefaultDeployFailureSummary = "failed to deploy"
	4	+
3	5		// DeployFailureError describes a surfaced deployment failure.
4	6		type DeployFailureError struct {
5	7		Summary string

@@ -14,7 +16,7 @@ type DeployFailureError struct {
14	16		// Error returns the deploy failure summary.
15	17		func (e *DeployFailureError) Error() string {
16	18		if e == nil \|\| e.Summary == "" {
17		-	return "failed to deploy"
	19	+	return DefaultDeployFailureSummary
18	20		}
19	21
20	22		return e.Summary

 package domain
+const DefaultDeployFailureSummary = "failed to deploy"
 // DeployFailureError describes a surfaced deployment failure.
 type DeployFailureError struct {
 	Summary       string
 // Error returns the deploy failure summary.
 func (e *DeployFailureError) Error() string {
 	if e == nil || e.Summary == "" {
-		return "failed to deploy"
+		return DefaultDeployFailureSummary
 	}
 	return e.Summary