Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions pkg/ctl/cmdutils/configfile.go
Original file line number Diff line number Diff line change
Expand Up @@ -883,6 +883,13 @@ func NewGetLabelsLoader(cmd *Cmd, ngName string) ClusterConfigLoader {
return l
}

// NewGetClusterLoader will load config or use flags for 'eksctl get cluster(s)'
func NewGetClusterLoader(cmd *Cmd) ClusterConfigLoader {
l := newCommonClusterConfigLoader(cmd)

return l
}

// validateSupportedConfigFields parses a config file's fields, evaluates if non-empty fields are supported,
// and returns an error if a field is not supported.
func validateSupportedConfigFields(obj interface{}, supportedFields []string, unsupportedFields []string) ([]string, error) {
Expand Down
4 changes: 4 additions & 0 deletions pkg/ctl/get/cluster.go
Original file line number Diff line number Diff line change
Expand Up @@ -40,12 +40,16 @@ func getClusterCmd(cmd *cmdutils.Cmd) {
cmdutils.AddRegionFlag(fs, &cmd.ProviderConfig)
cmdutils.AddCommonFlagsForGetCmd(fs, &params.chunkSize, &params.output)
cmdutils.AddTimeoutFlag(fs, &cmd.ProviderConfig.WaitTimeout)
cmdutils.AddConfigFileFlag(fs, &cmd.ClusterConfigFile)
})

cmdutils.AddCommonFlagsForAWS(cmd.FlagSetGroup, &cmd.ProviderConfig, false)
}

func doGetCluster(cmd *cmdutils.Cmd, params *getCmdParams, listAllRegions bool) error {
if err := cmdutils.NewGetClusterLoader(cmd).Load(); err != nil {
return err
}
cfg := cmd.ClusterConfig
regionGiven := cfg.Metadata.Region != "" // eks.New resets this field, so we need to check if it was set in the first place

Expand Down
22 changes: 20 additions & 2 deletions pkg/ctl/get/cluster_test.go
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
package get

import (
"os"

. "github.com/onsi/ginkgo"
. "github.com/onsi/gomega"
)
Expand All @@ -10,8 +12,24 @@ var _ = Describe("get", func() {
It("with invalid flags", func() {
cmd := newMockCmd("cluster", "--invalid", "dummy")
_, err := cmd.execute()
Expect(err).To(HaveOccurred())
Expect(err.Error()).To(ContainSubstring("Error: unknown flag: --invalid"))
Expect(err).To(MatchError(ContainSubstring("Error: unknown flag: --invalid")))
})
It("--name and --config-file together", func() {
f, err := os.CreateTemp("", "configfile")
Expect(err).NotTo(HaveOccurred())
_, err = f.WriteString(getClusterConfigFile)
Expect(err).NotTo(HaveOccurred())
cmd := newMockCmd("cluster", "--name", "dummy", "--config-file", f.Name())
_, err = cmd.execute()
Expect(err).To(MatchError(ContainSubstring("Error: cannot use --name when --config-file/-f is set")))
})
})
})

var getClusterConfigFile = `apiVersion: eksctl.io/v1alpha5
kind: ClusterConfig
metadata:
name: test-nodegroup-cluster-config
region: us-west-2
version: '1.20'
`
6 changes: 3 additions & 3 deletions pkg/ctl/get/nodegroup_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ var _ = Describe("get", func() {
It("setting --name and --config-file at the same time", func() {
f, err := os.CreateTemp("", "configfile")
Expect(err).NotTo(HaveOccurred())
_, err = f.WriteString(configFile)
_, err = f.WriteString(nodegroupConfigFile)
Expect(err).NotTo(HaveOccurred())
cmd := newMockCmd("nodegroup", "--name", "name", "--config-file", f.Name())
_, err = cmd.execute()
Expand All @@ -34,7 +34,7 @@ var _ = Describe("get", func() {
It("setting --cluster and --config-file at the same time", func() {
f, err := os.CreateTemp("", "configfile")
Expect(err).NotTo(HaveOccurred())
_, err = f.WriteString(configFile)
_, err = f.WriteString(nodegroupConfigFile)
Expect(err).NotTo(HaveOccurred())
cmd := newMockCmd("nodegroup", "--cluster", "name", "--config-file", f.Name())
_, err = cmd.execute()
Expand All @@ -49,7 +49,7 @@ var _ = Describe("get", func() {
})
})

var configFile = `apiVersion: eksctl.io/v1alpha5
var nodegroupConfigFile = `apiVersion: eksctl.io/v1alpha5
kind: ClusterConfig

metadata:
Expand Down
2 changes: 1 addition & 1 deletion pkg/eks/mocks/KubeNodeGroup.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.