Add async tests for acm, apigateway, autoscaling

varunnvs92 · varunnvs92 · commit 9ce2d521efdc · 2019-04-17T14:44:26.000-07:00
diff --git a/services/acm/src/it/java/software/amazon/awssdk/services/acm/AwsCertficateManagerAsyncIntegrationTest.java b/services/acm/src/it/java/software/amazon/awssdk/services/acm/AwsCertficateManagerAsyncIntegrationTest.java
@@ -0,0 +1,55 @@
+/*
+ * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ *  http://aws.amazon.com/apache2.0
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+package software.amazon.awssdk.services.acm;
+
+import static org.assertj.core.api.Assertions.assertThatThrownBy;
+
+import org.junit.Assert;
+import org.junit.BeforeClass;
+import org.junit.Test;
+import software.amazon.awssdk.services.acm.model.AcmException;
+import software.amazon.awssdk.services.acm.model.GetCertificateRequest;
+import software.amazon.awssdk.services.acm.model.ListCertificatesRequest;
+import software.amazon.awssdk.services.acm.model.ListCertificatesResponse;
+import software.amazon.awssdk.testutils.service.AwsIntegrationTestBase;
+
+public class AwsCertficateManagerAsyncIntegrationTest extends AwsIntegrationTestBase {
+    private static AcmAsyncClient client;
+
+    @BeforeClass
+    public static void setUp() {
+        client = AcmAsyncClient.builder().credentialsProvider(getCredentialsProvider()).build();
+    }
+
+    @Test
+    public void list_certificates() {
+        ListCertificatesResponse result = client.listCertificates(ListCertificatesRequest.builder().build())
+                                                .join();
+        Assert.assertTrue(result.certificateSummaryList().size() >= 0);
+    }
+
+    @Test
+    public void get_certificate_fake_arn_throws_exception() {
+        assertThatThrownBy(() -> client.getCertificate(getCertificateRequest()).join())
+            .hasCauseInstanceOf(AcmException.class);
+    }
+
+    private GetCertificateRequest getCertificateRequest() {
+        return GetCertificateRequest.builder()
+                                    .certificateArn("arn:aws:acm:us-east-1:123456789:fakecert")
+                                    .build();
+    }
+}
diff --git a/services/acm/src/it/java/software/amazon/awssdk/services/acm/AwsCertficateManagerIntegrationTest.java b/services/acm/src/it/java/software/amazon/awssdk/services/acm/AwsCertficateManagerIntegrationTest.java
@@ -18,8 +18,6 @@
 import org.junit.Assert;
 import org.junit.BeforeClass;
 import org.junit.Test;
-import software.amazon.awssdk.auth.credentials.StaticCredentialsProvider;
-import software.amazon.awssdk.core.exception.SdkServiceException;
 import software.amazon.awssdk.services.acm.model.AcmException;
 import software.amazon.awssdk.services.acm.model.GetCertificateRequest;
 import software.amazon.awssdk.services.acm.model.ListCertificatesRequest;
@@ -32,7 +30,7 @@ public class AwsCertficateManagerIntegrationTest extends AwsIntegrationTestBase
 
     @BeforeClass
     public static void setUp() {
-        client = AcmClient.builder().credentialsProvider(StaticCredentialsProvider.create(getCredentials())).build();
+        client = AcmClient.builder().credentialsProvider(getCredentialsProvider()).build();
     }
 
     @Test
diff --git a/services/apigateway/src/it/java/software/amazon/awssdk/services/apigateway/AsyncClientIntegrationTest.java b/services/apigateway/src/it/java/software/amazon/awssdk/services/apigateway/AsyncClientIntegrationTest.java
@@ -0,0 +1,218 @@
+/*
+ * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ *  http://aws.amazon.com/apache2.0
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+package software.amazon.awssdk.services.apigateway;
+
+import java.util.List;
+import org.junit.AfterClass;
+import org.junit.Assert;
+import org.junit.BeforeClass;
+import org.junit.Test;
+import software.amazon.awssdk.services.apigateway.model.CreateApiKeyRequest;
+import software.amazon.awssdk.services.apigateway.model.CreateApiKeyResponse;
+import software.amazon.awssdk.services.apigateway.model.CreateResourceRequest;
+import software.amazon.awssdk.services.apigateway.model.CreateResourceResponse;
+import software.amazon.awssdk.services.apigateway.model.CreateRestApiRequest;
+import software.amazon.awssdk.services.apigateway.model.CreateRestApiResponse;
+import software.amazon.awssdk.services.apigateway.model.DeleteRestApiRequest;
+import software.amazon.awssdk.services.apigateway.model.GetApiKeyRequest;
+import software.amazon.awssdk.services.apigateway.model.GetApiKeyResponse;
+import software.amazon.awssdk.services.apigateway.model.GetResourceRequest;
+import software.amazon.awssdk.services.apigateway.model.GetResourceResponse;
+import software.amazon.awssdk.services.apigateway.model.GetResourcesRequest;
+import software.amazon.awssdk.services.apigateway.model.GetResourcesResponse;
+import software.amazon.awssdk.services.apigateway.model.GetRestApiRequest;
+import software.amazon.awssdk.services.apigateway.model.GetRestApiResponse;
+import software.amazon.awssdk.services.apigateway.model.IntegrationType;
+import software.amazon.awssdk.services.apigateway.model.Op;
+import software.amazon.awssdk.services.apigateway.model.PatchOperation;
+import software.amazon.awssdk.services.apigateway.model.PutIntegrationRequest;
+import software.amazon.awssdk.services.apigateway.model.PutIntegrationResponse;
+import software.amazon.awssdk.services.apigateway.model.PutMethodRequest;
+import software.amazon.awssdk.services.apigateway.model.PutMethodResponse;
+import software.amazon.awssdk.services.apigateway.model.Resource;
+import software.amazon.awssdk.services.apigateway.model.UpdateApiKeyRequest;
+import software.amazon.awssdk.services.apigateway.model.UpdateResourceRequest;
+import software.amazon.awssdk.services.apigateway.model.UpdateRestApiRequest;
+
+public class AsyncClientIntegrationTest extends IntegrationTestBase {
+
+    private static final String NAME = "java-sdk-apig-integration-" + System.currentTimeMillis();
+    private static final String DESCRIPTION = "fooDesc";
+
+    private static String restApiId = null;
+
+    @BeforeClass
+    public static void createRestApi() {
+        CreateRestApiResponse createRestApiResult = asyncClient.createRestApi(CreateRestApiRequest.builder().name(NAME)
+                                                                                                  .description(DESCRIPTION)
+                                                                                                  .build())
+                                                               .join();
+
+        Assert.assertNotNull(createRestApiResult);
+        Assert.assertNotNull(createRestApiResult.description());
+        Assert.assertNotNull(createRestApiResult.id());
+        Assert.assertNotNull(createRestApiResult.name());
+        Assert.assertNotNull(createRestApiResult.createdDate());
+        Assert.assertEquals(createRestApiResult.name(), NAME);
+        Assert.assertEquals(createRestApiResult.description(), DESCRIPTION);
+
+        restApiId = createRestApiResult.id();
+    }
+
+    @AfterClass
+    public static void deleteRestApiKey() {
+        if (restApiId != null) {
+            asyncClient.deleteRestApi(DeleteRestApiRequest.builder().restApiId(restApiId).build()).join();
+        }
+    }
+
+    @Test
+    public void testUpdateRetrieveRestApi() {
+        PatchOperation patch = PatchOperation.builder().op(Op.REPLACE)
+                                             .path("/description").value("updatedDesc").build();
+        asyncClient.updateRestApi(UpdateRestApiRequest.builder()
+                                                      .restApiId(restApiId)
+                                                      .patchOperations(patch)
+                                                      .build())
+                   .join();
+
+        GetRestApiResponse getRestApiResult = asyncClient.getRestApi(GetRestApiRequest.builder().restApiId(restApiId).build())
+                                                         .join();
+
+        Assert.assertNotNull(getRestApiResult);
+        Assert.assertNotNull(getRestApiResult.description());
+        Assert.assertNotNull(getRestApiResult.id());
+        Assert.assertNotNull(getRestApiResult.name());
+        Assert.assertNotNull(getRestApiResult.createdDate());
+        Assert.assertEquals(getRestApiResult.name(), NAME);
+        Assert.assertEquals(getRestApiResult.description(), "updatedDesc");
+    }
+
+    @Test
+    public void testCreateUpdateRetrieveApiKey() {
+        CreateApiKeyResponse createApiKeyResult = asyncClient.createApiKey(CreateApiKeyRequest.builder().name(NAME)
+                                                                                              .description(DESCRIPTION).build())
+                                                             .join();
+
+        Assert.assertNotNull(createApiKeyResult);
+        Assert.assertNotNull(createApiKeyResult.description());
+        Assert.assertNotNull(createApiKeyResult.id());
+        Assert.assertNotNull(createApiKeyResult.name());
+        Assert.assertNotNull(createApiKeyResult.createdDate());
+        Assert.assertNotNull(createApiKeyResult.enabled());
+        Assert.assertNotNull(createApiKeyResult.lastUpdatedDate());
+        Assert.assertNotNull(createApiKeyResult.stageKeys());
+
+        String apiKeyId = createApiKeyResult.id();
+        Assert.assertEquals(createApiKeyResult.name(), NAME);
+        Assert.assertEquals(createApiKeyResult.description(), DESCRIPTION);
+
+        PatchOperation patch = PatchOperation.builder().op(Op.REPLACE)
+                                             .path("/description").value("updatedDesc").build();
+        asyncClient.updateApiKey(UpdateApiKeyRequest.builder().apiKey(apiKeyId)
+                                                   .patchOperations(patch).build())
+                   .join();
+
+        GetApiKeyResponse getApiKeyResult = asyncClient.getApiKey(GetApiKeyRequest.builder().apiKey(apiKeyId).build()).join();
+
+        Assert.assertNotNull(getApiKeyResult);
+        Assert.assertNotNull(getApiKeyResult.description());
+        Assert.assertNotNull(getApiKeyResult.id());
+        Assert.assertNotNull(getApiKeyResult.name());
+        Assert.assertNotNull(getApiKeyResult.createdDate());
+        Assert.assertNotNull(getApiKeyResult.enabled());
+        Assert.assertNotNull(getApiKeyResult.lastUpdatedDate());
+        Assert.assertNotNull(getApiKeyResult.stageKeys());
+        Assert.assertEquals(getApiKeyResult.id(), apiKeyId);
+        Assert.assertEquals(getApiKeyResult.name(), NAME);
+        Assert.assertEquals(getApiKeyResult.description(), "updatedDesc");
+    }
+
+    @Test
+    public void testResourceOperations() {
+        GetResourcesResponse resourcesResult = asyncClient.getResources(GetResourcesRequest.builder()
+                                                                                           .restApiId(restApiId)
+                                                                                           .build())
+                                                          .join();
+
+        List<Resource> resources = resourcesResult.items();
+        Assert.assertEquals(resources.size(), 1);
+        Resource rootResource = resources.get(0);
+        Assert.assertNotNull(rootResource);
+        Assert.assertEquals(rootResource.path(), "/");
+        String rootResourceId = rootResource.id();
+
+        CreateResourceResponse createResourceResult = asyncClient
+            .createResource(CreateResourceRequest.builder()
+                                                 .restApiId(restApiId)
+                                                 .pathPart("fooPath")
+                                                 .parentId(rootResourceId).build())
+            .join();
+        Assert.assertNotNull(createResourceResult);
+        Assert.assertNotNull(createResourceResult.id());
+        Assert.assertNotNull(createResourceResult.parentId());
+        Assert.assertNotNull(createResourceResult.path());
+        Assert.assertNotNull(createResourceResult.pathPart());
+        Assert.assertEquals(createResourceResult.pathPart(), "fooPath");
+        Assert.assertEquals(createResourceResult.parentId(), rootResourceId);
+
+        PatchOperation patch = PatchOperation.builder().op(Op.REPLACE)
+                                             .path("/pathPart").value("updatedPath").build();
+        asyncClient.updateResource(UpdateResourceRequest.builder()
+                                                       .restApiId(restApiId)
+                                                       .resourceId(createResourceResult.id())
+                                                       .patchOperations(patch).build())
+                   .join();
+
+        GetResourceResponse getResourceResult = asyncClient
+            .getResource(GetResourceRequest.builder()
+                                           .restApiId(restApiId)
+                                           .resourceId(createResourceResult.id()).build())
+            .join();
+        Assert.assertNotNull(getResourceResult);
+        Assert.assertNotNull(getResourceResult.id());
+        Assert.assertNotNull(getResourceResult.parentId());
+        Assert.assertNotNull(getResourceResult.path());
+        Assert.assertNotNull(getResourceResult.pathPart());
+        Assert.assertEquals(getResourceResult.pathPart(), "updatedPath");
+        Assert.assertEquals(getResourceResult.parentId(), rootResourceId);
+
+        PutMethodResponse putMethodResult = asyncClient
+            .putMethod(PutMethodRequest.builder().restApiId(restApiId)
+                                       .resourceId(createResourceResult.id())
+                                       .authorizationType("AWS_IAM").httpMethod("PUT").build()).join();
+        Assert.assertNotNull(putMethodResult);
+        Assert.assertNotNull(putMethodResult.authorizationType());
+        Assert.assertNotNull(putMethodResult.apiKeyRequired());
+        Assert.assertNotNull(putMethodResult.httpMethod());
+        Assert.assertEquals(putMethodResult.authorizationType(), "AWS_IAM");
+        Assert.assertEquals(putMethodResult.httpMethod(), "PUT");
+
+        PutIntegrationResponse putIntegrationResult = asyncClient
+            .putIntegration(PutIntegrationRequest.builder()
+                                                 .restApiId(restApiId)
+                                                 .resourceId(createResourceResult.id())
+                                                 .httpMethod("PUT").type(IntegrationType.MOCK)
+                                                 .uri("http://foo.bar")
+                                                 .integrationHttpMethod("GET").build())
+            .join();
+        Assert.assertNotNull(putIntegrationResult);
+        Assert.assertNotNull(putIntegrationResult.cacheNamespace());
+        Assert.assertNotNull(putIntegrationResult.type());
+        Assert.assertEquals(putIntegrationResult.type(),
+                            IntegrationType.MOCK);
+    }
+}
diff --git a/services/apigateway/src/it/java/software/amazon/awssdk/services/apigateway/IntegrationTestBase.java b/services/apigateway/src/it/java/software/amazon/awssdk/services/apigateway/IntegrationTestBase.java
@@ -23,10 +23,13 @@
 public class IntegrationTestBase extends AwsTestBase {
 
     protected static ApiGatewayClient apiGateway;
+    protected static ApiGatewayAsyncClient asyncClient;
 
     @BeforeClass
     public static void setUp() throws IOException {
         apiGateway = ApiGatewayClient.builder().region(Region.US_EAST_1).credentialsProvider(CREDENTIALS_PROVIDER_CHAIN).build();
+        asyncClient = ApiGatewayAsyncClient.builder().region(Region.US_EAST_1).credentialsProvider(CREDENTIALS_PROVIDER_CHAIN)
+                                           .build();
     }
 
 }
diff --git a/services/apigateway/src/it/java/software/amazon/awssdk/services/apigateway/ServiceIntegrationTest.java b/services/apigateway/src/it/java/software/amazon/awssdk/services/apigateway/ServiceIntegrationTest.java
@@ -16,8 +16,8 @@
 package software.amazon.awssdk.services.apigateway;
 
 import java.util.List;
-import junit.framework.Assert;
 import org.junit.AfterClass;
+import org.junit.Assert;
 import org.junit.BeforeClass;
 import org.junit.Test;
 import software.amazon.awssdk.services.apigateway.model.CreateApiKeyRequest;
diff --git a/services/applicationautoscaling/src/it/java/software/amazon/awssdk/services/applicationautoscaling/AsyncClientIntegrationTest.java b/services/applicationautoscaling/src/it/java/software/amazon/awssdk/services/applicationautoscaling/AsyncClientIntegrationTest.java
@@ -0,0 +1,30 @@
+package software.amazon.awssdk.services.applicationautoscaling;
+
+import org.junit.Assert;
+import org.junit.BeforeClass;
+import org.junit.Test;
+import software.amazon.awssdk.services.applicationautoscaling.model.DescribeScalingPoliciesRequest;
+import software.amazon.awssdk.services.applicationautoscaling.model.DescribeScalingPoliciesResponse;
+import software.amazon.awssdk.services.applicationautoscaling.model.ServiceNamespace;
+import software.amazon.awssdk.testutils.service.AwsIntegrationTestBase;
+
+public class AsyncClientIntegrationTest extends AwsIntegrationTestBase {
+    private static ApplicationAutoScalingAsyncClient autoscaling;
+
+    @BeforeClass
+    public static void setUp() {
+        autoscaling = ApplicationAutoScalingAsyncClient.builder()
+                                                  .credentialsProvider(getCredentialsProvider())
+                                                  .build();
+    }
+
+    @Test
+    public void testScalingPolicy() {
+        DescribeScalingPoliciesResponse res = autoscaling.describeScalingPolicies(
+            DescribeScalingPoliciesRequest.builder().serviceNamespace(ServiceNamespace.ECS).build())
+                                                         .join();
+
+        Assert.assertNotNull(res);
+        Assert.assertNotNull(res.scalingPolicies());
+    }
+}
diff --git a/services/applicationautoscaling/src/it/java/software/amazon/awssdk/services/applicationautoscaling/ServiceIntegrationTest.java b/services/applicationautoscaling/src/it/java/software/amazon/awssdk/services/applicationautoscaling/ServiceIntegrationTest.java
@@ -18,7 +18,6 @@
 import org.junit.Assert;
 import org.junit.BeforeClass;
 import org.junit.Test;
-import software.amazon.awssdk.auth.credentials.StaticCredentialsProvider;
 import software.amazon.awssdk.services.applicationautoscaling.model.DescribeScalingPoliciesRequest;
 import software.amazon.awssdk.services.applicationautoscaling.model.DescribeScalingPoliciesResponse;
 import software.amazon.awssdk.services.applicationautoscaling.model.ServiceNamespace;
@@ -31,8 +30,8 @@ public class ServiceIntegrationTest extends AwsIntegrationTestBase {
     @BeforeClass
     public static void setUp() {
         autoscaling = ApplicationAutoScalingClient.builder()
-                .credentialsProvider(StaticCredentialsProvider.create(getCredentials()))
-                .build();
+                                                  .credentialsProvider(getCredentialsProvider())
+                                                  .build();
     }
 
     @Test
diff --git a/services/autoscaling/src/it/java/software/amazon/awssdk/services/autoscaling/AsyncAutoScalingIntegrationTest.java b/services/autoscaling/src/it/java/software/amazon/awssdk/services/autoscaling/AsyncAutoScalingIntegrationTest.java

Original file line number	Diff line number	Diff line change
`@@ -23,10 +23,13 @@`
`23`	`23`	`public class IntegrationTestBase extends AwsTestBase {`
`24`	`24`
`25`	`25`	`protected static ApiGatewayClient apiGateway;`
	`26`	`+ protected static ApiGatewayAsyncClient asyncClient;`
`26`	`27`
`27`	`28`	`@BeforeClass`
`28`	`29`	`public static void setUp() throws IOException {`
`29`	`30`	`apiGateway = ApiGatewayClient.builder().region(Region.US_EAST_1).credentialsProvider(CREDENTIALS_PROVIDER_CHAIN).build();`
	`31`	`+ asyncClient = ApiGatewayAsyncClient.builder().region(Region.US_EAST_1).credentialsProvider(CREDENTIALS_PROVIDER_CHAIN)`
	`32`	`+ .build();`
`30`	`33`	`}`
`31`	`34`
`32`	`35`	`}`