oc new-app/new-build/process: add --env-file/--param-file parameters

contrib/completions/bash/oc

@@ -10432,6 +10432,10 @@ _oc_new-app()
     flags+=("--env=")
     two_word_flags+=("-e")
     local_nonpersistent_flags+=("--env=")
+    flags+=("--env-file=")
+    flags_with_completion+=("--env-file")
+    flags_completion+=("_filedir")
+    local_nonpersistent_flags+=("--env-file=")
     flags+=("--file=")
     flags_with_completion+=("--file")
     flags_completion+=("__handle_filename_extension_flag yaml|yml|json")
@@ -10466,6 +10470,10 @@ _oc_new-app()
     flags+=("--param=")
     two_word_flags+=("-p")
     local_nonpersistent_flags+=("--param=")
+    flags+=("--param-file=")
+    flags_with_completion+=("--param-file")
+    flags_completion+=("_filedir")
+    local_nonpersistent_flags+=("--param-file=")
     flags+=("--search")
     flags+=("-S")
     local_nonpersistent_flags+=("--search")
@@ -10538,6 +10546,10 @@ _oc_new-build()
     flags+=("--env=")
     two_word_flags+=("-e")
     local_nonpersistent_flags+=("--env=")
+    flags+=("--env-file=")
+    flags_with_completion+=("--env-file")
+    flags_completion+=("_filedir")
+    local_nonpersistent_flags+=("--env-file=")
     flags+=("--image-stream=")
     two_word_flags+=("-i")
     local_nonpersistent_flags+=("--image-stream=")
@@ -11510,6 +11522,10 @@ _oc_process()
     flags+=("--param=")
     two_word_flags+=("-p")
     local_nonpersistent_flags+=("--param=")
+    flags+=("--param-file=")
+    flags_with_completion+=("--param-file")
+    flags_completion+=("_filedir")
+    local_nonpersistent_flags+=("--param-file=")
     flags+=("--parameters")
     local_nonpersistent_flags+=("--parameters")
     flags+=("--raw")

contrib/completions/bash/openshift

@@ -15080,6 +15080,10 @@ _openshift_cli_new-app()
     flags+=("--env=")
     two_word_flags+=("-e")
     local_nonpersistent_flags+=("--env=")
+    flags+=("--env-file=")
+    flags_with_completion+=("--env-file")
+    flags_completion+=("_filedir")
+    local_nonpersistent_flags+=("--env-file=")
     flags+=("--file=")
     flags_with_completion+=("--file")
     flags_completion+=("__handle_filename_extension_flag yaml|yml|json")
@@ -15114,6 +15118,10 @@ _openshift_cli_new-app()
     flags+=("--param=")
     two_word_flags+=("-p")
     local_nonpersistent_flags+=("--param=")
+    flags+=("--param-file=")
+    flags_with_completion+=("--param-file")
+    flags_completion+=("_filedir")
+    local_nonpersistent_flags+=("--param-file=")
     flags+=("--search")
     flags+=("-S")
     local_nonpersistent_flags+=("--search")
@@ -15187,6 +15195,10 @@ _openshift_cli_new-build()
     flags+=("--env=")
     two_word_flags+=("-e")
     local_nonpersistent_flags+=("--env=")
+    flags+=("--env-file=")
+    flags_with_completion+=("--env-file")
+    flags_completion+=("_filedir")
+    local_nonpersistent_flags+=("--env-file=")
     flags+=("--image-stream=")
     two_word_flags+=("-i")
     local_nonpersistent_flags+=("--image-stream=")
@@ -16174,6 +16186,10 @@ _openshift_cli_process()
     flags+=("--param=")
     two_word_flags+=("-p")
     local_nonpersistent_flags+=("--param=")
+    flags+=("--param-file=")
+    flags_with_completion+=("--param-file")
+    flags_completion+=("_filedir")
+    local_nonpersistent_flags+=("--param-file=")
     flags+=("--parameters")
     local_nonpersistent_flags+=("--parameters")
     flags+=("--raw")

