Clean up manifest apply output (istio#457)

* Clean up manifest apply output

* Restore warning for special case

cmd/mesh/manifest-apply.go

@@ -67,8 +67,9 @@ func manifestApplyCmd(rootArgs *rootArgs, maArgs *manifestApplyArgs) *cobra.Comm
 		Run: func(cmd *cobra.Command, args []string) {
 			// Passing cmd.OutOrStdXXX() allows capturing command output for e2e tests.
 			l := newLogger(rootArgs.logToStdErr, cmd.OutOrStdout(), cmd.OutOrStderr())
-			if !maArgs.skipConfirmation && maArgs.kubeConfigPath == "" && maArgs.context == "" {
-				if !confirm("Do you want to proceed? (y/N)", cmd.OutOrStdout()) {
+			// Warn a user if they type `mesh manifest apply` without any config args.
+			if maArgs.inFilename == "" && len(maArgs.set) == 0 && !maArgs.skipConfirmation {
+				if !confirm("This will install the default Istio profile into the cluster. Proceed? (y/N)", cmd.OutOrStdout()) {
 					cmd.Print("Cancelled.\n")
 					os.Exit(1)
 				}

cmd/mesh/manifest.go

@@ -137,18 +137,18 @@ func genApplyManifests(setOverlay []string, inFilename string, dryRun bool, verb
 	for cn := range manifests {
 		if out[cn].Err != nil {
 			cs := fmt.Sprintf("Component %s failed install:", cn)
-			l.logAndPrintf("\n%s\n%s\n", cs, strings.Repeat("=", len(cs)))
+			l.logAndPrintf("\n%s\n%s", cs, strings.Repeat("=", len(cs)))
 			l.logAndPrint("Error: ", out[cn].Err, "\n")
 		} else {
 			cs := fmt.Sprintf("Component %s installed successfully:", cn)
-			l.logAndPrintf("\n%s\n%s\n", cs, strings.Repeat("=", len(cs)))
+			l.logAndPrintf("\n%s\n%s", cs, strings.Repeat("=", len(cs)))
 		}
 
 		if strings.TrimSpace(out[cn].Stderr) != "" {
 			l.logAndPrint("Error detail:\n", out[cn].Stderr, "\n")
 		}
 		if strings.TrimSpace(out[cn].Stdout) != "" {
-			l.logAndPrint("Stdout:\n", out[cn].Stdout, "\n")
+			l.logAndPrint(out[cn].Stdout, "\n")
 		}
 	}
 	return nil

pkg/manifest/installer.go

@@ -223,7 +223,7 @@ func ApplyAll(manifests name.ManifestMap, version version.Version, opts *Install
 	for c := range manifests {
 		logAndPrint("- %s", c)
 	}
-	logAndPrint("Component dependencies tree: \n%s", installTreeString())
+	log.Infof("Component dependencies tree: \n%s", installTreeString())
 	if err := initK8SRestClient(opts.Kubeconfig, opts.Context); err != nil {
 		return nil, err
 	}
@@ -239,15 +239,15 @@ func applyRecursive(manifests name.ManifestMap, version version.Version, opts *I
 		wg.Add(1)
 		go func() {
 			if s := dependencyWaitCh[c]; s != nil {
-				logAndPrint("%s is waiting on parent dependency...", c)
+				logAndPrint("%s is waiting on a prerequisite...", c)
 				<-s
-				logAndPrint("Parent dependency for %s has unblocked, proceeding.", c)
+				logAndPrint("Prerequisite for %s has completed, proceeding with install.", c)
 			}
 			out[c] = applyManifest(c, m, version, opts)
 
 			// Signal all the components that depend on us.
 			for _, ch := range componentDependencies[c] {
-				logAndPrint("unblocking child dependency %s.", ch)
+				log.Infof("unblocking child %s.", ch)
 				dependencyWaitCh[ch] <- struct{}{}
 			}
 			wg.Done()
@@ -313,7 +313,7 @@ func applyManifest(componentName name.ComponentName, manifestStr string, version
 		extraArgs = append(extraArgs, "--prune", "--selector", componentLabel)
 	}
 
-	logAndPrint("kubectl applying manifest for component %s", componentName)
+	logAndPrint("Applying manifest for component %s", componentName)
 
 	crdObjects := cRDKindObjects(objects)
 	if len(crdObjects) > 0 {
@@ -348,7 +348,7 @@ func applyManifest(componentName name.ComponentName, manifestStr string, version
 		}
 	}
 	stdout, stderr, err = kubectl.Apply(opts.DryRun, opts.Verbose, opts.Kubeconfig, opts.Context, namespace, m, extraArgs...)
-	logAndPrint("finished applying manifest for component %s", componentName)
+	logAndPrint("Finished applying manifest for component %s", componentName)
 	ym, _ := objects.YAMLManifest()
 	return &ComponentApplyOutput{
 		Stdout:   stdoutCRD + "\n" + stdout,