simplify summary

reverbdotcom · Dec 19, 2024 · 68597e3 · 68597e3
1 parent 210e588
commit 68597e3
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 53 deletions.
diff --git a/summary/summary.go b/summary/summary.go
@@ -3,27 +3,23 @@ package summary
 import (
 	"fmt"
 	"github.com/reverbdotcom/sbx/commit"
-	"github.com/reverbdotcom/sbx/dash"
-	"github.com/reverbdotcom/sbx/graphiql"
-	"github.com/reverbdotcom/sbx/logs"
 	"github.com/reverbdotcom/sbx/name"
 	"github.com/reverbdotcom/sbx/run"
 	"github.com/reverbdotcom/sbx/web"
 )
 
 const summary = `»»»
-Name:       %s
-SHA:        %s
-
-Deploy:     %s
-Dash:       %s
-Logs:       %s
-
-Host:       %s
-Graphiql:   %s
+Name:           %s
+SHA:            %s
+Host:           %s
 
 »»»
-View deployment, run: 'sbx p'
+Site:           sbx w | sbx web
+Graphiql:       sbx g | sbx graphiql
+
+Dash:           sbx d | sbx dash
+Logs:           sbx l | sbx logs
+Deployment:     sbx p | sbx progress
 `
 
 func Run() (string, error) {
@@ -50,18 +46,9 @@ func Print(name string) error {
 
 var htmlUrl = run.HtmlUrl
 var headSHA = commit.HeadSHA
-var dashUrl = dash.Url
-var logsUrl = logs.Url
 var webUrl = web.Url
-var graphiqlUrl = graphiql.Url
 
 func printSummary(name string) (string, error) {
-	deployUrl, err := htmlUrl()
-
-	if err != nil {
-		return "", err
-	}
-
 	sha, err := headSHA()
 
 	if err != nil {
@@ -72,10 +59,6 @@ func printSummary(name string) (string, error) {
 		summary,
 		name,
 		sha,
-		deployUrl,
-		dashUrl(),
-		logsUrl(),
 		webUrl(),
-		graphiqlUrl(),
 	), nil
 }
diff --git a/summary/summary_test.go b/summary/summary_test.go
@@ -9,12 +9,8 @@ func TestPrint(t *testing.T) {
 	t.Run("it prints the summary", func(t *testing.T) {
 		name := "sandbox-blake-julian-kevin"
 
-		htmlUrl = func() (string, error) { return "deploy.url", nil }
 		headSHA = func() (string, error) { return "head.sha", nil }
-		dashUrl = func() string { return "dash.url" }
-		logsUrl = func() string { return "logs.url" }
 		webUrl = func() string { return "web.url" }
-		graphiqlUrl = func() string { return "graphiql.url" }
 
 		got, err := printSummary(name)
 
@@ -23,41 +19,27 @@ func TestPrint(t *testing.T) {
 		}
 
 		want := `»»»
-Name:       sandbox-blake-julian-kevin
-SHA:        head.sha
-
-Deploy:     deploy.url
-Dash:       dash.url
-Logs:       logs.url
-
-Host:       web.url
-Graphiql:   graphiql.url
+Name:           sandbox-blake-julian-kevin
+SHA:            head.sha
+Host:           web.url
 
 »»»
-View deployment, run: 'sbx p'
+Site:           sbx w | sbx web
+Graphiql:       sbx g | sbx graphiql
+
+Dash:           sbx d | sbx dash
+Logs:           sbx l | sbx logs
+Deployment:     sbx p | sbx progress
 `
 
 		if got != want {
 			t.Errorf("got %v, want %v", got, want)
 		}
 	})
 
-	t.Run("it errs on htmlUrl", func(t *testing.T) {
-		name := "sandbox-blake-julian-kevin"
-
-		htmlUrl = func() (string, error) { return "", errors.New("htmlUrl error") }
-
-		_, err := printSummary(name)
-
-		if err.Error() != "htmlUrl error" {
-			t.Errorf("got %v, want htmlUrl error", err.Error())
-		}
-	})
-
 	t.Run("it errs on headSHA", func(t *testing.T) {
 		name := "sandbox-blake-julian-kevin"
 
-		htmlUrl = func() (string, error) { return "deploy.url", nil }
 		headSHA = func() (string, error) { return "", errors.New("headSHA error") }
 
 		_, err := printSummary(name)