contrib/completions/zsh/oc

@@ -10593,6 +10593,10 @@ _oc_new-app()
     flags+=("--env=")
     two_word_flags+=("-e")
     local_nonpersistent_flags+=("--env=")
+    flags+=("--env-file=")
+    flags_with_completion+=("--env-file")
+    flags_completion+=("_filedir")
+    local_nonpersistent_flags+=("--env-file=")
     flags+=("--file=")
     flags_with_completion+=("--file")
     flags_completion+=("__handle_filename_extension_flag yaml|yml|json")
@@ -10627,6 +10631,10 @@ _oc_new-app()
     flags+=("--param=")
     two_word_flags+=("-p")
     local_nonpersistent_flags+=("--param=")
+    flags+=("--param-file=")
+    flags_with_completion+=("--param-file")
+    flags_completion+=("_filedir")
+    local_nonpersistent_flags+=("--param-file=")
     flags+=("--search")
     flags+=("-S")
     local_nonpersistent_flags+=("--search")
@@ -10699,6 +10707,10 @@ _oc_new-build()
     flags+=("--env=")
     two_word_flags+=("-e")
     local_nonpersistent_flags+=("--env=")
+    flags+=("--env-file=")
+    flags_with_completion+=("--env-file")
+    flags_completion+=("_filedir")
+    local_nonpersistent_flags+=("--env-file=")
     flags+=("--image-stream=")
     two_word_flags+=("-i")
     local_nonpersistent_flags+=("--image-stream=")
@@ -11671,6 +11683,10 @@ _oc_process()
     flags+=("--param=")
     two_word_flags+=("-p")
     local_nonpersistent_flags+=("--param=")
+    flags+=("--param-file=")
+    flags_with_completion+=("--param-file")
+    flags_completion+=("_filedir")
+    local_nonpersistent_flags+=("--param-file=")
     flags+=("--parameters")
     local_nonpersistent_flags+=("--parameters")
     flags+=("--raw")

contrib/completions/zsh/openshift

@@ -15241,6 +15241,10 @@ _openshift_cli_new-app()
     flags+=("--env=")
     two_word_flags+=("-e")
     local_nonpersistent_flags+=("--env=")
+    flags+=("--env-file=")
+    flags_with_completion+=("--env-file")
+    flags_completion+=("_filedir")
+    local_nonpersistent_flags+=("--env-file=")
     flags+=("--file=")
     flags_with_completion+=("--file")
     flags_completion+=("__handle_filename_extension_flag yaml|yml|json")
@@ -15275,6 +15279,10 @@ _openshift_cli_new-app()
     flags+=("--param=")
     two_word_flags+=("-p")
     local_nonpersistent_flags+=("--param=")
+    flags+=("--param-file=")
+    flags_with_completion+=("--param-file")
+    flags_completion+=("_filedir")
+    local_nonpersistent_flags+=("--param-file=")
     flags+=("--search")
     flags+=("-S")
     local_nonpersistent_flags+=("--search")
@@ -15348,6 +15356,10 @@ _openshift_cli_new-build()
     flags+=("--env=")
     two_word_flags+=("-e")
     local_nonpersistent_flags+=("--env=")
+    flags+=("--env-file=")
+    flags_with_completion+=("--env-file")
+    flags_completion+=("_filedir")
+    local_nonpersistent_flags+=("--env-file=")
     flags+=("--image-stream=")
     two_word_flags+=("-i")
     local_nonpersistent_flags+=("--image-stream=")
@@ -16335,6 +16347,10 @@ _openshift_cli_process()
     flags+=("--param=")
     two_word_flags+=("-p")
     local_nonpersistent_flags+=("--param=")
+    flags+=("--param-file=")
+    flags_with_completion+=("--param-file")
+    flags_completion+=("_filedir")
+    local_nonpersistent_flags+=("--param-file=")
     flags+=("--parameters")
     local_nonpersistent_flags+=("--parameters")
     flags+=("--raw")

