Kotlin Updated the SDK build number in Gradle Build file and include fromEnvironment()

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

@@ -1,126 +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("weathertop")
-    @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;
-        }
-    }
-}
+// 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/apigateway/build.gradle.kts

@@ -1,7 +1,7 @@
 import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
 
 plugins {
-    kotlin("jvm") version "1.9.0"
+    kotlin("jvm") version "2.1.0"
     application
 }
 
@@ -27,7 +27,7 @@ repositories {
 }
 apply(plugin = "org.jlleitschuh.gradle.ktlint")
 dependencies {
-    implementation(platform("aws.sdk.kotlin:bom:1.3.112"))
+    implementation(platform("aws.sdk.kotlin:bom:1.4.119"))
     implementation("aws.sdk.kotlin:apigateway")
     implementation("aws.sdk.kotlin:secretsmanager")
     implementation("aws.smithy.kotlin:http-client-engine-okhttp")

kotlin/services/apigateway/src/main/kotlin/com/kotlin/gateway/CreateDeployment.kt

@@ -37,7 +37,7 @@ suspend fun createNewDeployment(restApiIdVal: String?, stageNameVal: String?): S
         stageName = stageNameVal
     }
 
-    ApiGatewayClient { region = "us-east-1" }.use { apiGateway ->
+    ApiGatewayClient.fromEnvironment { region = "us-east-1" }.use { apiGateway ->
         val response = apiGateway.createDeployment(request)
         println("The id of the deployment is " + response.id)
         return response.id

kotlin/services/apigateway/src/main/kotlin/com/kotlin/gateway/CreateRestApi.kt

@@ -35,7 +35,7 @@ suspend fun createAPI(restApiName: String?): String? {
         name = restApiName
     }
 
-    ApiGatewayClient { region = "us-east-1" }.use { apiGateway ->
+    ApiGatewayClient.fromEnvironment { region = "us-east-1" }.use { apiGateway ->
         val response = apiGateway.createRestApi(request)
         println("The id of the new api is ${response.id}")
         return response.id

kotlin/services/apigateway/src/main/kotlin/com/kotlin/gateway/DeleteRestApi.kt

@@ -33,7 +33,7 @@ suspend fun deleteAPI(restApiIdVal: String?) {
         restApiId = restApiIdVal
     }
 
-    ApiGatewayClient { region = "us-east-1" }.use { apiGateway ->
+    ApiGatewayClient.fromEnvironment { region = "us-east-1" }.use { apiGateway ->
         apiGateway.deleteRestApi(request)
         println("The API was successfully deleted")
     }

kotlin/services/apigateway/src/main/kotlin/com/kotlin/gateway/GetAPIKeys.kt

@@ -14,7 +14,7 @@ suspend fun main() {
 
 // snippet-start:[apigateway.kotlin.get_apikeys.main]
 suspend fun getKeys() {
-    ApiGatewayClient { region = "us-east-1" }.use { apiGateway ->
+    ApiGatewayClient.fromEnvironment { region = "us-east-1" }.use { apiGateway ->
         val response = apiGateway.getApiKeys(GetApiKeysRequest { })
         response.items?.forEach { key ->
             println("Key is $key")

kotlin/services/apigateway/src/main/kotlin/com/kotlin/gateway/GetDeployments.kt

@@ -33,7 +33,7 @@ suspend fun getAllDeployments(restApiIdVal: String?) {
         restApiId = restApiIdVal
     }
 
-    ApiGatewayClient { region = "us-east-1" }.use { apiGateway ->
+    ApiGatewayClient.fromEnvironment { region = "us-east-1" }.use { apiGateway ->
         val response = apiGateway.getDeployments(request)
         response.items?.forEach { deployment ->
             println("The deployment id is ${deployment.id}")

kotlin/services/apigateway/src/main/kotlin/com/kotlin/gateway/GetMethod.kt

@@ -39,7 +39,7 @@ suspend fun getSpecificMethod(restApiIdVal: String?, resourceIdVal: String?, htt
         resourceId = resourceIdVal
     }
 
-    ApiGatewayClient { region = "us-east-1" }.use { apiGateway ->
+    ApiGatewayClient.fromEnvironment { region = "us-east-1" }.use { apiGateway ->
         val response = apiGateway.getMethod(methodRequest)
 
         // Retrieve a method response associated with a given HTTP status code.

kotlin/services/apigateway/src/main/kotlin/com/kotlin/gateway/GetStages.kt

@@ -33,7 +33,7 @@ suspend fun getAllStages(restApiIdVal: String?) {
         restApiId = restApiIdVal
     }
 
-    ApiGatewayClient { region = "us-east-1" }.use { apiGateway ->
+    ApiGatewayClient.fromEnvironment { region = "us-east-1" }.use { apiGateway ->
         val response = apiGateway.getStages(stagesRequest)
         response.item?.forEach { stage ->
             println("Stage name is ${stage.stageName}")

kotlin/services/appsync/build.gradle.kts

@@ -1,7 +1,7 @@
 import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
 
 plugins {
-    kotlin("jvm") version "1.9.0"
+    kotlin("jvm") version "2.1.0"
     application
 }
 
@@ -27,7 +27,7 @@ repositories {
 }
 apply(plugin = "org.jlleitschuh.gradle.ktlint")
 dependencies {
-    implementation(platform("aws.sdk.kotlin:bom:1.3.112"))
+    implementation(platform("aws.sdk.kotlin:bom:1.4.119"))
     implementation("aws.sdk.kotlin:appsync")
     implementation("aws.sdk.kotlin:sts")
     implementation("aws.sdk.kotlin:s3")

kotlin/services/appsync/src/main/kotlin/com/example/appsync/CreateApiKey.kt

@@ -42,7 +42,7 @@ suspend fun createKey(apiIdVal: String): String? {
             description = "Created using the AWS SDK for Kotlin"
         }
 
-    AppSyncClient { region = "us-east-1" }.use { appClient ->
+    AppSyncClient.fromEnvironment { region = "us-east-1" }.use { appClient ->
         val response = appClient.createApiKey(apiKeyRequest)
         return response.apiKey?.id
     }

kotlin/services/appsync/src/main/kotlin/com/example/appsync/CreateDataSource.kt

@@ -68,7 +68,7 @@ suspend fun createDS(
             type = DataSourceType.AmazonDynamodb
         }
 
-    AppSyncClient { region = "us-east-1" }.use { appClient ->
+    AppSyncClient.fromEnvironment { region = "us-east-1" }.use { appClient ->
         val response = appClient.createDataSource(request)
         return response.dataSource?.dataSourceArn
     }

kotlin/services/appsync/src/main/kotlin/com/example/appsync/DeleteApiKey.kt

@@ -47,7 +47,7 @@ suspend fun deleteKey(
             id = keyIdVal
         }
 
-    AppSyncClient { region = "us-east-1" }.use { appClient ->
+    AppSyncClient.fromEnvironment { region = "us-east-1" }.use { appClient ->
         appClient.deleteApiKey(apiKeyRequest)
         println("$keyIdVal key was deleted.")
     }

kotlin/services/appsync/src/main/kotlin/com/example/appsync/DeleteDataSource.kt

@@ -47,7 +47,7 @@ suspend fun deleteDS(
             name = dsName
         }
 
-    AppSyncClient { region = "us-east-1" }.use { appClient ->
+    AppSyncClient.fromEnvironment { region = "us-east-1" }.use { appClient ->
         appClient.deleteDataSource(request)
         println("The data source was deleted.")
     }

kotlin/services/appsync/src/main/kotlin/com/example/appsync/GetDataSource.kt

@@ -44,7 +44,7 @@ suspend fun getDS(apiIdVal: String?, dsName: String?) {
             name = dsName
         }
 
-    AppSyncClient { region = "us-east-1" }.use { appClient ->
+    AppSyncClient.fromEnvironment { region = "us-east-1" }.use { appClient ->
         val response = appClient.getDataSource(request)
         println("The DataSource ARN is ${response.dataSource?.dataSourceArn}")
     }