Consolidate flags for all commands

padcli/command/build.go

@@ -118,6 +118,7 @@ func registerEmbeddedBuildFlags(cmd *cobra.Command, opts *embeddedBuildOptions)
 			"adds BUILDKIT_INLINE_CACHE=1 build arg to save cache metadata and also "+
 			"sets the cache-from docker build option",
 	)
+	_ = cmd.Flags().MarkHidden("remote-cache")
 
 	cmd.Flags().StringVar(
 		&opts.LocalImage,

padcli/command/env.go

@@ -15,12 +15,7 @@ import (
 	"go.jetpack.io/launchpad/pkg/jetlog"
 )
 
-type envOptions struct {
-	projectConfigPath string
-}
-
 func envCmd() *cobra.Command {
-	opts := &envOptions{}
 	cmdCfg := &envcli.CmdConfig{}
 	command := &cobra.Command{
 		Use:   "env",
@@ -31,15 +26,12 @@ func envCmd() *cobra.Command {
 			Securely stores and retrieves environment variables on the cloud.
 			Environment variables are always encrypted, which makes it possible to
 			store values that contain passwords and other secrets.
+
+			This command can only be run within a Launchpad project's directory (the directory
+			where launchpad.yaml is present)
 		`),
 		PersistentPreRunE: func(cmd *cobra.Command, args []string) error {
-			var absProjectPath string
-			var err error
-			if opts.projectConfigPath == "" {
-				absProjectPath, err = getProjectDir()
-			} else {
-				absProjectPath, err = absPath([]string{opts.projectConfigPath})
-			}
+			absProjectPath, err := getProjectDir()
 			if err != nil {
 				return errors.WithStack(err)
 			}
@@ -80,14 +72,6 @@ func envCmd() *cobra.Command {
 		},
 	}
 
-	command.PersistentFlags().StringVarP(
-		&opts.projectConfigPath,
-		"project",
-		"p",
-		"",
-		"Path to project config. If directory, we assume name is launchpad.yaml",
-	)
-
 	command.AddCommand(
 		envcli.SetCmd(cmdCfg),
 		envcli.RemoveCmd(cmdCfg),

padcli/command/up.go

@@ -181,25 +181,31 @@ func registerDeployFlags(cmd *cobra.Command, opts *deployOptions) {
 		"",
 		"custom location for app chart",
 	)
+	_ = cmd.Flags().MarkHidden("helm.app.chart-location")
+
 	cmd.Flags().StringVar(
 		&opts.App.Name,
 		"helm.app.name",
 		"",
 		"App install name",
 	)
+	_ = cmd.Flags().MarkHidden("helm.app.name")
 
 	cmd.Flags().StringVar(
 		&opts.Runtime.SetValues,
 		"helm.runtime.set",
 		"",
 		"args passed to helm --set option for runtime (can specify multiple or separate values with commas: key1=val1,key2=val2)",
 	)
+	_ = cmd.Flags().MarkHidden("helm.runtime.set")
+
 	cmd.Flags().StringVar(
 		&opts.Runtime.ChartLocation,
 		"helm.runtime.chart-location",
 		"",
 		"custom location for runtime chart",
 	)
+	_ = cmd.Flags().MarkHidden("helm.runtime.chart-location")
 
 	cmd.Flags().StringVarP(
 		&opts.Namespace,
@@ -251,16 +257,14 @@ func registerDeployFlags(cmd *cobra.Command, opts *deployOptions) {
 		"",
 		envOverrideFlagMsg,
 	)
-	// Made env-override file flag hidden temporarily until we decide on concrete approach
-	// on whether override merges with launchpad env or skips it
-	_ = cmd.Flags().MarkHidden(envOverrideFlag)
 
 	cmd.Flags().StringVar(
 		&opts.execQualifiedSymbol,
 		"exec",
 		"",
 		"Execute a single cronjob or jetroutine for a given function.",
 	)
+	_ = cmd.Flags().MarkHidden("exec")
 
 	cmd.Flags().BoolVar(
 		&opts.ReinstallOnHelmUpgradeError,

padcli/jetconfig/errors.go

@@ -2,5 +2,5 @@ package jetconfig
 
 import "github.com/pkg/errors"
 
-var ErrConfigNotFound = errors.New("jetconfig was not found")
+var ErrConfigNotFound = errors.New("jetconfig (launchpad.yaml) was not found")
 var ErrInvalidProjectID = errors.New("project ID is invalid")