docs/man/man1/oc-new-app.1

@@ -58,6 +58,10 @@ If you provide source code, a new build will be automatically triggered. You can
 \fB\-e\fP, \fB\-\-env\fP=[]
     Specify a key\-value pair for an environment variable to set into each container.
 
+.PP
+\fB\-\-env\-file\fP=[]
+    File containing key\-value pairs of environment variables to set into each container.
+
 .PP
 \fB\-f\fP, \fB\-\-file\fP=[]
     Path to a template file to use for the app.
@@ -110,6 +114,10 @@ If you provide source code, a new build will be automatically triggered. You can
 \fB\-p\fP, \fB\-\-param\fP=[]
     Specify a key\-value pair (e.g., \-p FOO=BAR) to set/override a parameter value in the template.
 
+.PP
+\fB\-\-param\-file\fP=[]
+    File containing parameter values to set/override in the template.
+
 .PP
 \fB\-S\fP, \fB\-\-search\fP=false
     Search all templates, image streams, and Docker images that match the arguments provided.

docs/man/man1/oc-new-build.1

@@ -66,6 +66,10 @@ Once the build configuration is created a new build will be automatically trigge
 \fB\-e\fP, \fB\-\-env\fP=[]
     Specify a key\-value pair for an environment variable to set into resulting image.
 
+.PP
+\fB\-\-env\-file\fP=[]
+    File containing key\-value pairs of environment variables to set into each container.
+
 .PP
 \fB\-\-image\fP=[]
     Name of an image stream to to use as a builder. (deprecated)

docs/man/man1/oc-process.1

@@ -43,6 +43,10 @@ The output of the process command is always a list of one or more resources. You
 \fB\-p\fP, \fB\-\-param\fP=[]
     Specify a key\-value pair (eg. \-p FOO=BAR) to set/override a parameter value in the template.
 
+.PP
+\fB\-\-param\-file\fP=[]
+    File containing template parameter values to set/override in the template.
+
 .PP
 \fB\-\-parameters\fP=false
     Do not process but only print available parameters

docs/man/man1/openshift-cli-new-app.1

@@ -58,6 +58,10 @@ If you provide source code, a new build will be automatically triggered. You can
 \fB\-e\fP, \fB\-\-env\fP=[]
     Specify a key\-value pair for an environment variable to set into each container.
 
+.PP
+\fB\-\-env\-file\fP=[]
+    File containing key\-value pairs of environment variables to set into each container.
+
 .PP
 \fB\-f\fP, \fB\-\-file\fP=[]
     Path to a template file to use for the app.
@@ -110,6 +114,10 @@ If you provide source code, a new build will be automatically triggered. You can
 \fB\-p\fP, \fB\-\-param\fP=[]
     Specify a key\-value pair (e.g., \-p FOO=BAR) to set/override a parameter value in the template.
 
+.PP
+\fB\-\-param\-file\fP=[]
+    File containing parameter values to set/override in the template.
+
 .PP
 \fB\-S\fP, \fB\-\-search\fP=false
     Search all templates, image streams, and Docker images that match the arguments provided.

docs/man/man1/openshift-cli-new-build.1

@@ -66,6 +66,10 @@ Once the build configuration is created a new build will be automatically trigge
 \fB\-e\fP, \fB\-\-env\fP=[]
     Specify a key\-value pair for an environment variable to set into resulting image.
 
+.PP
+\fB\-\-env\-file\fP=[]
+    File containing key\-value pairs of environment variables to set into each container.
+
 .PP
 \fB\-\-image\fP=[]
     Name of an image stream to to use as a builder. (deprecated)

docs/man/man1/openshift-cli-process.1

@@ -43,6 +43,10 @@ The output of the process command is always a list of one or more resources. You
 \fB\-p\fP, \fB\-\-param\fP=[]
     Specify a key\-value pair (eg. \-p FOO=BAR) to set/override a parameter value in the template.
 
