Verify -> Validate and use result.ErrorOrNil where appropriate

Author: JoshVanL

pkg/tarmak/cluster/cluster.go

@@ -73,7 +73,7 @@ func NewFromConfig(environment interfaces.Environment, conf *clusterv1alpha1.Clu
 	}
 
 	// setup instance pools
-	var result error
+	var result *multierror.Error
 	for pos, _ := range cluster.conf.InstancePools {
 		instancePool := cluster.conf.InstancePools[pos]
 		// create instance pools
@@ -85,7 +85,7 @@ func NewFromConfig(environment interfaces.Environment, conf *clusterv1alpha1.Clu
 		cluster.instancePools = append(cluster.instancePools, pool)
 	}
 
-	return cluster, result
+	return cluster, result.ErrorOrNil()
 }
 
 func (c *Cluster) InstancePools() []interfaces.InstancePool {
@@ -120,7 +120,9 @@ func (c *Cluster) InstancePoolsMap() (instancePoolsMap map[string][]*clusterv1al
 }
 
 // validate hub instancePool types
-func validateHubTypes(poolMap map[string][]*clusterv1alpha1.InstancePool, clusterType string) (result error) {
+func validateHubTypes(poolMap map[string][]*clusterv1alpha1.InstancePool, clusterType string) error {
+	var result *multierror.Error
+
 	if len(poolMap[clusterv1alpha1.InstancePoolTypeBastion]) != 1 {
 		result = multierror.Append(result, fmt.Errorf("a hub needs to have exactly one '%s' server pool", clusterv1alpha1.InstancePoolTypeBastion))
 	}
@@ -129,11 +131,13 @@ func validateHubTypes(poolMap map[string][]*clusterv1alpha1.InstancePool, cluste
 		result = multierror.Append(result, fmt.Errorf("a hub needs to have exactly one '%s' server pool", clusterv1alpha1.InstancePoolTypeVault))
 	}
 
-	return result
+	return result.ErrorOrNil()
 }
 
 // validate cluster instancePool types
-func validateClusterTypes(poolMap map[string][]*clusterv1alpha1.InstancePool, clusterType string) (result error) {
+func validateClusterTypes(poolMap map[string][]*clusterv1alpha1.InstancePool, clusterType string) error {
+	var result *multierror.Error
+
 	if len(poolMap[clusterv1alpha1.InstancePoolTypeEtcd]) != 1 {
 		result = multierror.Append(result, fmt.Errorf("a %s needs to have exactly one '%s' server pool", clusterType, clusterv1alpha1.InstancePoolTypeEtcd))
 	}
@@ -142,27 +146,30 @@ func validateClusterTypes(poolMap map[string][]*clusterv1alpha1.InstancePool, cl
 		result = multierror.Append(result, fmt.Errorf("a %s needs to have more than one '%s' server pool", clusterType, clusterv1alpha1.InstancePoolTypeMaster))
 	}
 
-	return result
+	return result.ErrorOrNil()
 }
 
 // validate server pools
-func (c *Cluster) validateInstancePools() (result error) {
+func (c *Cluster) validateInstancePools() error {
+	var result *multierror.Error
+
 	for _, instancePool := range c.InstancePools() {
 		err := instancePool.Validate()
 		if err != nil {
 			result = multierror.Append(result, err)
 		}
 	}
-	return result
-}
 
-// Verify cluster
-func (c *Cluster) Verify() (result error) {
-	return c.VerifyInstancePools()
+	if err := c.Environment().Provider().ValidateInstanceTypes(c.InstancePools()); err != nil {
+		result = multierror.Append(result, err)
+	}
+
+	return result.ErrorOrNil()
 }
 
-// Verify instance pools
-func (c *Cluster) VerifyInstancePools() (result error) {
+// Verify cluster
+func (c *Cluster) Verify() error {
+	// Verify instance pools
 	imageIDs, err := c.ImageIDs()
 	if err != nil {
 		return fmt.Errorf("error getting image IDs: %s]", err)
@@ -175,10 +182,13 @@ func (c *Cluster) VerifyInstancePools() (result error) {
 			return fmt.Errorf("error getting the image ID of %s", instancePool.TFName())
 		}
 	}
+
 	return nil
 }
 
-func (c *Cluster) Validate() (result error) {
+func (c *Cluster) Validate() error {
+	var result *multierror.Error
+
 	// validate instance pools
 	if err := c.validateInstancePools(); err != nil {
 		result = multierror.Append(result, err)
@@ -203,7 +213,7 @@ func (c *Cluster) Validate() (result error) {
 		}
 	}
 
-	return result
+	return result.ErrorOrNil()
 }
 
 // validate network configuration
@@ -228,7 +238,7 @@ func (c *Cluster) validateNetwork() (result error) {
 }
 
 // validate logging configuration
-func (c *Cluster) validateLoggingSinks() (result error) {
+func (c *Cluster) validateLoggingSinks() error {
 
 	if c.Config().LoggingSinks != nil {
 		for index, loggingSink := range c.Config().LoggingSinks {
@@ -250,15 +260,17 @@ func (c *Cluster) validateLoggingSinks() (result error) {
 }
 
 // Validate APIServer
-func (c *Cluster) validateAPIServer() (result error) {
+func (c *Cluster) validateAPIServer() error {
+	var result *multierror.Error
+
 	for _, cidr := range c.Config().Kubernetes.APIServer.AllowCIDRs {
 		_, _, err := net.ParseCIDR(cidr)
 		if err != nil {
 			result = multierror.Append(result, fmt.Errorf("%s is not a valid CIDR format", cidr))
 		}
 	}
 
-	return result
+	return result.ErrorOrNil()
 }
 
 // Determine if this Cluster is a cluster or hub, single or multi environment

pkg/tarmak/interfaces/interfaces.go

@@ -127,7 +127,7 @@ type Provider interface {
 	AskEnvironmentLocation(Initialize) (string, error)
 	AskInstancePoolZones(Initialize) (zones []string, err error)
 	UploadConfiguration(Cluster, io.ReadSeeker) error
-	VerifyInstanceTypes(intstancePools []InstancePool) error
+	ValidateInstanceTypes(intstancePools []InstancePool) error
 }
 
 type Tarmak interface {

pkg/tarmak/provider/amazon/amazon.go

@@ -505,7 +505,7 @@ func (a *Amazon) vaultSession() (*session.Session, error) {
 	return sess, nil
 }
 
-func (a *Amazon) VerifyInstanceTypes(instancePools []interfaces.InstancePool) error {
+func (a *Amazon) ValidateInstanceTypes(instancePools []interfaces.InstancePool) error {
 	var result *multierror.Error
 
 	svc, err := a.EC2()