Fix broken --parameters switch for process

Author: mfojtik

pkg/cmd/cli/cmd/process.go

@@ -2,8 +2,10 @@ package cmd
 
 import (
 	"errors"
+	"fmt"
 	"io"
 	"strings"
+	"text/tabwriter"
 
 	cmdutil "github.com/GoogleCloudPlatform/kubernetes/pkg/kubectl/cmd/util"
 	"github.com/GoogleCloudPlatform/kubernetes/pkg/util"
@@ -15,6 +17,25 @@ import (
 	"github.com/openshift/origin/pkg/template/api"
 )
 
+// printTemplateParameters prints all parameters defined by the template
+func printTemplateParameters(t *api.Template, output io.Writer) error {
+	w := tabwriter.NewWriter(output, 20, 5, 3, ' ', 0)
+	defer w.Flush()
+	parameterColumns := []string{"NAME", "DESCRIPTION", "GENERATOR", "VALUE"}
+	fmt.Fprintf(w, "%s\n", strings.Join(parameterColumns, "\t"))
+	for _, p := range t.Parameters {
+		value := p.Value
+		if len(p.Generate) != 0 {
+			value = p.From
+		}
+		_, err := fmt.Fprintf(w, "%s\t%s\t%s\t%s\n", p.Name, p.Description, p.Generate, value)
+		if err != nil {
+			return err
+		}
+	}
+	return nil
+}
+
 // injectUserVars injects user specified variables into the Template
 func injectUserVars(cmd *cobra.Command, t *api.Template) {
 	values := util.StringList{}
@@ -89,7 +110,7 @@ Examples:
 			// If 'parameters' flag is set it does not do processing but only print
 			// the template parameters to console for inspection.
 			if cmdutil.GetFlagBool(cmd, "parameters") == true {
-				err = printer.PrintObj(templateObj, out)
+				err = printTemplateParameters(templateObj, out)
 				checkErr(err)
 				return
 			}

pkg/cmd/cli/describe/printer.go

@@ -30,7 +30,6 @@ var (
 	deploymentColumns       = []string{"NAME", "STATUS", "CAUSE"}
 	deploymentConfigColumns = []string{"NAME", "TRIGGERS", "LATEST VERSION"}
 	templateColumns         = []string{"NAME", "DESCRIPTION", "PARAMETERS", "OBJECTS"}
-	parameterColumns        = []string{"NAME", "DESCRIPTION", "GENERATOR", "VALUE"}
 	policyColumns           = []string{"NAME", "ROLES", "LAST MODIFIED"}
 	policyBindingColumns    = []string{"NAME", "ROLE BINDINGS", "LAST MODIFIED"}
 
@@ -116,20 +115,6 @@ func printTemplate(t *templateapi.Template, w io.Writer) error {
 	return err
 }
 
-func printTemplateParameters(t *templateapi.Template, w io.Writer) error {
-	for _, p := range t.Parameters {
-		value := p.Value
-		if len(p.Generate) != 0 {
-			value = p.From
-		}
-		_, err := fmt.Fprintf(w, "%s\t%s\t%s\t%s\n", p.Name, p.Description, p.Generate, value)
-		if err != nil {
-			return err
-		}
-	}
-	return nil
-}
-
 func printTemplateList(list *templateapi.TemplateList, w io.Writer) error {
 	for _, t := range list.Items {
 		if err := printTemplate(&t, w); err != nil {