fixup! Add golintci and fix errors

cmoog · cmoog · commit 626e9233132d · 2020-10-22T11:00:26.000-05:00
diff --git a/.golangci.yml b/.golangci.yml
@@ -13,5 +13,4 @@ linters-settings:
         funcs: # Run `go tool vet help printf` to see available settings for `printf` analyzer.
           - (cdr.dev/coder-cli/internal/clog).Tipf
           - (cdr.dev/coder-cli/internal/clog).Hintf
-          - (cdr.dev/coder-cli/internal/clog).LogDebugf
           - (cdr.dev/coder-cli/internal/clog).Causef
diff --git a/internal/clog/error.go b/internal/clog/error.go
@@ -112,18 +112,18 @@ func Bold(a string) string {
 	return color.New(color.Bold).Sprint(a)
 }
 
-// Tip formats according to the given format specifier and prepends a bolded "tip: " header.
-func Tip(format string, a ...interface{}) string {
+// Tipf formats according to the given format specifier and prepends a bolded "tip: " header.
+func Tipf(format string, a ...interface{}) string {
 	return fmt.Sprintf("%s %s", Bold("tip:"), fmt.Sprintf(format, a...))
 }
 
-// Hint formats according to the given format specifier and prepends a bolded "hint: " header.
-func Hint(format string, a ...interface{}) string {
+// Hintf formats according to the given format specifier and prepends a bolded "hint: " header.
+func Hintf(format string, a ...interface{}) string {
 	return fmt.Sprintf("%s %s", Bold("hint:"), fmt.Sprintf(format, a...))
 }
 
-// Cause formats according to the given format specifier and prepends a bolded "cause: " header.
-func Cause(format string, a ...interface{}) string {
+// Causef formats according to the given format specifier and prepends a bolded "cause: " header.
+func Causef(format string, a ...interface{}) string {
 	return fmt.Sprintf("%s %s", Bold("cause:"), fmt.Sprintf(format, a...))
 }
 
diff --git a/internal/cmd/auth.go b/internal/cmd/auth.go
@@ -14,7 +14,7 @@ import (
 
 var errNeedLogin = clog.Fatal(
 	"failed to read session credentials",
-	clog.Hint(`did you run "coder login [https://coder.domain.com]"?`),
+	clog.Hintf(`did you run "coder login [https://coder.domain.com]"?`),
 )
 
 func newClient() (*coder.Client, error) {
diff --git a/internal/cmd/ceapi.go b/internal/cmd/ceapi.go
@@ -78,6 +78,6 @@ func findEnv(ctx context.Context, client *coder.Client, envName, userEmail strin
 		"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"),
+		clog.Tipf("run \"coder envs ls\" to view your environments"),
 	)
 }
diff --git a/internal/cmd/envs.go b/internal/cmd/envs.go
@@ -117,8 +117,8 @@ 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.BlankLine,
-							clog.Hint("current environment status is %q", env.LatestStat.ContainerStatus),
+							clog.Causef(err.Error()), clog.BlankLine,
+							clog.Hintf("current environment status is %q", env.LatestStat.ContainerStatus),
 						)
 						clog.Log(err)
 						return err
@@ -186,7 +186,7 @@ coder envs create --cpu 4 --disk 100 --memory 8 --image 5f443b16-30652892427b955
 			clog.LogSuccess(
 				"creating environment...",
 				clog.BlankLine,
-				clog.Tip(`run "coder envs watch-build %q" to trail the build logs`, args[0]),
+				clog.Tipf(`run "coder envs watch-build %q" to trail the build logs`, args[0]),
 			)
 
 			if follow {
@@ -205,7 +205,7 @@ coder envs create --cpu 4 --disk 100 --memory 8 --image 5f443b16-30652892427b955
 	cmd.Flags().IntP("gpus", "g", defaultGPUs, "number GPUs an environment should be provisioned with.")
 	cmd.Flags().StringVarP(&img, "image", "i", "", "ID of the image to base the environment off of.")
 	cmd.Flags().BoolVar(&follow, "follow", false, "follow buildlog after initiating rebuild")
-	cmd.MarkFlagRequired("image")
+	_ = cmd.MarkFlagRequired("image")
 	return cmd
 }
 
@@ -296,7 +296,7 @@ coder envs edit back-end-env --disk 20`,
 			clog.LogSuccess(
 				"applied changes to the environment, rebuilding...",
 				clog.BlankLine,
-				clog.Tip(`run "coder envs watch-build %q" to trail the build logs`, envName),
+				clog.Tipf(`run "coder envs watch-build %q" to trail the build logs`, envName),
 			)
 			return nil
 		},
diff --git a/internal/cmd/rebuild.go b/internal/cmd/rebuild.go
@@ -58,7 +58,7 @@ coder envs rebuild backend-env --force`,
 			} else {
 				clog.LogSuccess(
 					"successfully started rebuild",
-					clog.Tip("run \"coder envs watch-build %s\" to follow the build logs", env.Name),
+					clog.Tipf("run \"coder envs watch-build %s\" to follow the build logs", env.Name),
 				)
 			}
 			return nil
diff --git a/internal/cmd/resourcemanager.go b/internal/cmd/resourcemanager.go
@@ -214,7 +214,7 @@ func printResourceTop(writer io.Writer, groups []groupable, labeler envLabeler,
 	if len(userResources) == 0 {
 		clog.LogInfo(
 			"no groups for the given filters exist with active environments",
-			clog.Tip("run \"--show-empty\" to see groups with no resources."),
+			clog.Tipf("run \"--show-empty\" to see groups with no resources."),
 		)
 	}
 	return nil
diff --git a/internal/cmd/shell.go b/internal/cmd/shell.go
@@ -201,7 +201,7 @@ func networkErr(client *coder.Client, env *coder.Environment) error {
 			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),
+			clog.Tipf("run \"coder envs rebuild %s --follow\" to start the environment", env.Name),
 		)
 	}
 	return xerrors.Errorf("network error, is %q online?", env.Name)

