Fix name argument for scale nodegroup

eksctl-io · Jul 10, 2020 · 2e8b66c · 2e8b66c
1 parent 59776f8
commit 2e8b66c
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 7 deletions.
diff --git a/pkg/ctl/cmdutils/configfile.go b/pkg/ctl/cmdutils/configfile.go
@@ -32,7 +32,6 @@ type commonClusterConfigLoader struct {
 	flagsIncompatibleWithoutConfigFile sets.String
 	validateWithConfigFile             func() error
 	validateWithoutConfigFile          func() error
-	nameArgumentAllowed                bool
 }
 
 var (
@@ -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 == "" {

diff --git a/pkg/ctl/cmdutils/configfile_test.go b/pkg/ctl/cmdutils/configfile_test.go
@@ -62,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()
 

diff --git a/pkg/ctl/cmdutils/scale.go b/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 {