Updated the list of instance types

ohnosequences · Sep 30, 2017 · 9ca8e1c · 9ca8e1c
1 parent 91e9abf
commit 9ca8e1c
Show file tree

Hide file tree

Showing 3 changed files with 35 additions and 2 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -6,7 +6,7 @@ scala:
   - 2.11.11
   - 2.12.3
 script:
-  - sbt ++$TRAVIS_SCALA_VERSION test:compile
+  - sbt ++$TRAVIS_SCALA_VERSION 'testOnly *InstanceTypes'
 notifications:
   email: false
   webhooks:

diff --git a/src/main/scala/ohnosequences/awstools/ec2/InstanceType.scala b/src/main/scala/ohnosequences/awstools/ec2/InstanceType.scala
@@ -54,6 +54,8 @@ case object t2 extends InstanceTypeFamily with CurrentGeneration {
   case object small  extends InstanceType(t2)
   case object medium extends InstanceType(t2)
   case object large  extends InstanceType(t2)
+  case object   xlarge  extends InstanceType(t2)
+  case object `2xlarge` extends InstanceType(t2)
 }
 case object m4 extends InstanceTypeFamily with CurrentGeneration {
   case object     large  extends InstanceType(m4)
@@ -94,10 +96,21 @@ case object r3 extends InstanceTypeFamily with CurrentGeneration {
   case object `4xlarge` extends InstanceType(r3)
   case object `8xlarge` extends InstanceType(r3)
 }
+case object r4 extends InstanceTypeFamily with CurrentGeneration {
+  case object     large  extends InstanceType(r4)
+  case object    xlarge  extends InstanceType(r4)
+  case object  `2xlarge` extends InstanceType(r4)
+  case object  `4xlarge` extends InstanceType(r4)
+  case object  `8xlarge` extends InstanceType(r4)
+  case object `16xlarge` extends InstanceType(r4)
+}
 case object x1 extends InstanceTypeFamily with CurrentGeneration {
   case object `16xlarge` extends InstanceType(x1)
   case object `32xlarge` extends InstanceType(x1)
 }
+case object x1e extends InstanceTypeFamily with CurrentGeneration {
+  case object `32xlarge` extends InstanceType(x1e)
+}
 
 /* #### Storage optimized */
 case object i2 extends InstanceTypeFamily with CurrentGeneration {
@@ -106,6 +119,14 @@ case object i2 extends InstanceTypeFamily with CurrentGeneration {
   case object `4xlarge` extends InstanceType(i2)
   case object `8xlarge` extends InstanceType(i2)
 }
+case object i3 extends InstanceTypeFamily with CurrentGeneration {
+  case object     large  extends InstanceType(i3)
+  case object    xlarge  extends InstanceType(i3)
+  case object  `2xlarge` extends InstanceType(i3)
+  case object  `4xlarge` extends InstanceType(i3)
+  case object  `8xlarge` extends InstanceType(i3)
+  case object `16xlarge` extends InstanceType(i3)
+}
 case object d2 extends InstanceTypeFamily with CurrentGeneration {
   case object   xlarge  extends InstanceType(d2)
   case object `2xlarge` extends InstanceType(d2)
@@ -123,6 +144,15 @@ case object g2 extends InstanceTypeFamily with CurrentGeneration {
   case object `2xlarge` extends InstanceType(g2)
   case object `8xlarge` extends InstanceType(g2)
 }
+case object g3 extends InstanceTypeFamily with CurrentGeneration {
+  case object  `4xlarge` extends InstanceType(g3)
+  case object  `8xlarge` extends InstanceType(g3)
+  case object `16xlarge` extends InstanceType(g3)
+}
+case object f1 extends InstanceTypeFamily with CurrentGeneration {
+  case object  `2xlarge` extends InstanceType(f1)
+  case object `16xlarge` extends InstanceType(f1)
+}
 
 
 /* ### Previous Generation Instances */
@@ -140,6 +170,9 @@ case object c1 extends InstanceTypeFamily with PreviousGeneration {
   case object medium extends InstanceType(c1)
   case object xlarge extends InstanceType(c1)
 }
+case object cc1 extends InstanceTypeFamily with PreviousGeneration {
+  case object `4xlarge` extends InstanceType(cc1)
+}
 case object cc2 extends InstanceTypeFamily with PreviousGeneration {
   case object `8xlarge` extends InstanceType(cc2)
 }

diff --git a/src/test/scala/ohnosequences/awstools/instanceTypes.scala b/src/test/scala/ohnosequences/awstools/instanceTypes.scala
@@ -20,7 +20,7 @@ class InstanceTypes extends org.scalatest.FunSuite {
       scalaInstanceTypes diff javaInstanceTypes
     }
 
-    assertResult(Set("cc1.4xlarge"), "these types are defined in the Java SDK, but not in the library") {
+    assertResult(Set(), "these types are defined in the Java SDK, but not in the library") {
       javaInstanceTypes diff scalaInstanceTypes
     }
   }