Refactor validate and verify

Make sure that validate and verify are present on cluster, environment and provider. This streamlines the use of both validate and verify as central calling point instead of all different methods.

Author: MattiasGees

pkg/tarmak/cluster/cluster.go

@@ -54,18 +54,7 @@ func NewFromConfig(environment interfaces.Environment, conf *clusterv1alpha1.Clu
 		log:         environment.Log().WithField("cluster", conf.Name),
 	}
 
-	// validate instance pools
-	if err := cluster.validateInstancePools(); err != nil {
-		return nil, err
-	}
-
-	// validate network setup
-	if err := cluster.validateNetwork(); err != nil {
-		return nil, err
-	}
-
-	//validate logging
-	if err := cluster.validateLoggingSinks(); err != nil {
+	if err := cluster.Validate(); err != nil {
 		return nil, err
 	}
 
@@ -184,6 +173,25 @@ func (c *Cluster) VerifyInstancePools() (result error) {
 	return nil
 }
 
+func (c *Cluster) Validate() (result error) {
+	// validate instance pools
+	if err := c.validateInstancePools(); err != nil {
+		result = multierror.Append(result, err)
+	}
+
+	// validate network setup
+	if err := c.validateNetwork(); err != nil {
+		result = multierror.Append(result, err)
+	}
+
+	//validate logging
+	if err := c.validateLoggingSinks(); err != nil {
+		result = multierror.Append(result, err)
+	}
+
+	return result
+}
+
 // validate network configuration
 func (c *Cluster) validateNetwork() (result error) {
 	// make the choice between deploying into existing VPC or creating a new one
@@ -305,10 +313,6 @@ func (c *Cluster) APITunnel() interfaces.Tunnel {
 	)
 }
 
-func (c *Cluster) Validate() error {
-	return nil
-}
-
 func (c *Cluster) Environment() interfaces.Environment {
 	return c.environment
 }

pkg/tarmak/environment/environment.go

@@ -286,6 +286,10 @@ func (e *Environment) Validate() error {
 	return result
 }
 
+func (e *Environment) Verify() (result error) {
+	return result
+}
+
 func (e *Environment) WingTunnel() interfaces.Tunnel {
 	return e.Tarmak().SSH().Tunnel(
 		"bastion",

pkg/tarmak/interfaces/interfaces.go

@@ -21,7 +21,6 @@ type Cluster interface {
 	Variables() map[string]interface{}
 	Environment() Environment
 	Name() string
-	Validate() error
 	NetworkCIDR() *net.IPNet
 	RemoteState() string
 
@@ -53,6 +52,8 @@ type Cluster interface {
 	UploadConfiguration() error
 	// Verify the cluster (these contain more expensive calls like AWS calls
 	Verify() error
+	// Validate the cluster (these contain less expensive local calls)
+	Validate() error
 
 	// This state is either destroy or apply
 	GetState() string
@@ -70,6 +71,9 @@ type Environment interface {
 	Location() string // this returns the location of the environment (e.g. the region)
 	Variables() map[string]interface{}
 	Provider() Provider
+	// Verify the cluster (these contain more expensive calls like AWS calls
+	Verify() error
+	// Validate the cluster (these contain less expensive local calls)
 	Validate() error
 	Name() string
 	HubName() string
@@ -102,6 +106,9 @@ type Provider interface {
 	Name() string
 	Parameters() map[string]string
 	Region() string
+	// Verify the cluster (these contain more expensive calls like AWS calls
+	Verify() error
+	// Validate the cluster (these contain less expensive local calls)
 	Validate() error
 	Reset() // reset all caches within the provider
 	RemoteStateBucketName() string

pkg/tarmak/provider/amazon/amazon.go

@@ -356,6 +356,10 @@ func (a *Amazon) Validate() error {
 
 }
 
+func (a *Amazon) Verify() (result error) {
+	return result
+}
+
 func (a *Amazon) getAvailablityZoneByRegion() (zones []string, err error) {
 	svc, err := a.EC2()
 	if err != nil {