Update AWS region validations (#899)

Author: deliahu

cli/cmd/deploy.go

@@ -166,5 +166,5 @@ func deploy(configPath string, force bool) {
 		exit.Error(err, "/deploy", string(response))
 	}
 
-	print.ForUser(deployResponse.Message)
+	print.ForUserSplitDoubleNewLine(deployResponse.Message)
 }

cli/cmd/lib_aws_creds.go

@@ -24,6 +24,7 @@ import (
 	cr "github.com/cortexlabs/cortex/pkg/lib/configreader"
 	"github.com/cortexlabs/cortex/pkg/lib/errors"
 	"github.com/cortexlabs/cortex/pkg/lib/prompt"
+	"github.com/cortexlabs/cortex/pkg/types/clusterconfig"
 )
 
 type AWSCredentials struct {
@@ -34,6 +35,10 @@ type AWSCredentials struct {
 }
 
 func newAWSClient(region string, awsCreds AWSCredentials) (*aws.Client, error) {
+	if err := clusterconfig.ValidateRegion(region); err != nil {
+		return nil, err
+	}
+
 	awsClient, err := aws.NewFromCreds(region, awsCreds.AWSAccessKeyID, awsCreds.AWSSecretAccessKey)
 	if err != nil {
 		return nil, err

pkg/lib/aws/ec2.go

@@ -66,6 +66,68 @@ func (c *Client) SpotInstancePrice(region string, instanceType string) (float64,
 	return min, nil
 }
 
+func (c *Client) ListAllRegions() (strset.Set, error) {
+	result, err := c.EC2().DescribeRegions(&ec2.DescribeRegionsInput{
+		AllRegions: aws.Bool(true),
+	})
+	if err != nil {
+		return nil, errors.WithStack(err)
+	}
+
+	regions := strset.New()
+	for _, region := range result.Regions {
+		if region.RegionName != nil {
+			regions.Add(*region.RegionName)
+		}
+	}
+
+	return regions, nil
+}
+
+// Returns only regions that are enabled for your account
+func (c *Client) ListEnabledRegions() (strset.Set, error) {
+	result, err := c.EC2().DescribeRegions(&ec2.DescribeRegionsInput{
+		AllRegions: aws.Bool(false),
+	})
+	if err != nil {
+		return nil, errors.WithStack(err)
+	}
+
+	regions := strset.New()
+	for _, region := range result.Regions {
+		if region.RegionName != nil {
+			regions.Add(*region.RegionName)
+		}
+	}
+
+	return regions, nil
+}
+
+// Returns all regions and enabled regions
+func (c *Client) ListRegions() (strset.Set, strset.Set, error) {
+	var allRegions strset.Set
+	var enabledRegions strset.Set
+
+	err := parallel.RunFirstErr(
+		func() error {
+			var err error
+			allRegions, err = c.ListAllRegions()
+			return err
+		},
+		func() error {
+			var err error
+			enabledRegions, err = c.ListEnabledRegions()
+			return err
+		},
+	)
+
+	if err != nil {
+		return nil, nil, err
+	}
+
+	return allRegions, enabledRegions, nil
+}
+
 func (c *Client) ListAvailabilityZones() (strset.Set, error) {
 	input := &ec2.DescribeAvailabilityZonesInput{
 		Filters: []*ec2.Filter{

pkg/lib/aws/eks.go

@@ -17,19 +17,14 @@ limitations under the License.
 package aws
 
 import (
-	"sort"
-
 	"github.com/cortexlabs/cortex/pkg/lib/sets/strset"
 )
 
 var EKSSupportedRegions strset.Set
-var EKSSupportedRegionsSlice []string
 
 func init() {
 	EKSSupportedRegions = strset.New()
 	for region := range InstanceMetadatas {
 		EKSSupportedRegions.Add(region)
 	}
-	EKSSupportedRegionsSlice = EKSSupportedRegions.Slice()
-	sort.Strings(EKSSupportedRegionsSlice)
 }

pkg/lib/aws/sts.go

@@ -46,12 +46,12 @@ func (c *Client) AreCredentialsValid() (string, string, bool, error) {
 // Ignores cache, so will re-run on every call to this method
 func (c *Client) CheckCredentials() (string, string, error) {
 	_, _, isValid, err := c.AreCredentialsValid()
-	if !isValid {
-		return "", "", ErrorInvalidAWSCredentials()
-	}
 	if err != nil {
 		return "", "", err
 	}
+	if !isValid {
+		return "", "", ErrorInvalidAWSCredentials()
+	}
 	return *c.accountID, *c.hashedAccountID, nil
 }
 

pkg/lib/print/print.go

@@ -24,6 +24,21 @@ import (
 )
 
 func ForUser(msg string) {
+	msgParts := strings.Split(msg, "\n")
+
+	if len(msgParts[0]) > 200 {
+		fmt.Println(msg)
+		return
+	}
+
+	fmt.Println(console.Bold(msgParts[0]))
+
+	if len(msgParts) > 1 {
+		fmt.Println(strings.Join(msgParts[1:], "\n"))
+	}
+}
+
+func ForUserSplitDoubleNewLine(msg string) {
 	msgParts := strings.Split(msg, "\n\n")
 
 	if len(msgParts[0]) > 200 {

pkg/types/clusterconfig/clusterconfig.go

@@ -203,7 +203,7 @@ var UserValidation = &cr.StructValidation{
 		{
 			StructField: "Region",
 			StringPtrValidation: &cr.StringPtrValidation{
-				AllowedValues: aws.EKSSupportedRegionsSlice,
+				Validator: validateRegion,
 			},
 		},
 		{
@@ -389,6 +389,20 @@ var UserValidation = &cr.StructValidation{
 	},
 }
 
+func ValidateRegion(region string) error {
+	if !aws.EKSSupportedRegions.Has(region) {
+		return ErrorInvalidRegion(region)
+	}
+	return nil
+}
+
+func validateRegion(region string) (string, error) {
+	if err := ValidateRegion(region); err != nil {
+		return "", err
+	}
+	return region, nil
+}
+
 func validateImageVersion(image string) (string, error) {
 	if !strings.HasPrefix(image, "cortexlabs/") && !strings.HasPrefix(image, "cortexlabsdev/") {
 		return image, nil
@@ -437,7 +451,7 @@ var AccessValidation = &cr.StructValidation{
 		{
 			StructField: "Region",
 			StringPtrValidation: &cr.StringPtrValidation{
-				AllowedValues: aws.EKSSupportedRegionsSlice,
+				Validator: validateRegion,
 			},
 		},
 		{
@@ -728,8 +742,8 @@ func RegionPrompt(clusterConfig *Config) error {
 					Prompt: RegionUserKey,
 				},
 				StringPtrValidation: &cr.StringPtrValidation{
-					AllowedValues: aws.EKSSupportedRegionsSlice,
-					Default:       defaults.Region,
+					Validator: validateRegion,
+					Default:   defaults.Region,
 				},
 			},
 		},
@@ -870,8 +884,8 @@ var AccessPromptValidation = &cr.PromptValidation{
 				Prompt: RegionUserKey,
 			},
 			StringPtrValidation: &cr.StringPtrValidation{
-				AllowedValues: aws.EKSSupportedRegionsSlice,
-				Default:       pointer.String("us-west-2"),
+				Validator: validateRegion,
+				Default:   pointer.String("us-west-2"),
 			},
 		},
 	},

pkg/types/clusterconfig/errors.go

@@ -28,6 +28,7 @@ import (
 )
 
 const (
+	ErrInvalidRegion                          = "clusterconfig.invalid_region"
 	ErrInstanceTypeTooSmall                   = "clusterconfig.instance_type_too_small"
 	ErrMinInstancesGreaterThanMax             = "clusterconfig.min_instances_greater_than_max"
 	ErrInstanceTypeNotSupportedInRegion       = "clusterconfig.instance_type_not_supported_in_region"
@@ -51,10 +52,17 @@ const (
 	ErrInvalidInstanceType                    = "clusterconfig.invalid_instance_type"
 )
 
+func ErrorInvalidRegion(region string) error {
+	return errors.WithStack(&errors.Error{
+		Kind:    ErrInvalidRegion,
+		Message: fmt.Sprintf("%s is not a valid AWS region, or is an AWS region which is not supported by AWS EKS; please choose one of the following regions: %s", s.UserStr(region), strings.Join(aws.EKSSupportedRegions.SliceSorted(), ", ")),
+	})
+}
+
 func ErrorInstanceTypeTooSmall() error {
 	return errors.WithStack(&errors.Error{
 		Kind:    ErrInstanceTypeTooSmall,
-		Message: "Cortex does not support nano or micro instances - please specify a larger instance type",
+		Message: "cortex does not support nano or micro instances - please specify a larger instance type",
 	})
 }