Refactor metrics prompt functions and change color package name

.gitignore

@@ -15,5 +15,5 @@ docs/resources
 docs/node_modules
 docs/themes
 docs/package-lock.json
-pkg/skaffold/color/debug.test
+pkg/skaffold/output/debug.test
 cmd/skaffold/app/cmd/statik/statik.go

cmd/skaffold/app/cmd/cmd.go

@@ -28,11 +28,12 @@ import (
 	"github.com/spf13/pflag"
 	"k8s.io/kubectl/pkg/util/templates"
 
-	"github.com/GoogleContainerTools/skaffold/pkg/skaffold/color"
 	"github.com/GoogleContainerTools/skaffold/pkg/skaffold/config"
 	"github.com/GoogleContainerTools/skaffold/pkg/skaffold/constants"
 	sErrors "github.com/GoogleContainerTools/skaffold/pkg/skaffold/errors"
 	"github.com/GoogleContainerTools/skaffold/pkg/skaffold/instrumentation"
+	"github.com/GoogleContainerTools/skaffold/pkg/skaffold/instrumentation/prompt"
+	"github.com/GoogleContainerTools/skaffold/pkg/skaffold/output"
 	"github.com/GoogleContainerTools/skaffold/pkg/skaffold/runner/runcontext"
 	"github.com/GoogleContainerTools/skaffold/pkg/skaffold/server"
 	"github.com/GoogleContainerTools/skaffold/pkg/skaffold/survey"
@@ -78,7 +79,7 @@ func NewSkaffoldCommand(out, errOut io.Writer) *cobra.Command {
 
 			opts.Command = cmd.Use
 			instrumentation.SetCommand(cmd.Use)
-			out := color.SetupColors(out, defaultColor, forceColors)
+			out := output.SetupColors(out, defaultColor, forceColors)
 			if timestamps {
 				l := logrus.New()
 				l.SetOutput(out)
@@ -114,7 +115,7 @@ func NewSkaffoldCommand(out, errOut io.Writer) *cobra.Command {
 				updateMsg <- updateCheckForReleasedVersionsIfNotDisabled(versionInfo.Version)
 				surveyPrompt <- config.ShouldDisplaySurveyPrompt(opts.GlobalConfig)
 			}()
-			metricsPrompt = instrumentation.ShouldDisplayMetricsPrompt(opts.GlobalConfig)
+			metricsPrompt = prompt.ShouldDisplayMetricsPrompt(opts.GlobalConfig)
 			return nil
 		},
 		PersistentPostRun: func(cmd *cobra.Command, args []string) {
@@ -140,7 +141,7 @@ func NewSkaffoldCommand(out, errOut io.Writer) *cobra.Command {
 			default:
 			}
 			if metricsPrompt {
-				if err := instrumentation.DisplayMetricsPrompt(opts.GlobalConfig, cmd.OutOrStdout()); err != nil {
+				if err := prompt.DisplayMetricsPrompt(opts.GlobalConfig, cmd.OutOrStdout()); err != nil {
 					fmt.Fprintf(cmd.OutOrStderr(), "%v\n", err)
 				}
 			}
@@ -194,7 +195,7 @@ func NewSkaffoldCommand(out, errOut io.Writer) *cobra.Command {
 
 	templates.ActsAsRootCommand(rootCmd, nil, groups...)
 	rootCmd.PersistentFlags().StringVarP(&v, "verbosity", "v", constants.DefaultLogLevel.String(), "Log level (debug, info, warn, error, fatal, panic)")
-	rootCmd.PersistentFlags().IntVar(&defaultColor, "color", int(color.DefaultColorCode), "Specify the default output color in ANSI escape codes")
+	rootCmd.PersistentFlags().IntVar(&defaultColor, "color", int(output.DefaultColorCode), "Specify the default output color in ANSI escape codes")
 	rootCmd.PersistentFlags().BoolVar(&forceColors, "force-colors", false, "Always print color codes (hidden)")
 	rootCmd.PersistentFlags().BoolVar(&interactive, "interactive", true, "Allow user prompts for more information")
 	rootCmd.PersistentFlags().BoolVar(&update.EnableCheck, "update-check", true, "Check for a more recent version of Skaffold")

cmd/skaffold/app/cmd/diagnose.go

@@ -23,8 +23,8 @@ import (
 
 	"github.com/spf13/cobra"
 
-	"github.com/GoogleContainerTools/skaffold/pkg/skaffold/color"
 	"github.com/GoogleContainerTools/skaffold/pkg/skaffold/diagnose"
+	"github.com/GoogleContainerTools/skaffold/pkg/skaffold/output"
 	"github.com/GoogleContainerTools/skaffold/pkg/skaffold/parser"
 	"github.com/GoogleContainerTools/skaffold/pkg/skaffold/runner/runcontext"
 	latestV1 "github.com/GoogleContainerTools/skaffold/pkg/skaffold/schema/latest/v1"
@@ -91,7 +91,7 @@ func printArtifactDiagnostics(ctx context.Context, out io.Writer, configs []*lat
 			return fmt.Errorf("running diagnostic on artifacts: %w", err)
 		}
 
-		color.Blue.Fprintln(out, "\nConfiguration")
+		output.Blue.Fprintln(out, "\nConfiguration")
 	}
 	return nil
 }

cmd/skaffold/app/cmd/find_configs.go

@@ -25,7 +25,7 @@ import (
 
 	"github.com/spf13/cobra"
 
-	"github.com/GoogleContainerTools/skaffold/pkg/skaffold/color"
+	"github.com/GoogleContainerTools/skaffold/pkg/skaffold/output"
 	"github.com/GoogleContainerTools/skaffold/pkg/skaffold/schema"
 	latestV1 "github.com/GoogleContainerTools/skaffold/pkg/skaffold/schema/latest/v1"
 	"github.com/GoogleContainerTools/skaffold/pkg/skaffold/walk"
@@ -65,9 +65,9 @@ func doFindConfigs(_ context.Context, out io.Writer) error {
 	case "table":
 		pathOutLen, versionOutLen := 70, 30
 		for p, v := range pathToVersion {
-			c := color.Default
+			c := output.Default
 			if v != latestV1.Version {
-				c = color.Green
+				c = output.Green
 			}
 			c.Fprintf(out, fmt.Sprintf("%%-%ds\t%%-%ds\n", pathOutLen, versionOutLen), p, v)
 		}

cmd/skaffold/app/cmd/fix.go

@@ -24,7 +24,7 @@ import (
 
 	"github.com/spf13/cobra"
 
-	"github.com/GoogleContainerTools/skaffold/pkg/skaffold/color"
+	"github.com/GoogleContainerTools/skaffold/pkg/skaffold/output"
 	"github.com/GoogleContainerTools/skaffold/pkg/skaffold/schema"
 	latestV1 "github.com/GoogleContainerTools/skaffold/pkg/skaffold/schema/latest/v1"
 	"github.com/GoogleContainerTools/skaffold/pkg/skaffold/schema/validation"
@@ -63,7 +63,7 @@ func fix(out io.Writer, configFile string, toVersion string, overwrite bool) err
 		}
 	}
 	if !needsUpdate {
-		color.Default.Fprintln(out, "config is already version", toVersion)
+		output.Default.Fprintln(out, "config is already version", toVersion)
 		return nil
 	}
 
@@ -97,7 +97,7 @@ func fix(out io.Writer, configFile string, toVersion string, overwrite bool) err
 		if err := ioutil.WriteFile(configFile, newCfg, 0644); err != nil {
 			return fmt.Errorf("writing config file: %w", err)
 		}
-		color.Default.Fprintf(out, "New config at version %s generated and written to %s\n", toVersion, opts.ConfigurationFile)
+		output.Default.Fprintf(out, "New config at version %s generated and written to %s\n", toVersion, opts.ConfigurationFile)
 	} else {
 		out.Write(newCfg)
 	}

cmd/skaffold/app/cmd/generate_pipeline.go

@@ -23,7 +23,7 @@ import (
 
 	"github.com/spf13/cobra"
 
-	"github.com/GoogleContainerTools/skaffold/pkg/skaffold/color"
+	"github.com/GoogleContainerTools/skaffold/pkg/skaffold/output"
 	"github.com/GoogleContainerTools/skaffold/pkg/skaffold/runner"
 	latestV1 "github.com/GoogleContainerTools/skaffold/pkg/skaffold/schema/latest/v1"
 )
@@ -48,7 +48,7 @@ func doGeneratePipeline(ctx context.Context, out io.Writer) error {
 		if err := r.GeneratePipeline(ctx, out, configs, configFiles, "pipeline.yaml"); err != nil {
 			return fmt.Errorf("generating : %w", err)
 		}
-		color.Default.Fprintln(out, "Pipeline config written to pipeline.yaml!")
+		output.Default.Fprintln(out, "Pipeline config written to pipeline.yaml!")
 		return nil
 	})
 }

cmd/skaffold/app/cmd/runner.go

@@ -24,14 +24,14 @@ import (
 
 	"github.com/sirupsen/logrus"
 
-	"github.com/GoogleContainerTools/skaffold/pkg/skaffold/color"
 	"github.com/GoogleContainerTools/skaffold/pkg/skaffold/config"
 	sErrors "github.com/GoogleContainerTools/skaffold/pkg/skaffold/errors"
 	"github.com/GoogleContainerTools/skaffold/pkg/skaffold/event"
 	"github.com/GoogleContainerTools/skaffold/pkg/skaffold/initializer"
 	initConfig "github.com/GoogleContainerTools/skaffold/pkg/skaffold/initializer/config"
 	"github.com/GoogleContainerTools/skaffold/pkg/skaffold/instrumentation"
 	kubectx "github.com/GoogleContainerTools/skaffold/pkg/skaffold/kubernetes/context"
+	"github.com/GoogleContainerTools/skaffold/pkg/skaffold/output"
 	"github.com/GoogleContainerTools/skaffold/pkg/skaffold/parser"
 	"github.com/GoogleContainerTools/skaffold/pkg/skaffold/runner"
 	"github.com/GoogleContainerTools/skaffold/pkg/skaffold/runner/runcontext"
@@ -109,7 +109,7 @@ func withFallbackConfig(out io.Writer, opts config.SkaffoldOptions, getCfgs func
 	var e sErrors.Error
 	if errors.As(err, &e) && e.StatusCode() == proto.StatusCode_CONFIG_FILE_NOT_FOUND_ERR {
 		if opts.AutoCreateConfig && initializer.ValidCmd(opts) {
-			color.Default.Fprintf(out, "Skaffold config file %s not found - Trying to create one for you...\n", opts.ConfigurationFile)
+			output.Default.Fprintf(out, "Skaffold config file %s not found - Trying to create one for you...\n", opts.ConfigurationFile)
 			config, err := initializer.Transparent(context.Background(), out, initConfig.Config{Opts: opts})
 			if err != nil {
 				return nil, fmt.Errorf("unable to generate skaffold config file automatically - try running `skaffold init`: %w", err)

cmd/skaffold/app/tips/tips.go

@@ -19,8 +19,8 @@ package tips
 import (
 	"io"
 
-	"github.com/GoogleContainerTools/skaffold/pkg/skaffold/color"
 	"github.com/GoogleContainerTools/skaffold/pkg/skaffold/config"
+	"github.com/GoogleContainerTools/skaffold/pkg/skaffold/output"
 )
 
 // PrintForRun prints tips to the user who has run `skaffold run`.
@@ -51,5 +51,5 @@ func PrintUseRunVsDeploy(out io.Writer) {
 }
 
 func printTip(out io.Writer, message string) {
-	color.Green.Fprintln(out, message)
+	output.Green.Fprintln(out, message)
 }

cmd/skaffold/skaffold.go

@@ -24,8 +24,8 @@ import (
 	"github.com/sirupsen/logrus"
 
 	"github.com/GoogleContainerTools/skaffold/cmd/skaffold/app"
-	"github.com/GoogleContainerTools/skaffold/pkg/skaffold/color"
 	"github.com/GoogleContainerTools/skaffold/pkg/skaffold/instrumentation"
+	"github.com/GoogleContainerTools/skaffold/pkg/skaffold/output"
 )
 
 type ExitCoder interface {
@@ -41,8 +41,8 @@ func main() {
 			// As we allow some color setup using CLI flags for the main run, we can't run SetupColors()
 			// for the entire skaffold run here. It's possible SetupColors() was never called, so call it again
 			// before we print an error to get the right coloring.
-			errOut := color.SetupColors(os.Stderr, color.DefaultColorCode, false)
-			color.Red.Fprintln(errOut, err)
+			errOut := output.SetupColors(os.Stderr, output.DefaultColorCode, false)
+			output.Red.Fprintln(errOut, err)
 			code = exitCode(err)
 		}
 	}

hack/versions/cmd/new/version.go

@@ -29,7 +29,7 @@ import (
 	"github.com/sirupsen/logrus"
 
 	hackschema "github.com/GoogleContainerTools/skaffold/hack/versions/pkg/schema"
-	"github.com/GoogleContainerTools/skaffold/pkg/skaffold/color"
+	"github.com/GoogleContainerTools/skaffold/pkg/skaffold/output"
 	"github.com/GoogleContainerTools/skaffold/pkg/skaffold/schema"
 	"github.com/GoogleContainerTools/skaffold/pkg/skaffold/walk"
 )
@@ -118,7 +118,7 @@ func readNextVersion(current string) string {
 	var new string
 	if len(os.Args) <= 1 {
 		new = bumpVersion(current)
-		color.Red.Fprintf(os.Stdout, "Please enter new version (default: %s): ", new)
+		output.Red.Fprintf(os.Stdout, "Please enter new version (default: %s): ", new)
 		reader := bufio.NewReader(os.Stdin)
 		if line, err := reader.ReadString('\n'); err != nil {
 			logrus.Fatalf("error reading input: %s", err)

pkg/skaffold/build/bazel/build.go

@@ -26,8 +26,8 @@ import (
 	"path/filepath"
 	"strings"
 
-	"github.com/GoogleContainerTools/skaffold/pkg/skaffold/color"
 	"github.com/GoogleContainerTools/skaffold/pkg/skaffold/docker"
+	"github.com/GoogleContainerTools/skaffold/pkg/skaffold/output"
 	latestV1 "github.com/GoogleContainerTools/skaffold/pkg/skaffold/schema/latest/v1"
 	"github.com/GoogleContainerTools/skaffold/pkg/skaffold/util"
 )
@@ -56,7 +56,7 @@ func (b *Builder) buildTar(ctx context.Context, out io.Writer, workspace string,
 	args = append(args, a.BuildArgs...)
 	args = append(args, a.BuildTarget)
 
-	if color.IsColorable(out) {
+	if output.IsColorable(out) {
 		args = append(args, "--color=yes")
 	} else {
 		args = append(args, "--color=no")

pkg/skaffold/build/buildpacks/lifecycle.go

@@ -32,8 +32,8 @@ import (
 	"github.com/buildpacks/pack/project"
 	"github.com/sirupsen/logrus"
 
-	"github.com/GoogleContainerTools/skaffold/pkg/skaffold/color"
 	"github.com/GoogleContainerTools/skaffold/pkg/skaffold/docker"
+	"github.com/GoogleContainerTools/skaffold/pkg/skaffold/output"
 	latestV1 "github.com/GoogleContainerTools/skaffold/pkg/skaffold/schema/latest/v1"
 )
 
@@ -91,7 +91,7 @@ func (b *Builder) build(ctx context.Context, out io.Writer, a *latestV1.Artifact
 
 	builderImage, runImage, pullPolicy := resolveDependencyImages(artifact, b.artifacts, a.Dependencies, b.pushImages)
 
-	if err := runPackBuildFunc(ctx, color.GetWriter(out), b.localDocker, pack.BuildOptions{
+	if err := runPackBuildFunc(ctx, output.GetWriter(out), b.localDocker, pack.BuildOptions{
 		AppPath:      workspace,
 		Builder:      builderImage,
 		RunImage:     runImage,

pkg/skaffold/build/cache/retrieve.go

@@ -25,10 +25,10 @@ import (
 	"github.com/sirupsen/logrus"
 
 	"github.com/GoogleContainerTools/skaffold/pkg/skaffold/build"
-	"github.com/GoogleContainerTools/skaffold/pkg/skaffold/color"
 	"github.com/GoogleContainerTools/skaffold/pkg/skaffold/docker"
 	sErrors "github.com/GoogleContainerTools/skaffold/pkg/skaffold/errors"
 	"github.com/GoogleContainerTools/skaffold/pkg/skaffold/graph"
+	"github.com/GoogleContainerTools/skaffold/pkg/skaffold/output"
 	latestV1 "github.com/GoogleContainerTools/skaffold/pkg/skaffold/schema/latest/v1"
 	"github.com/GoogleContainerTools/skaffold/pkg/skaffold/tag"
 	"github.com/GoogleContainerTools/skaffold/pkg/skaffold/util"
@@ -40,7 +40,7 @@ func (c *cache) Build(ctx context.Context, out io.Writer, tags tag.ImageTags, ar
 
 	start := time.Now()
 
-	color.Default.Fprintln(out, "Checking cache...")
+	output.Default.Fprintln(out, "Checking cache...")
 
 	lookup := make(chan []cacheDetails)
 	go func() { lookup <- c.lookupArtifacts(ctx, tags, artifacts) }()
@@ -56,28 +56,28 @@ func (c *cache) Build(ctx context.Context, out io.Writer, tags tag.ImageTags, ar
 	var needToBuild []*latestV1.Artifact
 	var alreadyBuilt []graph.Artifact
 	for i, artifact := range artifacts {
-		color.Default.Fprintf(out, " - %s: ", artifact.ImageName)
+		output.Default.Fprintf(out, " - %s: ", artifact.ImageName)
 
 		result := results[i]
 		switch result := result.(type) {
 		case failed:
-			color.Red.Fprintln(out, "Error checking cache.")
+			output.Red.Fprintln(out, "Error checking cache.")
 			return nil, result.err
 
 		case needsBuilding:
-			color.Yellow.Fprintln(out, "Not found. Building")
+			output.Yellow.Fprintln(out, "Not found. Building")
 			hashByName[artifact.ImageName] = result.Hash()
 			needToBuild = append(needToBuild, artifact)
 			continue
 
 		case needsTagging:
-			color.Green.Fprintln(out, "Found. Tagging")
+			output.Green.Fprintln(out, "Found. Tagging")
 			if err := result.Tag(ctx, c); err != nil {
 				return nil, fmt.Errorf("tagging image: %w", err)
 			}
 
 		case needsPushing:
-			color.Green.Fprintln(out, "Found. Pushing")
+			output.Green.Fprintln(out, "Found. Pushing")
 			if err := result.Push(ctx, out, c); err != nil {
 				return nil, fmt.Errorf("%s: %w", sErrors.PushImageErr, err)
 			}
@@ -88,9 +88,9 @@ func (c *cache) Build(ctx context.Context, out io.Writer, tags tag.ImageTags, ar
 				return nil, err
 			}
 			if isLocal {
-				color.Green.Fprintln(out, "Found Locally")
+				output.Green.Fprintln(out, "Found Locally")
 			} else {
-				color.Green.Fprintln(out, "Found Remotely")
+				output.Green.Fprintln(out, "Found Remotely")
 			}
 		}
 

pkg/skaffold/build/cluster/secret.go

@@ -28,8 +28,8 @@ import (
 	typedV1 "k8s.io/client-go/kubernetes/typed/core/v1"
 
 	"github.com/GoogleContainerTools/skaffold/pkg/skaffold/build/kaniko"
-	"github.com/GoogleContainerTools/skaffold/pkg/skaffold/color"
 	kubernetesclient "github.com/GoogleContainerTools/skaffold/pkg/skaffold/kubernetes/client"
+	"github.com/GoogleContainerTools/skaffold/pkg/skaffold/output"
 )
 
 const (
@@ -41,15 +41,15 @@ func (b *Builder) setupPullSecret(ctx context.Context, out io.Writer) (func(), e
 		return func() {}, nil
 	}
 
-	color.Default.Fprintf(out, "Checking for kaniko secret [%s/%s]...\n", b.Namespace, b.PullSecretName)
+	output.Default.Fprintf(out, "Checking for kaniko secret [%s/%s]...\n", b.Namespace, b.PullSecretName)
 	client, err := kubernetesclient.Client()
 	if err != nil {
 		return nil, fmt.Errorf("getting Kubernetes client: %w", err)
 	}
 
 	secrets := client.CoreV1().Secrets(b.Namespace)
 	if _, err := secrets.Get(ctx, b.PullSecretName, metav1.GetOptions{}); err != nil {
-		color.Default.Fprintf(out, "Creating kaniko secret [%s/%s]...\n", b.Namespace, b.PullSecretName)
+		output.Default.Fprintf(out, "Creating kaniko secret [%s/%s]...\n", b.Namespace, b.PullSecretName)
 		if b.PullSecretPath == "" {
 			return nil, fmt.Errorf("secret %s does not exist. No path specified to create it", b.PullSecretName)
 		}
@@ -95,7 +95,7 @@ func (b *Builder) setupDockerConfigSecret(ctx context.Context, out io.Writer) (f
 		return func() {}, nil
 	}
 
-	color.Default.Fprintf(out, "Creating docker config secret [%s]...\n", b.DockerConfig.SecretName)
+	output.Default.Fprintf(out, "Creating docker config secret [%s]...\n", b.DockerConfig.SecretName)
 
 	client, err := kubernetesclient.Client()
 	if err != nil {

pkg/skaffold/build/docker/docker.go

@@ -23,8 +23,8 @@ import (
 	"os"
 	"os/exec"
 
-	"github.com/GoogleContainerTools/skaffold/pkg/skaffold/color"
 	"github.com/GoogleContainerTools/skaffold/pkg/skaffold/docker"
+	"github.com/GoogleContainerTools/skaffold/pkg/skaffold/output"
 	latestV1 "github.com/GoogleContainerTools/skaffold/pkg/skaffold/schema/latest/v1"
 	"github.com/GoogleContainerTools/skaffold/pkg/skaffold/util"
 	"github.com/GoogleContainerTools/skaffold/pkg/skaffold/warnings"
@@ -48,7 +48,7 @@ func (b *Builder) Build(ctx context.Context, out io.Writer, a *latestV1.Artifact
 	var imageID string
 
 	if b.useCLI || b.useBuildKit {
-		imageID, err = b.dockerCLIBuild(ctx, color.GetWriter(out), a.Workspace, dockerfile, a.ArtifactType.DockerArtifact, opts)
+		imageID, err = b.dockerCLIBuild(ctx, output.GetWriter(out), a.Workspace, dockerfile, a.ArtifactType.DockerArtifact, opts)
 	} else {
 		imageID, err = b.localDocker.Build(ctx, out, a.Workspace, a.ImageName, a.ArtifactType.DockerArtifact, opts)
 	}