fixup! Migrate more logs to clog

cmoog · cmoog · commit c2a182da12b6 · 2020-10-21T13:38:41.000-05:00
diff --git a/internal/clog/error.go b/internal/clog/error.go
@@ -131,3 +131,6 @@ func Hint(format string, a ...interface{}) string {
 func Cause(format string, a ...interface{}) string {
 	return fmt.Sprintf("%s %s", Bold("cause:"), fmt.Sprintf(format, a...))
 }
+
+// BlankLine is an empty string meant to be used in CLIMessage and CLIError construction.
+const BlankLine = ""
diff --git a/internal/cmd/ceapi.go b/internal/cmd/ceapi.go
@@ -77,7 +77,7 @@ func findEnv(ctx context.Context, client *coder.Client, envName, userEmail strin
 	return nil, clog.Fatal(
 		"failed to find environment",
 		fmt.Sprintf("environment %q not found in %q", envName, found),
-		"",
+		clog.BlankLine,
 		clog.Tip("run \"coder envs ls\" to view your environments"),
 	)
 }
diff --git a/internal/cmd/envs.go b/internal/cmd/envs.go
@@ -107,7 +107,7 @@ coder envs --user charlie@coder.com ls -o json \
 					if err = client.StopEnvironment(cmd.Context(), env.ID); err != nil {
 						atomic.AddInt32(&fails, 1)
 						err = clog.Fatal(fmt.Sprintf("stop environment %q", env.Name),
-							clog.Cause(err.Error()), "",
+							clog.Cause(err.Error()), clog.BlankLine,
 							clog.Hint("current environment status is %q", env.LatestStat.ContainerStatus),
 						)
 						clog.Log(err)
diff --git a/internal/cmd/rebuild.go b/internal/cmd/rebuild.go
@@ -8,11 +8,11 @@ import (
 	"time"
 
 	"cdr.dev/coder-cli/coder-sdk"
+	"cdr.dev/coder-cli/internal/clog"
 	"github.com/briandowns/spinner"
 	"github.com/fatih/color"
 	"github.com/manifoldco/promptui"
 	"github.com/spf13/cobra"
-	"go.coder.com/flog"
 	"golang.org/x/crypto/ssh/terminal"
 	"golang.org/x/xerrors"
 )
@@ -56,7 +56,10 @@ coder envs rebuild backend-env --force`,
 					return err
 				}
 			} else {
-				flog.Info("Use \"coder envs watch-build %s\" to follow the build logs", env.Name)
+				clog.LogSuccess(
+					"successfully started rebuild",
+					clog.Tip("run \"coder envs watch-build %s\" to follow the build logs", env.Name),
+				)
 			}
 			return nil
 		},
diff --git a/internal/cmd/secrets.go b/internal/cmd/secrets.go
@@ -12,8 +12,6 @@ import (
 	"cdr.dev/coder-cli/coder-sdk"
 	"cdr.dev/coder-cli/internal/clog"
 	"cdr.dev/coder-cli/internal/x/xtabwriter"
-
-	"go.coder.com/flog"
 )
 
 func makeSecretsCmd() *cobra.Command {
@@ -155,7 +153,7 @@ func listSecrets(userEmail *string) func(cmd *cobra.Command, _ []string) error {
 		}
 
 		if len(secrets) < 1 {
-			flog.Info("No secrets found")
+			clog.LogInfo("no secrets found")
 			return nil
 		}
 
diff --git a/internal/cmd/shell.go b/internal/cmd/shell.go
@@ -202,7 +202,7 @@ func networkErr(client *coder.Client, env *coder.Environment) error {
 			"environment is not running",
 			fmt.Sprintf("environment %q is not running", env.Name),
 			fmt.Sprintf("its current status is %q", env.LatestStat.ContainerStatus),
-			"",
+			clog.BlankLine,
 			clog.Tip("run \"coder envs rebuild %s --follow\" to start the environment", env.Name),
 		)
 	}
diff --git a/internal/cmd/sync.go b/internal/cmd/sync.go
@@ -9,11 +9,10 @@ import (
 	"strings"
 
 	"cdr.dev/coder-cli/coder-sdk"
+	"cdr.dev/coder-cli/internal/clog"
 	"cdr.dev/coder-cli/internal/sync"
 	"github.com/spf13/cobra"
 	"golang.org/x/xerrors"
-
-	"go.coder.com/flog"
 )
 
 func makeSyncCmd() *cobra.Command {
@@ -96,7 +95,7 @@ func makeRunSync(init *bool) func(cmd *cobra.Command, args []string) error {
 		remoteVersion, rsyncErr := s.Version()
 
 		if rsyncErr != nil {
-			flog.Info("Unable to determine remote rsync version.  Proceeding cautiously.")
+			clog.LogInfo("unable to determine remote rsync version: proceeding cautiously")
 		} else if localVersion != remoteVersion {
 			return xerrors.Errorf("rsync protocol mismatch: local = %s, remote = %s", localVersion, remoteVersion)
 		}
diff --git a/internal/cmd/urls.go b/internal/cmd/urls.go
@@ -102,7 +102,7 @@ func makeListDevURLs(outputFmt *string) func(cmd *cobra.Command, args []string)
 		switch *outputFmt {
 		case "human":
 			if len(devURLs) < 1 {
-				flog.Info("No devURLs found for environment %q", envName)
+				clog.LogInfo(fmt.Sprintf("no devURLs found for environment %q", envName))
 				return nil
 			}
 			err := xtabwriter.WriteTable(len(devURLs), func(i int) interface{} {
@@ -169,13 +169,13 @@ func makeCreateDevURL() *cobra.Command {
 
 			urlID, found := devURLID(portNum, urls)
 			if found {
-				flog.Info("Updating devurl for port %v", port)
+				clog.LogInfo(fmt.Sprintf("updating devurl for port %v", port))
 				err := client.UpdateDevURL(cmd.Context(), env.ID, urlID, portNum, urlname, access)
 				if err != nil {
 					return xerrors.Errorf("update DevURL: %w", err)
 				}
 			} else {
-				flog.Info("Adding devurl for port %v", port)
+				clog.LogInfo(fmt.Sprintf("Adding devurl for port %v", port))
 				err := client.InsertDevURL(cmd.Context(), env.ID, portNum, urlname, access)
 				if err != nil {
 					return xerrors.Errorf("insert DevURL: %w", err)

Original file line number	Diff line number	Diff line change
`@@ -131,3 +131,6 @@ func Hint(format string, a ...interface{}) string {`
`131`	`131`	`func Cause(format string, a ...interface{}) string {`
`132`	`132`	`return fmt.Sprintf("%s %s", Bold("cause:"), fmt.Sprintf(format, a...))`
`133`	`133`	`}`
	`134`	`+`
	`135`	`+// BlankLine is an empty string meant to be used in CLIMessage and CLIError construction.`
	`136`	`+const BlankLine = ""`
Original file line number	Diff line number	Diff line change
`@@ -77,7 +77,7 @@ func findEnv(ctx context.Context, client *coder.Client, envName, userEmail strin`
`77`	`77`	`return nil, clog.Fatal(`
`78`	`78`	`"failed to find environment",`
`79`	`79`	`fmt.Sprintf("environment %q not found in %q", envName, found),`
`80`		`- "",`
	`80`	`+ clog.BlankLine,`
`81`	`81`	`clog.Tip("run \"coder envs ls\" to view your environments"),`
`82`	`82`	`)`
`83`	`83`	`}`
Original file line number	Diff line number	Diff line change
`@@ -107,7 +107,7 @@ coder envs --user charlie@coder.com ls -o json \`
`107`	`107`	`if err = client.StopEnvironment(cmd.Context(), env.ID); err != nil {`
`108`	`108`	`atomic.AddInt32(&fails, 1)`
`109`	`109`	`err = clog.Fatal(fmt.Sprintf("stop environment %q", env.Name),`
`110`		`- clog.Cause(err.Error()), "",`
	`110`	`+ clog.Cause(err.Error()), clog.BlankLine,`
`111`	`111`	`clog.Hint("current environment status is %q", env.LatestStat.ContainerStatus),`
`112`	`112`	`)`
`113`	`113`	`clog.Log(err)`
Original file line number	Diff line number	Diff line change
`@@ -12,8 +12,6 @@ import (`
`12`	`12`	`"cdr.dev/coder-cli/coder-sdk"`
`13`	`13`	`"cdr.dev/coder-cli/internal/clog"`
`14`	`14`	`"cdr.dev/coder-cli/internal/x/xtabwriter"`
`15`		`-`
`16`		`- "go.coder.com/flog"`
`17`	`15`	`)`
`18`	`16`
`19`	`17`	`func makeSecretsCmd() *cobra.Command {`
`@@ -155,7 +153,7 @@ func listSecrets(userEmail string) func(cmd cobra.Command, _ []string) error {`
`155`	`153`	`}`
`156`	`154`
`157`	`155`	`if len(secrets) < 1 {`
`158`		`- flog.Info("No secrets found")`
	`156`	`+ clog.LogInfo("no secrets found")`
`159`	`157`	`return nil`
`160`	`158`	`}`
`161`	`159`
Original file line number	Diff line number	Diff line change
`@@ -202,7 +202,7 @@ func networkErr(client coder.Client, env coder.Environment) error {`
`202`	`202`	`"environment is not running",`
`203`	`203`	`fmt.Sprintf("environment %q is not running", env.Name),`
`204`	`204`	`fmt.Sprintf("its current status is %q", env.LatestStat.ContainerStatus),`
`205`		`- "",`
	`205`	`+ clog.BlankLine,`
`206`	`206`	`clog.Tip("run \"coder envs rebuild %s --follow\" to start the environment", env.Name),`
`207`	`207`	`)`
`208`	`208`	`}`