Improve consistency of command function

- perform defaulting and validation - check region is supported
eksctl-io · Aug 8, 2019 · 3c85303 · 3c85303
1 parent 4ca14cd
commit 3c85303
Show file tree

Hide file tree

Showing 19 changed files with 147 additions and 0 deletions.
diff --git a/pkg/ctl/create/iamidentitymapping.go b/pkg/ctl/create/iamidentitymapping.go
@@ -50,8 +50,19 @@ func doCreateIAMIdentityMapping(rc *cmdutils.ResourceCmd, id *authconfigmap.MapR
 
 	cfg := rc.ClusterConfig
 
+	api.SetClusterConfigDefaults(cfg)
+
+	if err := api.ValidateClusterConfig(cfg); err != nil {
+		return err
+	}
+
 	ctl := eks.New(rc.ProviderConfig, cfg)
 
+	if !ctl.IsSupportedRegion() {
+		return cmdutils.ErrUnsupportedRegion(rc.ProviderConfig)
+	}
+	logger.Info("using region %s", cfg.Metadata.Region)
+
 	if err := ctl.CheckAuth(); err != nil {
 		return err
 	}

diff --git a/pkg/ctl/delete/cluster.go b/pkg/ctl/delete/cluster.go
@@ -76,6 +76,12 @@ func doDeleteCluster(rc *cmdutils.ResourceCmd) error {
 	cfg := rc.ClusterConfig
 	meta := rc.ClusterConfig.Metadata
 
+	api.SetClusterConfigDefaults(cfg)
+
+	if err := api.ValidateClusterConfig(cfg); err != nil {
+		return err
+	}
+
 	printer := printers.NewJSONPrinter()
 	ctl := eks.New(rc.ProviderConfig, cfg)
 

diff --git a/pkg/ctl/delete/iamidentitymapping.go b/pkg/ctl/delete/iamidentitymapping.go
@@ -44,8 +44,19 @@ func doDeleteIAMIdentityMapping(rc *cmdutils.ResourceCmd, role string, all bool)
 
 	cfg := rc.ClusterConfig
 
+	api.SetClusterConfigDefaults(cfg)
+
+	if err := api.ValidateClusterConfig(cfg); err != nil {
+		return err
+	}
+
 	ctl := eks.New(rc.ProviderConfig, cfg)
 
+	if !ctl.IsSupportedRegion() {
+		return cmdutils.ErrUnsupportedRegion(rc.ProviderConfig)
+	}
+	logger.Info("using region %s", cfg.Metadata.Region)
+
 	if err := ctl.CheckAuth(); err != nil {
 		return err
 	}

diff --git a/pkg/ctl/delete/nodegroup.go b/pkg/ctl/delete/nodegroup.go
@@ -53,8 +53,19 @@ func doDeleteNodeGroup(rc *cmdutils.ResourceCmd, ng *api.NodeGroup, updateAuthCo
 
 	cfg := rc.ClusterConfig
 
+	api.SetClusterConfigDefaults(cfg)
+
+	if err := api.ValidateClusterConfig(cfg); err != nil {
+		return err
+	}
+
 	ctl := eks.New(rc.ProviderConfig, cfg)
 
+	if !ctl.IsSupportedRegion() {
+		return cmdutils.ErrUnsupportedRegion(rc.ProviderConfig)
+	}
+	logger.Info("using region %s", cfg.Metadata.Region)
+
 	if err := ctl.CheckAuth(); err != nil {
 		return err
 	}

diff --git a/pkg/ctl/drain/nodegroup.go b/pkg/ctl/drain/nodegroup.go
@@ -49,8 +49,19 @@ func doDrainNodeGroup(rc *cmdutils.ResourceCmd, ng *api.NodeGroup, undo, onlyMis
 
 	cfg := rc.ClusterConfig
 
+	api.SetClusterConfigDefaults(cfg)
+
+	if err := api.ValidateClusterConfig(cfg); err != nil {
+		return err
+	}
+
 	ctl := eks.New(rc.ProviderConfig, cfg)
 
+	if !ctl.IsSupportedRegion() {
+		return cmdutils.ErrUnsupportedRegion(rc.ProviderConfig)
+	}
+	logger.Info("using region %s", cfg.Metadata.Region)
+
 	if err := ctl.CheckAuth(); err != nil {
 		return err
 	}

diff --git a/pkg/ctl/get/cluster.go b/pkg/ctl/get/cluster.go
@@ -39,6 +39,12 @@ func doGetCluster(rc *cmdutils.ResourceCmd, params *getCmdParams, listAllRegions
 	cfg := rc.ClusterConfig
 	regionGiven := cfg.Metadata.Region != "" // eks.New resets this field, so we need to check if it was set in the fist place
 
+	api.SetClusterConfigDefaults(cfg)
+
+	if err := api.ValidateClusterConfig(cfg); err != nil {
+		return err
+	}
+
 	ctl := eks.New(rc.ProviderConfig, cfg)
 
 	if !ctl.IsSupportedRegion() {

diff --git a/pkg/ctl/get/iamidentitymapping.go b/pkg/ctl/get/iamidentitymapping.go
@@ -47,8 +47,18 @@ func doGetIAMIdentityMapping(rc *cmdutils.ResourceCmd, params *getCmdParams, rol
 
 	cfg := rc.ClusterConfig
 
+	api.SetClusterConfigDefaults(cfg)
+
+	if err := api.ValidateClusterConfig(cfg); err != nil {
+		return err
+	}
+
 	ctl := eks.New(rc.ProviderConfig, cfg)
 
+	if !ctl.IsSupportedRegion() {
+		return cmdutils.ErrUnsupportedRegion(rc.ProviderConfig)
+	}
+
 	if err := ctl.CheckAuth(); err != nil {
 		return err
 	}

diff --git a/pkg/ctl/get/nodegroup.go b/pkg/ctl/get/nodegroup.go
@@ -41,8 +41,19 @@ func getNodeGroupCmd(rc *cmdutils.ResourceCmd) {
 
 func doGetNodeGroup(rc *cmdutils.ResourceCmd, ng *api.NodeGroup, params *getCmdParams) error {
 	cfg := rc.ClusterConfig
+
+	api.SetClusterConfigDefaults(cfg)
+
+	if err := api.ValidateClusterConfig(cfg); err != nil {
+		return err
+	}
+
 	ctl := eks.New(rc.ProviderConfig, cfg)
 
+	if !ctl.IsSupportedRegion() {
+		return cmdutils.ErrUnsupportedRegion(rc.ProviderConfig)
+	}
+
 	if err := ctl.CheckAuth(); err != nil {
 		return err
 	}

diff --git a/pkg/ctl/install/install.go b/pkg/ctl/install/install.go
@@ -119,11 +119,21 @@ func newFluxInstaller(ctx context.Context, rc *cmdutils.ResourceCmd, opts *insta
 	if err := cmdutils.NewMetadataLoader(rc).Load(); err != nil {
 		return nil, err
 	}
+
 	cfg := rc.ClusterConfig
+
+	api.SetClusterConfigDefaults(cfg)
+
+	if err := api.ValidateClusterConfig(cfg); err != nil {
+		return nil, err
+	}
+
 	ctl := eks.New(rc.ProviderConfig, cfg)
+
 	if !ctl.IsSupportedRegion() {
 		return nil, cmdutils.ErrUnsupportedRegion(rc.ProviderConfig)
 	}
+
 	if err := ctl.RefreshClusterConfig(cfg); err != nil {
 		return nil, err
 	}

diff --git a/pkg/ctl/scale/nodegroup.go b/pkg/ctl/scale/nodegroup.go
@@ -5,6 +5,7 @@ import (
 
 	"github.com/spf13/cobra"
 	"github.com/spf13/pflag"
+
 	api "github.com/weaveworks/eksctl/pkg/apis/eksctl.io/v1alpha5"
 	"github.com/weaveworks/eksctl/pkg/ctl/cmdutils"
 	"github.com/weaveworks/eksctl/pkg/eks"
@@ -44,6 +45,10 @@ func doScaleNodeGroup(rc *cmdutils.ResourceCmd, ng *api.NodeGroup) error {
 
 	ctl := eks.New(rc.ProviderConfig, cfg)
 
+	if !ctl.IsSupportedRegion() {
+		return cmdutils.ErrUnsupportedRegion(rc.ProviderConfig)
+	}
+
 	if err := ctl.CheckAuth(); err != nil {
 		return err
 	}

diff --git a/pkg/ctl/update/cluster.go b/pkg/ctl/update/cluster.go
@@ -53,6 +53,10 @@ func doUpdateClusterCmd(rc *cmdutils.ResourceCmd) error {
 
 	api.SetClusterConfigDefaults(cfg)
 
+	if err := api.ValidateClusterConfig(cfg); err != nil {
+		return err
+	}
+
 	printer := printers.NewJSONPrinter()
 	ctl := eks.New(rc.ProviderConfig, cfg)
 

diff --git a/pkg/ctl/utils/describe_stacks.go b/pkg/ctl/utils/describe_stacks.go
@@ -39,8 +39,19 @@ func describeStacksCmd(rc *cmdutils.ResourceCmd) {
 func doDescribeStacksCmd(rc *cmdutils.ResourceCmd, all, events, trail bool) error {
 	cfg := rc.ClusterConfig
 
+	api.SetClusterConfigDefaults(cfg)
+
+	if err := api.ValidateClusterConfig(cfg); err != nil {
+		return err
+	}
+
 	ctl := eks.New(rc.ProviderConfig, cfg)
 
+	if !ctl.IsSupportedRegion() {
+		return cmdutils.ErrUnsupportedRegion(rc.ProviderConfig)
+	}
+	logger.Info("using region %s", cfg.Metadata.Region)
+
 	if err := ctl.CheckAuth(); err != nil {
 		return err
 	}

diff --git a/pkg/ctl/utils/update_aws_node.go b/pkg/ctl/utils/update_aws_node.go
@@ -40,6 +40,12 @@ func doUpdateAWSNode(rc *cmdutils.ResourceCmd) error {
 	cfg := rc.ClusterConfig
 	meta := rc.ClusterConfig.Metadata
 
+	api.SetClusterConfigDefaults(cfg)
+
+	if err := api.ValidateClusterConfig(cfg); err != nil {
+		return err
+	}
+
 	ctl := eks.New(rc.ProviderConfig, cfg)
 
 	if !ctl.IsSupportedRegion() {

diff --git a/pkg/ctl/utils/update_cluster_logging.go b/pkg/ctl/utils/update_cluster_logging.go
@@ -62,6 +62,10 @@ func doEnableLogging(rc *cmdutils.ResourceCmd, logTypesToEnable []string, logTyp
 
 	api.SetClusterConfigDefaults(cfg)
 
+	if err := api.ValidateClusterConfig(cfg); err != nil {
+		return err
+	}
+
 	printer := printers.NewJSONPrinter()
 	ctl := eks.New(rc.ProviderConfig, cfg)
 

diff --git a/pkg/ctl/utils/update_coredns.go b/pkg/ctl/utils/update_coredns.go
@@ -40,6 +40,12 @@ func doUpdateCoreDNS(rc *cmdutils.ResourceCmd) error {
 	cfg := rc.ClusterConfig
 	meta := rc.ClusterConfig.Metadata
 
+	api.SetClusterConfigDefaults(cfg)
+
+	if err := api.ValidateClusterConfig(cfg); err != nil {
+		return err
+	}
+
 	ctl := eks.New(rc.ProviderConfig, cfg)
 
 	if !ctl.IsSupportedRegion() {

diff --git a/pkg/ctl/utils/update_kube_proxy.go b/pkg/ctl/utils/update_kube_proxy.go
@@ -40,6 +40,12 @@ func doUpdateKubeProxy(rc *cmdutils.ResourceCmd) error {
 	cfg := rc.ClusterConfig
 	meta := rc.ClusterConfig.Metadata
 
+	api.SetClusterConfigDefaults(cfg)
+
+	if err := api.ValidateClusterConfig(cfg); err != nil {
+		return err
+	}
+
 	ctl := eks.New(rc.ProviderConfig, cfg)
 
 	if !ctl.IsSupportedRegion() {

diff --git a/pkg/ctl/utils/utils.go b/pkg/ctl/utils/utils.go
@@ -17,6 +17,7 @@ func Command(flagGrouping *cmdutils.FlagGrouping) *cobra.Command {
 	cmdutils.AddResourceCmd(flagGrouping, verbCmd, updateAWSNodeCmd)
 	cmdutils.AddResourceCmd(flagGrouping, verbCmd, updateCoreDNSCmd)
 	cmdutils.AddResourceCmd(flagGrouping, verbCmd, enableLoggingCmd)
+	cmdutils.AddResourceCmd(flagGrouping, verbCmd, associateIAMOIDCProviderCmd)
 
 	return verbCmd
 }
diff --git a/pkg/ctl/utils/wait_nodes.go b/pkg/ctl/utils/wait_nodes.go
@@ -38,6 +38,12 @@ func waitNodesCmd(rc *cmdutils.ResourceCmd) {
 func doWaitNodes(rc *cmdutils.ResourceCmd, ng *api.NodeGroup, kubeconfigPath string) error {
 	cfg := rc.ClusterConfig
 
+	api.SetClusterConfigDefaults(cfg)
+
+	if err := api.ValidateClusterConfig(cfg); err != nil {
+		return err
+	}
+
 	ctl := eks.New(rc.ProviderConfig, cfg)
 
 	if kubeconfigPath == "" {

diff --git a/pkg/ctl/utils/write_kubeconfig.go b/pkg/ctl/utils/write_kubeconfig.go
@@ -45,8 +45,19 @@ func writeKubeconfigCmd(rc *cmdutils.ResourceCmd) {
 func doWriteKubeconfigCmd(rc *cmdutils.ResourceCmd, outputPath, roleARN string, setContext, autoPath bool) error {
 	cfg := rc.ClusterConfig
 
+	api.SetClusterConfigDefaults(cfg)
+
+	if err := api.ValidateClusterConfig(cfg); err != nil {
+		return err
+	}
+
 	ctl := eks.New(rc.ProviderConfig, cfg)
 
+	if !ctl.IsSupportedRegion() {
+		return cmdutils.ErrUnsupportedRegion(rc.ProviderConfig)
+	}
+	logger.Info("using region %s", cfg.Metadata.Region)
+
 	if err := ctl.CheckAuth(); err != nil {
 		return err
 	}