updated Kotlin MediaConvert code

Author: scmacdon

javav2/example_code/comprehend/src/test/java/AmazonComprehendTest.java

@@ -0,0 +1,126 @@
+// Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+// SPDX-License-Identifier: Apache-2.0
+
+import com.example.comprehend.*;
+import com.google.gson.Gson;
+import org.junit.jupiter.api.*;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import software.amazon.awssdk.auth.credentials.EnvironmentVariableCredentialsProvider;
+import software.amazon.awssdk.regions.Region;
+import software.amazon.awssdk.services.comprehend.ComprehendClient;
+import software.amazon.awssdk.services.secretsmanager.SecretsManagerClient;
+import software.amazon.awssdk.services.secretsmanager.model.GetSecretValueRequest;
+import software.amazon.awssdk.services.secretsmanager.model.GetSecretValueResponse;
+import java.io.*;
+import static org.junit.jupiter.api.Assertions.assertDoesNotThrow;
+
+/**
+ * To run these integration tests, you must set the required values
+ * in the config.properties file or AWS Secrets Manager.
+ */
+@TestInstance(TestInstance.Lifecycle.PER_METHOD)
+@TestMethodOrder(MethodOrderer.OrderAnnotation.class)
+public class AmazonComprehendTest {
+    private static final Logger logger = LoggerFactory.getLogger(AmazonComprehendTest.class);
+    private static ComprehendClient comClient;
+    private static String text = "Amazon.com, Inc. is located in Seattle, WA and was founded July 5th, 1994 by Jeff Bezos, allowing customers to buy everything from books to blenders. Seattle is north of Portland and south of Vancouver, BC. Other notable Seattle - based companies are Starbucks and Boeing";
+    private static String frText = "Il pleut aujourd'hui à Seattle";
+    private static String dataAccessRoleArn;
+    private static String s3Uri;
+    private static String documentClassifierName;
+
+    @BeforeAll
+    public static void setUp() throws IOException {
+        comClient = ComprehendClient.builder()
+                .region(Region.US_EAST_1)
+                .build();
+
+        // Get the values to run these tests from AWS Secrets Manager.
+        Gson gson = new Gson();
+        String json = getSecretValues();
+        SecretValues values = gson.fromJson(json, SecretValues.class);
+        dataAccessRoleArn = values.getDataAccessRoleArn();
+        s3Uri = values.getS3Uri();
+        documentClassifierName = values.getDocumentClassifier();
+    }
+
+    @Test
+    @Tag("weathertop2")
+    @Tag("IntegrationTest")
+    @Order(1)
+    public void testDetectEntities() {
+        assertDoesNotThrow(() -> DetectEntities.detectAllEntities(comClient, text));
+        logger.info("Test 1 passed");
+    }
+
+    @Test
+    @Tag("weathertop")
+    @Tag("IntegrationTest")
+    @Order(2)
+    public void testDetectKeyPhrases() {
+        assertDoesNotThrow(() -> DetectKeyPhrases.detectAllKeyPhrases(comClient, text));
+        logger.info("Test 2 passed");
+    }
+
+    @Test
+    @Tag("weathertop")
+    @Tag("IntegrationTest")
+    @Order(3)
+    public void testDetectLanguage() {
+        assertDoesNotThrow(() -> DetectLanguage.detectTheDominantLanguage(comClient, frText));
+        logger.info("Test 3 passed");
+    }
+
+    @Test
+    @Tag("weathertop")
+    @Tag("IntegrationTest")
+    @Order(4)
+    public void testDetectSentiment() {
+        assertDoesNotThrow(() -> DetectSentiment.detectSentiments(comClient, text));
+        logger.info("Test 4 passed");
+    }
+
+    @Test
+    @Tag("weathertop")
+    @Tag("IntegrationTest")
+    @Order(5)
+    public void testDetectSyntax() {
+        assertDoesNotThrow(() -> DetectSyntax.detectAllSyntax(comClient, text));
+        logger.info("Test 5 passed");
+    }
+
+    private static String getSecretValues() {
+        SecretsManagerClient secretClient = SecretsManagerClient.builder()
+                .region(Region.US_EAST_1)
+                .build();
+        String secretName = "test/comprehend";
+
+        GetSecretValueRequest valueRequest = GetSecretValueRequest.builder()
+                .secretId(secretName)
+                .build();
+
+        GetSecretValueResponse valueResponse = secretClient.getSecretValue(valueRequest);
+        return valueResponse.secretString();
+    }
+
+    @Nested
+    @DisplayName("A class used to get test values from test/comprehend (an AWS Secrets Manager secret)")
+    class SecretValues {
+        private String dataAccessRoleArn;
+        private String s3Uri;
+        private String documentClassifier;
+
+        public String getDataAccessRoleArn() {
+            return dataAccessRoleArn;
+        }
+
+        public String getS3Uri() {
+            return s3Uri;
+        }
+
+        public String getDocumentClassifier() {
+            return documentClassifier;
+        }
+    }
+}

kotlin/services/mediaconvert/src/main/kotlin/com/kotlin/mediaconvert/CreateJob.kt

@@ -57,7 +57,7 @@ suspend fun main(args: Array<String>) {
 
     val mcRoleARN = args[0]
     val fileInput = args[1]
-    val mcClient = MediaConvertClient { region = "us-west-2" }
+    val mcClient = MediaConvertClient.fromEnvironment  { region = "us-west-2" }
     val id = createMediaJob(mcClient, mcRoleARN, fileInput)
     println("MediaConvert job $id was successfully created!")
 }

kotlin/services/mediaconvert/src/main/kotlin/com/kotlin/mediaconvert/GetJob.kt

@@ -31,7 +31,7 @@ suspend fun main(args: Array<String>) {
     }
 
     val jobId = args[0]
-    val mcClient = MediaConvertClient { region = "us-west-2" }
+    val mcClient = MediaConvertClient.fromEnvironment  { region = "us-west-2" }
     getSpecificJob(mcClient, jobId)
 }
 

kotlin/services/mediaconvert/src/main/kotlin/com/kotlin/mediaconvert/ListJobs.kt

@@ -21,7 +21,7 @@ For more information, see the following documentation topic:
 https://docs.aws.amazon.com/sdk-for-kotlin/latest/developer-guide/setup.html
 */
 suspend fun main() {
-    val mcClient = MediaConvertClient { region = "us-west-2" }
+    val mcClient = MediaConvertClient.fromEnvironment  { region = "us-west-2" }
     listCompleteJobs(mcClient)
 }