+.PP
+\fB\-\-param\-file\fP=[]
+    File containing template parameter values to set/override in the template.
+
 .PP
 \fB\-\-parameters\fP=false
     Do not process but only print available parameters

pkg/cmd/cli/cli.go

@@ -95,7 +95,7 @@ func NewCommandCLI(name, fullName string, in io.Reader, out, errout io.Writer) *
 				cmd.NewCmdTypes(fullName, f, out),
 				loginCmd,
 				cmd.NewCmdRequestProject(cmd.RequestProjectRecommendedCommandName, fullName, f, out, errout),
-				cmd.NewCmdNewApplication(cmd.NewAppRecommendedCommandName, fullName, f, out, errout),
+				cmd.NewCmdNewApplication(cmd.NewAppRecommendedCommandName, fullName, f, in, out, errout),
 				cmd.NewCmdStatus(cmd.StatusRecommendedName, fullName, fullName+" "+cmd.StatusRecommendedName, f, out),
 				cmd.NewCmdProject(fullName+" project", f, out),
 				cmd.NewCmdProjects(fullName, f, out),
@@ -156,7 +156,7 @@ func NewCommandCLI(name, fullName string, in io.Reader, out, errout io.Writer) *
 				cmd.NewCmdReplace(fullName, f, out),
 				cmd.NewCmdApply(fullName, f, out),
 				cmd.NewCmdPatch(fullName, f, out),
-				cmd.NewCmdProcess(fullName, f, out, errout),
+				cmd.NewCmdProcess(fullName, f, in, out, errout),
 				cmd.NewCmdExport(fullName, f, in, out),
 				cmd.NewCmdExtract(fullName, f, in, out, errout),
 				observe.NewCmdObserve(fullName, f, out, errout),

pkg/cmd/cli/cmd/dockerbuild/dockerbuild.go

