Fix name argument for scale nodegroup

pkg/ctl/cmdutils/cmd.go

@@ -20,7 +20,7 @@ type Cmd struct {
 
 	ClusterConfigFile string
 
-	ProviderConfig *api.ProviderConfig
+	ProviderConfig api.ProviderConfig
 	ClusterConfig  *api.ClusterConfig
 
 	Include, Exclude []string
@@ -58,10 +58,10 @@ func (c *Cmd) NewCtl() (*eks.ClusterProvider, error) {
 		}
 	}
 
-	ctl := eks.New(c.ProviderConfig, c.ClusterConfig)
+	ctl := eks.New(&c.ProviderConfig, c.ClusterConfig)
 
 	if !ctl.IsSupportedRegion() {
-		return nil, ErrUnsupportedRegion(c.ProviderConfig)
+		return nil, ErrUnsupportedRegion(&c.ProviderConfig)
 	}
 
 	return ctl, nil
@@ -71,7 +71,7 @@ func (c *Cmd) NewCtl() (*eks.ClusterProvider, error) {
 func AddResourceCmd(flagGrouping *FlagGrouping, parentVerbCmd *cobra.Command, newCmd func(*Cmd)) {
 	c := &Cmd{
 		CobraCommand:   &cobra.Command{},
-		ProviderConfig: &api.ProviderConfig{},
+		ProviderConfig: api.ProviderConfig{},
 
 		Plan:     true,  // always on by default
 		Wait:     false, // varies in some commands

pkg/ctl/cmdutils/configfile.go

@@ -32,23 +32,22 @@ type commonClusterConfigLoader struct {
 	flagsIncompatibleWithoutConfigFile sets.String
 	validateWithConfigFile             func() error
 	validateWithoutConfigFile          func() error
-	nameArgumentAllowed                bool
 }
 
 var (
-	defaultFlagsIncompatibleWithConfigFile = sets.NewString(
+	defaultFlagsIncompatibleWithConfigFile = [...]string{
 		"name",
 		"region",
 		"version",
 		"cluster",
 		"namepace",
-	)
-	defaultFlagsIncompatibleWithoutConfigFile = sets.NewString(
+	}
+	defaultFlagsIncompatibleWithoutConfigFile = [...]string{
 		"only",
 		"include",
 		"exclude",
 		"only-missing",
-	)
+	}
 )
 
 func newCommonClusterConfigLoader(cmd *Cmd) *commonClusterConfigLoader {
@@ -58,9 +57,9 @@ func newCommonClusterConfigLoader(cmd *Cmd) *commonClusterConfigLoader {
 		Cmd: cmd,
 
 		validateWithConfigFile:             nilValidatorFunc,
-		flagsIncompatibleWithConfigFile:    defaultFlagsIncompatibleWithConfigFile,
+		flagsIncompatibleWithConfigFile:    sets.NewString(defaultFlagsIncompatibleWithConfigFile[:]...),
 		validateWithoutConfigFile:          nilValidatorFunc,
-		flagsIncompatibleWithoutConfigFile: defaultFlagsIncompatibleWithoutConfigFile,
+		flagsIncompatibleWithoutConfigFile: sets.NewString(defaultFlagsIncompatibleWithoutConfigFile[:]...),
 	}
 }
 
@@ -99,10 +98,8 @@ func (l *commonClusterConfigLoader) Load() error {
 		}
 	}
 
-	if !l.nameArgumentAllowed {
-		if l.NameArg != "" {
-			return ErrCannotUseWithConfigFile(fmt.Sprintf("name argument %q", l.NameArg))
-		}
+	if l.flagsIncompatibleWithConfigFile.Has("name") && l.NameArg != "" {
+		return ErrCannotUseWithConfigFile("name argument")
 	}
 
 	if meta.Name == "" {

pkg/ctl/cmdutils/configfile_test.go

@@ -1,4 +1,4 @@
-package cmdutils_test
+package cmdutils
 
 import (
 	"path/filepath"
@@ -8,7 +8,6 @@ import (
 	"github.com/spf13/cobra"
 
 	api "github.com/weaveworks/eksctl/pkg/apis/eksctl.io/v1alpha5"
-	. "github.com/weaveworks/eksctl/pkg/ctl/cmdutils"
 	"github.com/weaveworks/eksctl/pkg/ctl/cmdutils/filter"
 )
 
@@ -63,7 +62,7 @@ var _ = Describe("cmdutils configfile", func() {
 
 				err := NewMetadataLoader(cmd).Load()
 				Expect(err).To(HaveOccurred())
-				Expect(err.Error()).To(Equal(ErrCannotUseWithConfigFile(`name argument "foo-3"`).Error()))
+				Expect(err.Error()).To(Equal(ErrCannotUseWithConfigFile(`name argument`).Error()))
 
 				fs := cmd.CobraCommand.Flags()
 
@@ -79,6 +78,47 @@ var _ = Describe("cmdutils configfile", func() {
 			}
 		})
 
+		Describe("name argument", func() {
+			When("given as --name switch", func() {
+				It("succeeds", func() {
+					cfg := api.NewClusterConfig()
+					cobraCmd := newCmd()
+					name := "foo-2"
+					cobraCmd.SetArgs([]string{"--name", name})
+
+					cmd := &Cmd{
+						ClusterConfig:     cfg,
+						NameArg:           name,
+						CobraCommand:      cobraCmd,
+						ClusterConfigFile: examplesDir + "01-simple-cluster.yaml",
+						ProviderConfig:    api.ProviderConfig{},
+					}
+					l := newCommonClusterConfigLoader(cmd)
+					l.flagsIncompatibleWithConfigFile.Delete("name")
+
+					err := l.Load()
+					Expect(err).ToNot(HaveOccurred())
+				})
+			})
+			When("given as positional argument", func() {
+				It("succeeds", func() {
+					cfg := api.NewClusterConfig()
+					cmd := &Cmd{
+						ClusterConfig:     cfg,
+						NameArg:           "foo-2",
+						CobraCommand:      newCmd(),
+						ClusterConfigFile: examplesDir + "01-simple-cluster.yaml",
+						ProviderConfig:    api.ProviderConfig{},
+					}
+					l := newCommonClusterConfigLoader(cmd)
+					l.flagsIncompatibleWithConfigFile.Delete("name")
+
+					err := l.Load()
+					Expect(err).ToNot(HaveOccurred())
+				})
+			})
+		})
+
 		It("load all of example file", func() {
 			examples, err := filepath.Glob(examplesDir + "*.yaml")
 			Expect(err).ToNot(HaveOccurred())
@@ -89,7 +129,7 @@ var _ = Describe("cmdutils configfile", func() {
 					CobraCommand:      newCmd(),
 					ClusterConfigFile: example,
 					ClusterConfig:     api.NewClusterConfig(),
-					ProviderConfig:    &api.ProviderConfig{},
+					ProviderConfig:    api.ProviderConfig{},
 				}
 
 				err := NewMetadataLoader(cmd).Load()
@@ -122,7 +162,7 @@ var _ = Describe("cmdutils configfile", func() {
 					CobraCommand:      newCmd(),
 					ClusterConfigFile: filepath.Join(examplesDir, natTest.configFile),
 					ClusterConfig:     api.NewClusterConfig(),
-					ProviderConfig:    &api.ProviderConfig{},
+					ProviderConfig:    api.ProviderConfig{},
 				}
 
 				params := &CreateClusterCmdParams{WithoutNodeGroup: true, Managed: false}
@@ -172,7 +212,7 @@ var _ = Describe("cmdutils configfile", func() {
 				cmd := &Cmd{
 					CobraCommand:   newCmd(),
 					ClusterConfig:  api.NewClusterConfig(),
-					ProviderConfig: &api.ProviderConfig{},
+					ProviderConfig: api.ProviderConfig{},
 				}
 
 				ngFilter := filter.NewNodeGroupFilter()
@@ -236,7 +276,7 @@ var _ = Describe("cmdutils configfile", func() {
 					CobraCommand:      newCmd(),
 					ClusterConfigFile: filepath.Join(examplesDir, loaderTest.configFile),
 					ClusterConfig:     api.NewClusterConfig(),
-					ProviderConfig:    &api.ProviderConfig{},
+					ProviderConfig:    api.ProviderConfig{},
 				}
 
 				ngFilter := filter.NewNodeGroupFilter()
@@ -270,7 +310,7 @@ var _ = Describe("cmdutils configfile", func() {
 					CobraCommand:      newCmd(),
 					ClusterConfigFile: configFilePath,
 					ClusterConfig:     api.NewClusterConfig(),
-					ProviderConfig:    &api.ProviderConfig{},
+					ProviderConfig:    api.ProviderConfig{},
 				}
 
 				params := &CreateClusterCmdParams{

pkg/ctl/cmdutils/fargate.go

@@ -116,7 +116,7 @@ func NewGetFargateProfileLoader(cmd *Cmd, options *fargate.Options) ClusterConfi
 
 func flagsIncompatibleWithConfigFileExcept(items ...string) sets.String {
 	set := sets.NewString(fargateProfileFlagsIncompatibleWithConfigFile...)
-	set = set.Union(defaultFlagsIncompatibleWithConfigFile)
+	set = set.Union(sets.NewString(defaultFlagsIncompatibleWithConfigFile[:]...))
 	set.Delete(items...)
 	return set
 }

pkg/ctl/cmdutils/scale.go

@@ -9,13 +9,13 @@ import (
 // NewScaleNodeGroupLoader will load config or use flags for 'eksctl scale nodegroup'
 func NewScaleNodeGroupLoader(cmd *Cmd, ng *api.NodeGroup) ClusterConfigLoader {
 	l := newCommonClusterConfigLoader(cmd)
-	l.nameArgumentAllowed = true
 
 	l.flagsIncompatibleWithConfigFile.Insert(
 		"nodes",
 		"nodes-min",
 		"nodes-max",
 	)
+	l.flagsIncompatibleWithConfigFile.Delete("name")
 
 	l.validateWithConfigFile = func() error {
 		if err := validateNameArgument(cmd, ng); err != nil {

pkg/ctl/cmdutils/scale_test.go

@@ -31,7 +31,7 @@ var _ = Describe("scale node group config file loader", func() {
 				CobraCommand:      newCmd(),
 				ClusterConfigFile: "test_data/scale-ng-test.yaml",
 				ClusterConfig:     api.NewClusterConfig(),
-				ProviderConfig:    &api.ProviderConfig{},
+				ProviderConfig:    api.ProviderConfig{},
 				NameArg:           params.name,
 			}
 

pkg/ctl/create/cluster.go

@@ -51,7 +51,7 @@ func createClusterCmdWithRunFunc(cmd *cmdutils.Cmd, runFunc func(cmd *cmdutils.C
 	cmd.FlagSetGroup.InFlagSet("General", func(fs *pflag.FlagSet) {
 		fs.StringVarP(&cfg.Metadata.Name, "name", "n", "", fmt.Sprintf("EKS cluster name (generated if unspecified, e.g. %q)", exampleClusterName))
 		cmdutils.AddStringToStringVarPFlag(fs, &cfg.Metadata.Tags, "tags", "", map[string]string{}, "Used to tag the AWS resources")
-		cmdutils.AddRegionFlag(fs, cmd.ProviderConfig)
+		cmdutils.AddRegionFlag(fs, &cmd.ProviderConfig)
 		fs.StringSliceVar(&params.AvailabilityZones, "zones", nil, "(auto-select if unspecified)")
 		cmdutils.AddVersionFlag(fs, cfg.Metadata, "")
 		cmdutils.AddConfigFileFlag(fs, &cmd.ClusterConfigFile)
@@ -82,7 +82,7 @@ func createClusterCmdWithRunFunc(cmd *cmdutils.Cmd, runFunc func(cmd *cmdutils.C
 		fs.StringVar(cfg.VPC.NAT.Gateway, "vpc-nat-mode", api.ClusterSingleNAT, "VPC NAT mode, valid options: HighlyAvailable, Single, Disable")
 	})
 
-	cmdutils.AddCommonFlagsForAWS(cmd.FlagSetGroup, cmd.ProviderConfig, true)
+	cmdutils.AddCommonFlagsForAWS(cmd.FlagSetGroup, &cmd.ProviderConfig, true)
 
 	cmd.FlagSetGroup.InFlagSet("Output kubeconfig", func(fs *pflag.FlagSet) {
 		cmdutils.AddCommonFlagsForKubeconfig(fs, &params.KubeconfigPath, &params.AuthenticatorRoleARN, &params.SetContext, &params.AutoKubeconfigPath, exampleClusterName)

pkg/ctl/create/fargate.go

@@ -41,11 +41,11 @@ func configureCreateFargateProfileCmd(cmd *cmdutils.Cmd) *fargate.CreateOptions
 	})
 	cmd.FlagSetGroup.InFlagSet("General", func(fs *pflag.FlagSet) {
 		cmdutils.AddClusterFlag(fs, cmd.ClusterConfig.Metadata)
-		cmdutils.AddRegionFlag(fs, cmd.ProviderConfig)
+		cmdutils.AddRegionFlag(fs, &cmd.ProviderConfig)
 		cmdutils.AddConfigFileFlag(fs, &cmd.ClusterConfigFile)
 		cmdutils.AddTimeoutFlag(fs, &cmd.ProviderConfig.WaitTimeout)
 	})
-	cmdutils.AddCommonFlagsForAWS(cmd.FlagSetGroup, cmd.ProviderConfig, false)
+	cmdutils.AddCommonFlagsForAWS(cmd.FlagSetGroup, &cmd.ProviderConfig, false)
 	return &options
 }
 

pkg/ctl/create/iamidentitymapping.go

@@ -39,12 +39,12 @@ func createIAMIdentityMappingCmd(cmd *cmdutils.Cmd) {
 		fs.StringArrayVar(&groups, "group", []string{}, "Group within Kubernetes to which IAM role is mapped")
 		cmdutils.AddIAMIdentityMappingARNFlags(fs, cmd, &arn)
 		cmdutils.AddClusterFlagWithDeprecated(fs, cfg.Metadata)
-		cmdutils.AddRegionFlag(fs, cmd.ProviderConfig)
+		cmdutils.AddRegionFlag(fs, &cmd.ProviderConfig)
 		cmdutils.AddConfigFileFlag(fs, &cmd.ClusterConfigFile)
 		cmdutils.AddTimeoutFlag(fs, &cmd.ProviderConfig.WaitTimeout)
 	})
 
-	cmdutils.AddCommonFlagsForAWS(cmd.FlagSetGroup, cmd.ProviderConfig, false)
+	cmdutils.AddCommonFlagsForAWS(cmd.FlagSetGroup, &cmd.ProviderConfig, false)
 }
 
 func doCreateIAMIdentityMapping(cmd *cmdutils.Cmd, arn string, username string, groups []string) error {

pkg/ctl/create/iamserviceaccount.go

@@ -52,12 +52,12 @@ func createIAMServiceAccountCmdWithRunFunc(cmd *cmdutils.Cmd, runFunc func(cmd *
 
 		cmdutils.AddIAMServiceAccountFilterFlags(fs, &cmd.Include, &cmd.Exclude)
 		cmdutils.AddApproveFlag(fs, cmd)
-		cmdutils.AddRegionFlag(fs, cmd.ProviderConfig)
+		cmdutils.AddRegionFlag(fs, &cmd.ProviderConfig)
 		cmdutils.AddConfigFileFlag(fs, &cmd.ClusterConfigFile)
 		cmdutils.AddTimeoutFlag(fs, &cmd.ProviderConfig.WaitTimeout)
 	})
 
-	cmdutils.AddCommonFlagsForAWS(cmd.FlagSetGroup, cmd.ProviderConfig, true)
+	cmdutils.AddCommonFlagsForAWS(cmd.FlagSetGroup, &cmd.ProviderConfig, true)
 }
 
 func doCreateIAMServiceAccount(cmd *cmdutils.Cmd, overrideExistingServiceAccounts bool) error {

pkg/ctl/create/nodegroup.go

@@ -53,7 +53,7 @@ func createNodeGroupCmdWithRunFunc(cmd *cmdutils.Cmd, runFunc func(cmd *cmdutils
 	cmd.FlagSetGroup.InFlagSet("General", func(fs *pflag.FlagSet) {
 		fs.StringVar(&cfg.Metadata.Name, "cluster", "", "name of the EKS cluster to add the nodegroup to")
 		cmdutils.AddStringToStringVarPFlag(fs, &cfg.Metadata.Tags, "tags", "", map[string]string{}, "Used to tag the AWS resources")
-		cmdutils.AddRegionFlag(fs, cmd.ProviderConfig)
+		cmdutils.AddRegionFlag(fs, &cmd.ProviderConfig)
 		cmdutils.AddVersionFlag(fs, cfg.Metadata, `for nodegroups "auto" and "latest" can be used to automatically inherit version from the control plane or force latest`)
 		cmdutils.AddConfigFileFlag(fs, &cmd.ClusterConfigFile)
 		cmdutils.AddNodeGroupFilterFlags(fs, &cmd.Include, &cmd.Exclude)
@@ -72,7 +72,7 @@ func createNodeGroupCmdWithRunFunc(cmd *cmdutils.Cmd, runFunc func(cmd *cmdutils
 		fs.BoolVarP(&params.installNeuronDevicePlugin, "install-neuron-plugin", "", true, "Install Neuron plugin for Inferentia nodes")
 	})
 
-	cmdutils.AddCommonFlagsForAWS(cmd.FlagSetGroup, cmd.ProviderConfig, true)
+	cmdutils.AddCommonFlagsForAWS(cmd.FlagSetGroup, &cmd.ProviderConfig, true)
 }
 
 func doCreateNodeGroups(cmd *cmdutils.Cmd, ng *api.NodeGroup, params createNodeGroupParams) error {

pkg/ctl/delete/cluster.go

@@ -38,7 +38,7 @@ func deleteClusterCmd(cmd *cmdutils.Cmd) {
 
 	cmd.FlagSetGroup.InFlagSet("General", func(fs *pflag.FlagSet) {
 		fs.StringVarP(&cfg.Metadata.Name, "name", "n", "", "EKS cluster name")
-		cmdutils.AddRegionFlag(fs, cmd.ProviderConfig)
+		cmdutils.AddRegionFlag(fs, &cmd.ProviderConfig)
 
 		cmd.Wait = false
 		cmdutils.AddWaitFlag(fs, &cmd.Wait, "deletion of all resources")
@@ -47,7 +47,7 @@ func deleteClusterCmd(cmd *cmdutils.Cmd) {
 		cmdutils.AddTimeoutFlag(fs, &cmd.ProviderConfig.WaitTimeout)
 	})
 
-	cmdutils.AddCommonFlagsForAWS(cmd.FlagSetGroup, cmd.ProviderConfig, true)
+	cmdutils.AddCommonFlagsForAWS(cmd.FlagSetGroup, &cmd.ProviderConfig, true)
 }
 
 func handleErrors(errs []error, subject string) error {

pkg/ctl/delete/fargate.go

@@ -41,12 +41,12 @@ func configureDeleteFargateProfileCmd(cmd *cmdutils.Cmd) *fargate.Options {
 	})
 	cmd.FlagSetGroup.InFlagSet("General", func(fs *pflag.FlagSet) {
 		cmdutils.AddClusterFlag(fs, cmd.ClusterConfig.Metadata)
-		cmdutils.AddRegionFlag(fs, cmd.ProviderConfig)
+		cmdutils.AddRegionFlag(fs, &cmd.ProviderConfig)
 		cmdutils.AddConfigFileFlag(fs, &cmd.ClusterConfigFile)
 		cmdutils.AddWaitFlag(fs, &cmd.Wait, "wait for the deletion of the Fargate profile, which may take from a couple seconds to a couple minutes.")
 		cmdutils.AddTimeoutFlag(fs, &cmd.ProviderConfig.WaitTimeout)
 	})
-	cmdutils.AddCommonFlagsForAWS(cmd.FlagSetGroup, cmd.ProviderConfig, false)
+	cmdutils.AddCommonFlagsForAWS(cmd.FlagSetGroup, &cmd.ProviderConfig, false)
 	return &opts
 }
 

pkg/ctl/delete/iamidentitymapping.go

@@ -29,12 +29,12 @@ func deleteIAMIdentityMappingCmd(cmd *cmdutils.Cmd) {
 		fs.BoolVar(&all, "all", false, "Delete all matching mappings instead of just one")
 		cmdutils.AddIAMIdentityMappingARNFlags(fs, cmd, &arn)
 		cmdutils.AddClusterFlagWithDeprecated(fs, cfg.Metadata)
-		cmdutils.AddRegionFlag(fs, cmd.ProviderConfig)
+		cmdutils.AddRegionFlag(fs, &cmd.ProviderConfig)
 		cmdutils.AddConfigFileFlag(fs, &cmd.ClusterConfigFile)
 		cmdutils.AddTimeoutFlag(fs, &cmd.ProviderConfig.WaitTimeout)
 	})
 
-	cmdutils.AddCommonFlagsForAWS(cmd.FlagSetGroup, cmd.ProviderConfig, false)
+	cmdutils.AddCommonFlagsForAWS(cmd.FlagSetGroup, &cmd.ProviderConfig, false)
 }
 
 func doDeleteIAMIdentityMapping(cmd *cmdutils.Cmd, arn string, all bool) error {

pkg/ctl/delete/iamserviceaccount.go

@@ -47,15 +47,15 @@ func deleteIAMServiceAccountCmdWithRunFunc(cmd *cmdutils.Cmd, runFunc func(cmd *
 		cmdutils.AddIAMServiceAccountFilterFlags(fs, &cmd.Include, &cmd.Exclude)
 		fs.BoolVar(&onlyMissing, "only-missing", false, "Only delete nodegroups that are not defined in the given config file")
 		cmdutils.AddApproveFlag(fs, cmd)
-		cmdutils.AddRegionFlag(fs, cmd.ProviderConfig)
+		cmdutils.AddRegionFlag(fs, &cmd.ProviderConfig)
 		cmdutils.AddConfigFileFlag(fs, &cmd.ClusterConfigFile)
 
 		cmd.Wait = false
 		cmdutils.AddWaitFlag(fs, &cmd.Wait, "deletion of all resources")
 		cmdutils.AddTimeoutFlag(fs, &cmd.ProviderConfig.WaitTimeout)
 	})
 
-	cmdutils.AddCommonFlagsForAWS(cmd.FlagSetGroup, cmd.ProviderConfig, true)
+	cmdutils.AddCommonFlagsForAWS(cmd.FlagSetGroup, &cmd.ProviderConfig, true)
 }
 
 func doDeleteIAMServiceAccount(cmd *cmdutils.Cmd, serviceAccount *api.ClusterIAMServiceAccount, onlyMissing bool) error {

pkg/ctl/delete/nodegroup.go

@@ -34,7 +34,7 @@ func deleteNodeGroupWithRunFunc(cmd *cmdutils.Cmd, runFunc func(cmd *cmdutils.Cm
 
 	cmd.FlagSetGroup.InFlagSet("General", func(fs *pflag.FlagSet) {
 		fs.StringVar(&cfg.Metadata.Name, "cluster", "", "EKS cluster name")
-		cmdutils.AddRegionFlag(fs, cmd.ProviderConfig)
+		cmdutils.AddRegionFlag(fs, &cmd.ProviderConfig)
 		fs.StringVarP(&ng.Name, "name", "n", "", "Name of the nodegroup to delete")
 		cmdutils.AddConfigFileFlag(fs, &cmd.ClusterConfigFile)
 		cmdutils.AddApproveFlag(fs, cmd)
@@ -48,7 +48,7 @@ func deleteNodeGroupWithRunFunc(cmd *cmdutils.Cmd, runFunc func(cmd *cmdutils.Cm
 		cmdutils.AddTimeoutFlag(fs, &cmd.ProviderConfig.WaitTimeout)
 	})
 
-	cmdutils.AddCommonFlagsForAWS(cmd.FlagSetGroup, cmd.ProviderConfig, true)
+	cmdutils.AddCommonFlagsForAWS(cmd.FlagSetGroup, &cmd.ProviderConfig, true)
 }
 
 func doDeleteNodeGroup(cmd *cmdutils.Cmd, ng *api.NodeGroup, updateAuthConfigMap, deleteNodeGroupDrain, onlyMissing bool) error {