Merge pull request #159 from wata727/add_instance_type

Use `cristim/ec2-instances-info` instead of hard-coded list

detector/aws_db_instance_invalid_type.go

@@ -41,6 +41,12 @@ func (d *AwsDBInstanceInvalidTypeDetector) PreProcess() {
 		"db.m3.large":    true,
 		"db.m3.xlarge":   true,
 		"db.m3.2xlarge":  true,
+		"db.r4.large":    true,
+		"db.r4.xlarge":   true,
+		"db.r4.2xlarge":  true,
+		"db.r4.4xlarge":  true,
+		"db.r4.8xlarge":  true,
+		"db.r4.16xlarge": true,
 		"db.r3.large":    true,
 		"db.r3.xlarge":   true,
 		"db.r3.2xlarge":  true,

detector/aws_instance_invalid_type.go

@@ -3,6 +3,7 @@ package detector
 import (
 	"fmt"
 
+	instances "github.com/cristim/ec2-instances-info"
 	"github.com/wata727/tflint/issue"
 	"github.com/wata727/tflint/schema"
 )
@@ -27,85 +28,15 @@ func (d *Detector) CreateAwsInstanceInvalidTypeDetector() *AwsInstanceInvalidTyp
 }
 
 func (d *AwsInstanceInvalidTypeDetector) PreProcess() {
-	d.instanceTypes = map[string]bool{
-		"t2.nano":     true,
-		"t2.micro":    true,
-		"t2.small":    true,
-		"t2.medium":   true,
-		"t2.large":    true,
-		"t2.xlarge":   true,
-		"t2.2xlarge":  true,
-		"m4.large":    true,
-		"m4.xlarge":   true,
-		"m4.2xlarge":  true,
-		"m4.4xlarge":  true,
-		"m4.10xlarge": true,
-		"m4.16xlarge": true,
-		"m3.medium":   true,
-		"m3.large":    true,
-		"m3.xlarge":   true,
-		"m3.2xlarge":  true,
-		"c4.large":    true,
-		"c4.2xlarge":  true,
-		"c4.4xlarge":  true,
-		"c4.8xlarge":  true,
-		"c3.large":    true,
-		"c3.xlarge":   true,
-		"c3.2xlarge":  true,
-		"c3.4xlarge":  true,
-		"c3.8xlarge":  true,
-		"x1.16xlarge": true,
-		"x1.32xlarge": true,
-		"r4.large":    true,
-		"r4.xlarge":   true,
-		"r4.2xlarge":  true,
-		"r4.4xlarge":  true,
-		"r4.8xlarge":  true,
-		"r4.16xlarge": true,
-		"r3.large":    true,
-		"r3.xlarge":   true,
-		"r3.2xlarge":  true,
-		"r3.4xlarge":  true,
-		"r3.8xlarge":  true,
-		"p2.xlarge":   true,
-		"p2.8xlarge":  true,
-		"p2.16xlarge": true,
-		"g2.2xlarge":  true,
-		"g2.8xlarge":  true,
-		"g3.4xlarge":  true,
-		"g3.8xlarge":  true,
-		"g3.16xlarge": true,
-		"i2.xlarge":   true,
-		"i2.2xlarge":  true,
-		"i2.4xlarge":  true,
-		"i2.8xlarge":  true,
-		"d2.xlarge":   true,
-		"d2.2xlarge":  true,
-		"d2.4xlarge":  true,
-		"d2.8xlarge":  true,
-		"t1.micro":    true,
-		"m1.small":    true,
-		"m1.medium":   true,
-		"m1.large":    true,
-		"m1.xlarge":   true,
-		"c1.medium":   true,
-		"c1.xlarge":   true,
-		"cc2.8xlarge": true,
-		"cg1.4xlarge": true,
-		"m2.xlarge":   true,
-		"m2.2xlarge":  true,
-		"m2.4xlarge":  true,
-		"cr1.8xlarge": true,
-		"hi1.4xlarge": true,
-		"hs1.8xlarge": true,
-		"i3.large":    true,
-		"i3.xlarge":   true,
-		"i3.2xlarge":  true,
-		"i3.4xlarge":  true,
-		"i3.8xlarge":  true,
-		"i3.16xlarge": true,
-		"f1.2xlarge":  true,
-		"f1.16xlarge": true,
+	data, err := instances.Data()
+	if err != nil {
+		d.Logger.Error(err)
+		d.Error = true
+		return
+	}
+
+	for _, i := range *data {
+		d.instanceTypes[i.InstanceType] = true
 	}
 }
 

glide.yaml

@@ -31,3 +31,4 @@ import:
 - package: github.com/jessevdk/go-flags
   version: ^1.3.0
 - package: github.com/hashicorp/go-version
+- package: github.com/cristim/ec2-instances-info