@@ -20,6 +20,7 @@ import (
 	"github.com/openshift/origin/pkg/cmd/templates"
 	cmdutil "github.com/openshift/origin/pkg/cmd/util"
 	"github.com/openshift/origin/pkg/cmd/util/clientcmd"
+	"github.com/openshift/origin/pkg/generate/app"
 )
 
 var (
@@ -55,7 +56,7 @@ type DockerbuildOptions struct {
 	DockerfilePath string
 	AllowPull      bool
 	Keyring        credentialprovider.DockerKeyring
-	Arguments      cmdutil.Environment
+	Arguments      app.Environment
 }
 
 func NewCmdDockerbuild(fullName string, f *clientcmd.Factory, out, errOut io.Writer) *cobra.Command {
@@ -97,7 +98,7 @@ func (o *DockerbuildOptions) Complete(f *clientcmd.Factory, cmd *cobra.Command,
 	if len(paths) != 2 {
 		return kcmdutil.UsageError(cmd, "the directory to build and tag must be specified")
 	}
-	o.Arguments, _, _ = cmdutil.ParseEnvironmentArguments(envArgs)
+	o.Arguments, _, _ = app.ParseEnvironment(envArgs...)
 	o.Directory = paths[0]
 	o.Tag = paths[1]
 	if len(o.DockerfilePath) == 0 {

pkg/cmd/cli/cmd/newapp.go

@@ -45,10 +45,6 @@ import (
 // NewAppRecommendedCommandName is the recommended command name.
 const NewAppRecommendedCommandName = "new-app"
 
-type usage interface {
-	UsageError(baseName string) string
-}
-
 var (
 	newAppLong = templates.LongDesc(`
 		Create a new application by specifying source code, templates, and/or images
@@ -129,14 +125,15 @@ type NewAppOptions struct {
 	CommandPath string
 	CommandName string
 
+	In            io.Reader
 	Out, ErrOut   io.Writer
 	Output        string
 	PrintObject   func(obj runtime.Object) error
 	LogsForObject LogsForObjectFunc
 }
 
 // NewCmdNewApplication implements the OpenShift cli new-app command.
-func NewCmdNewApplication(name, baseName string, f *clientcmd.Factory, out, errout io.Writer) *cobra.Command {
+func NewCmdNewApplication(name, baseName string, f *clientcmd.Factory, in io.Reader, out, errout io.Writer) *cobra.Command {
 	config := newcmd.NewAppConfig()
 	config.Deploy = true
 	o := &NewAppOptions{Config: config}
@@ -148,7 +145,7 @@ func NewCmdNewApplication(name, baseName string, f *clientcmd.Factory, out, erro
 		Example:    fmt.Sprintf(newAppExample, baseName, name),
 		SuggestFor: []string{"app", "application"},
 		Run: func(c *cobra.Command, args []string) {
-			kcmdutil.CheckErr(o.Complete(baseName, name, f, c, args, out, errout))
+			kcmdutil.CheckErr(o.Complete(baseName, name, f, c, args, in, out, errout))
 			err := o.RunNewApp()
 			if err == cmdutil.ErrExit {
 				os.Exit(1)
@@ -168,8 +165,12 @@ func NewCmdNewApplication(name, baseName string, f *clientcmd.Factory, out, erro
 	cmd.Flags().StringSliceVarP(&config.TemplateFiles, "file", "f", config.TemplateFiles, "Path to a template file to use for the app.")
 	cmd.MarkFlagFilename("file", "yaml", "yml", "json")
 	cmd.Flags().StringArrayVarP(&config.TemplateParameters, "param", "p", config.TemplateParameters, "Specify a key-value pair (e.g., -p FOO=BAR) to set/override a parameter value in the template.")
+	cmd.Flags().StringArrayVar(&config.TemplateParameterFiles, "param-file", config.TemplateParameterFiles, "File containing parameter values to set/override in the template.")
+	cmd.MarkFlagFilename("param-file")
 	cmd.Flags().StringSliceVar(&config.Groups, "group", config.Groups, "Indicate components that should be grouped together as <comp1>+<comp2>.")
 	cmd.Flags().StringArrayVarP(&config.Environment, "env", "e", config.Environment, "Specify a key-value pair for an environment variable to set into each container.")
+	cmd.Flags().StringArrayVar(&config.EnvironmentFiles, "env-file", config.EnvironmentFiles, "File containing key-value pairs of environment variables to set into each container.")
+	cmd.MarkFlagFilename("env-file")
 	cmd.Flags().StringVar(&config.Name, "name", "", "Set name to use for generated application artifacts")
 	cmd.Flags().Var(&config.Strategy, "strategy", "Specify the build strategy to use if you don't want to detect (docker|pipeline|source).")
 	cmd.Flags().StringP("labels", "l", "", "Label to set in all resources for this application.")
@@ -188,12 +189,14 @@ func NewCmdNewApplication(name, baseName string, f *clientcmd.Factory, out, erro
 }
 
 // Complete sets any default behavior for the command
-func (o *NewAppOptions) Complete(baseName, name string, f *clientcmd.Factory, c *cobra.Command, args []string, out, errout io.Writer) error {
+func (o *NewAppOptions) Complete(baseName, name string, f *clientcmd.Factory, c *cobra.Command, args []string, in io.Reader, out, errout io.Writer) error {
+	o.In = in
 	o.Out = out
 	o.ErrOut = errout
 	o.Output = kcmdutil.GetFlagString(c, "output")
 	// Only output="" should print descriptions of intermediate steps. Everything
 	// else should print only some specific output (json, yaml, go-template, ...)
+	o.Config.In = o.In
 	if len(o.Output) == 0 {
 		o.Config.Out = o.Out
 	} else {

pkg/cmd/cli/cmd/newapp_test.go

@@ -112,7 +112,7 @@ func TestNewAppDefaultFlags(t *testing.T) {
 		},
 	}
 
-	cmd := NewCmdNewApplication("oc", NewAppRecommendedCommandName, nil, nil, nil)
+	cmd := NewCmdNewApplication("oc", NewAppRecommendedCommandName, nil, nil, nil, nil)
 
 	for _, v := range tests {
 		f := cmd.Flag(v.flagName)