Ensures results are of type multierror.Error and call ErrorOrNil

JoshVanL · JoshVanL · commit e1b9f1462764 · 2018-07-31T14:31:26.000+01:00
diff --git a/pkg/tarmak/cluster/cluster.go b/pkg/tarmak/cluster/cluster.go
@@ -74,7 +74,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
@@ -86,7 +86,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 {
@@ -357,7 +357,7 @@ func (c *Cluster) verifyHubState() error {
 }
 
 // Verify instance pools
-func (c *Cluster) VerifyInstancePools() (result error) {
+func (c *Cluster) VerifyInstancePools() error {
 	imageIDs, err := c.ImageIDs()
 	if err != nil {
 		return fmt.Errorf("error getting image IDs: %s]", err)
@@ -370,6 +370,7 @@ func (c *Cluster) VerifyInstancePools() (result error) {
 			return fmt.Errorf("error getting the image ID of %s", instancePool.TFName())
 		}
 	}
+
 	return nil
 }
 
@@ -416,7 +417,7 @@ func (c *Cluster) Validate() error {
 }
 
 // validate network configuration
-func (c *Cluster) validateNetwork() (result error) {
+func (c *Cluster) validateNetwork() error {
 	// make the choice between deploying into existing VPC or creating a new one
 	if _, ok := c.Config().Network.ObjectMeta.Annotations[clusterv1alpha1.ExistingVPCAnnotationKey]; ok {
 		// TODO: handle existing vpc
@@ -437,7 +438,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 {
@@ -459,7 +460,7 @@ func (c *Cluster) validateLoggingSinks() (result error) {
 }
 
 // validate overprovisioning
-func (c *Cluster) validateClusterAutoscaler() (result error) {
+func (c *Cluster) validateClusterAutoscaler() error {
 
 	if c.Config().Kubernetes != nil && c.Config().Kubernetes.ClusterAutoscaler != nil && c.Config().Kubernetes.ClusterAutoscaler.Overprovisioning != nil {
 		if !c.Config().Kubernetes.ClusterAutoscaler.Overprovisioning.Enabled {
@@ -490,20 +491,20 @@ func (c *Cluster) validateClusterAutoscaler() (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()
 }
 
 func (c *Cluster) validatePrometheusMode() error {
-	var result error
-
 	allowedModes := sets.NewString(
 		clusterv1alpha1.PrometheusModeFull,
 		clusterv1alpha1.PrometheusModeExternalScrapeTargetsOnly,
@@ -517,7 +518,7 @@ func (c *Cluster) validatePrometheusMode() error {
 		}
 	}
 
-	return result
+	return nil
 }
 
 // Determine if this Cluster is a cluster or hub, single or multi environment
diff --git a/pkg/tarmak/environment/environment.go b/pkg/tarmak/environment/environment.go
@@ -53,9 +53,7 @@ func NewFromConfig(tarmak interfaces.Tarmak, conf *tarmakv1alpha1.Environment, c
 		log:    tarmak.Log().WithField("environment", conf.Name),
 	}
 
-	var result error
 	var err error
-
 	// init provider
 	e.provider, err = tarmak.ProviderByName(conf.Provider)
 	if err != nil {
@@ -65,20 +63,23 @@ func NewFromConfig(tarmak interfaces.Tarmak, conf *tarmakv1alpha1.Environment, c
 	// TODO RENABLE
 	//networkCIDRs := []*net.IPNet{}
 
+	var result *multierror.Error
 	for posCluster, _ := range clusters {
 		clusterConf := clusters[posCluster]
 		clusterIntf, err := cluster.NewFromConfig(e, clusterConf)
 		if err != nil {
 			result = multierror.Append(result, err)
 			continue
 		}
+
 		e.clusters = append(e.clusters, clusterIntf)
 		if len(clusters) == 1 || clusterConf.Name == "hub" {
 			e.HubCluster = clusterIntf
 		}
 	}
+
 	if result != nil {
-		return nil, result
+		return nil, result.ErrorOrNil()
 	}
 
 	if e.HubCluster != nil {
@@ -277,7 +278,8 @@ func (e *Environment) Log() *logrus.Entry {
 	return e.log
 }
 
-func (e *Environment) Validate() (result error) {
+func (e *Environment) Validate() error {
+	var result *multierror.Error
 
 	if err := e.Provider().Validate(); err != nil {
 		result = multierror.Append(result, err)
@@ -287,18 +289,20 @@ func (e *Environment) Validate() (result error) {
 		result = multierror.Append(result, err)
 	}
 
-	return result
+	return result.ErrorOrNil()
 }
 
-func (e *Environment) ValidateAdminCIDRs() (result error) {
+func (e *Environment) ValidateAdminCIDRs() error {
+	var result *multierror.Error
+
 	for _, cidr := range e.Config().AdminCIDRs {
 		_, _, 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()
 }
 
 func (e *Environment) Verify() error {
diff --git a/pkg/tarmak/instance_pool/instance_pool.go b/pkg/tarmak/instance_pool/instance_pool.go
@@ -75,8 +75,7 @@ func NewFromConfig(cluster interfaces.Cluster, conf *clusterv1alpha1.InstancePoo
 		return nil, fmt.Errorf("minCount does not equal maxCount but role is stateful. minCount=%d maxCount=%d", instancePool.Config().MinCount, instancePool.Config().MaxCount)
 	}
 
-	var result error
-
+	var result *multierror.Error
 	count := 0
 	for pos, _ := range conf.Volumes {
 		volume, err := NewVolumeFromConfig(count, provider, &conf.Volumes[pos])
@@ -96,7 +95,7 @@ func NewFromConfig(cluster interfaces.Cluster, conf *clusterv1alpha1.InstancePoo
 		return nil, errors.New("no root volume given")
 	}
 
-	return instancePool, result
+	return instancePool, result.ErrorOrNil()
 }
 
 func (n *InstancePool) Role() *role.Role {
@@ -189,24 +188,26 @@ func (n *InstancePool) AmazonAdditionalIAMPolicies() string {
 	return fmt.Sprintf("[%s]", strings.Join(policies, ","))
 }
 
-func (n *InstancePool) Validate() (result error) {
+func (n *InstancePool) Validate() error {
 	return n.ValidateAllowCIDRs()
 }
 
-func (n *InstancePool) ValidateAllowCIDRs() (result error) {
+func (n *InstancePool) ValidateAllowCIDRs() error {
+	var result *multierror.Error
+
 	for _, cidr := range n.Config().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()
 }
 
 func (n *InstancePool) Labels() (string, error) {
 	var labels []string
-	var result error
+	var result *multierror.Error
 
 	validKey := regexp.MustCompile(`^\w+$`)
 	validValue := regexp.MustCompile(`^\w+$`)
@@ -221,12 +222,12 @@ func (n *InstancePool) Labels() (string, error) {
 		labels = append(labels, fmt.Sprintf("  %s: \"%s\"", label.Key, label.Value))
 	}
 
-	return strings.Join(labels, "\n"), result
+	return strings.Join(labels, "\n"), result.ErrorOrNil()
 }
 
 func (n *InstancePool) Taints() (string, error) {
 	var taints []string
-	var result error
+	var result *multierror.Error
 
 	validKey := regexp.MustCompile(`^\w+$`)
 	validValue := regexp.MustCompile(`^\w+$`)
@@ -246,5 +247,5 @@ func (n *InstancePool) Taints() (string, error) {
 		taints = append(taints, fmt.Sprintf("  %s: \"%s:%s\"", taint.Key, taint.Value, taint.Effect))
 	}
 
-	return strings.Join(taints, "\n"), result
+	return strings.Join(taints, "\n"), result.ErrorOrNil()
 }
diff --git a/pkg/tarmak/provider/amazon/amazon.go b/pkg/tarmak/provider/amazon/amazon.go
@@ -399,7 +399,7 @@ func (a *Amazon) getAvailablityZoneByRegion() (zones []string, err error) {
 }
 
 func (a *Amazon) validateAvailabilityZones() error {
-	var result error
+	var result *multierror.Error
 
 	zones, err := a.getAvailablityZoneByRegion()
 	if err != nil {
@@ -432,7 +432,7 @@ func (a *Amazon) validateAvailabilityZones() error {
 		}
 	}
 	if result != nil {
-		return result
+		return result.ErrorOrNil()
 	}
 
 	if len(availabilityZones) == 0 {
@@ -522,7 +522,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 {
@@ -540,11 +540,11 @@ func (a *Amazon) VerifyInstanceTypes(instancePools []interfaces.InstancePool) er
 		}
 	}
 
-	return result
+	return result.ErrorOrNil()
 }
 
 func (a *Amazon) verifyInstanceType(instanceType string, zones []string, svc EC2) error {
-	var result error
+	var result *multierror.Error
 	var available bool
 
 	//Request offering, filter by given instance type
@@ -579,7 +579,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
diff --git a/pkg/tarmak/tarmak.go b/pkg/tarmak/tarmak.go
@@ -281,20 +281,17 @@ func (t *Tarmak) Version() string {
 }
 
 func (t *Tarmak) Validate() error {
-	var err error
-	var result error
+	var result *multierror.Error
 
-	err = t.Cluster().Validate()
-	if err != nil {
+	if err := t.Cluster().Validate(); err != nil {
 		result = multierror.Append(result, err)
 	}
 
-	err = t.Cluster().Environment().Validate()
-	if err != nil {
+	if err := t.Cluster().Environment().Validate(); err != nil {
 		result = multierror.Append(result, err)
 	}
 
-	return result
+	return result.ErrorOrNil()
 }
 
 func (t *Tarmak) Verify() error {
diff --git a/pkg/tarmak/utils/networks.go b/pkg/tarmak/utils/networks.go
@@ -21,7 +21,7 @@ func UnusedPort() int {
 }
 
 func NetworkOverlap(netCIDRs []*net.IPNet) error {
-	var result error
+	var result *multierror.Error
 	for i, _ := range netCIDRs {
 		for j := i + 1; j < len(netCIDRs); j++ {
 			// check for overlap per network
@@ -34,5 +34,5 @@ func NetworkOverlap(netCIDRs []*net.IPNet) error {
 			}
 		}
 	}
-	return result
+	return result.ErrorOrNil()
 }
diff --git a/pkg/terraform/templating.go b/pkg/terraform/templating.go
@@ -118,7 +118,7 @@ type terraformTemplate struct {
 
 func (t *terraformTemplate) Generate() error {
 
-	var result error
+	var result *multierror.Error
 	if err := t.generateRemoteStateConfig(); err != nil {
 		result = multierror.Append(result, err)
 	}
@@ -151,7 +151,7 @@ func (t *terraformTemplate) Generate() error {
 		result = multierror.Append(result, err)
 	}
 
-	return result
+	return result.ErrorOrNil()
 }
 
 func (t *terraformTemplate) data(module string) map[string]interface{} {

Original file line number	Diff line number	Diff line change
`@@ -74,7 +74,7 @@ func NewFromConfig(environment interfaces.Environment, conf *clusterv1alpha1.Clu`
`74`	`74`	`}`
`75`	`75`
`76`	`76`	`// setup instance pools`
`77`		`- var result error`
	`77`	`+ var result *multierror.Error`
`78`	`78`	`for pos, _ := range cluster.conf.InstancePools {`
`79`	`79`	`instancePool := cluster.conf.InstancePools[pos]`
`80`	`80`	`// create instance pools`
`@@ -86,7 +86,7 @@ func NewFromConfig(environment interfaces.Environment, conf *clusterv1alpha1.Clu`
`86`	`86`	`cluster.instancePools = append(cluster.instancePools, pool)`
`87`	`87`	`}`
`88`	`88`
`89`		`- return cluster, result`
	`89`	`+ return cluster, result.ErrorOrNil()`
`90`	`90`	`}`
`91`	`91`
`92`	`92`	`func (c *Cluster) InstancePools() []interfaces.InstancePool {`
`@@ -357,7 +357,7 @@ func (c *Cluster) verifyHubState() error {`
`357`	`357`	`}`
`358`	`358`
`359`	`359`	`// Verify instance pools`
`360`		`-func (c *Cluster) VerifyInstancePools() (result error) {`
	`360`	`+func (c *Cluster) VerifyInstancePools() error {`
`361`	`361`	`imageIDs, err := c.ImageIDs()`
`362`	`362`	`if err != nil {`
`363`	`363`	`return fmt.Errorf("error getting image IDs: %s]", err)`
`@@ -370,6 +370,7 @@ func (c *Cluster) VerifyInstancePools() (result error) {`
`370`	`370`	`return fmt.Errorf("error getting the image ID of %s", instancePool.TFName())`
`371`	`371`	`}`
`372`	`372`	`}`
	`373`	`+`
`373`	`374`	`return nil`
`374`	`375`	`}`
`375`	`376`
`@@ -416,7 +417,7 @@ func (c *Cluster) Validate() error {`
`416`	`417`	`}`
`417`	`418`
`418`	`419`	`// validate network configuration`
`419`		`-func (c *Cluster) validateNetwork() (result error) {`
	`420`	`+func (c *Cluster) validateNetwork() error {`
`420`	`421`	`// make the choice between deploying into existing VPC or creating a new one`
`421`	`422`	`if _, ok := c.Config().Network.ObjectMeta.Annotations[clusterv1alpha1.ExistingVPCAnnotationKey]; ok {`
`422`	`423`	`// TODO: handle existing vpc`
`@@ -437,7 +438,7 @@ func (c *Cluster) validateNetwork() (result error) {`
`437`	`438`	`}`
`438`	`439`
`439`	`440`	`// validate logging configuration`
`440`		`-func (c *Cluster) validateLoggingSinks() (result error) {`
	`441`	`+func (c *Cluster) validateLoggingSinks() error {`
`441`	`442`
`442`	`443`	`if c.Config().LoggingSinks != nil {`
`443`	`444`	`for index, loggingSink := range c.Config().LoggingSinks {`
`@@ -459,7 +460,7 @@ func (c *Cluster) validateLoggingSinks() (result error) {`
`459`	`460`	`}`
`460`	`461`
`461`	`462`	`// validate overprovisioning`
`462`		`-func (c *Cluster) validateClusterAutoscaler() (result error) {`
	`463`	`+func (c *Cluster) validateClusterAutoscaler() error {`
`463`	`464`
`464`	`465`	`if c.Config().Kubernetes != nil && c.Config().Kubernetes.ClusterAutoscaler != nil && c.Config().Kubernetes.ClusterAutoscaler.Overprovisioning != nil {`
`465`	`466`	`if !c.Config().Kubernetes.ClusterAutoscaler.Overprovisioning.Enabled {`
`@@ -490,20 +491,20 @@ func (c *Cluster) validateClusterAutoscaler() (result error) {`
`490`	`491`	`}`
`491`	`492`
`492`	`493`	`// Validate APIServer`
`493`		`-func (c *Cluster) validateAPIServer() (result error) {`
	`494`	`+func (c *Cluster) validateAPIServer() error {`
	`495`	`+ var result *multierror.Error`
	`496`	`+`
`494`	`497`	`for _, cidr := range c.Config().Kubernetes.APIServer.AllowCIDRs {`
`495`	`498`	`_, _, err := net.ParseCIDR(cidr)`
`496`	`499`	`if err != nil {`
`497`	`500`	`result = multierror.Append(result, fmt.Errorf("%s is not a valid CIDR format", cidr))`
`498`	`501`	`}`
`499`	`502`	`}`
`500`	`503`
`501`		`- return result`
	`504`	`+ return result.ErrorOrNil()`
`502`	`505`	`}`
`503`	`506`
`504`	`507`	`func (c *Cluster) validatePrometheusMode() error {`
`505`		`- var result error`
`506`		`-`
`507`	`508`	`allowedModes := sets.NewString(`
`508`	`509`	`clusterv1alpha1.PrometheusModeFull,`
`509`	`510`	`clusterv1alpha1.PrometheusModeExternalScrapeTargetsOnly,`
`@@ -517,7 +518,7 @@ func (c *Cluster) validatePrometheusMode() error {`
`517`	`518`	`}`
`518`	`519`	`}`
`519`	`520`
`520`		`- return result`
	`521`	`+ return nil`
`521`	`522`	`}`
`522`	`523`
`523`	`524`	`// Determine if this Cluster is a cluster or hub, single or multi environment`
Original file line number	Diff line number	Diff line change
`@@ -53,9 +53,7 @@ func NewFromConfig(tarmak interfaces.Tarmak, conf *tarmakv1alpha1.Environment, c`
`53`	`53`	`log: tarmak.Log().WithField("environment", conf.Name),`
`54`	`54`	`}`
`55`	`55`
`56`		`- var result error`
`57`	`56`	`var err error`
`58`		`-`
`59`	`57`	`// init provider`
`60`	`58`	`e.provider, err = tarmak.ProviderByName(conf.Provider)`
`61`	`59`	`if err != nil {`
`@@ -65,20 +63,23 @@ func NewFromConfig(tarmak interfaces.Tarmak, conf *tarmakv1alpha1.Environment, c`
`65`	`63`	`// TODO RENABLE`
`66`	`64`	`//networkCIDRs := []*net.IPNet{}`
`67`	`65`
	`66`	`+ var result *multierror.Error`
`68`	`67`	`for posCluster, _ := range clusters {`
`69`	`68`	`clusterConf := clusters[posCluster]`
`70`	`69`	`clusterIntf, err := cluster.NewFromConfig(e, clusterConf)`
`71`	`70`	`if err != nil {`
`72`	`71`	`result = multierror.Append(result, err)`
`73`	`72`	`continue`
`74`	`73`	`}`
	`74`	`+`
`75`	`75`	`e.clusters = append(e.clusters, clusterIntf)`
`76`	`76`	`if len(clusters) == 1 \|\| clusterConf.Name == "hub" {`
`77`	`77`	`e.HubCluster = clusterIntf`
`78`	`78`	`}`
`79`	`79`	`}`
	`80`	`+`
`80`	`81`	`if result != nil {`
`81`		`- return nil, result`
	`82`	`+ return nil, result.ErrorOrNil()`
`82`	`83`	`}`
`83`	`84`
`84`	`85`	`if e.HubCluster != nil {`
`@@ -277,7 +278,8 @@ func (e Environment) Log() logrus.Entry {`
`277`	`278`	`return e.log`
`278`	`279`	`}`
`279`	`280`
`280`		`-func (e *Environment) Validate() (result error) {`
	`281`	`+func (e *Environment) Validate() error {`
	`282`	`+ var result *multierror.Error`
`281`	`283`
`282`	`284`	`if err := e.Provider().Validate(); err != nil {`
`283`	`285`	`result = multierror.Append(result, err)`
`@@ -287,18 +289,20 @@ func (e *Environment) Validate() (result error) {`
`287`	`289`	`result = multierror.Append(result, err)`
`288`	`290`	`}`
`289`	`291`
`290`		`- return result`
	`292`	`+ return result.ErrorOrNil()`
`291`	`293`	`}`
`292`	`294`
`293`		`-func (e *Environment) ValidateAdminCIDRs() (result error) {`
	`295`	`+func (e *Environment) ValidateAdminCIDRs() error {`
	`296`	`+ var result *multierror.Error`
	`297`	`+`
`294`	`298`	`for _, cidr := range e.Config().AdminCIDRs {`
`295`	`299`	`_, _, err := net.ParseCIDR(cidr)`
`296`	`300`	`if err != nil {`
`297`	`301`	`result = multierror.Append(result, fmt.Errorf("%s is not a valid CIDR format", cidr))`
`298`	`302`	`}`
`299`	`303`	`}`
`300`	`304`
`301`		`- return result`
	`305`	`+ return result.ErrorOrNil()`
`302`	`306`	`}`
`303`	`307`
`304`	`308`	`func (e *Environment) Verify() error {`
Original file line number	Diff line number	Diff line change
`@@ -75,8 +75,7 @@ func NewFromConfig(cluster interfaces.Cluster, conf *clusterv1alpha1.InstancePoo`
`75`	`75`	`return nil, fmt.Errorf("minCount does not equal maxCount but role is stateful. minCount=%d maxCount=%d", instancePool.Config().MinCount, instancePool.Config().MaxCount)`
`76`	`76`	`}`
`77`	`77`
`78`		`- var result error`
`79`		`-`
	`78`	`+ var result *multierror.Error`
`80`	`79`	`count := 0`
`81`	`80`	`for pos, _ := range conf.Volumes {`
`82`	`81`	`volume, err := NewVolumeFromConfig(count, provider, &conf.Volumes[pos])`
`@@ -96,7 +95,7 @@ func NewFromConfig(cluster interfaces.Cluster, conf *clusterv1alpha1.InstancePoo`
`96`	`95`	`return nil, errors.New("no root volume given")`
`97`	`96`	`}`
`98`	`97`
`99`		`- return instancePool, result`
	`98`	`+ return instancePool, result.ErrorOrNil()`
`100`	`99`	`}`
`101`	`100`
`102`	`101`	`func (n InstancePool) Role() role.Role {`
`@@ -189,24 +188,26 @@ func (n *InstancePool) AmazonAdditionalIAMPolicies() string {`
`189`	`188`	`return fmt.Sprintf("[%s]", strings.Join(policies, ","))`
`190`	`189`	`}`
`191`	`190`
`192`		`-func (n *InstancePool) Validate() (result error) {`
	`191`	`+func (n *InstancePool) Validate() error {`
`193`	`192`	`return n.ValidateAllowCIDRs()`
`194`	`193`	`}`
`195`	`194`
`196`		`-func (n *InstancePool) ValidateAllowCIDRs() (result error) {`
	`195`	`+func (n *InstancePool) ValidateAllowCIDRs() error {`
	`196`	`+ var result *multierror.Error`
	`197`	`+`
`197`	`198`	`for _, cidr := range n.Config().AllowCIDRs {`
`198`	`199`	`_, _, err := net.ParseCIDR(cidr)`
`199`	`200`	`if err != nil {`
`200`	`201`	`result = multierror.Append(result, fmt.Errorf("%s is not a valid CIDR format", cidr))`
`201`	`202`	`}`
`202`	`203`	`}`
`203`	`204`
`204`		`- return result`
	`205`	`+ return result.ErrorOrNil()`
`205`	`206`	`}`
`206`	`207`
`207`	`208`	`func (n *InstancePool) Labels() (string, error) {`
`208`	`209`	`var labels []string`
`209`		`- var result error`
	`210`	`+ var result *multierror.Error`
`210`	`211`
`211`	`212`	validKey := regexp.MustCompile(`^\w+$`)
`212`	`213`	validValue := regexp.MustCompile(`^\w+$`)
`@@ -221,12 +222,12 @@ func (n *InstancePool) Labels() (string, error) {`
`221`	`222`	`labels = append(labels, fmt.Sprintf(" %s: \"%s\"", label.Key, label.Value))`
`222`	`223`	`}`
`223`	`224`
`224`		`- return strings.Join(labels, "\n"), result`
	`225`	`+ return strings.Join(labels, "\n"), result.ErrorOrNil()`
`225`	`226`	`}`
`226`	`227`
`227`	`228`	`func (n *InstancePool) Taints() (string, error) {`
`228`	`229`	`var taints []string`
`229`		`- var result error`
	`230`	`+ var result *multierror.Error`
`230`	`231`
`231`	`232`	validKey := regexp.MustCompile(`^\w+$`)
`232`	`233`	validValue := regexp.MustCompile(`^\w+$`)
`@@ -246,5 +247,5 @@ func (n *InstancePool) Taints() (string, error) {`
`246`	`247`	`taints = append(taints, fmt.Sprintf(" %s: \"%s:%s\"", taint.Key, taint.Value, taint.Effect))`
`247`	`248`	`}`
`248`	`249`
`249`		`- return strings.Join(taints, "\n"), result`
	`250`	`+ return strings.Join(taints, "\n"), result.ErrorOrNil()`
`250`	`251`	`}`
Original file line number	Diff line number	Diff line change
`@@ -399,7 +399,7 @@ func (a *Amazon) getAvailablityZoneByRegion() (zones []string, err error) {`
`399`	`399`	`}`
`400`	`400`
`401`	`401`	`func (a *Amazon) validateAvailabilityZones() error {`
`402`		`- var result error`
	`402`	`+ var result *multierror.Error`
`403`	`403`
`404`	`404`	`zones, err := a.getAvailablityZoneByRegion()`
`405`	`405`	`if err != nil {`
`@@ -432,7 +432,7 @@ func (a *Amazon) validateAvailabilityZones() error {`
`432`	`432`	`}`
`433`	`433`	`}`
`434`	`434`	`if result != nil {`
`435`		`- return result`
	`435`	`+ return result.ErrorOrNil()`
`436`	`436`	`}`
`437`	`437`
`438`	`438`	`if len(availabilityZones) == 0 {`
`@@ -522,7 +522,7 @@ func (a Amazon) vaultSession() (session.Session, error) {`
`522`	`522`	`}`
`523`	`523`
`524`	`524`	`func (a *Amazon) VerifyInstanceTypes(instancePools []interfaces.InstancePool) error {`
`525`		`- var result error`
	`525`	`+ var result *multierror.Error`
`526`	`526`
`527`	`527`	`svc, err := a.EC2()`
`528`	`528`	`if err != nil {`
`@@ -540,11 +540,11 @@ func (a *Amazon) VerifyInstanceTypes(instancePools []interfaces.InstancePool) er`
`540`	`540`	`}`
`541`	`541`	`}`
`542`	`542`
`543`		`- return result`
	`543`	`+ return result.ErrorOrNil()`
`544`	`544`	`}`
`545`	`545`
`546`	`546`	`func (a *Amazon) verifyInstanceType(instanceType string, zones []string, svc EC2) error {`
`547`		`- var result error`
	`547`	`+ var result *multierror.Error`
`548`	`548`	`var available bool`
`549`	`549`
`550`	`550`	`//Request offering, filter by given instance type`
`@@ -579,7 +579,7 @@ func (a *Amazon) verifyInstanceType(instanceType string, zones []string, svc EC2`
`579`	`579`	`}`
`580`	`580`	`}`
`581`	`581`
`582`		`- return result`
	`582`	`+ return result.ErrorOrNil()`
`583`	`583`	`}`
`584`	`584`
`585`	`585`	`// This methods converts and possibly validates a generic instance type to a`
Original file line number	Diff line number	Diff line change
`@@ -281,20 +281,17 @@ func (t *Tarmak) Version() string {`
`281`	`281`	`}`
`282`	`282`
`283`	`283`	`func (t *Tarmak) Validate() error {`
`284`		`- var err error`
`285`		`- var result error`
	`284`	`+ var result *multierror.Error`
`286`	`285`
`287`		`- err = t.Cluster().Validate()`
`288`		`- if err != nil {`
	`286`	`+ if err := t.Cluster().Validate(); err != nil {`
`289`	`287`	`result = multierror.Append(result, err)`
`290`	`288`	`}`
`291`	`289`
`292`		`- err = t.Cluster().Environment().Validate()`
`293`		`- if err != nil {`
	`290`	`+ if err := t.Cluster().Environment().Validate(); err != nil {`
`294`	`291`	`result = multierror.Append(result, err)`
`295`	`292`	`}`
`296`	`293`
`297`		`- return result`
	`294`	`+ return result.ErrorOrNil()`
`298`	`295`	`}`
`299`	`296`
`300`	`297`	`func (t *Tarmak) Verify() error {`
Original file line number	Diff line number	Diff line change
`@@ -21,7 +21,7 @@ func UnusedPort() int {`
`21`	`21`	`}`
`22`	`22`
`23`	`23`	`func NetworkOverlap(netCIDRs []*net.IPNet) error {`
`24`		`- var result error`
	`24`	`+ var result *multierror.Error`
`25`	`25`	`for i, _ := range netCIDRs {`
`26`	`26`	`for j := i + 1; j < len(netCIDRs); j++ {`
`27`	`27`	`// check for overlap per network`
`@@ -34,5 +34,5 @@ func NetworkOverlap(netCIDRs []*net.IPNet) error {`
`34`	`34`	`}`
`35`	`35`	`}`
`36`	`36`	`}`
`37`		`- return result`
	`37`	`+ return result.ErrorOrNil()`
`38`	`38`	`}`
Original file line number	Diff line number	Diff line change
`@@ -118,7 +118,7 @@ type terraformTemplate struct {`
`118`	`118`
`119`	`119`	`func (t *terraformTemplate) Generate() error {`
`120`	`120`
`121`		`- var result error`
	`121`	`+ var result *multierror.Error`
`122`	`122`	`if err := t.generateRemoteStateConfig(); err != nil {`
`123`	`123`	`result = multierror.Append(result, err)`
`124`	`124`	`}`
`@@ -151,7 +151,7 @@ func (t *terraformTemplate) Generate() error {`
`151`	`151`	`result = multierror.Append(result, err)`
`152`	`152`	`}`
`153`	`153`
`154`		`- return result`
	`154`	`+ return result.ErrorOrNil()`
`155`	`155`	`}`
`156`	`156`
`157`	`157`	`func (t *terraformTemplate) data(module string) map[string]interface{} {`