Original file line number	Diff line number	Diff line change
`@@ -112,18 +112,18 @@ func Bold(a string) string {`
`112`	`112`	`return color.New(color.Bold).Sprint(a)`
`113`	`113`	`}`
`114`	`114`
`115`		`-// Tip formats according to the given format specifier and prepends a bolded "tip: " header.`
`116`		`-func Tip(format string, a ...interface{}) string {`
	`115`	`+// Tipf formats according to the given format specifier and prepends a bolded "tip: " header.`
	`116`	`+func Tipf(format string, a ...interface{}) string {`
`117`	`117`	`return fmt.Sprintf("%s %s", Bold("tip:"), fmt.Sprintf(format, a...))`
`118`	`118`	`}`
`119`	`119`
`120`		`-// Hint formats according to the given format specifier and prepends a bolded "hint: " header.`
`121`		`-func Hint(format string, a ...interface{}) string {`
	`120`	`+// Hintf formats according to the given format specifier and prepends a bolded "hint: " header.`
	`121`	`+func Hintf(format string, a ...interface{}) string {`
`122`	`122`	`return fmt.Sprintf("%s %s", Bold("hint:"), fmt.Sprintf(format, a...))`
`123`	`123`	`}`
`124`	`124`
`125`		`-// Cause formats according to the given format specifier and prepends a bolded "cause: " header.`
`126`		`-func Cause(format string, a ...interface{}) string {`
	`125`	`+// Causef formats according to the given format specifier and prepends a bolded "cause: " header.`
	`126`	`+func Causef(format string, a ...interface{}) string {`
`127`	`127`	`return fmt.Sprintf("%s %s", Bold("cause:"), fmt.Sprintf(format, a...))`
`128`	`128`	`}`
`129`	`129`
Original file line number	Diff line number	Diff line change
`@@ -14,7 +14,7 @@ import (`
`14`	`14`
`15`	`15`	`var errNeedLogin = clog.Fatal(`
`16`	`16`	`"failed to read session credentials",`
`17`		- clog.Hint(`did you run "coder login [https://coder.domain.com]"?`),
	`17`	+ clog.Hintf(`did you run "coder login [https://coder.domain.com]"?`),
`18`	`18`	`)`
`19`	`19`
`20`	`20`	`func newClient() (*coder.Client, error) {`
Original file line number	Diff line number	Diff line change
`@@ -78,6 +78,6 @@ func findEnv(ctx context.Context, client *coder.Client, envName, userEmail strin`
`78`	`78`	`"failed to find environment",`
`79`	`79`	`fmt.Sprintf("environment %q not found in %q", envName, found),`
`80`	`80`	`clog.BlankLine,`
`81`		`- clog.Tip("run \"coder envs ls\" to view your environments"),`
	`81`	`+ clog.Tipf("run \"coder envs ls\" to view your environments"),`
`82`	`82`	`)`
`83`	`83`	`}`
Original file line number	Diff line number	Diff line change
@@ -58,7 +58,7 @@ coder envs rebuild backend-env --force`,
`58`	`58`	`} else {`
`59`	`59`	`clog.LogSuccess(`
`60`	`60`	`"successfully started rebuild",`
`61`		`- clog.Tip("run \"coder envs watch-build %s\" to follow the build logs", env.Name),`
	`61`	`+ clog.Tipf("run \"coder envs watch-build %s\" to follow the build logs", env.Name),`
`62`	`62`	`)`
`63`	`63`	`}`
`64`	`64`	`return nil`
Original file line number	Diff line number	Diff line change
`@@ -214,7 +214,7 @@ func printResourceTop(writer io.Writer, groups []groupable, labeler envLabeler,`
`214`	`214`	`if len(userResources) == 0 {`
`215`	`215`	`clog.LogInfo(`
`216`	`216`	`"no groups for the given filters exist with active environments",`
`217`		`- clog.Tip("run \"--show-empty\" to see groups with no resources."),`
	`217`	`+ clog.Tipf("run \"--show-empty\" to see groups with no resources."),`
`218`	`218`	`)`
`219`	`219`	`}`
`220`	`220`	`return nil`
Original file line number	Diff line number	Diff line change
`@@ -201,7 +201,7 @@ func networkErr(client coder.Client, env coder.Environment) error {`
`201`	`201`	`fmt.Sprintf("environment %q is not running", env.Name),`
`202`	`202`	`fmt.Sprintf("its current status is %q", env.LatestStat.ContainerStatus),`
`203`	`203`	`clog.BlankLine,`
`204`		`- clog.Tip("run \"coder envs rebuild %s --follow\" to start the environment", env.Name),`
	`204`	`+ clog.Tipf("run \"coder envs rebuild %s --follow\" to start the environment", env.Name),`
`205`	`205`	`)`
`206`	`206`	`}`
`207`	`207`	`return xerrors.Errorf("network error, is %q online?", env.Name)`