Merge "[#57] - Added --current flag to set-context"

cmd/config/set_context.go

@@ -35,12 +35,17 @@ Specifying a name that already exists will merge new fields on top of existing v
 airshipctl config set-context e2e --%v=kube-system --%v=manifest --%v=auth-info --%v=%v
 
 # Update the current-context to e2e
-airshipctl config set-context e2e`,
+airshipctl config set-context e2e
+
+# Update attributes of the current-context
+airshipctl config set-context --%s --%v=manifest`,
 		config.FlagNamespace,
 		config.FlagManifest,
 		config.FlagAuthInfoName,
 		config.FlagClusterType,
-		config.Target)
+		config.Target,
+		config.FlagCurrent,
+		config.FlagManifest)
 )
 
 // NewCmdConfigSetContext creates a command object for the "set-context" action, which
@@ -53,15 +58,19 @@ func NewCmdConfigSetContext(rootSettings *environment.AirshipCTLSettings) *cobra
 		Short:   "Switch to a new context or update context values in the airshipctl config",
 		Long:    setContextLong,
 		Example: setContextExample,
-		Args:    cobra.ExactArgs(1),
+		Args:    cobra.MaximumNArgs(1),
 		RunE: func(cmd *cobra.Command, args []string) error {
 			nFlags := cmd.Flags().NFlag()
 			if nFlags == 0 {
 				// Change the current context to the provided context name if no flags are provided
 				o.CurrentContext = true
 			}
-			o.Name = args[0]
+			if len(args) == 1 {
+				//context name is made optional with --current flag added
+				o.Name = args[0]
+			}
 			modified, err := config.RunSetContext(o, rootSettings.Config(), true)
+
 			if err != nil {
 				return err
 			}
@@ -110,4 +119,10 @@ func addSetContextFlags(o *config.ContextOptions, cmd *cobra.Command) {
 		config.FlagClusterType,
 		"",
 		"sets the "+config.FlagClusterType+" for the specified context in the airshipctl config")
+
+	flags.BoolVar(
+		&o.Current,
+		config.FlagCurrent,
+		false,
+		"use current context from airshipctl config")
 }

cmd/config/set_context_test.go

@@ -55,13 +55,7 @@ func TestConfigSetContext(t *testing.T) {
 			Name:    "config-cmd-set-context-too-many-args",
 			CmdLine: "arg1 arg2",
 			Cmd:     NewCmdConfigSetContext(nil),
-			Error:   fmt.Errorf("accepts %d arg(s), received %d", 1, 2),
-		},
-		{
-			Name:    "config-cmd-set-context-too-few-args",
-			CmdLine: "",
-			Cmd:     NewCmdConfigSetContext(nil),
-			Error:   fmt.Errorf("accepts %d arg(s), received %d", 1, 0),
+			Error:   fmt.Errorf("accepts at most %d arg(s), received %d", 1, 2),
 		},
 	}
 

cmd/config/testdata/TestConfigSetContextGoldenOutput/config-cmd-set-context-too-many-args.golden

@@ -1,4 +1,4 @@
-Error: accepts 1 arg(s), received 2
+Error: accepts at most 1 arg(s), received 2
 Usage:
   set-context NAME [flags]
 
@@ -10,9 +10,13 @@ airshipctl config set-context e2e --namespace=kube-system --manifest=manifest --
 # Update the current-context to e2e
 airshipctl config set-context e2e
 
+# Update attributes of the current-context
+airshipctl config set-context --current --manifest=manifest
+
 Flags:
       --cluster string        sets the cluster for the specified context in the airshipctl config
       --cluster-type string   sets the cluster-type for the specified context in the airshipctl config
+      --current               use current context from airshipctl config
   -h, --help                  help for set-context
       --manifest string       sets the manifest for the specified context in the airshipctl config
       --namespace string      sets the namespace for the specified context in the airshipctl config

cmd/config/testdata/TestConfigSetContextGoldenOutput/config-cmd-set-context-with-help.golden

@@ -13,9 +13,13 @@ airshipctl config set-context e2e --namespace=kube-system --manifest=manifest --
 # Update the current-context to e2e
 airshipctl config set-context e2e
 
+# Update attributes of the current-context
+airshipctl config set-context --current --manifest=manifest
+
 Flags:
       --cluster string        sets the cluster for the specified context in the airshipctl config
       --cluster-type string   sets the cluster-type for the specified context in the airshipctl config
+      --current               use current context from airshipctl config
   -h, --help                  help for set-context
       --manifest string       sets the manifest for the specified context in the airshipctl config
       --namespace string      sets the namespace for the specified context in the airshipctl config

pkg/config/cmds.go

@@ -194,6 +194,13 @@ func RunSetContext(o *ContextOptions, airconfig *Config, writeToStorage bool) (b
 	if err != nil {
 		return modified, err
 	}
+	if o.Current {
+		if airconfig.CurrentContext == "" {
+			return modified, ErrMissingCurrentContext{}
+		}
+		// when --current flag is passed, use current context
+		o.Name = airconfig.CurrentContext
+	}
 
 	context, err := airconfig.GetContext(o.Name)
 	if err != nil {

pkg/config/constants.go

@@ -61,4 +61,5 @@ const (
 	FlagPassword         = "password"
 	FlagTimeout          = "request-timeout"
 	FlagUsername         = "username"
+	FlagCurrent          = "current"
 )

pkg/config/errors.go

@@ -84,3 +84,11 @@ type ErrConfigFailed struct {
 func (e ErrConfigFailed) Error() string {
 	return "Configuration failed to complete."
 }
+
+// ErrMissingCurrentContext returned in case --current used without setting current-context
+type ErrMissingCurrentContext struct {
+}
+
+func (e ErrMissingCurrentContext) Error() string {
+	return "Current context must be set before using --current flag"
+}

pkg/config/options.go

@@ -42,6 +42,7 @@ type ContextOptions struct {
 	AuthInfo       string
 	Manifest       string
 	Namespace      string
+	Current        bool
 }
 
 type ClusterOptions struct {
@@ -75,10 +76,14 @@ func (o *AuthInfoOptions) Validate() error {
 }
 
 func (o *ContextOptions) Validate() error {
-	if o.Name == "" {
+	if !o.Current && o.Name == "" {
 		return errors.New("you must specify a non-empty context name")
 	}
 
+	if o.Current && o.Name != "" {
+		return fmt.Errorf("you cannot specify context and --%s Flag at the same time", FlagCurrent)
+	}
+
 	// If the user simply wants to change the current context, no further validation is needed
 	if o.CurrentContext {
 		return nil