Adds validation for volumes and master instance types

Author: JoshVanL

pkg/tarmak/provider/amazon/amazon.go

@@ -317,12 +317,11 @@ func (a *Amazon) readVaultToken() (string, error) {
 }
 
 func (a *Amazon) Validate() error {
-	var result error
-	var err error
+	var result *multierror.Error
 
 	// These checks only make sense with an environment given
 	if a.tarmak.Environment() != nil {
-		err = a.validateRemoteStateBucket()
+		err := a.validateRemoteStateBucket()
 		if err != nil {
 			result = multierror.Append(result, err)
 		}
@@ -344,16 +343,12 @@ func (a *Amazon) Validate() error {
 
 	}
 
-	err = a.validatePublicZone()
+	err := a.validatePublicZone()
 	if err != nil {
 		result = multierror.Append(result, err)
 	}
 
-	if result != nil {
-		return result
-	}
-	return nil
-
+	return result.ErrorOrNil()
 }
 
 func (a *Amazon) Verify() (result error) {
@@ -511,7 +506,7 @@ func (a *Amazon) vaultSession() (*session.Session, error) {
 }
 
 func (a *Amazon) VerifyInstanceTypes(instancePools []interfaces.InstancePool) error {
-	var result error
+	var result *multierror.Error
 
 	svc, err := a.EC2()
 	if err != nil {
@@ -521,20 +516,35 @@ func (a *Amazon) VerifyInstanceTypes(instancePools []interfaces.InstancePool) er
 	for _, instance := range instancePools {
 		instanceType, err := a.InstanceType(instance.Config().Size)
 		if err != nil {
-			return err
+			result = multierror.Append(result, err)
+			continue
 		}
 
 		if err := a.verifyInstanceType(instanceType, instance.Zones(), svc); err != nil {
 			result = multierror.Append(result, err)
 		}
+
+		if instance.Name() == "master" {
+			found := false
+			for _, s := range a.nonMasterType() {
+				if s == instanceType {
+					found = true
+					break
+				}
+			}
+
+			if found {
+				err := fmt.Errorf("type '%s' is not supported for master instance")
+				result = multierror.Append(result, err)
+			}
+		}
 	}
 
-	return result
+	return result.ErrorOrNil()
 }
 
 func (a *Amazon) verifyInstanceType(instanceType string, zones []string, svc EC2) error {
-	var result error
-	var available bool
+	var result *multierror.Error
 
 	//Request offering, filter by given instance type
 	request := &ec2.DescribeReservedInstancesOfferingsInput{
@@ -552,7 +562,7 @@ func (a *Amazon) verifyInstanceType(instanceType string, zones []string, svc EC2
 
 	//Loop through the given zones
 	for _, zone := range zones {
-		available = false
+		available := false
 
 		//Loop through every offer given. Check the zone against the current looped zone.
 		for _, offer := range response.ReservedInstancesOfferings {
@@ -568,7 +578,7 @@ func (a *Amazon) verifyInstanceType(instanceType string, zones []string, svc EC2
 		}
 	}
 
-	return result
+	return result.ErrorOrNil()
 }
 
 // This methods converts and possibly validates a generic instance type to a
@@ -588,7 +598,7 @@ func (a *Amazon) InstanceType(typeIn string) (typeOut string, err error) {
 	}
 
 	found := false
-	for _, t := range a.instanceTypes() {
+	for _, t := range a.awsInstanceTypes() {
 		if t == typeIn {
 			found = true
 			break
@@ -611,48 +621,30 @@ func (a *Amazon) VolumeType(typeIn string) (typeOut string, err error) {
 	if typeIn == clusterv1alpha1.VolumeTypeSSD {
 		return "gp2", nil
 	}
-	// TODO: Validate custom instance type here
+
+	found := false
+	for _, t := range a.awsVolumeTypes() {
+		if t == typeIn {
+			found = true
+			break
+		}
+	}
+
+	if !found {
+		return "", fmt.Errorf("'%s' is not a supported volume type", typeIn)
+	}
+
 	return typeIn, nil
 }
 
-func (a *Amazon) instanceTypes() []string {
-	return []string{
-		"c1.medium",
-		"c1.xlarge",
-		"c3.2xlarge",
-		"c3.4xlarge",
-		"c3.8xlarge",
-		"c3.large",
-		"c3.xlarge",
-		"cc2.8xlarge",
-		"cg1.4xlarge",
-		"cr1.8xlarge",
-		"g2.2xlarge",
-		"hi1.4xlarge",
-		"hs1.8xlarge",
-		"i2.2xlarge",
-		"i2.4xlarge",
-		"i2.8xlarge",
-		"i2.xlarge",
-		"m1.large",
-		"m1.medium",
-		"m1.small",
-		"m1.xlarge",
-		"m2.2xlarge",
-		"m2.4xlarge",
-		"m2.xlarge",
-		"m3.2xlarge",
-		"m3.large",
-		"m3.medium",
-		"m3.xlarge",
-		"r3.2xlarge",
-		"r3.4xlarge",
-		"r3.8xlarge",
-		"r3.large",
-		"r3.xlarge",
-		"t1.micro",
-		"t2.medium",
-		"t2.micro",
-		"t2.small",
-	}
+func (a *Amazon) awsVolumeTypes() []string {
+	return []string{"io1", "gp2", "st1", "sc1"}
+}
+
+func (a *Amazon) awsInstanceTypes() []string {
+	return []string{"c1.medium", "c1.xlarge", "c3.2xlarge", "c3.4xlarge", "c3.8xlarge", "c3.large", "c3.xlarge", "cc2.8xlarge", "cg1.4xlarge", "cr1.8xlarge", "g2.2xlarge", "hi1.4xlarge", "hs1.8xlarge", "i2.2xlarge", "i2.4xlarge", "i2.8xlarge", "i2.xlarge", "m1.large", "m1.medium", "m1.small", "m1.xlarge", "m2.2xlarge", "m2.4xlarge", "m2.xlarge", "m3.2xlarge", "m3.large", "m3.medium", "m3.xlarge", "r3.2xlarge", "r3.4xlarge", "r3.8xlarge", "r3.large", "r3.xlarge", "t1.micro", "t2.medium", "t2.micro", "t2.small", "t2.nano", "t2.micro"}
+}
+
+func (a *Amazon) nonMasterType() []string {
+	return []string{"t2.nano", "t2.micro"}
 }