Make use of type constants and compare type not name

JoshVanL · JoshVanL · commit 7497fbce9267 · 2018-07-11T09:51:21.000+01:00
diff --git a/pkg/tarmak/provider/amazon/amazon.go b/pkg/tarmak/provider/amazon/amazon.go
@@ -525,9 +525,9 @@ func (a *Amazon) VerifyInstanceTypes(instancePools []interfaces.InstancePool) er
 			result = multierror.Append(result, err)
 		}
 
-		switch instance.Name() {
+		switch instance.InstanceType() {
 
-		case "master":
+		case clusterv1alpha1.InstancePoolTypeMaster:
 			found := false
 			for _, s := range a.nonMasterType() {
 				if s == instanceType {
@@ -541,7 +541,7 @@ func (a *Amazon) VerifyInstanceTypes(instancePools []interfaces.InstancePool) er
 			}
 			break
 
-		case "etcd", "vault":
+		case clusterv1alpha1.InstancePoolTypeEtcd, clusterv1alpha1.InstancePoolTypeVault:
 			if a.awsInstanceBurstable(instanceType) {
 				a.tarmak.Log().Warnf("Burstable type '%s' is not advised for instance '%s'", instanceType, instance.Name())
 			}

Original file line number	Diff line number	Diff line change
`@@ -525,9 +525,9 @@ func (a *Amazon) VerifyInstanceTypes(instancePools []interfaces.InstancePool) er`
`525`	`525`	`result = multierror.Append(result, err)`
`526`	`526`	`}`
`527`	`527`
`528`		`- switch instance.Name() {`
	`528`	`+ switch instance.InstanceType() {`
`529`	`529`
`530`		`- case "master":`
	`530`	`+ case clusterv1alpha1.InstancePoolTypeMaster:`
`531`	`531`	`found := false`
`532`	`532`	`for _, s := range a.nonMasterType() {`
`533`	`533`	`if s == instanceType {`
`@@ -541,7 +541,7 @@ func (a *Amazon) VerifyInstanceTypes(instancePools []interfaces.InstancePool) er`
`541`	`541`	`}`
`542`	`542`	`break`
`543`	`543`
`544`		`- case "etcd", "vault":`
	`544`	`+ case clusterv1alpha1.InstancePoolTypeEtcd, clusterv1alpha1.InstancePoolTypeVault:`
`545`	`545`	`if a.awsInstanceBurstable(instanceType) {`
`546`	`546`	`a.tarmak.Log().Warnf("Burstable type '%s' is not advised for instance '%s'", instanceType, instance.Name())`
`547`	`547`	`}`