Make use of type constants and compare type not name

jetstack · Jun 21, 2018 · c3c73de · c3c73de
1 parent b8ae323
commit c3c73de
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/pkg/tarmak/interfaces/interfaces.go b/pkg/tarmak/interfaces/interfaces.go
@@ -251,6 +251,7 @@ type InstancePool interface {
 	Validate() error
 	MinCount() int
 	MaxCount() int
+	InstanceType() string
 }
 
 type Volume interface {

diff --git a/pkg/tarmak/provider/amazon/amazon.go b/pkg/tarmak/provider/amazon/amazon.go
@@ -523,9 +523,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 {
@@ -539,7 +539,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())
 			}