Use hvm type for ec2 tests.

Author: varunnvs92

services/autoscaling/src/it/java/software/amazon/awssdk/services/autoscaling/IntegrationTestBase.java

@@ -26,8 +26,6 @@
  * Base class for AutoScaling integration tests. Provides several convenience methods for creating
  * test data, test data values, and automatically loads the AWS credentials from a properties file
  * on disk and instantiates clients for the test subclasses to use.
- *
- * @author Jason Fulghum [email protected]
  */
 public abstract class IntegrationTestBase extends AwsTestBase {
 

services/elasticloadbalancing/src/it/java/software/amazon/awssdk/services/elasticloadbalancing/ElbIntegrationTest.java

@@ -32,6 +32,9 @@
 import org.junit.Test;
 import software.amazon.awssdk.regions.Region;
 import software.amazon.awssdk.services.ec2.Ec2Client;
+import software.amazon.awssdk.services.ec2.model.DescribeImagesRequest;
+import software.amazon.awssdk.services.ec2.model.Filter;
+import software.amazon.awssdk.services.ec2.model.Image;
 import software.amazon.awssdk.services.ec2.model.Placement;
 import software.amazon.awssdk.services.ec2.model.RunInstancesRequest;
 import software.amazon.awssdk.services.ec2.model.TerminateInstancesRequest;
@@ -73,14 +76,8 @@
 
 /**
  * Integration tests for the Elastic Load Balancing client.
- *
- * @author Jason Fulghum [email protected]
  */
 public class ElbIntegrationTest extends AwsIntegrationTestBase {
-
-    /** AMI used for tests that require an EC2 instance. */
-    private static final String AMI_ID = "ami-7f418316";
-
     /** Protocol value used in LB requests. */
     private static final String PROTOCOL = "HTTP";
 
@@ -189,12 +186,14 @@ public void tearDown() throws Exception {
      */
     @Test
     public void testLoadBalancerInstanceOperations() throws Exception {
+        String ebs_hvm_ami_id = findEbsBackedPublicHvmAmiId();
+
         // Start up an EC2 instance to register with our LB
         RunInstancesRequest runInstancesRequest = RunInstancesRequest.builder()
                 .placement(
                         Placement.builder()
                                 .availabilityZone(AVAILABILITY_ZONE_1).build())
-                .imageId(AMI_ID).minCount(1).maxCount(1).build();
+                .imageId(ebs_hvm_ami_id).minCount(1).maxCount(1).build();
         instanceId = ec2.runInstances(runInstancesRequest)
                         .instances().get(0).instanceId();
 
@@ -490,4 +489,19 @@ public void testSetLoadBalancerPoliciesOfListener() {
         // Delete the policy
         elb.deleteLoadBalancerPolicy(DeleteLoadBalancerPolicyRequest.builder().loadBalancerName(loadBalancerName).policyName(policyName).build());
     }
+
+    private String findEbsBackedPublicHvmAmiId() {
+        List<Image> hvmImages = ec2.describeImages(
+            DescribeImagesRequest
+                .builder()
+                .filters(Filter.builder().name("virtualization-type").values("hvm").build(),
+                         Filter.builder().name("is-public").values("true").build(),
+                         Filter.builder().name("root-device-type").values("ebs").build(),
+                         Filter.builder().name("name").values("ubuntu/images/hvm-ssd/ubuntu-trusty-14.04-amd64*").build())
+                .build()).images();
+
+        assertTrue("Cannot find a public HVM AMI.", hvmImages.size() > 0);
+
+        return hvmImages.get(0).imageId();
+    }
 }

services/iam/src/it/java/software/amazon/awssdk/services/iam/IntegrationTestBase.java

@@ -31,8 +31,6 @@
  * Base class for IAM integration tests. Provides convenience methods for
  * creating test data, and automatically loads AWS credentials from a properties
  * file on disk and instantiates clients for the individual tests to use.
- *
- * @author Jason Fulghum [email protected]
  */
 public class IntegrationTestBase extends AwsTestBase {
 

services/sns/src/it/java/software/amazon/awssdk/services/sns/IntegrationTestBase.java

@@ -37,8 +37,6 @@
 /**
  * Base class for SNS integration tests; responsible for loading AWS account info for running the
  * tests, and instantiating clients, etc.
- *
- * @author [email protected]
  */
 public abstract class IntegrationTestBase extends AwsIntegrationTestBase {
 

services/sqs/src/it/java/software/amazon/awssdk/services/sqs/IntegrationTestBase.java

@@ -35,8 +35,6 @@
  * Base class for SQS integration tests. Provides convenience methods for creating test data, and
  * automatically loads AWS credentials from a properties file on disk and instantiates clients for
  * the individual tests to use.
- *
- * @author Jason Fulghum [email protected]
  */
 public class IntegrationTestBase extends AwsIntegrationTestBase {
 

test/protocol-tests/src/main/resources/codegen-resources/endpoint/json/customization.config renamed to test/protocol-tests/src/main/resources/codegen-resources/awsjson/endpointtrait/customization.config

@@ -22,8 +22,6 @@
 /**
  * Test utility InputStream implementation that generates random ASCII data when
  * read, up to the size specified when constructed.
- *
- * @author Jason Fulghum [email protected]
  */
 public class RandomInputStream extends InputStream {
 

test/protocol-tests/src/main/resources/codegen-resources/endpoint/json/service-2.json renamed to test/protocol-tests/src/main/resources/codegen-resources/awsjson/endpointtrait/service-2.json

@@ -30,8 +30,6 @@
  * Java's temporary directory, as declared in the JRE's system properties. The
  * file is immediately filled with a specified amount of random ASCII data.
  *
- * @author Jason Fulghum [email protected]
- *
  * @see RandomInputStream
  */
 public class RandomTempFile extends File {

test/test-utils/src/main/java/software/amazon/awssdk/testutils/RandomInputStream.java

@@ -23,8 +23,6 @@
  * Subclass of RandomInputStream that, in addition to spitting out a set length
  * of random characters, throws an IOException. Intended for testing error
  * recovery in the client library.
- *
- * @author Jason Fulghum [email protected]
  */
 public class UnreliableRandomInputStream extends RandomInputStream {
     private static final Logger log = LoggerFactory.getLogger(UnreliableRandomInputStream.class);