From 52df0f0aeab15a86ed7fabc6d89057bf98b9c143 Mon Sep 17 00:00:00 2001 From: Macdonald Date: Mon, 7 Jul 2025 11:59:49 -0400 Subject: [PATCH 01/27] updated the Kotlin SDK build --- kotlin/services/appsync/build.gradle.kts | 4 +- .../com/example/appsync/CreateApiKey.kt | 2 +- .../com/example/appsync/CreateDataSource.kt | 2 +- .../com/example/appsync/DeleteApiKey.kt | 2 +- .../com/example/appsync/DeleteDataSource.kt | 2 +- .../com/example/appsync/GetDataSource.kt | 2 +- .../kotlin/com/example/appsync/ListApiKeys.kt | 2 +- .../com/example/appsync/ListGraphqlApis.kt | 2 +- kotlin/services/athena/build.gradle.kts | 4 +- .../kotlin/athena/CreateNamedQueryExample.kt | 2 +- .../kotlin/athena/DeleteNamedQueryExample.kt | 2 +- .../kotlin/athena/ListNamedQueryExample.kt | 2 +- .../athena/ListQueryExecutionsExample.kt | 2 +- .../com/kotlin/athena/StartQueryExample.kt | 2 +- kotlin/services/autoscale/build.gradle.kts | 4 +- .../services/cloudformation/build.gradle.kts | 4 +- .../com/kotlin/cloudformation/CreateStack.kt | 2 +- .../com/kotlin/cloudformation/DeleteStack.kt | 2 +- .../kotlin/cloudformation/DescribeStacks.kt | 2 +- .../com/kotlin/cloudformation/GetTemplate.kt | 2 +- kotlin/services/cloudtrail/build.gradle.kts | 4 +- .../com/kotlin/cloudtrail/CreateTrail.kt | 2 +- .../com/kotlin/cloudtrail/DeleteTrail.kt | 2 +- .../com/kotlin/cloudtrail/DescribeTrails.kt | 2 +- .../kotlin/cloudtrail/GetEventSelectors.kt | 2 +- .../com/kotlin/cloudtrail/LookupEvents.kt | 2 +- .../kotlin/cloudtrail/PutEventSelectors.kt | 2 +- .../com/kotlin/cloudtrail/StartLogging.kt | 4 +- kotlin/services/cloudwatch/build.gradle.kts | 4 +- .../kotlin/cloudwatch/CloudWatchScenario.kt | 40 +++++++++---------- .../com/kotlin/cloudwatch/CreateAlarm.kt | 2 +- .../cloudwatch/CreateSubscriptionFilter.kt | 2 +- .../com/kotlin/cloudwatch/DeleteAlarm.kt | 2 +- .../cloudwatch/DeleteSubscriptionFilter.kt | 2 +- .../com/kotlin/cloudwatch/DescribeAlarms.kt | 2 +- .../cloudwatch/DescribeSubscriptionFilters.kt | 2 +- .../kotlin/cloudwatch/DisableAlarmActions.kt | 2 +- .../kotlin/cloudwatch/EnableAlarmActions.kt | 2 +- .../com/kotlin/cloudwatch/GetLogEvents.kt | 2 +- .../com/kotlin/cloudwatch/GetMetricData.kt | 2 +- .../com/kotlin/cloudwatch/HelloService.kt | 2 +- .../kotlin/com/kotlin/cloudwatch/PutEvents.kt | 2 +- .../com/kotlin/cloudwatch/PutLogEvents.kt | 2 +- .../com/kotlin/cloudwatch/PutMetricAlarm.kt | 2 +- .../kotlin/com/kotlin/cloudwatch/PutRule.kt | 2 +- kotlin/services/codepipeline/build.gradle.kts | 4 +- .../com/kotlin/pipeline/CreatePipeline.kt | 2 +- .../com/kotlin/pipeline/DeletePipeline.kt | 2 +- .../kotlin/com/kotlin/pipeline/GetPipeline.kt | 2 +- .../kotlin/pipeline/ListPipelineExecutions.kt | 2 +- .../com/kotlin/pipeline/ListPipelines.kt | 2 +- .../kotlin/pipeline/StartPipelineExecution.kt | 2 +- 52 files changed, 78 insertions(+), 80 deletions(-) diff --git a/kotlin/services/appsync/build.gradle.kts b/kotlin/services/appsync/build.gradle.kts index dbb9265f0d8..e5f55a8a144 100644 --- a/kotlin/services/appsync/build.gradle.kts +++ b/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.0.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") diff --git a/kotlin/services/appsync/src/main/kotlin/com/example/appsync/CreateApiKey.kt b/kotlin/services/appsync/src/main/kotlin/com/example/appsync/CreateApiKey.kt index 2af04711b3d..0d665605f0f 100644 --- a/kotlin/services/appsync/src/main/kotlin/com/example/appsync/CreateApiKey.kt +++ b/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 } diff --git a/kotlin/services/appsync/src/main/kotlin/com/example/appsync/CreateDataSource.kt b/kotlin/services/appsync/src/main/kotlin/com/example/appsync/CreateDataSource.kt index 60540eeae36..340221b079c 100644 --- a/kotlin/services/appsync/src/main/kotlin/com/example/appsync/CreateDataSource.kt +++ b/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 } diff --git a/kotlin/services/appsync/src/main/kotlin/com/example/appsync/DeleteApiKey.kt b/kotlin/services/appsync/src/main/kotlin/com/example/appsync/DeleteApiKey.kt index c2197944895..219d53eebab 100644 --- a/kotlin/services/appsync/src/main/kotlin/com/example/appsync/DeleteApiKey.kt +++ b/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.") } diff --git a/kotlin/services/appsync/src/main/kotlin/com/example/appsync/DeleteDataSource.kt b/kotlin/services/appsync/src/main/kotlin/com/example/appsync/DeleteDataSource.kt index bca1adc5c29..34dcace1bde 100644 --- a/kotlin/services/appsync/src/main/kotlin/com/example/appsync/DeleteDataSource.kt +++ b/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.") } diff --git a/kotlin/services/appsync/src/main/kotlin/com/example/appsync/GetDataSource.kt b/kotlin/services/appsync/src/main/kotlin/com/example/appsync/GetDataSource.kt index e44b14a8934..8aa5ed4db8a 100644 --- a/kotlin/services/appsync/src/main/kotlin/com/example/appsync/GetDataSource.kt +++ b/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}") } diff --git a/kotlin/services/appsync/src/main/kotlin/com/example/appsync/ListApiKeys.kt b/kotlin/services/appsync/src/main/kotlin/com/example/appsync/ListApiKeys.kt index 6c3268dc4f5..6bd34ef7e82 100644 --- a/kotlin/services/appsync/src/main/kotlin/com/example/appsync/ListApiKeys.kt +++ b/kotlin/services/appsync/src/main/kotlin/com/example/appsync/ListApiKeys.kt @@ -41,7 +41,7 @@ suspend fun getKeys(apiIdVal: String?) { apiId = apiIdVal } - AppSyncClient { region = "us-east-1" }.use { appClient -> + AppSyncClient.fromEnvironment { region = "us-east-1" }.use { appClient -> val response = appClient.listApiKeys(request) response.apiKeys?.forEach { key -> println("The key Id is ${key.id}") diff --git a/kotlin/services/appsync/src/main/kotlin/com/example/appsync/ListGraphqlApis.kt b/kotlin/services/appsync/src/main/kotlin/com/example/appsync/ListGraphqlApis.kt index 91de0c9509e..7481de34f65 100644 --- a/kotlin/services/appsync/src/main/kotlin/com/example/appsync/ListGraphqlApis.kt +++ b/kotlin/services/appsync/src/main/kotlin/com/example/appsync/ListGraphqlApis.kt @@ -22,7 +22,7 @@ suspend fun main() { // snippet-start:[appsync.kotlin.get_apis.main] suspend fun getApis() { - AppSyncClient { region = "us-east-1" }.use { appClient -> + AppSyncClient.fromEnvironment { region = "us-east-1" }.use { appClient -> val response = appClient.listGraphqlApis(ListGraphqlApisRequest {}) response.graphqlApis?.forEach { graph -> println("The name of the graph api is ${graph.name}") diff --git a/kotlin/services/athena/build.gradle.kts b/kotlin/services/athena/build.gradle.kts index 8508a196f57..5d87864c7ea 100644 --- a/kotlin/services/athena/build.gradle.kts +++ b/kotlin/services/athena/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.0.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:athena") implementation("aws.sdk.kotlin:secretsmanager") implementation("aws.smithy.kotlin:http-client-engine-okhttp") diff --git a/kotlin/services/athena/src/main/kotlin/com/kotlin/athena/CreateNamedQueryExample.kt b/kotlin/services/athena/src/main/kotlin/com/kotlin/athena/CreateNamedQueryExample.kt index 15afc05f86a..a80bfcace9a 100644 --- a/kotlin/services/athena/src/main/kotlin/com/kotlin/athena/CreateNamedQueryExample.kt +++ b/kotlin/services/athena/src/main/kotlin/com/kotlin/athena/CreateNamedQueryExample.kt @@ -34,7 +34,7 @@ suspend fun main(args: Array) { // snippet-start:[athena.kotlin.CreateNamedQueryExample.main] suspend fun createNamedQuery(queryStringVal: String, namedQuery: String, databaseVal: String): String? { - AthenaClient { region = "us-west-2" }.use { athenaClient -> + AthenaClient.fromEnvironment { region = "us-west-2" }.use { athenaClient -> val resp = athenaClient.createNamedQuery( CreateNamedQueryRequest { database = databaseVal diff --git a/kotlin/services/athena/src/main/kotlin/com/kotlin/athena/DeleteNamedQueryExample.kt b/kotlin/services/athena/src/main/kotlin/com/kotlin/athena/DeleteNamedQueryExample.kt index 21d22e949b0..cd06867a0cd 100644 --- a/kotlin/services/athena/src/main/kotlin/com/kotlin/athena/DeleteNamedQueryExample.kt +++ b/kotlin/services/athena/src/main/kotlin/com/kotlin/athena/DeleteNamedQueryExample.kt @@ -32,7 +32,7 @@ suspend fun deleteQueryName(sampleNamedQueryId: String?) { namedQueryId = sampleNamedQueryId } - AthenaClient { region = "us-west-2" }.use { athenaClient -> + AthenaClient.fromEnvironment { region = "us-west-2" }.use { athenaClient -> athenaClient.deleteNamedQuery(request) println("$sampleNamedQueryId was deleted!") } diff --git a/kotlin/services/athena/src/main/kotlin/com/kotlin/athena/ListNamedQueryExample.kt b/kotlin/services/athena/src/main/kotlin/com/kotlin/athena/ListNamedQueryExample.kt index cb45abdf376..93f606d9495 100644 --- a/kotlin/services/athena/src/main/kotlin/com/kotlin/athena/ListNamedQueryExample.kt +++ b/kotlin/services/athena/src/main/kotlin/com/kotlin/athena/ListNamedQueryExample.kt @@ -18,7 +18,7 @@ suspend fun listNamedQueries() { this.maxResults = 10 } - AthenaClient { region = "us-west-2" }.use { athenaClient -> + AthenaClient.fromEnvironment { region = "us-west-2" }.use { athenaClient -> val responses = athenaClient.listNamedQueries(request) responses.namedQueryIds?.forEach { queries -> println("Retrieved account alias $queries") diff --git a/kotlin/services/athena/src/main/kotlin/com/kotlin/athena/ListQueryExecutionsExample.kt b/kotlin/services/athena/src/main/kotlin/com/kotlin/athena/ListQueryExecutionsExample.kt index 73d7e3d4051..f7d04938d9b 100644 --- a/kotlin/services/athena/src/main/kotlin/com/kotlin/athena/ListQueryExecutionsExample.kt +++ b/kotlin/services/athena/src/main/kotlin/com/kotlin/athena/ListQueryExecutionsExample.kt @@ -18,7 +18,7 @@ suspend fun listQueryIds() { maxResults = 10 } - AthenaClient { region = "us-west-2" }.use { athenaClient -> + AthenaClient.fromEnvironment { region = "us-west-2" }.use { athenaClient -> val response = athenaClient.listQueryExecutions(request) response.queryExecutionIds?.forEach { queries -> println("The value is $queries") diff --git a/kotlin/services/athena/src/main/kotlin/com/kotlin/athena/StartQueryExample.kt b/kotlin/services/athena/src/main/kotlin/com/kotlin/athena/StartQueryExample.kt index 8d02deec260..99a26193d98 100644 --- a/kotlin/services/athena/src/main/kotlin/com/kotlin/athena/StartQueryExample.kt +++ b/kotlin/services/athena/src/main/kotlin/com/kotlin/athena/StartQueryExample.kt @@ -59,7 +59,7 @@ suspend fun submitAthenaQuery(queryStringVal: String, databaseVal: String, outpu resultConfiguration = resultConfigurationOb } - AthenaClient { region = "us-west-2" }.use { athenaClient -> + AthenaClient.fromEnvironment { region = "us-west-2" }.use { athenaClient -> val response = athenaClient.startQueryExecution(request) return response.queryExecutionId } diff --git a/kotlin/services/autoscale/build.gradle.kts b/kotlin/services/autoscale/build.gradle.kts index e5143ef9274..1232e5fa304 100644 --- a/kotlin/services/autoscale/build.gradle.kts +++ b/kotlin/services/autoscale/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.0.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:autoscaling") implementation("aws.sdk.kotlin:secretsmanager") implementation("aws.smithy.kotlin:http-client-engine-okhttp") diff --git a/kotlin/services/cloudformation/build.gradle.kts b/kotlin/services/cloudformation/build.gradle.kts index 762c8c88e0f..c64e9b2ea66 100644 --- a/kotlin/services/cloudformation/build.gradle.kts +++ b/kotlin/services/cloudformation/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.0.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:cloudformation") implementation("aws.sdk.kotlin:secretsmanager") implementation("aws.smithy.kotlin:http-client-engine-okhttp") diff --git a/kotlin/services/cloudformation/src/main/kotlin/com/kotlin/cloudformation/CreateStack.kt b/kotlin/services/cloudformation/src/main/kotlin/com/kotlin/cloudformation/CreateStack.kt index 2d0f25024ec..aee9c2f378e 100644 --- a/kotlin/services/cloudformation/src/main/kotlin/com/kotlin/cloudformation/CreateStack.kt +++ b/kotlin/services/cloudformation/src/main/kotlin/com/kotlin/cloudformation/CreateStack.kt @@ -44,7 +44,7 @@ suspend fun createCFStack(stackNameVal: String, roleARNVal: String?, location: S onFailure = OnFailure.Rollback } - CloudFormationClient { region = "us-east-1" }.use { cfClient -> + CloudFormationClient.fromEnvironment { region = "us-east-1" }.use { cfClient -> cfClient.createStack(request) println("$stackNameVal was created") } diff --git a/kotlin/services/cloudformation/src/main/kotlin/com/kotlin/cloudformation/DeleteStack.kt b/kotlin/services/cloudformation/src/main/kotlin/com/kotlin/cloudformation/DeleteStack.kt index 9ca9262cc5d..9bc35a1aede 100644 --- a/kotlin/services/cloudformation/src/main/kotlin/com/kotlin/cloudformation/DeleteStack.kt +++ b/kotlin/services/cloudformation/src/main/kotlin/com/kotlin/cloudformation/DeleteStack.kt @@ -34,7 +34,7 @@ suspend fun deleteSpecificTemplate(stackNameVal: String?) { stackName = stackNameVal } - CloudFormationClient { region = "us-east-1" }.use { cfClient -> + CloudFormationClient.fromEnvironment { region = "us-east-1" }.use { cfClient -> cfClient.deleteStack(request) println("The AWS CloudFormation stack was successfully deleted!") } diff --git a/kotlin/services/cloudformation/src/main/kotlin/com/kotlin/cloudformation/DescribeStacks.kt b/kotlin/services/cloudformation/src/main/kotlin/com/kotlin/cloudformation/DescribeStacks.kt index afd22ab3a45..52f79a3d0e2 100644 --- a/kotlin/services/cloudformation/src/main/kotlin/com/kotlin/cloudformation/DescribeStacks.kt +++ b/kotlin/services/cloudformation/src/main/kotlin/com/kotlin/cloudformation/DescribeStacks.kt @@ -15,7 +15,7 @@ suspend fun main() { // snippet-start:[cf.kotlin.get_stacks.main] suspend fun describeAllStacks() { - CloudFormationClient { region = "us-east-1" }.use { cfClient -> + CloudFormationClient.fromEnvironment { region = "us-east-1" }.use { cfClient -> val stacksResponse: DescribeStacksResponse = cfClient.describeStacks(DescribeStacksRequest {}) stacksResponse.stacks?.forEach { stack -> println("The stack description is ${stack.description}") diff --git a/kotlin/services/cloudformation/src/main/kotlin/com/kotlin/cloudformation/GetTemplate.kt b/kotlin/services/cloudformation/src/main/kotlin/com/kotlin/cloudformation/GetTemplate.kt index 2497a25f640..84dd63e6c87 100644 --- a/kotlin/services/cloudformation/src/main/kotlin/com/kotlin/cloudformation/GetTemplate.kt +++ b/kotlin/services/cloudformation/src/main/kotlin/com/kotlin/cloudformation/GetTemplate.kt @@ -34,7 +34,7 @@ suspend fun getSpecificTemplate(stackNameVal: String) { stackName = stackNameVal } - CloudFormationClient { region = "us-east-1" }.use { cfClient -> + CloudFormationClient.fromEnvironment { region = "us-east-1" }.use { cfClient -> val response = cfClient.getTemplate(request) val body = response.templateBody println(body) diff --git a/kotlin/services/cloudtrail/build.gradle.kts b/kotlin/services/cloudtrail/build.gradle.kts index c2358d65c3f..4ed36cb3a11 100644 --- a/kotlin/services/cloudtrail/build.gradle.kts +++ b/kotlin/services/cloudtrail/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.0.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:cloudtrail") implementation("aws.sdk.kotlin:secretsmanager") implementation("aws.smithy.kotlin:http-client-engine-okhttp") diff --git a/kotlin/services/cloudtrail/src/main/kotlin/com/kotlin/cloudtrail/CreateTrail.kt b/kotlin/services/cloudtrail/src/main/kotlin/com/kotlin/cloudtrail/CreateTrail.kt index c7f667024e0..80f071f9810 100644 --- a/kotlin/services/cloudtrail/src/main/kotlin/com/kotlin/cloudtrail/CreateTrail.kt +++ b/kotlin/services/cloudtrail/src/main/kotlin/com/kotlin/cloudtrail/CreateTrail.kt @@ -41,7 +41,7 @@ suspend fun createNewTrail( isMultiRegionTrail = true } - CloudTrailClient { region = "us-east-1" }.use { cloudTrail -> + CloudTrailClient.fromEnvironment { region = "us-east-1" }.use { cloudTrail -> val trailResponse = cloudTrail.createTrail(request) println("The trail ARN is ${trailResponse.trailArn}") } diff --git a/kotlin/services/cloudtrail/src/main/kotlin/com/kotlin/cloudtrail/DeleteTrail.kt b/kotlin/services/cloudtrail/src/main/kotlin/com/kotlin/cloudtrail/DeleteTrail.kt index ee14bf85ad7..b36e75cf5a9 100644 --- a/kotlin/services/cloudtrail/src/main/kotlin/com/kotlin/cloudtrail/DeleteTrail.kt +++ b/kotlin/services/cloudtrail/src/main/kotlin/com/kotlin/cloudtrail/DeleteTrail.kt @@ -35,7 +35,7 @@ suspend fun deleteSpecificTrail(trailName: String) { name = trailName } - CloudTrailClient { region = "us-east-1" }.use { cloudTrail -> + CloudTrailClient.fromEnvironment { region = "us-east-1" }.use { cloudTrail -> cloudTrail.deleteTrail(request) println("$trailName was successfully deleted") } diff --git a/kotlin/services/cloudtrail/src/main/kotlin/com/kotlin/cloudtrail/DescribeTrails.kt b/kotlin/services/cloudtrail/src/main/kotlin/com/kotlin/cloudtrail/DescribeTrails.kt index 09e9be9e6c5..da2691c245c 100644 --- a/kotlin/services/cloudtrail/src/main/kotlin/com/kotlin/cloudtrail/DescribeTrails.kt +++ b/kotlin/services/cloudtrail/src/main/kotlin/com/kotlin/cloudtrail/DescribeTrails.kt @@ -35,7 +35,7 @@ suspend fun describeSpecificTrails(trailName: String) { trailNameList = listOf(trailName) } - CloudTrailClient { region = "us-east-1" }.use { cloudTrail -> + CloudTrailClient.fromEnvironment { region = "us-east-1" }.use { cloudTrail -> val response = cloudTrail.describeTrails(request) response.trailList?.forEach { trail -> println("The ARN of the trail is ${trail.trailArn}") diff --git a/kotlin/services/cloudtrail/src/main/kotlin/com/kotlin/cloudtrail/GetEventSelectors.kt b/kotlin/services/cloudtrail/src/main/kotlin/com/kotlin/cloudtrail/GetEventSelectors.kt index ccae4cf6c5e..273684cc900 100644 --- a/kotlin/services/cloudtrail/src/main/kotlin/com/kotlin/cloudtrail/GetEventSelectors.kt +++ b/kotlin/services/cloudtrail/src/main/kotlin/com/kotlin/cloudtrail/GetEventSelectors.kt @@ -36,7 +36,7 @@ suspend fun getSelectors(trailNameVal: String) { trailName = trailNameVal } - CloudTrailClient { region = "us-east-1" }.use { cloudTrail -> + CloudTrailClient.fromEnvironment { region = "us-east-1" }.use { cloudTrail -> val response = cloudTrail.getEventSelectors(request) response.eventSelectors?.forEach { selector -> diff --git a/kotlin/services/cloudtrail/src/main/kotlin/com/kotlin/cloudtrail/LookupEvents.kt b/kotlin/services/cloudtrail/src/main/kotlin/com/kotlin/cloudtrail/LookupEvents.kt index c41f364482c..30d451353aa 100644 --- a/kotlin/services/cloudtrail/src/main/kotlin/com/kotlin/cloudtrail/LookupEvents.kt +++ b/kotlin/services/cloudtrail/src/main/kotlin/com/kotlin/cloudtrail/LookupEvents.kt @@ -19,7 +19,7 @@ suspend fun lookupAllEvents() { maxResults = 20 } - CloudTrailClient { region = "us-east-1" }.use { cloudTrail -> + CloudTrailClient.fromEnvironment { region = "us-east-1" }.use { cloudTrail -> val response = cloudTrail.lookupEvents(request) response.events?.forEach { event -> println("Event name is ${event.eventName}") diff --git a/kotlin/services/cloudtrail/src/main/kotlin/com/kotlin/cloudtrail/PutEventSelectors.kt b/kotlin/services/cloudtrail/src/main/kotlin/com/kotlin/cloudtrail/PutEventSelectors.kt index 7d3396d6da5..d030cd857d6 100644 --- a/kotlin/services/cloudtrail/src/main/kotlin/com/kotlin/cloudtrail/PutEventSelectors.kt +++ b/kotlin/services/cloudtrail/src/main/kotlin/com/kotlin/cloudtrail/PutEventSelectors.kt @@ -37,7 +37,7 @@ suspend fun setSelector(trailNameVal: String?) { readWriteType = ReadWriteType.fromValue("All") } - CloudTrailClient { region = "us-east-1" }.use { cloudTrail -> + CloudTrailClient.fromEnvironment { region = "us-east-1" }.use { cloudTrail -> cloudTrail.putEventSelectors( PutEventSelectorsRequest { trailName = trailNameVal diff --git a/kotlin/services/cloudtrail/src/main/kotlin/com/kotlin/cloudtrail/StartLogging.kt b/kotlin/services/cloudtrail/src/main/kotlin/com/kotlin/cloudtrail/StartLogging.kt index 7d1ad75dd15..862a41f4796 100644 --- a/kotlin/services/cloudtrail/src/main/kotlin/com/kotlin/cloudtrail/StartLogging.kt +++ b/kotlin/services/cloudtrail/src/main/kotlin/com/kotlin/cloudtrail/StartLogging.kt @@ -37,7 +37,7 @@ suspend fun stopLog(trailName: String) { StopLoggingRequest { name = trailName } - CloudTrailClient { region = "us-east-1" }.use { cloudTrail -> + CloudTrailClient.fromEnvironment { region = "us-east-1" }.use { cloudTrail -> cloudTrail.stopLogging(request) println("$trailName has stopped logging") } @@ -48,7 +48,7 @@ suspend fun startLog(trailName: String) { StartLoggingRequest { name = trailName } - CloudTrailClient { region = "us-east-1" }.use { cloudTrail -> + CloudTrailClient.fromEnvironment { region = "us-east-1" }.use { cloudTrail -> cloudTrail.startLogging(request) println("$trailName has started logging") } diff --git a/kotlin/services/cloudwatch/build.gradle.kts b/kotlin/services/cloudwatch/build.gradle.kts index e175829145e..18b0aa93784 100644 --- a/kotlin/services/cloudwatch/build.gradle.kts +++ b/kotlin/services/cloudwatch/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.0.0" application } @@ -28,7 +28,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:cloudwatch") implementation("aws.sdk.kotlin:cloudwatchevents") implementation("aws.sdk.kotlin:cloudwatchlogs") diff --git a/kotlin/services/cloudwatch/src/main/kotlin/com/kotlin/cloudwatch/CloudWatchScenario.kt b/kotlin/services/cloudwatch/src/main/kotlin/com/kotlin/cloudwatch/CloudWatchScenario.kt index e98571a3e5a..cb2a3565431 100644 --- a/kotlin/services/cloudwatch/src/main/kotlin/com/kotlin/cloudwatch/CloudWatchScenario.kt +++ b/kotlin/services/cloudwatch/src/main/kotlin/com/kotlin/cloudwatch/CloudWatchScenario.kt @@ -289,7 +289,7 @@ suspend fun deleteAnomalyDetector(fileName: String) { singleMetricAnomalyDetector = singleMetricAnomalyDetectorVal } - CloudWatchClient { region = "us-east-1" }.use { cwClient -> + CloudWatchClient.fromEnvironment { region = "us-east-1" }.use { cwClient -> cwClient.deleteAnomalyDetector(request) println("Successfully deleted the Anomaly Detector.") } @@ -303,7 +303,7 @@ suspend fun deleteAlarm(alarmNameVal: String) { alarmNames = listOf(alarmNameVal) } - CloudWatchClient { region = "us-east-1" }.use { cwClient -> + CloudWatchClient.fromEnvironment { region = "us-east-1" }.use { cwClient -> cwClient.deleteAlarms(request) println("Successfully deleted alarm $alarmNameVal") } @@ -316,7 +316,7 @@ suspend fun deleteDashboard(dashboardName: String) { DeleteDashboardsRequest { dashboardNames = listOf(dashboardName) } - CloudWatchClient { region = "us-east-1" }.use { cwClient -> + CloudWatchClient.fromEnvironment { region = "us-east-1" }.use { cwClient -> cwClient.deleteDashboards(dashboardsRequest) println("$dashboardName was successfully deleted.") } @@ -348,7 +348,7 @@ suspend fun getAndOpenMetricImage(fileName: String) { metricWidget = myJSON } - CloudWatchClient { region = "us-east-1" }.use { cwClient -> + CloudWatchClient.fromEnvironment { region = "us-east-1" }.use { cwClient -> val response = cwClient.getMetricWidgetImage(imageRequest) val bytes = response.metricWidgetImage if (bytes != null) { @@ -373,7 +373,7 @@ suspend fun describeAnomalyDetectors(fileName: String) { metricName = customMetricName namespace = customMetricNamespace } - CloudWatchClient { region = "us-east-1" }.use { cwClient -> + CloudWatchClient.fromEnvironment { region = "us-east-1" }.use { cwClient -> val response = cwClient.describeAnomalyDetectors(detectorsRequest) response.anomalyDetectors?.forEach { detector -> println("Metric name: ${detector.singleMetricAnomalyDetector?.metricName}") @@ -403,7 +403,7 @@ suspend fun addAnomalyDetector(fileName: String?) { singleMetricAnomalyDetector = singleMetricAnomalyDetectorVal } - CloudWatchClient { region = "us-east-1" }.use { cwClient -> + CloudWatchClient.fromEnvironment { region = "us-east-1" }.use { cwClient -> cwClient.putAnomalyDetector(anomalyDetectorRequest) println("Added anomaly detector for metric $customMetricName.") } @@ -434,9 +434,7 @@ suspend fun getAlarmHistory( historyItemType = HistoryItemType.Action } - CloudWatchClient { - credentialsProvider = EnvironmentCredentialsProvider() - region = "us-east-1" + CloudWatchClient.fromEnvironment {region = "us-east-1" }.use { cwClient -> val response = cwClient.describeAlarmHistory(historyRequest) val historyItems = response.alarmHistoryItems @@ -469,7 +467,7 @@ suspend fun checkForMetricAlarm(fileName: String?) { metricName = customMetricName namespace = customMetricNamespace } - CloudWatchClient { region = "us-east-1" }.use { cwClient -> + CloudWatchClient.fromEnvironment { region = "us-east-1" }.use { cwClient -> while (!hasAlarm && retries > 0) { val response = cwClient.describeAlarmsForMetric(metricRequest) if (response.metricAlarms?.count()!! > 0) { @@ -529,7 +527,7 @@ suspend fun addMetricDataForAlarm(fileName: String?) { metricData = metricDataList } - CloudWatchClient { region = "us-east-1" }.use { cwClient -> + CloudWatchClient.fromEnvironment { region = "us-east-1" }.use { cwClient -> cwClient.putMetricData(request) println("Added metric values for for metric $customMetricName") } @@ -589,7 +587,7 @@ suspend fun getCustomMetricData(fileName: String) { metricDataQueries = dq } - CloudWatchClient { region = "us-east-1" }.use { cwClient -> + CloudWatchClient.fromEnvironment { region = "us-east-1" }.use { cwClient -> val response = cwClient.getMetricData(getMetReq) response.metricDataResults?.forEach { item -> println("The label is ${item.label}") @@ -609,7 +607,7 @@ suspend fun describeAlarms() { maxRecords = 10 } - CloudWatchClient { region = "us-east-1" }.use { cwClient -> + CloudWatchClient.fromEnvironment { region = "us-east-1" }.use { cwClient -> val response = cwClient.describeAlarms(alarmsRequest) response.metricAlarms?.forEach { alarm -> println("Alarm name: ${alarm.alarmName}") @@ -650,7 +648,7 @@ suspend fun createAlarm(fileName: String): String { treatMissingData = "ignore" } - CloudWatchClient { region = "us-east-1" }.use { cwClient -> + CloudWatchClient.fromEnvironment { region = "us-east-1" }.use { cwClient -> cwClient.putMetricAlarm(alarmRequest) println("$alarmNameVal was successfully created!") return alarmNameVal @@ -669,7 +667,7 @@ suspend fun addMetricToDashboard( dashboardBody = readFileAsString(fileNameVal) } - CloudWatchClient { region = "us-east-1" }.use { cwClient -> + CloudWatchClient.fromEnvironment { region = "us-east-1" }.use { cwClient -> cwClient.putDashboard(dashboardRequest) println("$dashboardNameVal was successfully updated.") } @@ -704,7 +702,7 @@ suspend fun createNewCustomMetric(dataPoint: Double) { metricData = listOf(datum) } - CloudWatchClient { region = "us-east-1" }.use { cwClient -> + CloudWatchClient.fromEnvironment { region = "us-east-1" }.use { cwClient -> cwClient.putMetricData(request) println("Added metric values for for metric PAGES_VISITED") } @@ -736,7 +734,7 @@ suspend fun createDashboardWithMetrics( dashboardBody = readFileAsString(fileNameVal) } - CloudWatchClient { region = "us-east-1" }.use { cwClient -> + CloudWatchClient.fromEnvironment { region = "us-east-1" }.use { cwClient -> val response = cwClient.putDashboard(dashboardRequest) println("$dashboardNameVal was successfully created.") val messages = response.dashboardValidationMessages @@ -782,7 +780,7 @@ suspend fun getMetricStatistics(costDateWeek: String?) { .Instant(endDate) period = 86400 } - CloudWatchClient { region = "us-east-1" }.use { cwClient -> + CloudWatchClient.fromEnvironment { region = "us-east-1" }.use { cwClient -> val response = cwClient.getMetricStatistics(statisticsRequest) val data: List? = response.datapoints if (data != null) { @@ -846,7 +844,7 @@ suspend fun listMets(namespaceVal: String?): ArrayList? { ListMetricsRequest { namespace = namespaceVal } - CloudWatchClient { region = "us-east-1" }.use { cwClient -> + CloudWatchClient.fromEnvironment { region = "us-east-1" }.use { cwClient -> val reponse = cwClient.listMetrics(request) reponse.metrics?.forEach { metrics -> val data = metrics.metricName @@ -864,7 +862,7 @@ suspend fun getSpecificMet(namespaceVal: String?): Dimension? { ListMetricsRequest { namespace = namespaceVal } - CloudWatchClient { region = "us-east-1" }.use { cwClient -> + CloudWatchClient.fromEnvironment { region = "us-east-1" }.use { cwClient -> val response = cwClient.listMetrics(request) val myList = response.metrics if (myList != null) { @@ -877,7 +875,7 @@ suspend fun getSpecificMet(namespaceVal: String?): Dimension? { // snippet-start:[cloudwatch.kotlin.scenario.list.namespaces.main] suspend fun listNameSpaces(): ArrayList { val nameSpaceList = ArrayList() - CloudWatchClient { region = "us-east-1" }.use { cwClient -> + CloudWatchClient.fromEnvironment { region = "us-east-1" }.use { cwClient -> val response = cwClient.listMetrics(ListMetricsRequest {}) response.metrics?.forEach { metrics -> val data = metrics.namespace diff --git a/kotlin/services/cloudwatch/src/main/kotlin/com/kotlin/cloudwatch/CreateAlarm.kt b/kotlin/services/cloudwatch/src/main/kotlin/com/kotlin/cloudwatch/CreateAlarm.kt index ce510b15685..f0f70a940c3 100644 --- a/kotlin/services/cloudwatch/src/main/kotlin/com/kotlin/cloudwatch/CreateAlarm.kt +++ b/kotlin/services/cloudwatch/src/main/kotlin/com/kotlin/cloudwatch/CreateAlarm.kt @@ -69,7 +69,7 @@ suspend fun putAlarm( dimensions = listOf(dimension) } - CloudWatchClient { region = "us-east-1" }.use { cwClient -> + CloudWatchClient.fromEnvironment { region = "us-east-1" }.use { cwClient -> cwClient.putMetricAlarm(request) println("Successfully created an alarm with name $alarmNameVal") } diff --git a/kotlin/services/cloudwatch/src/main/kotlin/com/kotlin/cloudwatch/CreateSubscriptionFilter.kt b/kotlin/services/cloudwatch/src/main/kotlin/com/kotlin/cloudwatch/CreateSubscriptionFilter.kt index 145e13e11fb..d700599b31f 100644 --- a/kotlin/services/cloudwatch/src/main/kotlin/com/kotlin/cloudwatch/CreateSubscriptionFilter.kt +++ b/kotlin/services/cloudwatch/src/main/kotlin/com/kotlin/cloudwatch/CreateSubscriptionFilter.kt @@ -56,7 +56,7 @@ suspend fun putSubFilters( destinationArn = functionArn } - CloudWatchLogsClient { region = "us-west-2" }.use { cwlClient -> + CloudWatchLogsClient.fromEnvironment { region = "us-west-2" }.use { cwlClient -> cwlClient.putSubscriptionFilter(request) println("Successfully created CloudWatch logs subscription filter named $filter") } diff --git a/kotlin/services/cloudwatch/src/main/kotlin/com/kotlin/cloudwatch/DeleteAlarm.kt b/kotlin/services/cloudwatch/src/main/kotlin/com/kotlin/cloudwatch/DeleteAlarm.kt index b9112848b53..ff3de388a96 100644 --- a/kotlin/services/cloudwatch/src/main/kotlin/com/kotlin/cloudwatch/DeleteAlarm.kt +++ b/kotlin/services/cloudwatch/src/main/kotlin/com/kotlin/cloudwatch/DeleteAlarm.kt @@ -42,7 +42,7 @@ suspend fun deleteCWAlarm(alarmNameVal: String) { alarmNames = listOf(alarmNameVal) } - CloudWatchClient { region = "us-east-1" }.use { cwClient -> + CloudWatchClient.fromEnvironment { region = "us-east-1" }.use { cwClient -> cwClient.deleteAlarms(request) println("Successfully deleted alarm $alarmNameVal") } diff --git a/kotlin/services/cloudwatch/src/main/kotlin/com/kotlin/cloudwatch/DeleteSubscriptionFilter.kt b/kotlin/services/cloudwatch/src/main/kotlin/com/kotlin/cloudwatch/DeleteSubscriptionFilter.kt index ccc2ccdbe89..e761ee59e8e 100644 --- a/kotlin/services/cloudwatch/src/main/kotlin/com/kotlin/cloudwatch/DeleteSubscriptionFilter.kt +++ b/kotlin/services/cloudwatch/src/main/kotlin/com/kotlin/cloudwatch/DeleteSubscriptionFilter.kt @@ -49,7 +49,7 @@ suspend fun deleteSubFilter( logGroupName = logGroup } - CloudWatchLogsClient { region = "us-west-2" }.use { logs -> + CloudWatchLogsClient.fromEnvironment { region = "us-west-2" }.use { logs -> logs.deleteSubscriptionFilter(request) println("Successfully deleted CloudWatch logs subscription filter named $filter") } diff --git a/kotlin/services/cloudwatch/src/main/kotlin/com/kotlin/cloudwatch/DescribeAlarms.kt b/kotlin/services/cloudwatch/src/main/kotlin/com/kotlin/cloudwatch/DescribeAlarms.kt index d94ed73b8b7..c3bbd78fa06 100644 --- a/kotlin/services/cloudwatch/src/main/kotlin/com/kotlin/cloudwatch/DescribeAlarms.kt +++ b/kotlin/services/cloudwatch/src/main/kotlin/com/kotlin/cloudwatch/DescribeAlarms.kt @@ -22,7 +22,7 @@ suspend fun main() { // snippet-start:[cloudwatch.kotlin.describe_alarms.main] suspend fun desCWAlarms() { - CloudWatchClient { region = "us-east-1" }.use { cwClient -> + CloudWatchClient.fromEnvironment { region = "us-east-1" }.use { cwClient -> val response = cwClient.describeAlarms(DescribeAlarmsRequest {}) response.metricAlarms?.forEach { alarm -> println("Retrieved alarm ${alarm.alarmName}") diff --git a/kotlin/services/cloudwatch/src/main/kotlin/com/kotlin/cloudwatch/DescribeSubscriptionFilters.kt b/kotlin/services/cloudwatch/src/main/kotlin/com/kotlin/cloudwatch/DescribeSubscriptionFilters.kt index 12192b6307e..f93540f3c75 100644 --- a/kotlin/services/cloudwatch/src/main/kotlin/com/kotlin/cloudwatch/DescribeSubscriptionFilters.kt +++ b/kotlin/services/cloudwatch/src/main/kotlin/com/kotlin/cloudwatch/DescribeSubscriptionFilters.kt @@ -41,7 +41,7 @@ suspend fun describeFilters(logGroup: String) { limit = 1 } - CloudWatchLogsClient { region = "us-west-2" }.use { cwlClient -> + CloudWatchLogsClient.fromEnvironment { region = "us-west-2" }.use { cwlClient -> val response = cwlClient.describeSubscriptionFilters(request) response.subscriptionFilters?.forEach { filter -> println("Retrieved filter with name ${filter.filterName} pattern ${filter.filterPattern} and destination ${filter.destinationArn}") diff --git a/kotlin/services/cloudwatch/src/main/kotlin/com/kotlin/cloudwatch/DisableAlarmActions.kt b/kotlin/services/cloudwatch/src/main/kotlin/com/kotlin/cloudwatch/DisableAlarmActions.kt index a084f345537..cfdcf440ac3 100644 --- a/kotlin/services/cloudwatch/src/main/kotlin/com/kotlin/cloudwatch/DisableAlarmActions.kt +++ b/kotlin/services/cloudwatch/src/main/kotlin/com/kotlin/cloudwatch/DisableAlarmActions.kt @@ -42,7 +42,7 @@ suspend fun disableActions(alarmName: String) { DisableAlarmActionsRequest { alarmNames = listOf(alarmName) } - CloudWatchClient { region = "us-east-1" }.use { cwClient -> + CloudWatchClient.fromEnvironment { region = "us-east-1" }.use { cwClient -> cwClient.disableAlarmActions(request) println("Successfully disabled actions on alarm $alarmName") } diff --git a/kotlin/services/cloudwatch/src/main/kotlin/com/kotlin/cloudwatch/EnableAlarmActions.kt b/kotlin/services/cloudwatch/src/main/kotlin/com/kotlin/cloudwatch/EnableAlarmActions.kt index 4d629c56e31..3ba9e6fcb2b 100644 --- a/kotlin/services/cloudwatch/src/main/kotlin/com/kotlin/cloudwatch/EnableAlarmActions.kt +++ b/kotlin/services/cloudwatch/src/main/kotlin/com/kotlin/cloudwatch/EnableAlarmActions.kt @@ -42,7 +42,7 @@ suspend fun enableActions(alarm: String) { alarmNames = listOf(alarm) } - CloudWatchClient { region = "us-east-1" }.use { cwClient -> + CloudWatchClient.fromEnvironment { region = "us-east-1" }.use { cwClient -> cwClient.enableAlarmActions(request) println("Successfully enabled actions on alarm $alarm") } diff --git a/kotlin/services/cloudwatch/src/main/kotlin/com/kotlin/cloudwatch/GetLogEvents.kt b/kotlin/services/cloudwatch/src/main/kotlin/com/kotlin/cloudwatch/GetLogEvents.kt index b9ae231101b..65017aa4727 100644 --- a/kotlin/services/cloudwatch/src/main/kotlin/com/kotlin/cloudwatch/GetLogEvents.kt +++ b/kotlin/services/cloudwatch/src/main/kotlin/com/kotlin/cloudwatch/GetLogEvents.kt @@ -49,7 +49,7 @@ suspend fun getCWLogEvents( startFromHead = true } - CloudWatchLogsClient { region = "us-west-2" }.use { cwlClient -> + CloudWatchLogsClient.fromEnvironment { region = "us-west-2" }.use { cwlClient -> val eventsList = cwlClient.getLogEvents(request) eventsList.events?.forEach { list -> println("Message is: " + list.message) diff --git a/kotlin/services/cloudwatch/src/main/kotlin/com/kotlin/cloudwatch/GetMetricData.kt b/kotlin/services/cloudwatch/src/main/kotlin/com/kotlin/cloudwatch/GetMetricData.kt index 174fe5451a1..a5b2d174c1b 100644 --- a/kotlin/services/cloudwatch/src/main/kotlin/com/kotlin/cloudwatch/GetMetricData.kt +++ b/kotlin/services/cloudwatch/src/main/kotlin/com/kotlin/cloudwatch/GetMetricData.kt @@ -61,7 +61,7 @@ suspend fun getMetData() { metricDataQueries = dq } - CloudWatchClient { region = "us-east-1" }.use { cwClient -> + CloudWatchClient.fromEnvironment { region = "us-east-1" }.use { cwClient -> val response = cwClient.getMetricData(request) response.metricDataResults?.forEach { item -> println("The label is ${item.label}") diff --git a/kotlin/services/cloudwatch/src/main/kotlin/com/kotlin/cloudwatch/HelloService.kt b/kotlin/services/cloudwatch/src/main/kotlin/com/kotlin/cloudwatch/HelloService.kt index 582c6fcaeef..e3db8626a88 100644 --- a/kotlin/services/cloudwatch/src/main/kotlin/com/kotlin/cloudwatch/HelloService.kt +++ b/kotlin/services/cloudwatch/src/main/kotlin/com/kotlin/cloudwatch/HelloService.kt @@ -40,7 +40,7 @@ suspend fun listAllMets(namespaceVal: String?) { namespace = namespaceVal } - CloudWatchClient { region = "us-east-1" }.use { cwClient -> + CloudWatchClient.fromEnvironment { region = "us-east-1" }.use { cwClient -> cwClient .listMetricsPaginated(request) .transform { it.metrics?.forEach { obj -> emit(obj) } } diff --git a/kotlin/services/cloudwatch/src/main/kotlin/com/kotlin/cloudwatch/PutEvents.kt b/kotlin/services/cloudwatch/src/main/kotlin/com/kotlin/cloudwatch/PutEvents.kt index 9e7678709c2..5017859c125 100644 --- a/kotlin/services/cloudwatch/src/main/kotlin/com/kotlin/cloudwatch/PutEvents.kt +++ b/kotlin/services/cloudwatch/src/main/kotlin/com/kotlin/cloudwatch/PutEvents.kt @@ -51,7 +51,7 @@ suspend fun putCWEvents(resourceArn: String) { entries = listOf(requestEntry) } - CloudWatchEventsClient { region = "us-west-2" }.use { cwe -> + CloudWatchEventsClient.fromEnvironment { region = "us-west-2" }.use { cwe -> cwe.putEvents(request) println("Successfully put CloudWatch event") } diff --git a/kotlin/services/cloudwatch/src/main/kotlin/com/kotlin/cloudwatch/PutLogEvents.kt b/kotlin/services/cloudwatch/src/main/kotlin/com/kotlin/cloudwatch/PutLogEvents.kt index 41dbf433942..2a41873cfd0 100644 --- a/kotlin/services/cloudwatch/src/main/kotlin/com/kotlin/cloudwatch/PutLogEvents.kt +++ b/kotlin/services/cloudwatch/src/main/kotlin/com/kotlin/cloudwatch/PutLogEvents.kt @@ -52,7 +52,7 @@ suspend fun putCWLogEvents( logStreamNamePrefix = streamNameVal } - CloudWatchLogsClient { region = "us-west-2" }.use { logsClient -> + CloudWatchLogsClient.fromEnvironment { region = "us-west-2" }.use { logsClient -> describeLogStreamsResponse = logsClient.describeLogStreams(request) println("Successfully put the CloudWatch log event") diff --git a/kotlin/services/cloudwatch/src/main/kotlin/com/kotlin/cloudwatch/PutMetricAlarm.kt b/kotlin/services/cloudwatch/src/main/kotlin/com/kotlin/cloudwatch/PutMetricAlarm.kt index 9a6ed8f8e3a..394a20283c5 100644 --- a/kotlin/services/cloudwatch/src/main/kotlin/com/kotlin/cloudwatch/PutMetricAlarm.kt +++ b/kotlin/services/cloudwatch/src/main/kotlin/com/kotlin/cloudwatch/PutMetricAlarm.kt @@ -68,7 +68,7 @@ suspend fun putMetricAlarm( dimensions = listOf(dimensionOb) } - CloudWatchClient { region = "us-east-1" }.use { cwClient -> + CloudWatchClient.fromEnvironment { region = "us-east-1" }.use { cwClient -> cwClient.putMetricAlarm(request) println("Successfully created an alarm with name $alarmNameVal") } diff --git a/kotlin/services/cloudwatch/src/main/kotlin/com/kotlin/cloudwatch/PutRule.kt b/kotlin/services/cloudwatch/src/main/kotlin/com/kotlin/cloudwatch/PutRule.kt index 87c0da5f3b2..8d4f716d25e 100644 --- a/kotlin/services/cloudwatch/src/main/kotlin/com/kotlin/cloudwatch/PutRule.kt +++ b/kotlin/services/cloudwatch/src/main/kotlin/com/kotlin/cloudwatch/PutRule.kt @@ -51,7 +51,7 @@ suspend fun putCWRule( state = RuleState.Enabled } - CloudWatchEventsClient { region = "us-east-1" }.use { cwe -> + CloudWatchEventsClient.fromEnvironment { region = "us-east-1" }.use { cwe -> val response = cwe.putRule(request) println("Successfully created CloudWatch events ${roleArnVal}rule with ARN ${response.ruleArn}") } diff --git a/kotlin/services/codepipeline/build.gradle.kts b/kotlin/services/codepipeline/build.gradle.kts index f21e509d4ee..732923990e7 100644 --- a/kotlin/services/codepipeline/build.gradle.kts +++ b/kotlin/services/codepipeline/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.0.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:codepipeline") implementation("aws.sdk.kotlin:secretsmanager") implementation("aws.smithy.kotlin:http-client-engine-okhttp") diff --git a/kotlin/services/codepipeline/src/main/kotlin/com/kotlin/pipeline/CreatePipeline.kt b/kotlin/services/codepipeline/src/main/kotlin/com/kotlin/pipeline/CreatePipeline.kt index f3c7306c4f9..7c2fba607f1 100644 --- a/kotlin/services/codepipeline/src/main/kotlin/com/kotlin/pipeline/CreatePipeline.kt +++ b/kotlin/services/codepipeline/src/main/kotlin/com/kotlin/pipeline/CreatePipeline.kt @@ -143,7 +143,7 @@ suspend fun createNewPipeline( pipeline = pipelineDeclaration } - CodePipelineClient { region = "us-east-1" }.use { pipelineClient -> + CodePipelineClient.fromEnvironment { region = "us-east-1" }.use { pipelineClient -> val response = pipelineClient.createPipeline(request) println("Pipeline ${response.pipeline?.name} was successfully created") } diff --git a/kotlin/services/codepipeline/src/main/kotlin/com/kotlin/pipeline/DeletePipeline.kt b/kotlin/services/codepipeline/src/main/kotlin/com/kotlin/pipeline/DeletePipeline.kt index 6605afe94d1..e715d406e90 100644 --- a/kotlin/services/codepipeline/src/main/kotlin/com/kotlin/pipeline/DeletePipeline.kt +++ b/kotlin/services/codepipeline/src/main/kotlin/com/kotlin/pipeline/DeletePipeline.kt @@ -31,7 +31,7 @@ suspend fun deleteSpecificPipeline(nameVal: String) { DeletePipelineRequest { name = nameVal } - CodePipelineClient { region = "us-east-1" }.use { pipelineClient -> + CodePipelineClient.fromEnvironment { region = "us-east-1" }.use { pipelineClient -> pipelineClient.deletePipeline(request) println("$nameVal was successfully deleted") } diff --git a/kotlin/services/codepipeline/src/main/kotlin/com/kotlin/pipeline/GetPipeline.kt b/kotlin/services/codepipeline/src/main/kotlin/com/kotlin/pipeline/GetPipeline.kt index c996a72b4f4..814f358fcf9 100644 --- a/kotlin/services/codepipeline/src/main/kotlin/com/kotlin/pipeline/GetPipeline.kt +++ b/kotlin/services/codepipeline/src/main/kotlin/com/kotlin/pipeline/GetPipeline.kt @@ -41,7 +41,7 @@ suspend fun getSpecificPipeline(nameVal: String?) { name = nameVal version = 1 } - CodePipelineClient { region = "us-east-1" }.use { pipelineClient -> + CodePipelineClient.fromEnvironment { region = "us-east-1" }.use { pipelineClient -> val response = pipelineClient.getPipeline(request) response.pipeline?.stages?.forEach { stage -> println("Stage name is " + stage.name.toString() + " and actions are:") diff --git a/kotlin/services/codepipeline/src/main/kotlin/com/kotlin/pipeline/ListPipelineExecutions.kt b/kotlin/services/codepipeline/src/main/kotlin/com/kotlin/pipeline/ListPipelineExecutions.kt index bdd4c6c8f7e..6066eefd4c7 100644 --- a/kotlin/services/codepipeline/src/main/kotlin/com/kotlin/pipeline/ListPipelineExecutions.kt +++ b/kotlin/services/codepipeline/src/main/kotlin/com/kotlin/pipeline/ListPipelineExecutions.kt @@ -34,7 +34,7 @@ suspend fun listExecutions(name: String?) { pipelineName = name } - CodePipelineClient { region = "us-east-1" }.use { pipelineClient -> + CodePipelineClient.fromEnvironment { region = "us-east-1" }.use { pipelineClient -> val response = pipelineClient.listPipelineExecutions(request) response.pipelineExecutionSummaries?.forEach { exe -> println("The pipeline execution id is ${exe.pipelineExecutionId}") diff --git a/kotlin/services/codepipeline/src/main/kotlin/com/kotlin/pipeline/ListPipelines.kt b/kotlin/services/codepipeline/src/main/kotlin/com/kotlin/pipeline/ListPipelines.kt index c87dda40bd3..263bf7501a3 100644 --- a/kotlin/services/codepipeline/src/main/kotlin/com/kotlin/pipeline/ListPipelines.kt +++ b/kotlin/services/codepipeline/src/main/kotlin/com/kotlin/pipeline/ListPipelines.kt @@ -22,7 +22,7 @@ suspend fun main() { // snippet-start:[pipeline.kotlin.list_pipelines.main] suspend fun getAllPipelines() { - CodePipelineClient { region = "us-east-1" }.use { pipelineClient -> + CodePipelineClient.fromEnvironment { region = "us-east-1" }.use { pipelineClient -> val response = pipelineClient.listPipelines(ListPipelinesRequest {}) response.pipelines?.forEach { pipeline -> println("The name of the pipeline is ${pipeline.name}") diff --git a/kotlin/services/codepipeline/src/main/kotlin/com/kotlin/pipeline/StartPipelineExecution.kt b/kotlin/services/codepipeline/src/main/kotlin/com/kotlin/pipeline/StartPipelineExecution.kt index f5f442d9d2b..a5203af7b0a 100644 --- a/kotlin/services/codepipeline/src/main/kotlin/com/kotlin/pipeline/StartPipelineExecution.kt +++ b/kotlin/services/codepipeline/src/main/kotlin/com/kotlin/pipeline/StartPipelineExecution.kt @@ -40,7 +40,7 @@ suspend fun executePipeline(nameVal: String) { StartPipelineExecutionRequest { name = nameVal } - CodePipelineClient { region = "us-east-1" }.use { pipelineClient -> + CodePipelineClient.fromEnvironment { region = "us-east-1" }.use { pipelineClient -> val response = pipelineClient.startPipelineExecution(request) println("Piepline ${response.pipelineExecutionId} was successfully executed") } From 5557e4d9c14617f6d86fb10e2453948d3d9b314b Mon Sep 17 00:00:00 2001 From: Macdonald Date: Mon, 7 Jul 2025 12:06:15 -0400 Subject: [PATCH 02/27] updated the Kotlin SDK build --- .../main/kotlin/com/kotlin/cloudwatch/CloudWatchScenario.kt | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/kotlin/services/cloudwatch/src/main/kotlin/com/kotlin/cloudwatch/CloudWatchScenario.kt b/kotlin/services/cloudwatch/src/main/kotlin/com/kotlin/cloudwatch/CloudWatchScenario.kt index cb2a3565431..ec8bdd21048 100644 --- a/kotlin/services/cloudwatch/src/main/kotlin/com/kotlin/cloudwatch/CloudWatchScenario.kt +++ b/kotlin/services/cloudwatch/src/main/kotlin/com/kotlin/cloudwatch/CloudWatchScenario.kt @@ -3,7 +3,6 @@ package com.kotlin.cloudwatch -import aws.sdk.kotlin.runtime.auth.credentials.EnvironmentCredentialsProvider import aws.sdk.kotlin.services.cloudwatch.CloudWatchClient import aws.sdk.kotlin.services.cloudwatch.model.AlarmType import aws.sdk.kotlin.services.cloudwatch.model.ComparisonOperator @@ -434,8 +433,7 @@ suspend fun getAlarmHistory( historyItemType = HistoryItemType.Action } - CloudWatchClient.fromEnvironment {region = "us-east-1" - }.use { cwClient -> + CloudWatchClient.fromEnvironment { region = "us-east-1" }.use { cwClient -> val response = cwClient.describeAlarmHistory(historyRequest) val historyItems = response.alarmHistoryItems if (historyItems != null) { From a36460c37b1d7327de1cf9ee390c87773876b66d Mon Sep 17 00:00:00 2001 From: Macdonald Date: Mon, 7 Jul 2025 12:19:32 -0400 Subject: [PATCH 03/27] updated a Readme --- kotlin/services/cloudwatch/README.md | 32 ++++++++++++++-------------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/kotlin/services/cloudwatch/README.md b/kotlin/services/cloudwatch/README.md index 7bdcab5d33f..b2da2007655 100644 --- a/kotlin/services/cloudwatch/README.md +++ b/kotlin/services/cloudwatch/README.md @@ -50,24 +50,24 @@ Code examples that show you how to perform the essential operations within a ser Code excerpts that show you how to call individual service functions. -- [DeleteAlarms](src/main/kotlin/com/kotlin/cloudwatch/CloudWatchScenario.kt#L299) -- [DeleteAnomalyDetector](src/main/kotlin/com/kotlin/cloudwatch/CloudWatchScenario.kt#L272) -- [DeleteDashboards](src/main/kotlin/com/kotlin/cloudwatch/CloudWatchScenario.kt#L313) -- [DescribeAlarmHistory](src/main/kotlin/com/kotlin/cloudwatch/CloudWatchScenario.kt#L413) -- [DescribeAlarms](src/main/kotlin/com/kotlin/cloudwatch/CloudWatchScenario.kt#L602) -- [DescribeAlarmsForMetric](src/main/kotlin/com/kotlin/cloudwatch/CloudWatchScenario.kt#L457) -- [DescribeAnomalyDetectors](src/main/kotlin/com/kotlin/cloudwatch/CloudWatchScenario.kt#L362) +- [DeleteAlarms](src/main/kotlin/com/kotlin/cloudwatch/CloudWatchScenario.kt#L298) +- [DeleteAnomalyDetector](src/main/kotlin/com/kotlin/cloudwatch/CloudWatchScenario.kt#L271) +- [DeleteDashboards](src/main/kotlin/com/kotlin/cloudwatch/CloudWatchScenario.kt#L312) +- [DescribeAlarmHistory](src/main/kotlin/com/kotlin/cloudwatch/CloudWatchScenario.kt#L412) +- [DescribeAlarms](src/main/kotlin/com/kotlin/cloudwatch/CloudWatchScenario.kt#L598) +- [DescribeAlarmsForMetric](src/main/kotlin/com/kotlin/cloudwatch/CloudWatchScenario.kt#L453) +- [DescribeAnomalyDetectors](src/main/kotlin/com/kotlin/cloudwatch/CloudWatchScenario.kt#L361) - [DisableAlarmActions](src/main/kotlin/com/kotlin/cloudwatch/DisableAlarmActions.kt#L39) - [EnableAlarmActions](src/main/kotlin/com/kotlin/cloudwatch/EnableAlarmActions.kt#L38) -- [GetMetricData](src/main/kotlin/com/kotlin/cloudwatch/CloudWatchScenario.kt#L539) -- [GetMetricStatistics](src/main/kotlin/com/kotlin/cloudwatch/CloudWatchScenario.kt#L801) -- [GetMetricWidgetImage](src/main/kotlin/com/kotlin/cloudwatch/CloudWatchScenario.kt#L326) -- [ListDashboards](src/main/kotlin/com/kotlin/cloudwatch/CloudWatchScenario.kt#L714) -- [ListMetrics](src/main/kotlin/com/kotlin/cloudwatch/CloudWatchScenario.kt#L842) -- [PutAnomalyDetector](src/main/kotlin/com/kotlin/cloudwatch/CloudWatchScenario.kt#L386) -- [PutDashboard](src/main/kotlin/com/kotlin/cloudwatch/CloudWatchScenario.kt#L728) +- [GetMetricData](src/main/kotlin/com/kotlin/cloudwatch/CloudWatchScenario.kt#L535) +- [GetMetricStatistics](src/main/kotlin/com/kotlin/cloudwatch/CloudWatchScenario.kt#L797) +- [GetMetricWidgetImage](src/main/kotlin/com/kotlin/cloudwatch/CloudWatchScenario.kt#L325) +- [ListDashboards](src/main/kotlin/com/kotlin/cloudwatch/CloudWatchScenario.kt#L710) +- [ListMetrics](src/main/kotlin/com/kotlin/cloudwatch/CloudWatchScenario.kt#L838) +- [PutAnomalyDetector](src/main/kotlin/com/kotlin/cloudwatch/CloudWatchScenario.kt#L385) +- [PutDashboard](src/main/kotlin/com/kotlin/cloudwatch/CloudWatchScenario.kt#L724) - [PutMetricAlarm](src/main/kotlin/com/kotlin/cloudwatch/PutMetricAlarm.kt#L44) -- [PutMetricData](src/main/kotlin/com/kotlin/cloudwatch/CloudWatchScenario.kt#L491) +- [PutMetricData](src/main/kotlin/com/kotlin/cloudwatch/CloudWatchScenario.kt#L487) @@ -160,4 +160,4 @@ You can run the JUnit tests from an IDE, such as IntelliJ, or from the command l Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. -SPDX-License-Identifier: Apache-2.0 \ No newline at end of file +SPDX-License-Identifier: Apache-2.0 From a88afcde1b1f2223113da202c2fddabe961fc5bb Mon Sep 17 00:00:00 2001 From: Macdonald Date: Mon, 7 Jul 2025 12:28:31 -0400 Subject: [PATCH 04/27] updated build number --- kotlin/services/cognito/build.gradle.kts | 4 ++-- .../main/kotlin/com/kotlin/cognito/CognitoMVP.kt | 16 ++++++++-------- .../com/kotlin/cognito/CreateIdentityPool.kt | 2 +- .../main/kotlin/com/kotlin/cognito/CreateUser.kt | 2 +- .../kotlin/com/kotlin/cognito/CreateUserPool.kt | 2 +- .../com/kotlin/cognito/DeleteIdentityPool.kt | 3 +-- .../kotlin/com/kotlin/cognito/DeleteUserPool.kt | 2 +- .../com/kotlin/cognito/DescribeUserPool.kt | 2 +- .../kotlin/com/kotlin/cognito/ListIdentities.kt | 2 +- .../com/kotlin/cognito/ListIdentityPools.kt | 2 +- .../com/kotlin/cognito/ListUserPoolClients.kt | 2 +- .../kotlin/com/kotlin/cognito/ListUserPools.kt | 2 +- .../main/kotlin/com/kotlin/cognito/ListUsers.kt | 2 +- .../main/kotlin/com/kotlin/cognito/SignUpUser.kt | 2 +- 14 files changed, 22 insertions(+), 23 deletions(-) diff --git a/kotlin/services/cognito/build.gradle.kts b/kotlin/services/cognito/build.gradle.kts index 61d0a1c133e..0616149519d 100644 --- a/kotlin/services/cognito/build.gradle.kts +++ b/kotlin/services/cognito/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.0.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:cognitoidentityprovider") implementation("aws.sdk.kotlin:cognitoidentity") implementation("aws.sdk.kotlin:secretsmanager") diff --git a/kotlin/services/cognito/src/main/kotlin/com/kotlin/cognito/CognitoMVP.kt b/kotlin/services/cognito/src/main/kotlin/com/kotlin/cognito/CognitoMVP.kt index d5cabaf98cb..d2920048597 100644 --- a/kotlin/services/cognito/src/main/kotlin/com/kotlin/cognito/CognitoMVP.kt +++ b/kotlin/services/cognito/src/main/kotlin/com/kotlin/cognito/CognitoMVP.kt @@ -127,7 +127,7 @@ suspend fun checkAuthMethod( authFlow = AuthFlowType.AdminUserPasswordAuth } - CognitoIdentityProviderClient { region = "us-east-1" }.use { identityProviderClient -> + CognitoIdentityProviderClient.fromEnvironment { region = "us-east-1" }.use { identityProviderClient -> val response = identityProviderClient.adminInitiateAuth(authRequest) println("Result Challenge is ${response.challengeName}") return response @@ -146,7 +146,7 @@ suspend fun resendConfirmationCode( username = userNameVal } - CognitoIdentityProviderClient { region = "us-east-1" }.use { identityProviderClient -> + CognitoIdentityProviderClient.fromEnvironment { region = "us-east-1" }.use { identityProviderClient -> val response = identityProviderClient.resendConfirmationCode(codeRequest) println("Method of delivery is " + (response.codeDeliveryDetails?.deliveryMedium)) } @@ -174,7 +174,7 @@ suspend fun adminRespondToAuthChallenge( session = sessionVal } - CognitoIdentityProviderClient { region = "us-east-1" }.use { identityProviderClient -> + CognitoIdentityProviderClient.fromEnvironment { region = "us-east-1" }.use { identityProviderClient -> val respondToAuthChallengeResult = identityProviderClient.adminRespondToAuthChallenge(adminRespondToAuthChallengeRequest) println("respondToAuthChallengeResult.getAuthenticationResult() ${respondToAuthChallengeResult.authenticationResult}") } @@ -193,7 +193,7 @@ suspend fun verifyTOTP( session = sessionVal } - CognitoIdentityProviderClient { region = "us-east-1" }.use { identityProviderClient -> + CognitoIdentityProviderClient.fromEnvironment { region = "us-east-1" }.use { identityProviderClient -> val verifyResponse = identityProviderClient.verifySoftwareToken(tokenRequest) println("The status of the token is ${verifyResponse.status}") } @@ -207,7 +207,7 @@ suspend fun getSecretForAppMFA(sessionVal: String?): String? { session = sessionVal } - CognitoIdentityProviderClient { region = "us-east-1" }.use { identityProviderClient -> + CognitoIdentityProviderClient.fromEnvironment { region = "us-east-1" }.use { identityProviderClient -> val tokenResponse = identityProviderClient.associateSoftwareToken(softwareTokenRequest) val secretCode = tokenResponse.secretCode println("Enter this token into Google Authenticator") @@ -230,7 +230,7 @@ suspend fun confirmSignUp( username = userNameVal } - CognitoIdentityProviderClient { region = "us-east-1" }.use { identityProviderClient -> + CognitoIdentityProviderClient.fromEnvironment { region = "us-east-1" }.use { identityProviderClient -> identityProviderClient.confirmSignUp(signUpRequest) println("$userNameVal was confirmed") } @@ -248,7 +248,7 @@ suspend fun getAdminUser( userPoolId = poolIdVal } - CognitoIdentityProviderClient { region = "us-east-1" }.use { identityProviderClient -> + CognitoIdentityProviderClient.fromEnvironment { region = "us-east-1" }.use { identityProviderClient -> val response = identityProviderClient.adminGetUser(userRequest) println("User status ${response.userStatus}") } @@ -278,7 +278,7 @@ suspend fun signUp( password = passwordVal } - CognitoIdentityProviderClient { region = "us-east-1" }.use { identityProviderClient -> + CognitoIdentityProviderClient.fromEnvironment { region = "us-east-1" }.use { identityProviderClient -> identityProviderClient.signUp(signUpRequest) println("User has been signed up") } diff --git a/kotlin/services/cognito/src/main/kotlin/com/kotlin/cognito/CreateIdentityPool.kt b/kotlin/services/cognito/src/main/kotlin/com/kotlin/cognito/CreateIdentityPool.kt index de6fbd8bfd2..7ee94d889fb 100644 --- a/kotlin/services/cognito/src/main/kotlin/com/kotlin/cognito/CreateIdentityPool.kt +++ b/kotlin/services/cognito/src/main/kotlin/com/kotlin/cognito/CreateIdentityPool.kt @@ -43,7 +43,7 @@ suspend fun createIdPool(identityPoolName: String?): String? { this.identityPoolName = identityPoolName } - CognitoIdentityClient { region = "us-east-1" }.use { cognitoIdentityClient -> + CognitoIdentityClient.fromEnvironment { region = "us-east-1" }.use { cognitoIdentityClient -> val response = cognitoIdentityClient.createIdentityPool(request) return response.identityPoolId diff --git a/kotlin/services/cognito/src/main/kotlin/com/kotlin/cognito/CreateUser.kt b/kotlin/services/cognito/src/main/kotlin/com/kotlin/cognito/CreateUser.kt index 53c0c6eea7c..199d3c0e26c 100644 --- a/kotlin/services/cognito/src/main/kotlin/com/kotlin/cognito/CreateUser.kt +++ b/kotlin/services/cognito/src/main/kotlin/com/kotlin/cognito/CreateUser.kt @@ -62,7 +62,7 @@ suspend fun createNewUser( userAttributes = listOf(attType) } - CognitoIdentityProviderClient { region = "us-east-1" }.use { cognitoClient -> + CognitoIdentityProviderClient.fromEnvironment { region = "us-east-1" }.use { cognitoClient -> val response = cognitoClient.adminCreateUser(request) println("User ${response.user?.username} is created. Status is ${response.user?.userStatus}") } diff --git a/kotlin/services/cognito/src/main/kotlin/com/kotlin/cognito/CreateUserPool.kt b/kotlin/services/cognito/src/main/kotlin/com/kotlin/cognito/CreateUserPool.kt index 53e26230c64..ca52e799419 100644 --- a/kotlin/services/cognito/src/main/kotlin/com/kotlin/cognito/CreateUserPool.kt +++ b/kotlin/services/cognito/src/main/kotlin/com/kotlin/cognito/CreateUserPool.kt @@ -42,7 +42,7 @@ suspend fun createPool(userPoolName: String): String? { this.poolName = userPoolName } - CognitoIdentityProviderClient { region = "us-east-1" }.use { cognitoClient -> + CognitoIdentityProviderClient.fromEnvironment { region = "us-east-1" }.use { cognitoClient -> val createUserPoolResponse = cognitoClient.createUserPool(request) return createUserPoolResponse.userPool?.id } diff --git a/kotlin/services/cognito/src/main/kotlin/com/kotlin/cognito/DeleteIdentityPool.kt b/kotlin/services/cognito/src/main/kotlin/com/kotlin/cognito/DeleteIdentityPool.kt index e2e12c598e0..2386fe0e7d1 100644 --- a/kotlin/services/cognito/src/main/kotlin/com/kotlin/cognito/DeleteIdentityPool.kt +++ b/kotlin/services/cognito/src/main/kotlin/com/kotlin/cognito/DeleteIdentityPool.kt @@ -41,8 +41,7 @@ suspend fun deleteIdPool(identityPoold: String?) { this.identityPoolId = identityPoold } - CognitoIdentityClient { region = "us-east-1" }.use { cognitoIdclient -> - + CognitoIdentityClient.fromEnvironment { region = "us-east-1" }.use { cognitoIdclient -> cognitoIdclient.deleteIdentityPool(request) println("The identity pool was successfully deleted") } diff --git a/kotlin/services/cognito/src/main/kotlin/com/kotlin/cognito/DeleteUserPool.kt b/kotlin/services/cognito/src/main/kotlin/com/kotlin/cognito/DeleteUserPool.kt index 42f8826f452..119f1450553 100644 --- a/kotlin/services/cognito/src/main/kotlin/com/kotlin/cognito/DeleteUserPool.kt +++ b/kotlin/services/cognito/src/main/kotlin/com/kotlin/cognito/DeleteUserPool.kt @@ -40,7 +40,7 @@ suspend fun delPool(userPoolId: String) { this.userPoolId = userPoolId } - CognitoIdentityProviderClient { region = "us-east-1" }.use { cognitoClient -> + CognitoIdentityProviderClient.fromEnvironment { region = "us-east-1" }.use { cognitoClient -> cognitoClient.deleteUserPool(request) print("$userPoolId was successfully deleted") } diff --git a/kotlin/services/cognito/src/main/kotlin/com/kotlin/cognito/DescribeUserPool.kt b/kotlin/services/cognito/src/main/kotlin/com/kotlin/cognito/DescribeUserPool.kt index 2eb3d01c6a7..61af9fa7b29 100644 --- a/kotlin/services/cognito/src/main/kotlin/com/kotlin/cognito/DescribeUserPool.kt +++ b/kotlin/services/cognito/src/main/kotlin/com/kotlin/cognito/DescribeUserPool.kt @@ -41,7 +41,7 @@ suspend fun describePool(userPoolId: String) { this.userPoolId = userPoolId } - CognitoIdentityProviderClient { region = "us-east-1" }.use { cognitoClient -> + CognitoIdentityProviderClient.fromEnvironment { region = "us-east-1" }.use { cognitoClient -> val response = cognitoClient.describeUserPool(request) val poolARN = response.userPool?.arn println("The user pool ARN is $poolARN") diff --git a/kotlin/services/cognito/src/main/kotlin/com/kotlin/cognito/ListIdentities.kt b/kotlin/services/cognito/src/main/kotlin/com/kotlin/cognito/ListIdentities.kt index c1343aba012..700e6f5b76a 100644 --- a/kotlin/services/cognito/src/main/kotlin/com/kotlin/cognito/ListIdentities.kt +++ b/kotlin/services/cognito/src/main/kotlin/com/kotlin/cognito/ListIdentities.kt @@ -43,7 +43,7 @@ suspend fun listPoolIdentities(identityPoolId: String?) { maxResults = 15 } - CognitoIdentityClient { region = "us-east-1" }.use { cognitoIdentityClient -> + CognitoIdentityClient.fromEnvironment { region = "us-east-1" }.use { cognitoIdentityClient -> val response = cognitoIdentityClient.listIdentities(request) response.identities?.forEach { identity -> println("The identity Id value is ${identity.identityId}") diff --git a/kotlin/services/cognito/src/main/kotlin/com/kotlin/cognito/ListIdentityPools.kt b/kotlin/services/cognito/src/main/kotlin/com/kotlin/cognito/ListIdentityPools.kt index ceb58f9a642..b0eb509633b 100644 --- a/kotlin/services/cognito/src/main/kotlin/com/kotlin/cognito/ListIdentityPools.kt +++ b/kotlin/services/cognito/src/main/kotlin/com/kotlin/cognito/ListIdentityPools.kt @@ -27,7 +27,7 @@ suspend fun getPools() { maxResults = 10 } - CognitoIdentityClient { region = "us-east-1" }.use { cognitoIdentityClient -> + CognitoIdentityClient.fromEnvironment { region = "us-east-1" }.use { cognitoIdentityClient -> val response = cognitoIdentityClient.listIdentityPools(request) response.identityPools?.forEach { pool -> println("The identity pool name is ${pool.identityPoolName}") diff --git a/kotlin/services/cognito/src/main/kotlin/com/kotlin/cognito/ListUserPoolClients.kt b/kotlin/services/cognito/src/main/kotlin/com/kotlin/cognito/ListUserPoolClients.kt index bf030913585..4b57632f8d8 100644 --- a/kotlin/services/cognito/src/main/kotlin/com/kotlin/cognito/ListUserPoolClients.kt +++ b/kotlin/services/cognito/src/main/kotlin/com/kotlin/cognito/ListUserPoolClients.kt @@ -41,7 +41,7 @@ suspend fun listAllUserPoolClients(userPoolId: String) { this.userPoolId = userPoolId } - CognitoIdentityProviderClient { region = "us-east-1" }.use { cognitoClient -> + CognitoIdentityProviderClient.fromEnvironment { region = "us-east-1" }.use { cognitoClient -> val response = cognitoClient.listUserPoolClients(request) response.userPoolClients?.forEach { pool -> println("Client ID is ${pool.clientId}") diff --git a/kotlin/services/cognito/src/main/kotlin/com/kotlin/cognito/ListUserPools.kt b/kotlin/services/cognito/src/main/kotlin/com/kotlin/cognito/ListUserPools.kt index 9495871f8c2..a39a781278c 100644 --- a/kotlin/services/cognito/src/main/kotlin/com/kotlin/cognito/ListUserPools.kt +++ b/kotlin/services/cognito/src/main/kotlin/com/kotlin/cognito/ListUserPools.kt @@ -26,7 +26,7 @@ suspend fun getAllPools() { maxResults = 10 } - CognitoIdentityProviderClient { region = "us-east-1" }.use { cognitoClient -> + CognitoIdentityProviderClient.fromEnvironment { region = "us-east-1" }.use { cognitoClient -> val response = cognitoClient.listUserPools(request) response.userPools?.forEach { pool -> println("The user pool name is ${pool.name}") diff --git a/kotlin/services/cognito/src/main/kotlin/com/kotlin/cognito/ListUsers.kt b/kotlin/services/cognito/src/main/kotlin/com/kotlin/cognito/ListUsers.kt index 98d1af7b334..0e6cd8ab3e0 100644 --- a/kotlin/services/cognito/src/main/kotlin/com/kotlin/cognito/ListUsers.kt +++ b/kotlin/services/cognito/src/main/kotlin/com/kotlin/cognito/ListUsers.kt @@ -40,7 +40,7 @@ suspend fun listAllUsers(userPoolId: String) { this.userPoolId = userPoolId } - CognitoIdentityProviderClient { region = "us-east-1" }.use { cognitoClient -> + CognitoIdentityProviderClient.fromEnvironment { region = "us-east-1" }.use { cognitoClient -> val response = cognitoClient.listUsers(request) response.users?.forEach { user -> println("The user name is ${user.username}") diff --git a/kotlin/services/cognito/src/main/kotlin/com/kotlin/cognito/SignUpUser.kt b/kotlin/services/cognito/src/main/kotlin/com/kotlin/cognito/SignUpUser.kt index 7c6e88a1dc9..8d93177137d 100644 --- a/kotlin/services/cognito/src/main/kotlin/com/kotlin/cognito/SignUpUser.kt +++ b/kotlin/services/cognito/src/main/kotlin/com/kotlin/cognito/SignUpUser.kt @@ -74,7 +74,7 @@ suspend fun signUp( password = passwordVal secretHash = secretVal } - CognitoIdentityProviderClient { region = "us-east-1" }.use { identityProviderClient -> + CognitoIdentityProviderClient.fromEnvironment { region = "us-east-1" }.use { identityProviderClient -> identityProviderClient.signUp(request) println("User has been signed up") } From b6d829ba056509ed2be7cb47f7d873508a4bc86e Mon Sep 17 00:00:00 2001 From: Macdonald Date: Mon, 7 Jul 2025 13:14:52 -0400 Subject: [PATCH 05/27] updated build number --- kotlin/services/comprehend/build.gradle.kts | 4 ++-- .../kotlin/com/kotlin/comprehend/DetectEntities.kt | 2 +- .../com/kotlin/comprehend/DetectKeyPhrases.kt | 2 +- .../kotlin/com/kotlin/comprehend/DetectLanguage.kt | 2 +- .../kotlin/com/kotlin/comprehend/DetectSentiment.kt | 2 +- .../kotlin/com/kotlin/comprehend/DetectSyntax.kt | 2 +- .../com/kotlin/comprehend/DocumentClassifierDemo.kt | 2 +- kotlin/services/dynamodb/build.gradle.kts | 4 ++-- .../main/kotlin/com/kotlin/dynamodb/CreateTable.kt | 2 +- .../main/kotlin/com/kotlin/dynamodb/DeleteItem.kt | 2 +- .../main/kotlin/com/kotlin/dynamodb/DeleteTable.kt | 2 +- .../kotlin/com/kotlin/dynamodb/DescribeTable.kt | 2 +- .../kotlin/com/kotlin/dynamodb/DynamoDBScanItems.kt | 2 +- .../com/kotlin/dynamodb/DynamoDBScanItemsFilter.kt | 2 +- .../src/main/kotlin/com/kotlin/dynamodb/GetItem.kt | 2 +- .../main/kotlin/com/kotlin/dynamodb/ListTables.kt | 2 +- .../src/main/kotlin/com/kotlin/dynamodb/PutItem.kt | 2 +- .../main/kotlin/com/kotlin/dynamodb/QueryTable.kt | 2 +- .../main/kotlin/com/kotlin/dynamodb/UpdateItem.kt | 2 +- .../kotlin/com/kotlin/dynamodb/scenario/Scenario.kt | 13 ++++++------- .../com/kotlin/dynamodb/scenario/ScenarioPartiQ.kt | 2 +- .../dynamodb/scenario/ScenarioPartiQLBatch.kt | 2 +- 22 files changed, 29 insertions(+), 30 deletions(-) diff --git a/kotlin/services/comprehend/build.gradle.kts b/kotlin/services/comprehend/build.gradle.kts index d625af30796..dcbae4a8f1b 100644 --- a/kotlin/services/comprehend/build.gradle.kts +++ b/kotlin/services/comprehend/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.0.0" application } @@ -29,7 +29,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:comprehend") implementation("aws.sdk.kotlin:secretsmanager") implementation("aws.smithy.kotlin:http-client-engine-okhttp") diff --git a/kotlin/services/comprehend/src/main/kotlin/com/kotlin/comprehend/DetectEntities.kt b/kotlin/services/comprehend/src/main/kotlin/com/kotlin/comprehend/DetectEntities.kt index 61948b5360f..3b4b08da697 100644 --- a/kotlin/services/comprehend/src/main/kotlin/com/kotlin/comprehend/DetectEntities.kt +++ b/kotlin/services/comprehend/src/main/kotlin/com/kotlin/comprehend/DetectEntities.kt @@ -33,7 +33,7 @@ suspend fun detectAllEntities(textVal: String) { text = textVal languageCode = LanguageCode.fromValue("en") } - ComprehendClient { region = "us-east-1" }.use { comClient -> + ComprehendClient.fromEnvironment { region = "us-east-1" }.use { comClient -> val response = comClient.detectEntities(request) response.entities?.forEach { entity -> println("Entity text is ${entity.text}") diff --git a/kotlin/services/comprehend/src/main/kotlin/com/kotlin/comprehend/DetectKeyPhrases.kt b/kotlin/services/comprehend/src/main/kotlin/com/kotlin/comprehend/DetectKeyPhrases.kt index 14b66a9c870..a27637256e1 100644 --- a/kotlin/services/comprehend/src/main/kotlin/com/kotlin/comprehend/DetectKeyPhrases.kt +++ b/kotlin/services/comprehend/src/main/kotlin/com/kotlin/comprehend/DetectKeyPhrases.kt @@ -34,7 +34,7 @@ suspend fun detectAllKeyPhrases(textVal: String) { languageCode = LanguageCode.fromValue("en") } - ComprehendClient { region = "us-east-1" }.use { comClient -> + ComprehendClient.fromEnvironment { region = "us-east-1" }.use { comClient -> val response = comClient.detectKeyPhrases(request) response.keyPhrases?.forEach { phrase -> println("Key phrase text is ${phrase.text}") diff --git a/kotlin/services/comprehend/src/main/kotlin/com/kotlin/comprehend/DetectLanguage.kt b/kotlin/services/comprehend/src/main/kotlin/com/kotlin/comprehend/DetectLanguage.kt index b61102d2f4d..6bfb60631a3 100644 --- a/kotlin/services/comprehend/src/main/kotlin/com/kotlin/comprehend/DetectLanguage.kt +++ b/kotlin/services/comprehend/src/main/kotlin/com/kotlin/comprehend/DetectLanguage.kt @@ -20,7 +20,7 @@ suspend fun detectTheDominantLanguage(textVal: String) { text = textVal } - ComprehendClient { region = "us-east-1" }.use { comClient -> + ComprehendClient.fromEnvironment { region = "us-east-1" }.use { comClient -> val response = comClient.detectDominantLanguage(request) response.languages?.forEach { lang -> println("Language is ${lang.languageCode}") diff --git a/kotlin/services/comprehend/src/main/kotlin/com/kotlin/comprehend/DetectSentiment.kt b/kotlin/services/comprehend/src/main/kotlin/com/kotlin/comprehend/DetectSentiment.kt index 6c68dd9a643..f13705a18f3 100644 --- a/kotlin/services/comprehend/src/main/kotlin/com/kotlin/comprehend/DetectSentiment.kt +++ b/kotlin/services/comprehend/src/main/kotlin/com/kotlin/comprehend/DetectSentiment.kt @@ -33,7 +33,7 @@ suspend fun detectSentiments(textVal: String) { languageCode = LanguageCode.fromValue("en") } - ComprehendClient { region = "us-east-1" }.use { comClient -> + ComprehendClient.fromEnvironment { region = "us-east-1" }.use { comClient -> val resp = comClient.detectSentiment(request) println("The Neutral value is ${resp.sentimentScore?.neutral}") } diff --git a/kotlin/services/comprehend/src/main/kotlin/com/kotlin/comprehend/DetectSyntax.kt b/kotlin/services/comprehend/src/main/kotlin/com/kotlin/comprehend/DetectSyntax.kt index e65542711e7..ebe99c9b9dd 100644 --- a/kotlin/services/comprehend/src/main/kotlin/com/kotlin/comprehend/DetectSyntax.kt +++ b/kotlin/services/comprehend/src/main/kotlin/com/kotlin/comprehend/DetectSyntax.kt @@ -33,7 +33,7 @@ suspend fun detectAllSyntax(textVal: String) { text = textVal languageCode = SyntaxLanguageCode.fromValue("en") } - ComprehendClient { region = "us-east-1" }.use { comClient -> + ComprehendClient.fromEnvironment { region = "us-east-1" }.use { comClient -> val response = comClient.detectSyntax(request) response.syntaxTokens?.forEach { token -> println("Language is ${token.text}") diff --git a/kotlin/services/comprehend/src/main/kotlin/com/kotlin/comprehend/DocumentClassifierDemo.kt b/kotlin/services/comprehend/src/main/kotlin/com/kotlin/comprehend/DocumentClassifierDemo.kt index a164c1be25b..f91c8565f0a 100644 --- a/kotlin/services/comprehend/src/main/kotlin/com/kotlin/comprehend/DocumentClassifierDemo.kt +++ b/kotlin/services/comprehend/src/main/kotlin/com/kotlin/comprehend/DocumentClassifierDemo.kt @@ -60,7 +60,7 @@ suspend fun createDocumentClassifier( inputDataConfig = config } - ComprehendClient { region = "us-east-1" }.use { comClient -> + ComprehendClient.fromEnvironment { region = "us-east-1" }.use { comClient -> val resp = comClient.createDocumentClassifier(request) val documentClassifierArn = resp.documentClassifierArn println("Document Classifier ARN is $documentClassifierArn") diff --git a/kotlin/services/dynamodb/build.gradle.kts b/kotlin/services/dynamodb/build.gradle.kts index e96691e6290..6063579dcee 100644 --- a/kotlin/services/dynamodb/build.gradle.kts +++ b/kotlin/services/dynamodb/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:dynamodb") implementation("aws.sdk.kotlin:secretsmanager") implementation("aws.smithy.kotlin:http-client-engine-okhttp") diff --git a/kotlin/services/dynamodb/src/main/kotlin/com/kotlin/dynamodb/CreateTable.kt b/kotlin/services/dynamodb/src/main/kotlin/com/kotlin/dynamodb/CreateTable.kt index 64396317230..dd3b9f18cca 100644 --- a/kotlin/services/dynamodb/src/main/kotlin/com/kotlin/dynamodb/CreateTable.kt +++ b/kotlin/services/dynamodb/src/main/kotlin/com/kotlin/dynamodb/CreateTable.kt @@ -70,7 +70,7 @@ suspend fun createNewTable( tableName = tableNameVal } - DynamoDbClient { region = "us-east-1" }.use { ddb -> + DynamoDbClient.fromEnvironment { region = "us-east-1" }.use { ddb -> var tableArn: String val response = ddb.createTable(request) ddb.waitUntilTableExists { diff --git a/kotlin/services/dynamodb/src/main/kotlin/com/kotlin/dynamodb/DeleteItem.kt b/kotlin/services/dynamodb/src/main/kotlin/com/kotlin/dynamodb/DeleteItem.kt index 0a19b110a3f..00066980cc3 100644 --- a/kotlin/services/dynamodb/src/main/kotlin/com/kotlin/dynamodb/DeleteItem.kt +++ b/kotlin/services/dynamodb/src/main/kotlin/com/kotlin/dynamodb/DeleteItem.kt @@ -55,7 +55,7 @@ suspend fun deleteDynamoDBItem( key = keyToGet } - DynamoDbClient { region = "us-east-1" }.use { ddb -> + DynamoDbClient.fromEnvironment { region = "us-east-1" }.use { ddb -> ddb.deleteItem(request) println("Item with key matching $keyVal was deleted") } diff --git a/kotlin/services/dynamodb/src/main/kotlin/com/kotlin/dynamodb/DeleteTable.kt b/kotlin/services/dynamodb/src/main/kotlin/com/kotlin/dynamodb/DeleteTable.kt index fa8aa7f8ba0..e3ec6b0cc65 100644 --- a/kotlin/services/dynamodb/src/main/kotlin/com/kotlin/dynamodb/DeleteTable.kt +++ b/kotlin/services/dynamodb/src/main/kotlin/com/kotlin/dynamodb/DeleteTable.kt @@ -42,7 +42,7 @@ suspend fun deleteDynamoDBTable(tableNameVal: String) { tableName = tableNameVal } - DynamoDbClient { region = "us-east-1" }.use { ddb -> + DynamoDbClient.fromEnvironment { region = "us-east-1" }.use { ddb -> ddb.deleteTable(request) println("$tableNameVal was deleted") } diff --git a/kotlin/services/dynamodb/src/main/kotlin/com/kotlin/dynamodb/DescribeTable.kt b/kotlin/services/dynamodb/src/main/kotlin/com/kotlin/dynamodb/DescribeTable.kt index 532d058cc59..a1f22ca3647 100644 --- a/kotlin/services/dynamodb/src/main/kotlin/com/kotlin/dynamodb/DescribeTable.kt +++ b/kotlin/services/dynamodb/src/main/kotlin/com/kotlin/dynamodb/DescribeTable.kt @@ -42,7 +42,7 @@ suspend fun describeDymamoDBTable(tableNameVal: String?) { tableName = tableNameVal } - DynamoDbClient { region = "us-east-1" }.use { ddb -> + DynamoDbClient.fromEnvironment { region = "us-east-1" }.use { ddb -> val tableInfo = ddb.describeTable(request) println("Table name ${tableInfo.table?.tableName}") println("Table Arn: ${tableInfo.table?.tableArn}") diff --git a/kotlin/services/dynamodb/src/main/kotlin/com/kotlin/dynamodb/DynamoDBScanItems.kt b/kotlin/services/dynamodb/src/main/kotlin/com/kotlin/dynamodb/DynamoDBScanItems.kt index 6d2b1711eaa..1fb673d274a 100644 --- a/kotlin/services/dynamodb/src/main/kotlin/com/kotlin/dynamodb/DynamoDBScanItems.kt +++ b/kotlin/services/dynamodb/src/main/kotlin/com/kotlin/dynamodb/DynamoDBScanItems.kt @@ -42,7 +42,7 @@ suspend fun scanItems(tableNameVal: String) { tableName = tableNameVal } - DynamoDbClient { region = "us-east-1" }.use { ddb -> + DynamoDbClient.fromEnvironment { region = "us-east-1" }.use { ddb -> val response = ddb.scan(request) response.items?.forEach { item -> item.keys.forEach { key -> diff --git a/kotlin/services/dynamodb/src/main/kotlin/com/kotlin/dynamodb/DynamoDBScanItemsFilter.kt b/kotlin/services/dynamodb/src/main/kotlin/com/kotlin/dynamodb/DynamoDBScanItemsFilter.kt index 524e39b0a75..6227a0a2b6c 100644 --- a/kotlin/services/dynamodb/src/main/kotlin/com/kotlin/dynamodb/DynamoDBScanItemsFilter.kt +++ b/kotlin/services/dynamodb/src/main/kotlin/com/kotlin/dynamodb/DynamoDBScanItemsFilter.kt @@ -53,7 +53,7 @@ suspend fun scanItemsUsingFilter(tableNameVal: String) { filterExpression = "#archive2 = :val" } - DynamoDbClient { region = "us-east-1" }.use { ddb -> + DynamoDbClient.fromEnvironment { region = "us-east-1" }.use { ddb -> val response = ddb.scan(request) println("#######################################") response.items?.forEach { item -> diff --git a/kotlin/services/dynamodb/src/main/kotlin/com/kotlin/dynamodb/GetItem.kt b/kotlin/services/dynamodb/src/main/kotlin/com/kotlin/dynamodb/GetItem.kt index 9d617d2c233..91b5240549a 100644 --- a/kotlin/services/dynamodb/src/main/kotlin/com/kotlin/dynamodb/GetItem.kt +++ b/kotlin/services/dynamodb/src/main/kotlin/com/kotlin/dynamodb/GetItem.kt @@ -55,7 +55,7 @@ suspend fun getSpecificItem( tableName = tableNameVal } - DynamoDbClient { region = "us-east-1" }.use { ddb -> + DynamoDbClient.fromEnvironment { region = "us-east-1" }.use { ddb -> val returnedItem = ddb.getItem(request) val numbersMap = returnedItem.item numbersMap?.forEach { key1 -> diff --git a/kotlin/services/dynamodb/src/main/kotlin/com/kotlin/dynamodb/ListTables.kt b/kotlin/services/dynamodb/src/main/kotlin/com/kotlin/dynamodb/ListTables.kt index cdad4f3ee13..044478f45f8 100644 --- a/kotlin/services/dynamodb/src/main/kotlin/com/kotlin/dynamodb/ListTables.kt +++ b/kotlin/services/dynamodb/src/main/kotlin/com/kotlin/dynamodb/ListTables.kt @@ -22,7 +22,7 @@ suspend fun main() { // snippet-start:[dynamodb.kotlin.list_tables.main] suspend fun listAllTables() { - DynamoDbClient { region = "us-east-1" }.use { ddb -> + DynamoDbClient.fromEnvironment { region = "us-east-1" }.use { ddb -> val response = ddb.listTables(ListTablesRequest {}) response.tableNames?.forEach { tableName -> println("Table name is $tableName") diff --git a/kotlin/services/dynamodb/src/main/kotlin/com/kotlin/dynamodb/PutItem.kt b/kotlin/services/dynamodb/src/main/kotlin/com/kotlin/dynamodb/PutItem.kt index 454d6a2e7e8..cc5bae08433 100644 --- a/kotlin/services/dynamodb/src/main/kotlin/com/kotlin/dynamodb/PutItem.kt +++ b/kotlin/services/dynamodb/src/main/kotlin/com/kotlin/dynamodb/PutItem.kt @@ -79,7 +79,7 @@ suspend fun putItemInTable( item = itemValues } - DynamoDbClient { region = "us-east-1" }.use { ddb -> + DynamoDbClient.fromEnvironment { region = "us-east-1" }.use { ddb -> ddb.putItem(request) println(" A new item was placed into $tableNameVal.") } diff --git a/kotlin/services/dynamodb/src/main/kotlin/com/kotlin/dynamodb/QueryTable.kt b/kotlin/services/dynamodb/src/main/kotlin/com/kotlin/dynamodb/QueryTable.kt index 6d9c127fcc1..e1d5086447d 100644 --- a/kotlin/services/dynamodb/src/main/kotlin/com/kotlin/dynamodb/QueryTable.kt +++ b/kotlin/services/dynamodb/src/main/kotlin/com/kotlin/dynamodb/QueryTable.kt @@ -66,7 +66,7 @@ suspend fun queryDynTable( this.expressionAttributeValues = attrValues } - DynamoDbClient { region = "us-east-1" }.use { ddb -> + DynamoDbClient.fromEnvironment { region = "us-east-1" }.use { ddb -> val response = ddb.query(request) return response.count } diff --git a/kotlin/services/dynamodb/src/main/kotlin/com/kotlin/dynamodb/UpdateItem.kt b/kotlin/services/dynamodb/src/main/kotlin/com/kotlin/dynamodb/UpdateItem.kt index be649fbb227..88085192b94 100644 --- a/kotlin/services/dynamodb/src/main/kotlin/com/kotlin/dynamodb/UpdateItem.kt +++ b/kotlin/services/dynamodb/src/main/kotlin/com/kotlin/dynamodb/UpdateItem.kt @@ -72,7 +72,7 @@ suspend fun updateTableItem( attributeUpdates = updatedValues } - DynamoDbClient { region = "us-east-1" }.use { ddb -> + DynamoDbClient.fromEnvironment { region = "us-east-1" }.use { ddb -> ddb.updateItem(request) println("Item in $tableNameVal was updated") } diff --git a/kotlin/services/dynamodb/src/main/kotlin/com/kotlin/dynamodb/scenario/Scenario.kt b/kotlin/services/dynamodb/src/main/kotlin/com/kotlin/dynamodb/scenario/Scenario.kt index caf38c1ba05..32e3fdf0fd9 100644 --- a/kotlin/services/dynamodb/src/main/kotlin/com/kotlin/dynamodb/scenario/Scenario.kt +++ b/kotlin/services/dynamodb/src/main/kotlin/com/kotlin/dynamodb/scenario/Scenario.kt @@ -87,8 +87,7 @@ suspend fun createScenarioTable( tableName = tableNameVal } - DynamoDbClient { region = "us-east-1" }.use { ddb -> - + DynamoDbClient.fromEnvironment { region = "us-east-1" }.use { ddb -> val response = ddb.createTable(request) ddb.waitUntilTableExists { // suspend call @@ -144,7 +143,7 @@ suspend fun putMovie( item = itemValues } - DynamoDbClient { region = "us-east-1" }.use { ddb -> + DynamoDbClient.fromEnvironment { region = "us-east-1" }.use { ddb -> ddb.putItem(request) println("Added $title to the Movie table.") } @@ -167,7 +166,7 @@ suspend fun getMovie( tableName = tableNameVal } - DynamoDbClient { region = "us-east-1" }.use { ddb -> + DynamoDbClient.fromEnvironment { region = "us-east-1" }.use { ddb -> val returnedItem = ddb.getItem(request) val numbersMap = returnedItem.item numbersMap?.forEach { key1 -> @@ -184,7 +183,7 @@ suspend fun deletIssuesTable(tableNameVal: String) { tableName = tableNameVal } - DynamoDbClient { region = "us-east-1" }.use { ddb -> + DynamoDbClient.fromEnvironment { region = "us-east-1" }.use { ddb -> ddb.deleteTable(request) println("$tableNameVal was deleted") } @@ -210,7 +209,7 @@ suspend fun queryMovieTable( this.expressionAttributeValues = attrValues } - DynamoDbClient { region = "us-east-1" }.use { ddb -> + DynamoDbClient.fromEnvironment { region = "us-east-1" }.use { ddb -> val response = ddb.query(request) return response.count } @@ -222,7 +221,7 @@ suspend fun scanMovies(tableNameVal: String) { tableName = tableNameVal } - DynamoDbClient { region = "us-east-1" }.use { ddb -> + DynamoDbClient.fromEnvironment { region = "us-east-1" }.use { ddb -> val response = ddb.scan(request) response.items?.forEach { item -> item.keys.forEach { key -> diff --git a/kotlin/services/dynamodb/src/main/kotlin/com/kotlin/dynamodb/scenario/ScenarioPartiQ.kt b/kotlin/services/dynamodb/src/main/kotlin/com/kotlin/dynamodb/scenario/ScenarioPartiQ.kt index 8ac90325d86..48d7d435bed 100644 --- a/kotlin/services/dynamodb/src/main/kotlin/com/kotlin/dynamodb/scenario/ScenarioPartiQ.kt +++ b/kotlin/services/dynamodb/src/main/kotlin/com/kotlin/dynamodb/scenario/ScenarioPartiQ.kt @@ -33,7 +33,7 @@ import java.io.File // snippet-start:[dynamodb.kotlin.scenario.partiql.main] suspend fun main() { - val ddb = DynamoDbClient { region = "us-east-1" } + val ddb = DynamoDbClient.fromEnvironment { region = "us-east-1" } val tableName = "MoviesPartiQ" val fileName = "../../../resources/sample_files/movies.json" println("Creating an Amazon DynamoDB table named MoviesPartiQ with a key named id and a sort key named title.") diff --git a/kotlin/services/dynamodb/src/main/kotlin/com/kotlin/dynamodb/scenario/ScenarioPartiQLBatch.kt b/kotlin/services/dynamodb/src/main/kotlin/com/kotlin/dynamodb/scenario/ScenarioPartiQLBatch.kt index 8ed5c1eef61..ab015fe7d2c 100644 --- a/kotlin/services/dynamodb/src/main/kotlin/com/kotlin/dynamodb/scenario/ScenarioPartiQLBatch.kt +++ b/kotlin/services/dynamodb/src/main/kotlin/com/kotlin/dynamodb/scenario/ScenarioPartiQLBatch.kt @@ -36,7 +36,7 @@ import aws.sdk.kotlin.services.dynamodb.waiters.waitUntilTableExists // snippet-start:[dynamodb.kotlin.scenario.partiql.batch.main] suspend fun main() { - val ddb = DynamoDbClient { region = "us-east-1" } + val ddb = DynamoDbClient.fromEnvironment { region = "us-east-1" } val tableName = "MoviesPartiQBatch" println("Creating an Amazon DynamoDB table named $tableName with a key named id and a sort key named title.") createTablePartiQLBatch(ddb, tableName, "year") From c5182f8a809ef13cc8d873e7e6c021038d83a2c1 Mon Sep 17 00:00:00 2001 From: Macdonald Date: Mon, 7 Jul 2025 13:42:13 -0400 Subject: [PATCH 06/27] updated build number --- kotlin/services/ec2/build.gradle.kts | 4 +-- .../kotlin/com/kotlin/ec2/AllocateAddress.kt | 2 +- .../kotlin/com/kotlin/ec2/CreateInstance.kt | 2 +- .../kotlin/com/kotlin/ec2/CreateKeyPair.kt | 2 +- .../com/kotlin/ec2/CreateSecurityGroup.kt | 2 +- .../kotlin/com/kotlin/ec2/DeleteKeyPair.kt | 2 +- .../com/kotlin/ec2/DeleteSecurityGroup.kt | 2 +- .../kotlin/com/kotlin/ec2/DescribeAccount.kt | 2 +- .../com/kotlin/ec2/DescribeAddresses.kt | 2 +- .../com/kotlin/ec2/DescribeInstanceTags.kt | 2 +- .../com/kotlin/ec2/DescribeInstances.kt | 2 +- .../kotlin/com/kotlin/ec2/DescribeKeyPairs.kt | 2 +- .../com/kotlin/ec2/DescribeRegionsAndZones.kt | 2 +- .../com/kotlin/ec2/DescribeSecurityGroups.kt | 3 +- .../kotlin/com/kotlin/ec2/DescribeVPCs.kt | 2 +- .../main/kotlin/com/kotlin/ec2/EC2Scenario.kt | 36 +++++++++---------- .../com/kotlin/ec2/FindRunningInstances.kt | 2 +- .../com/kotlin/ec2/TerminateInstance.kt | 2 +- 18 files changed, 36 insertions(+), 37 deletions(-) diff --git a/kotlin/services/ec2/build.gradle.kts b/kotlin/services/ec2/build.gradle.kts index 9b7a34b844c..35898cb059c 100644 --- a/kotlin/services/ec2/build.gradle.kts +++ b/kotlin/services/ec2/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 } @@ -28,7 +28,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:ec2") implementation("aws.sdk.kotlin:ssm") implementation("aws.sdk.kotlin:secretsmanager") diff --git a/kotlin/services/ec2/src/main/kotlin/com/kotlin/ec2/AllocateAddress.kt b/kotlin/services/ec2/src/main/kotlin/com/kotlin/ec2/AllocateAddress.kt index e172ab46d05..9721d76aa42 100644 --- a/kotlin/services/ec2/src/main/kotlin/com/kotlin/ec2/AllocateAddress.kt +++ b/kotlin/services/ec2/src/main/kotlin/com/kotlin/ec2/AllocateAddress.kt @@ -45,7 +45,7 @@ suspend fun getAllocateAddress(instanceIdVal: String?): String? { domain = DomainType.Vpc } - Ec2Client { region = "us-west-2" }.use { ec2 -> + Ec2Client.fromEnvironment { region = "us-west-2" }.use { ec2 -> val allocateResponse = ec2.allocateAddress(allocateRequest) val allocationIdVal = allocateResponse.allocationId diff --git a/kotlin/services/ec2/src/main/kotlin/com/kotlin/ec2/CreateInstance.kt b/kotlin/services/ec2/src/main/kotlin/com/kotlin/ec2/CreateInstance.kt index 4e61e5729b5..6b21684ca7a 100644 --- a/kotlin/services/ec2/src/main/kotlin/com/kotlin/ec2/CreateInstance.kt +++ b/kotlin/services/ec2/src/main/kotlin/com/kotlin/ec2/CreateInstance.kt @@ -53,7 +53,7 @@ suspend fun createEC2Instance( minCount = 1 } - Ec2Client { region = "us-west-2" }.use { ec2 -> + Ec2Client.fromEnvironment { region = "us-west-2" }.use { ec2 -> val response = ec2.runInstances(request) val instanceId = response.instances?.get(0)?.instanceId val tag = diff --git a/kotlin/services/ec2/src/main/kotlin/com/kotlin/ec2/CreateKeyPair.kt b/kotlin/services/ec2/src/main/kotlin/com/kotlin/ec2/CreateKeyPair.kt index c1bc846aa5d..7923a87c488 100644 --- a/kotlin/services/ec2/src/main/kotlin/com/kotlin/ec2/CreateKeyPair.kt +++ b/kotlin/services/ec2/src/main/kotlin/com/kotlin/ec2/CreateKeyPair.kt @@ -42,7 +42,7 @@ suspend fun createEC2KeyPair(keyNameVal: String) { keyName = keyNameVal } - Ec2Client { region = "us-west-2" }.use { ec2 -> + Ec2Client.fromEnvironment { region = "us-west-2" }.use { ec2 -> val response = ec2.createKeyPair(request) println("The key ID is ${response.keyPairId}") } diff --git a/kotlin/services/ec2/src/main/kotlin/com/kotlin/ec2/CreateSecurityGroup.kt b/kotlin/services/ec2/src/main/kotlin/com/kotlin/ec2/CreateSecurityGroup.kt index 5693f267a45..2f7c7275f33 100644 --- a/kotlin/services/ec2/src/main/kotlin/com/kotlin/ec2/CreateSecurityGroup.kt +++ b/kotlin/services/ec2/src/main/kotlin/com/kotlin/ec2/CreateSecurityGroup.kt @@ -55,7 +55,7 @@ suspend fun createEC2SecurityGroup( vpcId = vpcIdVal } - Ec2Client { region = "us-west-2" }.use { ec2 -> + Ec2Client.fromEnvironment { region = "us-west-2" }.use { ec2 -> val resp = ec2.createSecurityGroup(request) val ipRange = IpRange { diff --git a/kotlin/services/ec2/src/main/kotlin/com/kotlin/ec2/DeleteKeyPair.kt b/kotlin/services/ec2/src/main/kotlin/com/kotlin/ec2/DeleteKeyPair.kt index 743fd5d0f1d..48d40ca0bbf 100644 --- a/kotlin/services/ec2/src/main/kotlin/com/kotlin/ec2/DeleteKeyPair.kt +++ b/kotlin/services/ec2/src/main/kotlin/com/kotlin/ec2/DeleteKeyPair.kt @@ -42,7 +42,7 @@ suspend fun deleteKeys(keyPair: String?) { keyName = keyPair } - Ec2Client { region = "us-west-2" }.use { ec2 -> + Ec2Client.fromEnvironment { region = "us-west-2" }.use { ec2 -> ec2.deleteKeyPair(request) println("Successfully deleted key pair named $keyPair") } diff --git a/kotlin/services/ec2/src/main/kotlin/com/kotlin/ec2/DeleteSecurityGroup.kt b/kotlin/services/ec2/src/main/kotlin/com/kotlin/ec2/DeleteSecurityGroup.kt index 3632ae4ac21..a79f7be17d0 100644 --- a/kotlin/services/ec2/src/main/kotlin/com/kotlin/ec2/DeleteSecurityGroup.kt +++ b/kotlin/services/ec2/src/main/kotlin/com/kotlin/ec2/DeleteSecurityGroup.kt @@ -41,7 +41,7 @@ suspend fun deleteEC2SecGroup(groupIdVal: String) { groupId = groupIdVal } - Ec2Client { region = "us-west-2" }.use { ec2 -> + Ec2Client.fromEnvironment { region = "us-west-2" }.use { ec2 -> ec2.deleteSecurityGroup(request) println("Successfully deleted Security Group with id $groupIdVal") } diff --git a/kotlin/services/ec2/src/main/kotlin/com/kotlin/ec2/DescribeAccount.kt b/kotlin/services/ec2/src/main/kotlin/com/kotlin/ec2/DescribeAccount.kt index c41bbc50cb3..eca802f62cf 100644 --- a/kotlin/services/ec2/src/main/kotlin/com/kotlin/ec2/DescribeAccount.kt +++ b/kotlin/services/ec2/src/main/kotlin/com/kotlin/ec2/DescribeAccount.kt @@ -21,7 +21,7 @@ suspend fun main() { // snippet-start:[ec2.kotlin.describe_account.main] suspend fun describeEC2Account() { - Ec2Client { region = "us-west-2" }.use { ec2 -> + Ec2Client.fromEnvironment { region = "us-west-2" }.use { ec2 -> val accountResults = ec2.describeAccountAttributes(DescribeAccountAttributesRequest {}) accountResults.accountAttributes?.forEach { attribute -> println("The name of the attribute is ${attribute.attributeName}") diff --git a/kotlin/services/ec2/src/main/kotlin/com/kotlin/ec2/DescribeAddresses.kt b/kotlin/services/ec2/src/main/kotlin/com/kotlin/ec2/DescribeAddresses.kt index 9c65a74a313..a9b49efa493 100644 --- a/kotlin/services/ec2/src/main/kotlin/com/kotlin/ec2/DescribeAddresses.kt +++ b/kotlin/services/ec2/src/main/kotlin/com/kotlin/ec2/DescribeAddresses.kt @@ -22,7 +22,7 @@ suspend fun main() { // snippet-start:[ec2.kotlin.describe_addresses.main] suspend fun describeEC2Address() { - Ec2Client { region = "us-west-2" }.use { ec2 -> + Ec2Client.fromEnvironment { region = "us-west-2" }.use { ec2 -> val response = ec2.describeAddresses(DescribeAddressesRequest {}) response.addresses?.forEach { address -> println( diff --git a/kotlin/services/ec2/src/main/kotlin/com/kotlin/ec2/DescribeInstanceTags.kt b/kotlin/services/ec2/src/main/kotlin/com/kotlin/ec2/DescribeInstanceTags.kt index 481bede38ff..6c57de6ffa4 100644 --- a/kotlin/services/ec2/src/main/kotlin/com/kotlin/ec2/DescribeInstanceTags.kt +++ b/kotlin/services/ec2/src/main/kotlin/com/kotlin/ec2/DescribeInstanceTags.kt @@ -48,7 +48,7 @@ suspend fun describeEC2Tags(resourceIdVal: String) { filters = listOf(filter) } - Ec2Client { region = "us-west-2" }.use { ec2 -> + Ec2Client.fromEnvironment { region = "us-west-2" }.use { ec2 -> val response = ec2.describeTags(request) response.tags?.forEach { tag -> println("Tag key is ${tag.key}") diff --git a/kotlin/services/ec2/src/main/kotlin/com/kotlin/ec2/DescribeInstances.kt b/kotlin/services/ec2/src/main/kotlin/com/kotlin/ec2/DescribeInstances.kt index 9dd57235218..974c4670ee7 100644 --- a/kotlin/services/ec2/src/main/kotlin/com/kotlin/ec2/DescribeInstances.kt +++ b/kotlin/services/ec2/src/main/kotlin/com/kotlin/ec2/DescribeInstances.kt @@ -27,7 +27,7 @@ suspend fun describeEC2Instances() { maxResults = 6 } - Ec2Client { region = "us-west-2" }.use { ec2 -> + Ec2Client.fromEnvironment { region = "us-west-2" }.use { ec2 -> val response = ec2.describeInstances(request) response.reservations?.forEach { reservation -> reservation.instances?.forEach { instance -> diff --git a/kotlin/services/ec2/src/main/kotlin/com/kotlin/ec2/DescribeKeyPairs.kt b/kotlin/services/ec2/src/main/kotlin/com/kotlin/ec2/DescribeKeyPairs.kt index 319a204dd91..4053ab11976 100644 --- a/kotlin/services/ec2/src/main/kotlin/com/kotlin/ec2/DescribeKeyPairs.kt +++ b/kotlin/services/ec2/src/main/kotlin/com/kotlin/ec2/DescribeKeyPairs.kt @@ -22,7 +22,7 @@ suspend fun main() { // snippet-start:[ec2.kotlin.describe_key_pairs.main] suspend fun describeEC2Keys() { - Ec2Client { region = "us-west-2" }.use { ec2 -> + Ec2Client.fromEnvironment { region = "us-west-2" }.use { ec2 -> val response = ec2.describeKeyPairs(DescribeKeyPairsRequest {}) response.keyPairs?.forEach { keyPair -> println("Found key pair with name ${keyPair.keyName} and fingerprint ${ keyPair.keyFingerprint}") diff --git a/kotlin/services/ec2/src/main/kotlin/com/kotlin/ec2/DescribeRegionsAndZones.kt b/kotlin/services/ec2/src/main/kotlin/com/kotlin/ec2/DescribeRegionsAndZones.kt index 95cd85642ad..83de75baa33 100644 --- a/kotlin/services/ec2/src/main/kotlin/com/kotlin/ec2/DescribeRegionsAndZones.kt +++ b/kotlin/services/ec2/src/main/kotlin/com/kotlin/ec2/DescribeRegionsAndZones.kt @@ -23,7 +23,7 @@ suspend fun main() { // snippet-start:[ec2.kotlin.describe_region_and_zones.main] suspend fun describeEC2RegionsAndZones() { - Ec2Client { region = "us-west-2" }.use { ec2 -> + Ec2Client.fromEnvironment { region = "us-west-2" }.use { ec2 -> val regionsResponse = ec2.describeRegions(DescribeRegionsRequest {}) regionsResponse.regions?.forEach { region -> println("Found Region ${region.regionName} with endpoint ${region.endpoint}") diff --git a/kotlin/services/ec2/src/main/kotlin/com/kotlin/ec2/DescribeSecurityGroups.kt b/kotlin/services/ec2/src/main/kotlin/com/kotlin/ec2/DescribeSecurityGroups.kt index 95d356eae11..3df6ff0fa0e 100644 --- a/kotlin/services/ec2/src/main/kotlin/com/kotlin/ec2/DescribeSecurityGroups.kt +++ b/kotlin/services/ec2/src/main/kotlin/com/kotlin/ec2/DescribeSecurityGroups.kt @@ -43,8 +43,7 @@ suspend fun describeEC2SecurityGroups(groupId: String) { groupIds = listOf(groupId) } - Ec2Client { region = "us-west-2" }.use { ec2 -> - + Ec2Client.fromEnvironment { region = "us-west-2" }.use { ec2 -> val response = ec2.describeSecurityGroups(request) response.securityGroups?.forEach { group -> println("Found Security Group with id ${group.groupId}, vpc id ${group.vpcId} and description ${group.description}") diff --git a/kotlin/services/ec2/src/main/kotlin/com/kotlin/ec2/DescribeVPCs.kt b/kotlin/services/ec2/src/main/kotlin/com/kotlin/ec2/DescribeVPCs.kt index 9f1c6d311f4..56f978d9a59 100644 --- a/kotlin/services/ec2/src/main/kotlin/com/kotlin/ec2/DescribeVPCs.kt +++ b/kotlin/services/ec2/src/main/kotlin/com/kotlin/ec2/DescribeVPCs.kt @@ -43,7 +43,7 @@ suspend fun describeEC2Vpcs(vpcId: String) { vpcIds = listOf(vpcId) } - Ec2Client { region = "us-west-2" }.use { ec2 -> + Ec2Client.fromEnvironment { region = "us-west-2" }.use { ec2 -> val response = ec2.describeVpcs(request) response.vpcs?.forEach { vpc -> println("Found VPC with id ${vpc.vpcId} VPC state ${vpc.state} and tenancy ${vpc.instanceTenancy}") diff --git a/kotlin/services/ec2/src/main/kotlin/com/kotlin/ec2/EC2Scenario.kt b/kotlin/services/ec2/src/main/kotlin/com/kotlin/ec2/EC2Scenario.kt index 665ade8d7e6..3f6032aebae 100644 --- a/kotlin/services/ec2/src/main/kotlin/com/kotlin/ec2/EC2Scenario.kt +++ b/kotlin/services/ec2/src/main/kotlin/com/kotlin/ec2/EC2Scenario.kt @@ -226,7 +226,7 @@ suspend fun deleteKeysSc(keyPair: String) { DeleteKeyPairRequest { keyName = keyPair } - Ec2Client { region = "us-west-2" }.use { ec2 -> + Ec2Client.fromEnvironment { region = "us-west-2" }.use { ec2 -> ec2.deleteKeyPair(request) println("Successfully deleted key pair named $keyPair") } @@ -237,7 +237,7 @@ suspend fun deleteEC2SecGroupSc(groupIdVal: String) { DeleteSecurityGroupRequest { groupId = groupIdVal } - Ec2Client { region = "us-west-2" }.use { ec2 -> + Ec2Client.fromEnvironment { region = "us-west-2" }.use { ec2 -> ec2.deleteSecurityGroup(request) println("Successfully deleted security group with Id $groupIdVal") } @@ -249,7 +249,7 @@ suspend fun terminateEC2Sc(instanceIdVal: String) { instanceIds = listOf(instanceIdVal) } println("Wait for the instance to terminate. This will take a few minutes.") - Ec2Client { region = "us-west-2" }.use { ec2 -> + Ec2Client.fromEnvironment { region = "us-west-2" }.use { ec2 -> ec2.terminateInstances(ti) ec2.waitUntilInstanceTerminated { // suspend call @@ -266,7 +266,7 @@ suspend fun releaseEC2AddressSc(allocId: String?) { allocationId = allocId } - Ec2Client { region = "us-west-2" }.use { ec2 -> + Ec2Client.fromEnvironment { region = "us-west-2" }.use { ec2 -> ec2.releaseAddress(request) println("Successfully released Elastic IP address $allocId") } @@ -279,7 +279,7 @@ suspend fun disassociateAddressSc(associationIdVal: String?) { DisassociateAddressRequest { associationId = associationIdVal } - Ec2Client { region = "us-west-2" }.use { ec2 -> + Ec2Client.fromEnvironment { region = "us-west-2" }.use { ec2 -> ec2.disassociateAddress(addressRequest) println("You successfully disassociated the address!") } @@ -297,7 +297,7 @@ suspend fun associateAddressSc( allocationId = allocationIdVal } - Ec2Client { region = "us-west-2" }.use { ec2 -> + Ec2Client.fromEnvironment { region = "us-west-2" }.use { ec2 -> val associateResponse = ec2.associateAddress(associateRequest) return associateResponse.associationId } @@ -309,7 +309,7 @@ suspend fun allocateAddressSc(): String? { AllocateAddressRequest { domain = DomainType.Vpc } - Ec2Client { region = "us-west-2" }.use { ec2 -> + Ec2Client.fromEnvironment { region = "us-west-2" }.use { ec2 -> val allocateResponse = ec2.allocateAddress(allocateRequest) return allocateResponse.allocationId } @@ -322,7 +322,7 @@ suspend fun startInstanceSc(instanceId: String) { instanceIds = listOf(instanceId) } - Ec2Client { region = "us-west-2" }.use { ec2 -> + Ec2Client.fromEnvironment { region = "us-west-2" }.use { ec2 -> ec2.startInstances(request) println("Waiting until instance $instanceId starts. This will take a few minutes.") ec2.waitUntilInstanceRunning { @@ -341,7 +341,7 @@ suspend fun stopInstanceSc(instanceId: String) { instanceIds = listOf(instanceId) } - Ec2Client { region = "us-west-2" }.use { ec2 -> + Ec2Client.fromEnvironment { region = "us-west-2" }.use { ec2 -> ec2.stopInstances(request) println("Waiting until instance $instanceId stops. This will take a few minutes.") ec2.waitUntilInstanceStopped { @@ -362,7 +362,7 @@ suspend fun describeEC2InstancesSc(newInstanceId: String?): String { } while (!isRunning) { - Ec2Client { region = "us-west-2" }.use { ec2 -> + Ec2Client.fromEnvironment { region = "us-west-2" }.use { ec2 -> val response = ec2.describeInstances(request) val state = response.reservations @@ -409,7 +409,7 @@ suspend fun runInstanceSc( imageId = amiIdVal } - Ec2Client { region = "us-west-2" }.use { ec2 -> + Ec2Client.fromEnvironment { region = "us-west-2" }.use { ec2 -> val response = ec2.runInstances(runRequest) val instanceId = response.instances?.get(0)?.instanceId println("Successfully started EC2 Instance $instanceId based on AMI $amiIdVal") @@ -434,7 +434,7 @@ suspend fun getInstanceTypesSc(): String { filters = filterObs maxResults = 10 } - Ec2Client { region = "us-west-2" }.use { ec2 -> + Ec2Client.fromEnvironment { region = "us-west-2" }.use { ec2 -> val response = ec2.describeInstanceTypes(typesRequest) response.instanceTypes?.forEach { type -> println("The memory information of this type is ${type.memoryInfo?.sizeInMib}") @@ -453,7 +453,7 @@ suspend fun describeImageSc(instanceId: String): String? { imageIds = listOf(instanceId) } - Ec2Client { region = "us-west-2" }.use { ec2 -> + Ec2Client.fromEnvironment { region = "us-west-2" }.use { ec2 -> val response = ec2.describeImages(imagesRequest) println("The description of the first image is ${response.images?.get(0)?.description}") println("The name of the first image is ${response.images?.get(0)?.name}") @@ -470,7 +470,7 @@ suspend fun getParaValuesSc(): String? { path = "/aws/service/ami-amazon-linux-latest" } - SsmClient { region = "us-west-2" }.use { ssmClient -> + SsmClient.fromEnvironment { region = "us-west-2" }.use { ssmClient -> val response = ssmClient.getParametersByPath(parameterRequest) response.parameters?.forEach { para -> println("The name of the para is: ${para.name}") @@ -496,7 +496,7 @@ suspend fun describeSecurityGroupsSc(groupId: String) { groupIds = listOf(groupId) } - Ec2Client { region = "us-west-2" }.use { ec2 -> + Ec2Client.fromEnvironment { region = "us-west-2" }.use { ec2 -> val response = ec2.describeSecurityGroups(request) for (group in response.securityGroups!!) { println("Found Security Group with id " + group.groupId.toString() + " and group VPC " + group.vpcId) @@ -518,7 +518,7 @@ suspend fun createEC2SecurityGroupSc( vpcId = vpcIdVal } - Ec2Client { region = "us-west-2" }.use { ec2 -> + Ec2Client.fromEnvironment { region = "us-west-2" }.use { ec2 -> val resp = ec2.createSecurityGroup(request) val ipRange = IpRange { @@ -554,7 +554,7 @@ suspend fun createEC2SecurityGroupSc( // snippet-end:[ec2.kotlin.scenario.inbound.rule.main] suspend fun describeEC2KeysSc() { - Ec2Client { region = "us-west-2" }.use { ec2 -> + Ec2Client.fromEnvironment { region = "us-west-2" }.use { ec2 -> val response = ec2.describeKeyPairs(DescribeKeyPairsRequest {}) response.keyPairs?.forEach { keyPair -> println("Found key pair with name ${keyPair.keyName} and fingerprint ${ keyPair.keyFingerprint}") @@ -571,7 +571,7 @@ suspend fun createKeyPairSc( keyName = keyNameVal } - Ec2Client { region = "us-west-2" }.use { ec2 -> + Ec2Client.fromEnvironment { region = "us-west-2" }.use { ec2 -> val response = ec2.createKeyPair(request) val content = response.keyMaterial if (content != null) { diff --git a/kotlin/services/ec2/src/main/kotlin/com/kotlin/ec2/FindRunningInstances.kt b/kotlin/services/ec2/src/main/kotlin/com/kotlin/ec2/FindRunningInstances.kt index a8a49a9b4b2..7fddbf4c237 100644 --- a/kotlin/services/ec2/src/main/kotlin/com/kotlin/ec2/FindRunningInstances.kt +++ b/kotlin/services/ec2/src/main/kotlin/com/kotlin/ec2/FindRunningInstances.kt @@ -33,7 +33,7 @@ suspend fun findRunningEC2Instances() { filters = listOf(filter) } - Ec2Client { region = "us-west-2" }.use { ec2 -> + Ec2Client.fromEnvironment { region = "us-west-2" }.use { ec2 -> val response = ec2.describeInstances(request) response.reservations?.forEach { reservation -> reservation.instances?.forEach { instance -> diff --git a/kotlin/services/ec2/src/main/kotlin/com/kotlin/ec2/TerminateInstance.kt b/kotlin/services/ec2/src/main/kotlin/com/kotlin/ec2/TerminateInstance.kt index 60b63587a99..1f44b60b525 100644 --- a/kotlin/services/ec2/src/main/kotlin/com/kotlin/ec2/TerminateInstance.kt +++ b/kotlin/services/ec2/src/main/kotlin/com/kotlin/ec2/TerminateInstance.kt @@ -42,7 +42,7 @@ suspend fun terminateEC2(instanceID: String) { instanceIds = listOf(instanceID) } - Ec2Client { region = "us-west-2" }.use { ec2 -> + Ec2Client.fromEnvironment { region = "us-west-2" }.use { ec2 -> val response = ec2.terminateInstances(request) response.terminatingInstances?.forEach { instance -> println("The ID of the terminated instance is ${instance.instanceId}") From cfd703f7a50ca5e4a4b8d5b96252ace333b39631 Mon Sep 17 00:00:00 2001 From: Macdonald Date: Mon, 7 Jul 2025 13:48:24 -0400 Subject: [PATCH 07/27] updated build number --- kotlin/services/ecr/build.gradle.kts | 4 ++-- .../main/kotlin/com/example/ecr/HelloECR.kt | 2 +- .../com/example/ecr/scenario/ECRActions.kt | 22 +++++++++---------- 3 files changed, 14 insertions(+), 14 deletions(-) diff --git a/kotlin/services/ecr/build.gradle.kts b/kotlin/services/ecr/build.gradle.kts index 8f953929622..e3b756a1101 100644 --- a/kotlin/services/ecr/build.gradle.kts +++ b/kotlin/services/ecr/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:ecr") implementation("aws.sdk.kotlin:secretsmanager") implementation("aws.smithy.kotlin:http-client-engine-okhttp") diff --git a/kotlin/services/ecr/src/main/kotlin/com/example/ecr/HelloECR.kt b/kotlin/services/ecr/src/main/kotlin/com/example/ecr/HelloECR.kt index 4a03fb840ea..d3ca60b3859 100644 --- a/kotlin/services/ecr/src/main/kotlin/com/example/ecr/HelloECR.kt +++ b/kotlin/services/ecr/src/main/kotlin/com/example/ecr/HelloECR.kt @@ -32,7 +32,7 @@ suspend fun listImageTags(repoName: String?) { repositoryName = repoName } - EcrClient { region = "us-east-1" }.use { ecrClient -> + EcrClient.fromEnvironment { region = "us-east-1" }.use { ecrClient -> val imageResponse = ecrClient.listImages(listImages) imageResponse.imageIds?.forEach { imageId -> println("Image tag: ${imageId.imageTag}") diff --git a/kotlin/services/ecr/src/main/kotlin/com/example/ecr/scenario/ECRActions.kt b/kotlin/services/ecr/src/main/kotlin/com/example/ecr/scenario/ECRActions.kt index 070406f1b9b..a092c43a100 100644 --- a/kotlin/services/ecr/src/main/kotlin/com/example/ecr/scenario/ECRActions.kt +++ b/kotlin/services/ecr/src/main/kotlin/com/example/ecr/scenario/ECRActions.kt @@ -76,7 +76,7 @@ class ECRActions { } // Execute the request asynchronously. - EcrClient { region = "us-east-1" }.use { ecrClient -> + EcrClient.fromEnvironment { region = "us-east-1" }.use { ecrClient -> val response = ecrClient.startLifecyclePolicyPreview(lifecyclePolicyPreviewRequest) return response.lifecyclePolicyText } @@ -98,7 +98,7 @@ class ECRActions { repositoryNames = listOf(repoName) } - EcrClient { region = "us-east-1" }.use { ecrClient -> + EcrClient.fromEnvironment { region = "us-east-1" }.use { ecrClient -> val describeRepositoriesResponse = ecrClient.describeRepositories(request) if (!describeRepositoriesResponse.repositories?.isEmpty()!!) { return describeRepositoriesResponse?.repositories?.get(0)?.repositoryUri @@ -117,7 +117,7 @@ class ECRActions { * */ suspend fun getAuthToken() { - EcrClient { region = "us-east-1" }.use { ecrClient -> + EcrClient.fromEnvironment { region = "us-east-1" }.use { ecrClient -> // Retrieve the authorization token for ECR. val response = ecrClient.getAuthorizationToken() val authorizationData = response.authorizationData?.get(0) @@ -144,7 +144,7 @@ class ECRActions { GetRepositoryPolicyRequest { repositoryName = repoName } - EcrClient { region = "us-east-1" }.use { ecrClient -> + EcrClient.fromEnvironment { region = "us-east-1" }.use { ecrClient -> val response = ecrClient.getRepositoryPolicy(getRepositoryPolicyRequest) val responseText = response.policyText return responseText @@ -185,7 +185,7 @@ class ECRActions { policyText = policyDocumentTemplate } - EcrClient { region = "us-east-1" }.use { ecrClient -> + EcrClient.fromEnvironment { region = "us-east-1" }.use { ecrClient -> val response = ecrClient.setRepositoryPolicy(setRepositoryPolicyRequest) if (response != null) { println("Repository policy set successfully.") @@ -211,7 +211,7 @@ class ECRActions { } return try { - EcrClient { region = "us-east-1" }.use { ecrClient -> + EcrClient.fromEnvironment { region = "us-east-1" }.use { ecrClient -> val response = ecrClient.createRepository(request) response.repository?.repositoryArn } @@ -231,7 +231,7 @@ class ECRActions { DescribeRepositoriesRequest { repositoryNames = listOf(repoName) } - EcrClient { region = "us-east-1" }.use { ecrClient -> + EcrClient.fromEnvironment { region = "us-east-1" }.use { ecrClient -> val describeResponse = ecrClient.describeRepositories(describeRequest) return describeResponse.repositories?.get(0)?.repositoryArn } @@ -262,7 +262,7 @@ class ECRActions { println("Pushing $imageName to $repoName will take a few seconds") val authConfig = getAuthConfig(repoName) - EcrClient { region = "us-east-1" }.use { ecrClient -> + EcrClient.fromEnvironment { region = "us-east-1" }.use { ecrClient -> val desRequest = DescribeRepositoriesRequest { repositoryNames = listOf(repoName) @@ -321,7 +321,7 @@ class ECRActions { imageIds = listOf(imageId) } - EcrClient { region = "us-east-1" }.use { ecrClient -> + EcrClient.fromEnvironment { region = "us-east-1" }.use { ecrClient -> val describeImagesResponse = ecrClient.describeImages(request) if (describeImagesResponse != null && !describeImagesResponse.imageDetails?.isEmpty()!!) { println("Image is present in the repository.") @@ -350,7 +350,7 @@ class ECRActions { repositoryName = repoName } - EcrClient { region = "us-east-1" }.use { ecrClient -> + EcrClient.fromEnvironment { region = "us-east-1" }.use { ecrClient -> ecrClient.deleteRepository(repositoryRequest) println("You have successfully deleted the $repoName repository") } @@ -359,7 +359,7 @@ class ECRActions { // Return an AuthConfig. private suspend fun getAuthConfig(repoName: String): AuthConfig { - EcrClient { region = "us-east-1" }.use { ecrClient -> + EcrClient.fromEnvironment { region = "us-east-1" }.use { ecrClient -> // Retrieve the authorization token for ECR. val response = ecrClient.getAuthorizationToken() val authorizationData = response.authorizationData?.get(0) From 90fda0c95caf518b08526c1dec4f06cdf95fc334 Mon Sep 17 00:00:00 2001 From: Macdonald Date: Mon, 7 Jul 2025 13:56:06 -0400 Subject: [PATCH 08/27] updated build number --- kotlin/services/ecs/build.gradle.kts | 4 ++-- .../ecs/src/main/kotlin/com/kotlin/ecs/CreateCluster.kt | 2 +- .../ecs/src/main/kotlin/com/kotlin/ecs/CreateService.kt | 2 +- .../ecs/src/main/kotlin/com/kotlin/ecs/DeleteService.kt | 2 +- .../ecs/src/main/kotlin/com/kotlin/ecs/DescribeClusters.kt | 2 +- .../ecs/src/main/kotlin/com/kotlin/ecs/ListClusters.kt | 2 +- .../ecs/src/main/kotlin/com/kotlin/ecs/ListTaskDefinitions.kt | 2 +- .../ecs/src/main/kotlin/com/kotlin/ecs/UpdateService.kt | 2 +- 8 files changed, 9 insertions(+), 9 deletions(-) diff --git a/kotlin/services/ecs/build.gradle.kts b/kotlin/services/ecs/build.gradle.kts index 883da7c1ac5..410da7958de 100644 --- a/kotlin/services/ecs/build.gradle.kts +++ b/kotlin/services/ecs/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:ecs") implementation("aws.sdk.kotlin:secretsmanager") implementation("aws.smithy.kotlin:http-client-engine-okhttp") diff --git a/kotlin/services/ecs/src/main/kotlin/com/kotlin/ecs/CreateCluster.kt b/kotlin/services/ecs/src/main/kotlin/com/kotlin/ecs/CreateCluster.kt index 4e83d410839..c0fd626ab39 100644 --- a/kotlin/services/ecs/src/main/kotlin/com/kotlin/ecs/CreateCluster.kt +++ b/kotlin/services/ecs/src/main/kotlin/com/kotlin/ecs/CreateCluster.kt @@ -58,7 +58,7 @@ suspend fun createGivenCluster(clusterNameVal: String?): String? { configuration = clusterConfiguration } - EcsClient { region = "us-east-1" }.use { ecsClient -> + EcsClient.fromEnvironment { region = "us-east-1" }.use { ecsClient -> val response = ecsClient.createCluster(request) return response.cluster?.clusterArn } diff --git a/kotlin/services/ecs/src/main/kotlin/com/kotlin/ecs/CreateService.kt b/kotlin/services/ecs/src/main/kotlin/com/kotlin/ecs/CreateService.kt index 24c596dcd78..385b79c01ad 100644 --- a/kotlin/services/ecs/src/main/kotlin/com/kotlin/ecs/CreateService.kt +++ b/kotlin/services/ecs/src/main/kotlin/com/kotlin/ecs/CreateService.kt @@ -76,7 +76,7 @@ suspend fun createNewService( taskDefinition = taskDefinitionVal } - EcsClient { region = "us-east-1" }.use { ecsClient -> + EcsClient.fromEnvironment { region = "us-east-1" }.use { ecsClient -> val response = ecsClient.createService(request) return response.service?.serviceArn } diff --git a/kotlin/services/ecs/src/main/kotlin/com/kotlin/ecs/DeleteService.kt b/kotlin/services/ecs/src/main/kotlin/com/kotlin/ecs/DeleteService.kt index 18f7d74f2c1..a16160782c4 100644 --- a/kotlin/services/ecs/src/main/kotlin/com/kotlin/ecs/DeleteService.kt +++ b/kotlin/services/ecs/src/main/kotlin/com/kotlin/ecs/DeleteService.kt @@ -48,7 +48,7 @@ suspend fun deleteSpecificService( service = serviceArn } - EcsClient { region = "us-east-1" }.use { ecsClient -> + EcsClient.fromEnvironment { region = "us-east-1" }.use { ecsClient -> ecsClient.deleteService(request) println("The Service was successfully deleted.") } diff --git a/kotlin/services/ecs/src/main/kotlin/com/kotlin/ecs/DescribeClusters.kt b/kotlin/services/ecs/src/main/kotlin/com/kotlin/ecs/DescribeClusters.kt index 0a5e9d5ae55..e33d6102190 100644 --- a/kotlin/services/ecs/src/main/kotlin/com/kotlin/ecs/DescribeClusters.kt +++ b/kotlin/services/ecs/src/main/kotlin/com/kotlin/ecs/DescribeClusters.kt @@ -43,7 +43,7 @@ suspend fun descCluster(clusterArn: String) { clusters = listOf(clusterArn) } - EcsClient { region = "us-east-1" }.use { ecsClient -> + EcsClient.fromEnvironment { region = "us-east-1" }.use { ecsClient -> val response = ecsClient.describeClusters(request) response.clusters?.forEach { cluster -> println("The cluster name is ${cluster.clusterName}.") diff --git a/kotlin/services/ecs/src/main/kotlin/com/kotlin/ecs/ListClusters.kt b/kotlin/services/ecs/src/main/kotlin/com/kotlin/ecs/ListClusters.kt index e581bf8e48a..87708d37214 100644 --- a/kotlin/services/ecs/src/main/kotlin/com/kotlin/ecs/ListClusters.kt +++ b/kotlin/services/ecs/src/main/kotlin/com/kotlin/ecs/ListClusters.kt @@ -22,7 +22,7 @@ suspend fun main() { // snippet-start:[ecs.kotlin.list_clusters.main] suspend fun listAllClusters() { - EcsClient { region = "us-east-1" }.use { ecsClient -> + EcsClient.fromEnvironment { region = "us-east-1" }.use { ecsClient -> val response = ecsClient.listClusters(ListClustersRequest {}) response.clusterArns?.forEach { cluster -> println("The cluster arn is $cluster.") diff --git a/kotlin/services/ecs/src/main/kotlin/com/kotlin/ecs/ListTaskDefinitions.kt b/kotlin/services/ecs/src/main/kotlin/com/kotlin/ecs/ListTaskDefinitions.kt index 4ab5dd39716..3b4b90920c8 100644 --- a/kotlin/services/ecs/src/main/kotlin/com/kotlin/ecs/ListTaskDefinitions.kt +++ b/kotlin/services/ecs/src/main/kotlin/com/kotlin/ecs/ListTaskDefinitions.kt @@ -49,7 +49,7 @@ suspend fun getAllTasks( tasks = listOf(taskId) } - EcsClient { region = "us-east-1" }.use { ecsClient -> + EcsClient.fromEnvironment { region = "us-east-1" }.use { ecsClient -> val response = ecsClient.describeTasks(request) response.tasks?.forEach { task -> println("The task ARN is " + task.taskDefinitionArn) diff --git a/kotlin/services/ecs/src/main/kotlin/com/kotlin/ecs/UpdateService.kt b/kotlin/services/ecs/src/main/kotlin/com/kotlin/ecs/UpdateService.kt index b15d7fe6de0..7c65a6dcd8f 100644 --- a/kotlin/services/ecs/src/main/kotlin/com/kotlin/ecs/UpdateService.kt +++ b/kotlin/services/ecs/src/main/kotlin/com/kotlin/ecs/UpdateService.kt @@ -49,7 +49,7 @@ suspend fun updateSpecificService( desiredCount = 0 } - EcsClient { region = "us-east-1" }.use { ecsClient -> + EcsClient.fromEnvironment { region = "us-east-1" }.use { ecsClient -> ecsClient.updateService(request) println("The service was modified") } From 78d5cd47175f6f5bfa388bf482b1e595789bce9c Mon Sep 17 00:00:00 2001 From: Macdonald Date: Mon, 7 Jul 2025 14:20:34 -0400 Subject: [PATCH 09/27] updated build number --- .../elasticbeanstalk/build.gradle.kts | 4 +- .../com/aws/example/CreateApplication.kt | 2 +- .../com/aws/example/CreateEnvironment.kt | 2 +- .../com/aws/example/DeleteApplication.kt | 2 +- .../com/aws/example/DescribeApplications.kt | 2 +- .../example/DescribeConfigurationOptions.kt | 2 +- .../com/aws/example/DescribeEnvironment.kt | 6 +- kotlin/services/emr/build.gradle.kts | 4 +- .../main/kotlin/com/kotlin/emr/AddSteps.kt | 2 +- .../kotlin/com/kotlin/emr/CreateCluster.kt | 2 +- .../kotlin/com/kotlin/emr/CreateEmrFleet.kt | 2 +- .../com/kotlin/emr/CreateSparkCluster.kt | 2 +- .../kotlin/com/kotlin/emr/DescribeCluster.kt | 2 +- .../kotlin/com/kotlin/emr/ListClusters.kt | 2 +- .../kotlin/com/kotlin/emr/TerminateJobFlow.kt | 2 +- kotlin/services/eventbridge/build.gradle.kts | 4 +- .../kotlin/eventbridge/CreateRuleSchedule.kt | 4 +- .../com/kotlin/eventbridge/EventbridgeMVP.kt | 87 ++++++++++--------- .../kotlin/eventbridge/HelloEventBridge.kt | 2 +- 19 files changed, 71 insertions(+), 64 deletions(-) diff --git a/kotlin/services/elasticbeanstalk/build.gradle.kts b/kotlin/services/elasticbeanstalk/build.gradle.kts index f9a4dfad8e6..2eb3b0ebc38 100644 --- a/kotlin/services/elasticbeanstalk/build.gradle.kts +++ b/kotlin/services/elasticbeanstalk/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 } @@ -28,7 +28,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:elasticbeanstalk") implementation("aws.sdk.kotlin:secretsmanager") implementation("aws.smithy.kotlin:http-client-engine-okhttp") diff --git a/kotlin/services/elasticbeanstalk/src/main/kotlin/com/aws/example/CreateApplication.kt b/kotlin/services/elasticbeanstalk/src/main/kotlin/com/aws/example/CreateApplication.kt index 67a2de25302..fa45b7e57d9 100644 --- a/kotlin/services/elasticbeanstalk/src/main/kotlin/com/aws/example/CreateApplication.kt +++ b/kotlin/services/elasticbeanstalk/src/main/kotlin/com/aws/example/CreateApplication.kt @@ -45,7 +45,7 @@ suspend fun createApp(appName: String?): String { } var tableArn: String - ElasticBeanstalkClient { region = "us-east-1" }.use { beanstalkClient -> + ElasticBeanstalkClient.fromEnvironment { region = "us-east-1" }.use { beanstalkClient -> val applicationResponse = beanstalkClient.createApplication(applicationRequest) tableArn = applicationResponse.application?.applicationArn.toString() } diff --git a/kotlin/services/elasticbeanstalk/src/main/kotlin/com/aws/example/CreateEnvironment.kt b/kotlin/services/elasticbeanstalk/src/main/kotlin/com/aws/example/CreateEnvironment.kt index 7fb5e66d5d1..fd346cd7e33 100644 --- a/kotlin/services/elasticbeanstalk/src/main/kotlin/com/aws/example/CreateEnvironment.kt +++ b/kotlin/services/elasticbeanstalk/src/main/kotlin/com/aws/example/CreateEnvironment.kt @@ -60,7 +60,7 @@ suspend fun createEBEnvironment( } var envArn: String - ElasticBeanstalkClient { region = "us-east-1" }.use { beanstalkClient -> + ElasticBeanstalkClient.fromEnvironment { region = "us-east-1" }.use { beanstalkClient -> val applicationResponse = beanstalkClient.createEnvironment(applicationRequest) envArn = applicationResponse.environmentArn.toString() } diff --git a/kotlin/services/elasticbeanstalk/src/main/kotlin/com/aws/example/DeleteApplication.kt b/kotlin/services/elasticbeanstalk/src/main/kotlin/com/aws/example/DeleteApplication.kt index ec0199d953a..02053e8c42c 100644 --- a/kotlin/services/elasticbeanstalk/src/main/kotlin/com/aws/example/DeleteApplication.kt +++ b/kotlin/services/elasticbeanstalk/src/main/kotlin/com/aws/example/DeleteApplication.kt @@ -42,7 +42,7 @@ suspend fun deleteApp(appName: String?) { terminateEnvByForce = true } - ElasticBeanstalkClient { region = "us-east-1" }.use { beanstalkClient -> + ElasticBeanstalkClient.fromEnvironment { region = "us-east-1" }.use { beanstalkClient -> beanstalkClient.deleteApplication(applicationRequest) println("The Elastic Beanstalk application was successfully deleted!") } diff --git a/kotlin/services/elasticbeanstalk/src/main/kotlin/com/aws/example/DescribeApplications.kt b/kotlin/services/elasticbeanstalk/src/main/kotlin/com/aws/example/DescribeApplications.kt index 34678249d06..02f690557fc 100644 --- a/kotlin/services/elasticbeanstalk/src/main/kotlin/com/aws/example/DescribeApplications.kt +++ b/kotlin/services/elasticbeanstalk/src/main/kotlin/com/aws/example/DescribeApplications.kt @@ -32,7 +32,7 @@ suspend fun describeApps() { applicationName = app.applicationName } - ElasticBeanstalkClient { region = "us-east-1" }.use { beanstalkClient -> + ElasticBeanstalkClient.fromEnvironment { region = "us-east-1" }.use { beanstalkClient -> val res = beanstalkClient.describeEnvironments(desRequest) res.environments?.forEach { desc -> diff --git a/kotlin/services/elasticbeanstalk/src/main/kotlin/com/aws/example/DescribeConfigurationOptions.kt b/kotlin/services/elasticbeanstalk/src/main/kotlin/com/aws/example/DescribeConfigurationOptions.kt index ba5f00e340f..8f162c4eebc 100644 --- a/kotlin/services/elasticbeanstalk/src/main/kotlin/com/aws/example/DescribeConfigurationOptions.kt +++ b/kotlin/services/elasticbeanstalk/src/main/kotlin/com/aws/example/DescribeConfigurationOptions.kt @@ -49,7 +49,7 @@ suspend fun getOptions(envName: String) { options = listOf(spec) } - ElasticBeanstalkClient { region = "us-east-1" }.use { beanstalkClient -> + ElasticBeanstalkClient.fromEnvironment { region = "us-east-1" }.use { beanstalkClient -> val res = beanstalkClient.describeConfigurationOptions(request) res.options?.forEach { option -> diff --git a/kotlin/services/elasticbeanstalk/src/main/kotlin/com/aws/example/DescribeEnvironment.kt b/kotlin/services/elasticbeanstalk/src/main/kotlin/com/aws/example/DescribeEnvironment.kt index 11f04e567cb..912ea4ac409 100644 --- a/kotlin/services/elasticbeanstalk/src/main/kotlin/com/aws/example/DescribeEnvironment.kt +++ b/kotlin/services/elasticbeanstalk/src/main/kotlin/com/aws/example/DescribeEnvironment.kt @@ -41,11 +41,11 @@ suspend fun describeEnv(appName: String) { environmentNames = listOf(appName) } - ElasticBeanstalkClient { region = "us-east-1" }.use { beanstalkClient -> + ElasticBeanstalkClient.fromEnvironment { region = "us-east-1" }.use { beanstalkClient -> val res = beanstalkClient.describeEnvironments(request) res.environments?.forEach { env -> - System.out.println("The environment name is ${env.environmentName}") - System.out.println("The environment ARN is ${env.environmentArn}") + println("The environment name is ${env.environmentName}") + println("The environment ARN is ${env.environmentArn}") } } } diff --git a/kotlin/services/emr/build.gradle.kts b/kotlin/services/emr/build.gradle.kts index a9e812ccb11..473da3ea018 100644 --- a/kotlin/services/emr/build.gradle.kts +++ b/kotlin/services/emr/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:emr") implementation("aws.sdk.kotlin:secretsmanager") implementation("aws.smithy.kotlin:http-client-engine-okhttp") diff --git a/kotlin/services/emr/src/main/kotlin/com/kotlin/emr/AddSteps.kt b/kotlin/services/emr/src/main/kotlin/com/kotlin/emr/AddSteps.kt index bd62eca637e..9672e8a6299 100644 --- a/kotlin/services/emr/src/main/kotlin/com/kotlin/emr/AddSteps.kt +++ b/kotlin/services/emr/src/main/kotlin/com/kotlin/emr/AddSteps.kt @@ -65,7 +65,7 @@ suspend fun addNewStep( steps = listOf(stepConfig) } - EmrClient { region = "us-west-2" }.use { emrClient -> + EmrClient.fromEnvironment { region = "us-west-2" }.use { emrClient -> emrClient.addJobFlowSteps(request) println("You have successfully added a step!") } diff --git a/kotlin/services/emr/src/main/kotlin/com/kotlin/emr/CreateCluster.kt b/kotlin/services/emr/src/main/kotlin/com/kotlin/emr/CreateCluster.kt index d25f035268e..15fc3f49bb9 100644 --- a/kotlin/services/emr/src/main/kotlin/com/kotlin/emr/CreateCluster.kt +++ b/kotlin/services/emr/src/main/kotlin/com/kotlin/emr/CreateCluster.kt @@ -112,7 +112,7 @@ suspend fun createAppCluster( instances = instancesConfig } - EmrClient { region = "us-west-2" }.use { emrClient -> + EmrClient.fromEnvironment { region = "us-west-2" }.use { emrClient -> val response: RunJobFlowResponse = emrClient.runJobFlow(request) return response.jobFlowId } diff --git a/kotlin/services/emr/src/main/kotlin/com/kotlin/emr/CreateEmrFleet.kt b/kotlin/services/emr/src/main/kotlin/com/kotlin/emr/CreateEmrFleet.kt index 3c94eaccb28..c1be751daf5 100644 --- a/kotlin/services/emr/src/main/kotlin/com/kotlin/emr/CreateEmrFleet.kt +++ b/kotlin/services/emr/src/main/kotlin/com/kotlin/emr/CreateEmrFleet.kt @@ -139,7 +139,7 @@ suspend fun createFleet() { releaseLabel = "emr-5.29.0" } - EmrClient { region = "us-west-2" }.use { emrClient -> + EmrClient.fromEnvironment { region = "us-west-2" }.use { emrClient -> val response = emrClient.runJobFlow(request) println(response.toString()) } diff --git a/kotlin/services/emr/src/main/kotlin/com/kotlin/emr/CreateSparkCluster.kt b/kotlin/services/emr/src/main/kotlin/com/kotlin/emr/CreateSparkCluster.kt index c01345b4eae..62968743652 100644 --- a/kotlin/services/emr/src/main/kotlin/com/kotlin/emr/CreateSparkCluster.kt +++ b/kotlin/services/emr/src/main/kotlin/com/kotlin/emr/CreateSparkCluster.kt @@ -98,7 +98,7 @@ suspend fun createSparkCluster( instances = instancesConfig } - EmrClient { region = "us-west-2" }.use { emrClient -> + EmrClient.fromEnvironment { region = "us-west-2" }.use { emrClient -> val response = emrClient.runJobFlow(request) return response.jobFlowId } diff --git a/kotlin/services/emr/src/main/kotlin/com/kotlin/emr/DescribeCluster.kt b/kotlin/services/emr/src/main/kotlin/com/kotlin/emr/DescribeCluster.kt index 2990a394fd4..3e177593bc4 100644 --- a/kotlin/services/emr/src/main/kotlin/com/kotlin/emr/DescribeCluster.kt +++ b/kotlin/services/emr/src/main/kotlin/com/kotlin/emr/DescribeCluster.kt @@ -42,7 +42,7 @@ suspend fun describeMyCluster(clusterIdVal: String?) { clusterId = clusterIdVal } - EmrClient { region = "us-west-2" }.use { emrClient -> + EmrClient.fromEnvironment { region = "us-west-2" }.use { emrClient -> val response = emrClient.describeCluster(request) println("The name of the cluster is ${response.cluster?.name}") } diff --git a/kotlin/services/emr/src/main/kotlin/com/kotlin/emr/ListClusters.kt b/kotlin/services/emr/src/main/kotlin/com/kotlin/emr/ListClusters.kt index 5a7629b4020..955e1d35372 100644 --- a/kotlin/services/emr/src/main/kotlin/com/kotlin/emr/ListClusters.kt +++ b/kotlin/services/emr/src/main/kotlin/com/kotlin/emr/ListClusters.kt @@ -22,7 +22,7 @@ suspend fun main() { // snippet-start:[erm.kotlin.list_cluster.main] suspend fun listAllClusters() { - EmrClient { region = "us-west-2" }.use { emrClient -> + EmrClient.fromEnvironment { region = "us-west-2" }.use { emrClient -> val response = emrClient.listClusters(ListClustersRequest {}) response.clusters?.forEach { cluster -> println("The cluster name is ${cluster.name}") diff --git a/kotlin/services/emr/src/main/kotlin/com/kotlin/emr/TerminateJobFlow.kt b/kotlin/services/emr/src/main/kotlin/com/kotlin/emr/TerminateJobFlow.kt index a1ce94c9724..328765f3eb8 100644 --- a/kotlin/services/emr/src/main/kotlin/com/kotlin/emr/TerminateJobFlow.kt +++ b/kotlin/services/emr/src/main/kotlin/com/kotlin/emr/TerminateJobFlow.kt @@ -42,7 +42,7 @@ suspend fun terminateFlow(id: String) { jobFlowIds = listOf(id) } - EmrClient { region = "us-west-2" }.use { emrClient -> + EmrClient.fromEnvironment { region = "us-west-2" }.use { emrClient -> emrClient.terminateJobFlows(request) println("You have successfully terminated $id") } diff --git a/kotlin/services/eventbridge/build.gradle.kts b/kotlin/services/eventbridge/build.gradle.kts index b5a4f8712c4..7aec06eb753 100644 --- a/kotlin/services/eventbridge/build.gradle.kts +++ b/kotlin/services/eventbridge/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 } @@ -28,7 +28,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:eventbridge") implementation("aws.sdk.kotlin:iam") implementation("aws.sdk.kotlin:sns") diff --git a/kotlin/services/eventbridge/src/main/kotlin/com/kotlin/eventbridge/CreateRuleSchedule.kt b/kotlin/services/eventbridge/src/main/kotlin/com/kotlin/eventbridge/CreateRuleSchedule.kt index f03405da061..9f5fb34a3d4 100644 --- a/kotlin/services/eventbridge/src/main/kotlin/com/kotlin/eventbridge/CreateRuleSchedule.kt +++ b/kotlin/services/eventbridge/src/main/kotlin/com/kotlin/eventbridge/CreateRuleSchedule.kt @@ -60,7 +60,7 @@ suspend fun createScRule( description = "A test rule that runs on a schedule created by the Kotlin API" } - EventBridgeClient { region = "us-west-2" }.use { eventBrClient -> + EventBridgeClient.fromEnvironment { region = "us-west-2" }.use { eventBrClient -> val ruleResponse = eventBrClient.putRule(ruleRequest) println("The ARN of the new rule is ${ruleResponse.ruleArn}") } @@ -88,7 +88,7 @@ suspend fun putRuleTarget( targets = listOf(lambdaTarget) } - EventBridgeClient { region = "us-west-2" }.use { eventBrClient -> + EventBridgeClient.fromEnvironment { region = "us-west-2" }.use { eventBrClient -> eventBrClient.putTargets(targetsRequest) println("The $lambdaARN was successfully used as a target") } diff --git a/kotlin/services/eventbridge/src/main/kotlin/com/kotlin/eventbridge/EventbridgeMVP.kt b/kotlin/services/eventbridge/src/main/kotlin/com/kotlin/eventbridge/EventbridgeMVP.kt index a6ae565b0f0..d598d400464 100644 --- a/kotlin/services/eventbridge/src/main/kotlin/com/kotlin/eventbridge/EventbridgeMVP.kt +++ b/kotlin/services/eventbridge/src/main/kotlin/com/kotlin/eventbridge/EventbridgeMVP.kt @@ -265,7 +265,7 @@ suspend fun deleteRole(roleNameVal: String?) { policyArn = policyArnVal roleName = roleNameVal } - IamClient { region = "us-east-1" }.use { iam -> + IamClient.fromEnvironment { region = "us-east-1" }.use { iam -> iam.detachRolePolicy(policyRequest) println("Successfully detached policy $policyArnVal from role $roleNameVal") @@ -286,7 +286,7 @@ suspend fun deleteS3Bucket(bucketName: String?) { ListObjectsRequest { bucket = bucketName } - S3Client { region = "us-east-1" }.use { s3Client -> + S3Client.fromEnvironment { region = "us-east-1" }.use { s3Client -> val res = s3Client.listObjects(listObjects) val myObjects = res.contents val toDelete = mutableListOf() @@ -330,7 +330,7 @@ suspend fun deleteSNSTopic(topicArnVal: String?) { topicArn = topicArnVal } - SnsClient { region = "us-east-1" }.use { snsClient -> + SnsClient.fromEnvironment { region = "us-east-1" }.use { snsClient -> snsClient.deleteTopic(request) println(" $topicArnVal was deleted.") } @@ -342,7 +342,7 @@ suspend fun deleteRuleByName(ruleName: String?) { DeleteRuleRequest { name = ruleName } - EventBridgeClient { region = "us-east-1" }.use { eventBrClient -> + EventBridgeClient.fromEnvironment { region = "us-east-1" }.use { eventBrClient -> eventBrClient.deleteRule(ruleRequest) println("Successfully deleted the rule") } @@ -357,7 +357,7 @@ suspend fun deleteTargetsFromRule(eventRuleName: String?) { rule = eventRuleName } - EventBridgeClient { region = "us-east-1" }.use { eventBrClient -> + EventBridgeClient.fromEnvironment { region = "us-east-1" }.use { eventBrClient -> val response = eventBrClient.listTargetsByRule(request) val allTargets = response.targets @@ -398,7 +398,7 @@ suspend fun triggerCustomRule(email: String) { this.entries = listOf(entry) } - EventBridgeClient { region = "us-east-1" }.use { eventBrClient -> + EventBridgeClient.fromEnvironment { region = "us-east-1" }.use { eventBrClient -> eventBrClient.putEvents(eventsRequest) } } @@ -430,7 +430,7 @@ suspend fun updateCustomRuleTargetWithTransform( eventBusName = null } - EventBridgeClient { region = "us-east-1" }.use { eventBrClient -> + EventBridgeClient.fromEnvironment { region = "us-east-1" }.use { eventBrClient -> eventBrClient.putTargets(targetsRequest) } } @@ -450,7 +450,7 @@ suspend fun updateToCustomRule(ruleName: String?) { eventPattern = customEventsPattern } - EventBridgeClient { region = "us-east-1" }.use { eventBrClient -> + EventBridgeClient.fromEnvironment { region = "us-east-1" }.use { eventBrClient -> eventBrClient.putRule(request) } } @@ -485,7 +485,7 @@ suspend fun updateSnsEventRule( eventBusName = null } - EventBridgeClient { region = "us-east-1" }.use { eventBrClient -> + EventBridgeClient.fromEnvironment { region = "us-east-1" }.use { eventBrClient -> eventBrClient.putTargets(targetsRequest) } } @@ -497,7 +497,7 @@ suspend fun checkRule(eventRuleName: String?) { name = eventRuleName } - EventBridgeClient { region = "us-east-1" }.use { eventBrClient -> + EventBridgeClient.fromEnvironment { region = "us-east-1" }.use { eventBrClient -> val response = eventBrClient.describeRule(ruleRequest) println("The state of the rule is $response") } @@ -524,7 +524,7 @@ suspend fun changeRuleState( EnableRuleRequest { name = eventRuleName } - EventBridgeClient { region = "us-east-1" }.use { eventBrClient -> + EventBridgeClient.fromEnvironment { region = "us-east-1" }.use { eventBrClient -> eventBrClient.enableRule(ruleRequest) } } @@ -549,7 +549,7 @@ suspend fun uploadTextFiletoS3(bucketName: String?) { body = myFile.asByteStream() } - S3Client { region = "us-east-1" }.use { s3Client -> + S3Client.fromEnvironment { region = "us-east-1" }.use { s3Client -> s3Client.putObject(putOb) } } @@ -561,7 +561,7 @@ suspend fun listTargetRules(topicArnVal: String?) { targetArn = topicArnVal } - EventBridgeClient { region = "us-east-1" }.use { eventBrClient -> + EventBridgeClient.fromEnvironment { region = "us-east-1" }.use { eventBrClient -> val response = eventBrClient.listRuleNamesByTarget(ruleNamesByTargetRequest) response.ruleNames?.forEach { rule -> println("The rule name is $rule") @@ -577,7 +577,7 @@ suspend fun listTargets(ruleName: String?) { rule = ruleName } - EventBridgeClient { region = "us-east-1" }.use { eventBrClient -> + EventBridgeClient.fromEnvironment { region = "us-east-1" }.use { eventBrClient -> val response = eventBrClient.listTargetsByRule(ruleRequest) response.targets?.forEach { target -> println("Target ARN: ${target.arn}") @@ -612,7 +612,7 @@ suspend fun addSnsEventRule( rule = ruleName } - EventBridgeClient { region = "us-east-1" }.use { eventBrClient -> + EventBridgeClient.fromEnvironment { region = "us-east-1" }.use { eventBrClient -> eventBrClient.putTargets(request) println("Added event rule $eventRuleName with Amazon SNS target $topicName for bucket $bucketName.") } @@ -631,26 +631,30 @@ suspend fun subEmail( topicArn = topicArnVal } - SnsClient { region = "us-east-1" }.use { snsClient -> + SnsClient.fromEnvironment { region = "us-east-1" }.use { snsClient -> val result = snsClient.subscribe(request) println(" Subscription ARN: ${result.subscriptionArn}") } } suspend fun createSnsTopic(topicName: String): String? { - val topicPolicy = - "{" + - "\"Version\": \"2012-10-17\"," + - "\"Statement\": [{" + - "\"Sid\": \"EventBridgePublishTopic\"," + - "\"Effect\": \"Allow\"," + - "\"Principal\": {" + - "\"Service\": \"events.amazonaws.com\"" + - "}," + - "\"Resource\": \"*\"," + - "\"Action\": \"sns:Publish\"" + - "}]" + - "}" + val topicPolicy = """ + { + "Version": "2012-10-17", + "Statement": [ + { + "Sid": "EventBridgePublishTopic", + "Effect": "Allow", + "Principal": { + "Service": "events.amazonaws.com" + }, + "Resource": "*", + "Action": "sns:Publish" + } + ] + } + """.trimIndent() + val topicAttributes = mutableMapOf() topicAttributes["Policy"] = topicPolicy @@ -661,7 +665,7 @@ suspend fun createSnsTopic(topicName: String): String? { attributes = topicAttributes } - SnsClient { region = "us-east-1" }.use { snsClient -> + SnsClient.fromEnvironment { region = "us-east-1" }.use { snsClient -> val response = snsClient.createTopic(topicRequest) println("Added topic $topicName for email subscriptions.") return response.topicArn @@ -676,7 +680,7 @@ suspend fun listRules() { limit = 10 } - EventBridgeClient { region = "us-east-1" }.use { eventBrClient -> + EventBridgeClient.fromEnvironment { region = "us-east-1" }.use { eventBrClient -> val response = eventBrClient.listRules(rulesRequest) response.rules?.forEach { rule -> println("The rule name is ${rule.name}") @@ -693,15 +697,18 @@ suspend fun addEventRule( bucketName: String, eventRuleName: String?, ) { - val pattern = """{ + val pattern = """ + { "source": ["aws.s3"], "detail-type": ["Object Created"], "detail": { - "bucket": { - "name": ["$bucketName"] + "bucket": { + "name": ["$bucketName"] } } - }""" + } + """.trimIndent() + val ruleRequest = PutRuleRequest { @@ -711,7 +718,7 @@ suspend fun addEventRule( roleArn = roleArnVal } - EventBridgeClient { region = "us-east-1" }.use { eventBrClient -> + EventBridgeClient.fromEnvironment { region = "us-east-1" }.use { eventBrClient -> val ruleResponse = eventBrClient.putRule(ruleRequest) println("The ARN of the new rule is ${ruleResponse.ruleArn}") } @@ -736,7 +743,7 @@ suspend fun setBucketNotification(bucketName: String) { skipDestinationValidation = true } - S3Client { region = "us-east-1" }.use { s3Client -> + S3Client.fromEnvironment { region = "us-east-1" }.use { s3Client -> s3Client.putBucketNotificationConfiguration(configurationRequest) println("Added bucket $bucketName with EventBridge events enabled.") } @@ -749,7 +756,7 @@ suspend fun createBucket(bucketName: String) { bucket = bucketName } - S3Client { region = "us-east-1" }.use { s3 -> + S3Client.fromEnvironment { region = "us-east-1" }.use { s3 -> s3.createBucket(request) s3.waitUntilBucketExists { bucket = bucketName @@ -766,7 +773,7 @@ suspend fun checkBucket(bucketName: String?): Boolean { bucket = bucketName } - S3Client { region = "us-east-1" }.use { s3Client -> + S3Client.fromEnvironment { region = "us-east-1" }.use { s3Client -> s3Client.headBucket(headBucketRequest) return true } @@ -793,7 +800,7 @@ suspend fun createIAMRole( policyArn = "arn:aws:iam::aws:policy/AmazonEventBridgeFullAccess" } - IamClient { region = "us-east-1" }.use { iam -> + IamClient.fromEnvironment { region = "us-east-1" }.use { iam -> val response = iam.createRole(request) iam.attachRolePolicy(rolePolicyRequest) return response.role?.arn diff --git a/kotlin/services/eventbridge/src/main/kotlin/com/kotlin/eventbridge/HelloEventBridge.kt b/kotlin/services/eventbridge/src/main/kotlin/com/kotlin/eventbridge/HelloEventBridge.kt index d9609c5a0e4..f5154351cb6 100644 --- a/kotlin/services/eventbridge/src/main/kotlin/com/kotlin/eventbridge/HelloEventBridge.kt +++ b/kotlin/services/eventbridge/src/main/kotlin/com/kotlin/eventbridge/HelloEventBridge.kt @@ -17,7 +17,7 @@ suspend fun listBusesHello() { limit = 10 } - EventBridgeClient { region = "us-west-2" }.use { eventBrClient -> + EventBridgeClient.fromEnvironment { region = "us-west-2" }.use { eventBrClient -> val response: ListEventBusesResponse = eventBrClient.listEventBuses(request) response.eventBuses?.forEach { bus -> println("The name of the event bus is ${bus.name}") From a972f9ae44b4ee6bcb1e35d831c8410675721372 Mon Sep 17 00:00:00 2001 From: Macdonald Date: Mon, 7 Jul 2025 14:24:49 -0400 Subject: [PATCH 10/27] updated build number --- .../src/main/kotlin/com/kotlin/eventbridge/EventbridgeMVP.kt | 2 -- 1 file changed, 2 deletions(-) diff --git a/kotlin/services/eventbridge/src/main/kotlin/com/kotlin/eventbridge/EventbridgeMVP.kt b/kotlin/services/eventbridge/src/main/kotlin/com/kotlin/eventbridge/EventbridgeMVP.kt index d598d400464..1189ba15a94 100644 --- a/kotlin/services/eventbridge/src/main/kotlin/com/kotlin/eventbridge/EventbridgeMVP.kt +++ b/kotlin/services/eventbridge/src/main/kotlin/com/kotlin/eventbridge/EventbridgeMVP.kt @@ -655,7 +655,6 @@ suspend fun createSnsTopic(topicName: String): String? { } """.trimIndent() - val topicAttributes = mutableMapOf() topicAttributes["Policy"] = topicPolicy @@ -709,7 +708,6 @@ suspend fun addEventRule( } """.trimIndent() - val ruleRequest = PutRuleRequest { description = "Created by using the AWS SDK for Kotlin" From f9ed47a85b4af89f2ce955ff2b350751e8e85016 Mon Sep 17 00:00:00 2001 From: Macdonald Date: Mon, 7 Jul 2025 14:30:38 -0400 Subject: [PATCH 11/27] updated build number --- kotlin/services/eventbridge/README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/kotlin/services/eventbridge/README.md b/kotlin/services/eventbridge/README.md index 0153a7cac2e..75bba5336e8 100644 --- a/kotlin/services/eventbridge/README.md +++ b/kotlin/services/eventbridge/README.md @@ -50,7 +50,7 @@ Code excerpts that show you how to call individual service functions. - [DisableRule](src/main/kotlin/com/kotlin/eventbridge/EventbridgeMVP.kt#L507) - [EnableRule](src/main/kotlin/com/kotlin/eventbridge/EventbridgeMVP.kt#L507) - [ListRuleNamesByTarget](src/main/kotlin/com/kotlin/eventbridge/EventbridgeMVP.kt#L557) -- [ListRules](src/main/kotlin/com/kotlin/eventbridge/EventbridgeMVP.kt#L671) +- [ListRules](src/main/kotlin/com/kotlin/eventbridge/EventbridgeMVP.kt#L674) - [ListTargetsByRule](src/main/kotlin/com/kotlin/eventbridge/EventbridgeMVP.kt#L573) - [PutEvents](src/main/kotlin/com/kotlin/eventbridge/EventbridgeMVP.kt#L380) - [PutRule](src/main/kotlin/com/kotlin/eventbridge/CreateRuleSchedule.kt#L49) @@ -117,4 +117,4 @@ in the `kotlin` folder. Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. -SPDX-License-Identifier: Apache-2.0 \ No newline at end of file +SPDX-License-Identifier: Apache-2.0 From 0c202ad254ce2451315342ebbd19e2b1e6b885cd Mon Sep 17 00:00:00 2001 From: Macdonald Date: Mon, 7 Jul 2025 14:59:58 -0400 Subject: [PATCH 12/27] updated build number --- kotlin/services/firehose/build.gradle.kts | 4 +-- .../kotlin/firehose/CreateDeliveryStream.kt | 2 +- .../com/kotlin/firehose/DeleteStream.kt | 2 +- .../kotlin/firehose/ListDeliveryStreams.kt | 2 +- .../com/kotlin/firehose/PutBatchRecords.kt | 2 +- .../kotlin/com/kotlin/firehose/PutRecord.kt | 2 +- kotlin/services/forecast/build.gradle.kts | 4 +-- .../com/kotlin/forecast/CreateDataSet.kt | 2 +- .../com/kotlin/forecast/CreateForecast.kt | 2 +- .../com/kotlin/forecast/DeleteDataset.kt | 2 +- .../com/kotlin/forecast/DeleteForecast.kt | 2 +- .../com/kotlin/forecast/DescribeForecast.kt | 2 +- .../com/kotlin/forecast/ListDataSetGroups.kt | 2 +- .../com/kotlin/forecast/ListDataSets.kt | 2 +- .../com/kotlin/forecast/ListForecasts.kt | 2 +- kotlin/services/glue/build.gradle.kts | 4 +-- .../kotlin/com/kotlin/glue/CreateCrawler.kt | 2 +- .../kotlin/com/kotlin/glue/DeleteCrawler.kt | 2 +- .../main/kotlin/com/kotlin/glue/GetCrawler.kt | 2 +- .../kotlin/com/kotlin/glue/GetCrawlers.kt | 2 +- .../kotlin/com/kotlin/glue/GetDatabase.kt | 2 +- .../kotlin/com/kotlin/glue/GetDatabases.kt | 2 +- .../main/kotlin/com/kotlin/glue/GetJobRun.kt | 2 +- .../main/kotlin/com/kotlin/glue/GetJobs.kt | 2 +- .../kotlin/com/kotlin/glue/GlueScenario.kt | 26 +++++++++---------- .../kotlin/com/kotlin/glue/ListWorkflows.kt | 2 +- .../kotlin/com/kotlin/glue/SearchTables.kt | 2 +- .../kotlin/com/kotlin/glue/StartCrawler.kt | 2 +- .../kotlin/com/kotlin/glue/StopCrawler.kt | 2 +- 29 files changed, 44 insertions(+), 44 deletions(-) diff --git a/kotlin/services/firehose/build.gradle.kts b/kotlin/services/firehose/build.gradle.kts index 74a5cd33eed..e4bf2931314 100644 --- a/kotlin/services/firehose/build.gradle.kts +++ b/kotlin/services/firehose/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:firehose") implementation("aws.sdk.kotlin:secretsmanager") implementation("aws.smithy.kotlin:http-client-engine-okhttp") diff --git a/kotlin/services/firehose/src/main/kotlin/com/kotlin/firehose/CreateDeliveryStream.kt b/kotlin/services/firehose/src/main/kotlin/com/kotlin/firehose/CreateDeliveryStream.kt index 2c49c6323e3..6e863b10ce9 100644 --- a/kotlin/services/firehose/src/main/kotlin/com/kotlin/firehose/CreateDeliveryStream.kt +++ b/kotlin/services/firehose/src/main/kotlin/com/kotlin/firehose/CreateDeliveryStream.kt @@ -61,7 +61,7 @@ suspend fun createStream( deliveryStreamType = DeliveryStreamType.DirectPut } - FirehoseClient { region = "us-west-2" }.use { firehoseClient -> + FirehoseClient.fromEnvironment { region = "us-west-2" }.use { firehoseClient -> val streamResponse = firehoseClient.createDeliveryStream(request) println("Delivery Stream ARN is ${streamResponse.deliveryStreamArn}") } diff --git a/kotlin/services/firehose/src/main/kotlin/com/kotlin/firehose/DeleteStream.kt b/kotlin/services/firehose/src/main/kotlin/com/kotlin/firehose/DeleteStream.kt index fadebe7848d..509bab76745 100644 --- a/kotlin/services/firehose/src/main/kotlin/com/kotlin/firehose/DeleteStream.kt +++ b/kotlin/services/firehose/src/main/kotlin/com/kotlin/firehose/DeleteStream.kt @@ -43,7 +43,7 @@ suspend fun delStream(streamName: String) { deliveryStreamName = streamName } - FirehoseClient { region = "us-west-2" }.use { firehoseClient -> + FirehoseClient.fromEnvironment { region = "us-west-2" }.use { firehoseClient -> firehoseClient.deleteDeliveryStream(request) println("Delivery Stream $streamName is deleted") } diff --git a/kotlin/services/firehose/src/main/kotlin/com/kotlin/firehose/ListDeliveryStreams.kt b/kotlin/services/firehose/src/main/kotlin/com/kotlin/firehose/ListDeliveryStreams.kt index be59f7cef15..086e823955f 100644 --- a/kotlin/services/firehose/src/main/kotlin/com/kotlin/firehose/ListDeliveryStreams.kt +++ b/kotlin/services/firehose/src/main/kotlin/com/kotlin/firehose/ListDeliveryStreams.kt @@ -22,7 +22,7 @@ suspend fun main() { // snippet-start:[firehose.kotlin.list_streams.main] suspend fun listStreams() { - FirehoseClient { region = "us-west-2" }.use { firehoseClient -> + FirehoseClient.fromEnvironment { region = "us-west-2" }.use { firehoseClient -> val response = firehoseClient.listDeliveryStreams(ListDeliveryStreamsRequest {}) response.deliveryStreamNames?.forEach { item -> println("The delivery stream name is $item") diff --git a/kotlin/services/firehose/src/main/kotlin/com/kotlin/firehose/PutBatchRecords.kt b/kotlin/services/firehose/src/main/kotlin/com/kotlin/firehose/PutBatchRecords.kt index e34d08d93f3..bfd7f9ddbaf 100644 --- a/kotlin/services/firehose/src/main/kotlin/com/kotlin/firehose/PutBatchRecords.kt +++ b/kotlin/services/firehose/src/main/kotlin/com/kotlin/firehose/PutBatchRecords.kt @@ -65,7 +65,7 @@ suspend fun addStockTradeData(streamName: String?) { records = recordList } - FirehoseClient { region = "us-west-2" }.use { firehoseClient -> + FirehoseClient.fromEnvironment { region = "us-west-2" }.use { firehoseClient -> val recordResponse = firehoseClient.putRecordBatch(request) println("The number of records added is ${recordResponse.requestResponses?.size}") } diff --git a/kotlin/services/firehose/src/main/kotlin/com/kotlin/firehose/PutRecord.kt b/kotlin/services/firehose/src/main/kotlin/com/kotlin/firehose/PutRecord.kt index 6591bf5bdaa..f3615d6e81e 100644 --- a/kotlin/services/firehose/src/main/kotlin/com/kotlin/firehose/PutRecord.kt +++ b/kotlin/services/firehose/src/main/kotlin/com/kotlin/firehose/PutRecord.kt @@ -55,7 +55,7 @@ suspend fun putSingleRecord( record = recordOb } - FirehoseClient { region = "us-west-2" }.use { firehoseClient -> + FirehoseClient.fromEnvironment { region = "us-west-2" }.use { firehoseClient -> val recordResponse = firehoseClient.putRecord(request) println("The record ID is ${recordResponse.recordId}") } diff --git a/kotlin/services/forecast/build.gradle.kts b/kotlin/services/forecast/build.gradle.kts index ac766827fb1..a89ac249b2e 100644 --- a/kotlin/services/forecast/build.gradle.kts +++ b/kotlin/services/forecast/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:forecast") implementation("aws.sdk.kotlin:secretsmanager") implementation("aws.smithy.kotlin:http-client-engine-okhttp") diff --git a/kotlin/services/forecast/src/main/kotlin/com/kotlin/forecast/CreateDataSet.kt b/kotlin/services/forecast/src/main/kotlin/com/kotlin/forecast/CreateDataSet.kt index 3a96c8abd54..eb3d9225175 100644 --- a/kotlin/services/forecast/src/main/kotlin/com/kotlin/forecast/CreateDataSet.kt +++ b/kotlin/services/forecast/src/main/kotlin/com/kotlin/forecast/CreateDataSet.kt @@ -57,7 +57,7 @@ suspend fun createForecastDataSet(name: String?): String? { schema = schemaOb } - ForecastClient { region = "us-west-2" }.use { forecast -> + ForecastClient.fromEnvironment { region = "us-west-2" }.use { forecast -> val response = forecast.createDataset(request) return response.datasetArn } diff --git a/kotlin/services/forecast/src/main/kotlin/com/kotlin/forecast/CreateForecast.kt b/kotlin/services/forecast/src/main/kotlin/com/kotlin/forecast/CreateForecast.kt index 7f4abd7ca97..25cb423c15a 100644 --- a/kotlin/services/forecast/src/main/kotlin/com/kotlin/forecast/CreateForecast.kt +++ b/kotlin/services/forecast/src/main/kotlin/com/kotlin/forecast/CreateForecast.kt @@ -49,7 +49,7 @@ suspend fun createNewForecast( predictorArn = predictorArnVal } - ForecastClient { region = "us-west-2" }.use { forecast -> + ForecastClient.fromEnvironment { region = "us-west-2" }.use { forecast -> val response = forecast.createForecast(request) return response.forecastArn } diff --git a/kotlin/services/forecast/src/main/kotlin/com/kotlin/forecast/DeleteDataset.kt b/kotlin/services/forecast/src/main/kotlin/com/kotlin/forecast/DeleteDataset.kt index 29874985479..9eec727826e 100644 --- a/kotlin/services/forecast/src/main/kotlin/com/kotlin/forecast/DeleteDataset.kt +++ b/kotlin/services/forecast/src/main/kotlin/com/kotlin/forecast/DeleteDataset.kt @@ -42,7 +42,7 @@ suspend fun deleteForecastDataSet(myDataSetARN: String?) { datasetArn = myDataSetARN } - ForecastClient { region = "us-west-2" }.use { forecast -> + ForecastClient.fromEnvironment { region = "us-west-2" }.use { forecast -> forecast.deleteDataset(request) println("$myDataSetARN data set was deleted") } diff --git a/kotlin/services/forecast/src/main/kotlin/com/kotlin/forecast/DeleteForecast.kt b/kotlin/services/forecast/src/main/kotlin/com/kotlin/forecast/DeleteForecast.kt index 1274e840edb..1fdb953a4f3 100644 --- a/kotlin/services/forecast/src/main/kotlin/com/kotlin/forecast/DeleteForecast.kt +++ b/kotlin/services/forecast/src/main/kotlin/com/kotlin/forecast/DeleteForecast.kt @@ -42,7 +42,7 @@ suspend fun delForecast(forecastArnVal: String) { forecastArn = forecastArnVal } - ForecastClient { region = "us-west-2" }.use { forecast -> + ForecastClient.fromEnvironment { region = "us-west-2" }.use { forecast -> forecast.deleteForecast(request) println("$forecastArnVal was successfully deleted") } diff --git a/kotlin/services/forecast/src/main/kotlin/com/kotlin/forecast/DescribeForecast.kt b/kotlin/services/forecast/src/main/kotlin/com/kotlin/forecast/DescribeForecast.kt index 135cdfcc5f3..fa656b673e3 100644 --- a/kotlin/services/forecast/src/main/kotlin/com/kotlin/forecast/DescribeForecast.kt +++ b/kotlin/services/forecast/src/main/kotlin/com/kotlin/forecast/DescribeForecast.kt @@ -42,7 +42,7 @@ suspend fun describe(forecastarn: String?) { forecastArn = forecastarn } - ForecastClient { region = "us-west-2" }.use { forecast -> + ForecastClient.fromEnvironment { region = "us-west-2" }.use { forecast -> val response = forecast.describeForecast(request) println("The name of the forecast is ${response.forecastName}") } diff --git a/kotlin/services/forecast/src/main/kotlin/com/kotlin/forecast/ListDataSetGroups.kt b/kotlin/services/forecast/src/main/kotlin/com/kotlin/forecast/ListDataSetGroups.kt index f9c72bed07a..191296f08db 100644 --- a/kotlin/services/forecast/src/main/kotlin/com/kotlin/forecast/ListDataSetGroups.kt +++ b/kotlin/services/forecast/src/main/kotlin/com/kotlin/forecast/ListDataSetGroups.kt @@ -27,7 +27,7 @@ suspend fun listDataGroups() { maxResults = 10 } - ForecastClient { region = "us-west-2" }.use { forecast -> + ForecastClient.fromEnvironment { region = "us-west-2" }.use { forecast -> val response = forecast.listDatasetGroups(request) response.datasetGroups?.forEach { group -> println("The data set group name is ${group.datasetGroupName}") diff --git a/kotlin/services/forecast/src/main/kotlin/com/kotlin/forecast/ListDataSets.kt b/kotlin/services/forecast/src/main/kotlin/com/kotlin/forecast/ListDataSets.kt index 9c5168f8c66..d2d9c508ffb 100644 --- a/kotlin/services/forecast/src/main/kotlin/com/kotlin/forecast/ListDataSets.kt +++ b/kotlin/services/forecast/src/main/kotlin/com/kotlin/forecast/ListDataSets.kt @@ -27,7 +27,7 @@ suspend fun listForecastDataSets() { maxResults = 10 } - ForecastClient { region = "us-west-2" }.use { forecast -> + ForecastClient.fromEnvironment { region = "us-west-2" }.use { forecast -> val response = forecast.listDatasets(request) response.datasets?.forEach { group -> println("The Data Set name is ${group.datasetName}") diff --git a/kotlin/services/forecast/src/main/kotlin/com/kotlin/forecast/ListForecasts.kt b/kotlin/services/forecast/src/main/kotlin/com/kotlin/forecast/ListForecasts.kt index 63ad68e1818..b8714cce7b4 100644 --- a/kotlin/services/forecast/src/main/kotlin/com/kotlin/forecast/ListForecasts.kt +++ b/kotlin/services/forecast/src/main/kotlin/com/kotlin/forecast/ListForecasts.kt @@ -27,7 +27,7 @@ suspend fun listAllForeCasts() { maxResults = 10 } - ForecastClient { region = "us-west-2" }.use { forecast -> + ForecastClient.fromEnvironment { region = "us-west-2" }.use { forecast -> val response = forecast.listForecasts(request) response.forecasts?.forEach { forecast -> println("The name of the forecast is ${forecast.forecastName}") diff --git a/kotlin/services/glue/build.gradle.kts b/kotlin/services/glue/build.gradle.kts index 45872e73ad0..db2ce2806fb 100644 --- a/kotlin/services/glue/build.gradle.kts +++ b/kotlin/services/glue/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:glue") implementation("aws.sdk.kotlin:secretsmanager") implementation("aws.smithy.kotlin:http-client-engine-okhttp") diff --git a/kotlin/services/glue/src/main/kotlin/com/kotlin/glue/CreateCrawler.kt b/kotlin/services/glue/src/main/kotlin/com/kotlin/glue/CreateCrawler.kt index e87a23fe0a3..33106ca08c0 100644 --- a/kotlin/services/glue/src/main/kotlin/com/kotlin/glue/CreateCrawler.kt +++ b/kotlin/services/glue/src/main/kotlin/com/kotlin/glue/CreateCrawler.kt @@ -77,7 +77,7 @@ suspend fun createGlueCrawler( schedule = cron } - GlueClient { region = "us-west-2" }.use { glueClient -> + GlueClient.fromEnvironment { region = "us-west-2" }.use { glueClient -> glueClient.createCrawler(request) println("$crawlerName was successfully created") } diff --git a/kotlin/services/glue/src/main/kotlin/com/kotlin/glue/DeleteCrawler.kt b/kotlin/services/glue/src/main/kotlin/com/kotlin/glue/DeleteCrawler.kt index 9df2b33aa6a..6f15513bb53 100644 --- a/kotlin/services/glue/src/main/kotlin/com/kotlin/glue/DeleteCrawler.kt +++ b/kotlin/services/glue/src/main/kotlin/com/kotlin/glue/DeleteCrawler.kt @@ -41,7 +41,7 @@ suspend fun deleteSpecificCrawler(crawlerName: String) { DeleteCrawlerRequest { name = crawlerName } - GlueClient { region = "us-east-1" }.use { glueClient -> + GlueClient.fromEnvironment { region = "us-east-1" }.use { glueClient -> glueClient.deleteCrawler(request) println("$crawlerName was deleted") } diff --git a/kotlin/services/glue/src/main/kotlin/com/kotlin/glue/GetCrawler.kt b/kotlin/services/glue/src/main/kotlin/com/kotlin/glue/GetCrawler.kt index 72329736e84..b1cb914945f 100644 --- a/kotlin/services/glue/src/main/kotlin/com/kotlin/glue/GetCrawler.kt +++ b/kotlin/services/glue/src/main/kotlin/com/kotlin/glue/GetCrawler.kt @@ -41,7 +41,7 @@ suspend fun getSpecificCrawler(crawlerName: String?) { GetCrawlerRequest { name = crawlerName } - GlueClient { region = "us-east-1" }.use { glueClient -> + GlueClient.fromEnvironment { region = "us-east-1" }.use { glueClient -> val response = glueClient.getCrawler(request) val role = response.crawler?.role println("The role associated with this crawler is $role") diff --git a/kotlin/services/glue/src/main/kotlin/com/kotlin/glue/GetCrawlers.kt b/kotlin/services/glue/src/main/kotlin/com/kotlin/glue/GetCrawlers.kt index 3dd0bd4b19e..1ba4616fd1d 100644 --- a/kotlin/services/glue/src/main/kotlin/com/kotlin/glue/GetCrawlers.kt +++ b/kotlin/services/glue/src/main/kotlin/com/kotlin/glue/GetCrawlers.kt @@ -27,7 +27,7 @@ suspend fun getAllCrawlers() { maxResults = 10 } - GlueClient { region = "us-east-1" }.use { glueClient -> + GlueClient.fromEnvironment { region = "us-east-1" }.use { glueClient -> val response = glueClient.getCrawlers(request) response.crawlers?.forEach { crawler -> println("The crawler name is ${crawler.name}") diff --git a/kotlin/services/glue/src/main/kotlin/com/kotlin/glue/GetDatabase.kt b/kotlin/services/glue/src/main/kotlin/com/kotlin/glue/GetDatabase.kt index 515e01df8e8..9082a0ee82c 100644 --- a/kotlin/services/glue/src/main/kotlin/com/kotlin/glue/GetDatabase.kt +++ b/kotlin/services/glue/src/main/kotlin/com/kotlin/glue/GetDatabase.kt @@ -44,7 +44,7 @@ suspend fun getSpecificDatabase(databaseName: String?) { name = databaseName } - GlueClient { region = "us-east-1" }.use { glueClient -> + GlueClient.fromEnvironment { region = "us-east-1" }.use { glueClient -> val response = glueClient.getDatabase(request) val dbDesc = response.database?.description println("The database description is $dbDesc") diff --git a/kotlin/services/glue/src/main/kotlin/com/kotlin/glue/GetDatabases.kt b/kotlin/services/glue/src/main/kotlin/com/kotlin/glue/GetDatabases.kt index ef1aeb90718..7d3f63bee26 100644 --- a/kotlin/services/glue/src/main/kotlin/com/kotlin/glue/GetDatabases.kt +++ b/kotlin/services/glue/src/main/kotlin/com/kotlin/glue/GetDatabases.kt @@ -27,7 +27,7 @@ suspend fun getAllDatabases() { maxResults = 10 } - GlueClient { region = "us-east-1" }.use { glueClient -> + GlueClient.fromEnvironment { region = "us-east-1" }.use { glueClient -> val response = glueClient.getDatabases(request) response.databaseList?.forEach { database -> println("The database name is ${database.name}") diff --git a/kotlin/services/glue/src/main/kotlin/com/kotlin/glue/GetJobRun.kt b/kotlin/services/glue/src/main/kotlin/com/kotlin/glue/GetJobRun.kt index 87b1c779567..f73d537cb82 100644 --- a/kotlin/services/glue/src/main/kotlin/com/kotlin/glue/GetJobRun.kt +++ b/kotlin/services/glue/src/main/kotlin/com/kotlin/glue/GetJobRun.kt @@ -48,7 +48,7 @@ suspend fun getGlueJobRun( runId = runIdVal } - GlueClient { region = "us-east-1" }.use { glueClient -> + GlueClient.fromEnvironment { region = "us-east-1" }.use { glueClient -> val runResponse = glueClient.getJobRun(request) println("Job status is ${runResponse.jobRun?.toString()}") } diff --git a/kotlin/services/glue/src/main/kotlin/com/kotlin/glue/GetJobs.kt b/kotlin/services/glue/src/main/kotlin/com/kotlin/glue/GetJobs.kt index a6d7e529c84..6951bce17fb 100644 --- a/kotlin/services/glue/src/main/kotlin/com/kotlin/glue/GetJobs.kt +++ b/kotlin/services/glue/src/main/kotlin/com/kotlin/glue/GetJobs.kt @@ -27,7 +27,7 @@ suspend fun getAllJobs() { maxResults = 10 } - GlueClient { region = "us-east-1" }.use { glueClient -> + GlueClient.fromEnvironment { region = "us-east-1" }.use { glueClient -> val response = glueClient.getJobs(request) response.jobs?.forEach { job -> println("Job name is ${job.name}") diff --git a/kotlin/services/glue/src/main/kotlin/com/kotlin/glue/GlueScenario.kt b/kotlin/services/glue/src/main/kotlin/com/kotlin/glue/GlueScenario.kt index cc8f1248fd5..9502174d89b 100644 --- a/kotlin/services/glue/src/main/kotlin/com/kotlin/glue/GlueScenario.kt +++ b/kotlin/services/glue/src/main/kotlin/com/kotlin/glue/GlueScenario.kt @@ -104,7 +104,7 @@ suspend fun createDatabase( databaseInput = input } - GlueClient { region = "us-east-1" }.use { glueClient -> + GlueClient.fromEnvironment { region = "us-east-1" }.use { glueClient -> glueClient.createDatabase(request) println("The database was successfully created") } @@ -140,7 +140,7 @@ suspend fun createCrawler( schedule = cron } - GlueClient { region = "us-east-1" }.use { glueClient -> + GlueClient.fromEnvironment { region = "us-east-1" }.use { glueClient -> glueClient.createCrawler(crawlerRequest) println("$crawlerName was successfully created") } @@ -152,7 +152,7 @@ suspend fun getCrawler(crawlerName: String?) { name = crawlerName } - GlueClient { region = "us-east-1" }.use { glueClient -> + GlueClient.fromEnvironment { region = "us-east-1" }.use { glueClient -> val response = glueClient.getCrawler(request) val role = response.crawler?.role println("The role associated with this crawler is $role") @@ -165,7 +165,7 @@ suspend fun startCrawler(crawlerName: String) { name = crawlerName } - GlueClient { region = "us-east-1" }.use { glueClient -> + GlueClient.fromEnvironment { region = "us-east-1" }.use { glueClient -> glueClient.startCrawler(crawlerRequest) println("$crawlerName was successfully started.") } @@ -177,7 +177,7 @@ suspend fun getDatabase(databaseName: String?) { name = databaseName } - GlueClient { region = "us-east-1" }.use { glueClient -> + GlueClient.fromEnvironment { region = "us-east-1" }.use { glueClient -> val response = glueClient.getDatabase(request) val dbDesc = response.database?.description println("The database description is $dbDesc") @@ -190,7 +190,7 @@ suspend fun getGlueTables(dbName: String?) { databaseName = dbName } - GlueClient { region = "us-east-1" }.use { glueClient -> + GlueClient.fromEnvironment { region = "us-east-1" }.use { glueClient -> val response = glueClient.getTables(tableRequest) response.tableList?.forEach { tableName -> println("Table name is ${tableName.name}") @@ -206,7 +206,7 @@ suspend fun startJob(jobNameVal: String?) { jobName = jobNameVal } - GlueClient { region = "us-east-1" }.use { glueClient -> + GlueClient.fromEnvironment { region = "us-east-1" }.use { glueClient -> val response = glueClient.startJobRun(runRequest) println("The job run Id is ${response.jobRunId}") } @@ -235,7 +235,7 @@ suspend fun createJob( command = commandOb } - GlueClient { region = "us-east-1" }.use { glueClient -> + GlueClient.fromEnvironment { region = "us-east-1" }.use { glueClient -> glueClient.createJob(jobRequest) println("$jobName was successfully created.") } @@ -247,7 +247,7 @@ suspend fun getJobs() { maxResults = 10 } - GlueClient { region = "us-east-1" }.use { glueClient -> + GlueClient.fromEnvironment { region = "us-east-1" }.use { glueClient -> val response = glueClient.getJobs(request) response.jobs?.forEach { job -> println("Job name is ${job.name}") @@ -261,7 +261,7 @@ suspend fun getJobRuns(jobNameVal: String?) { jobName = jobNameVal } - GlueClient { region = "us-east-1" }.use { glueClient -> + GlueClient.fromEnvironment { region = "us-east-1" }.use { glueClient -> val response = glueClient.getJobRuns(request) response.jobRuns?.forEach { job -> println("Job name is ${job.jobName}") @@ -275,7 +275,7 @@ suspend fun deleteJob(jobNameVal: String) { jobName = jobNameVal } - GlueClient { region = "us-east-1" }.use { glueClient -> + GlueClient.fromEnvironment { region = "us-east-1" }.use { glueClient -> glueClient.deleteJob(jobRequest) println("$jobNameVal was successfully deleted") } @@ -287,7 +287,7 @@ suspend fun deleteMyDatabase(databaseName: String) { name = databaseName } - GlueClient { region = "us-east-1" }.use { glueClient -> + GlueClient.fromEnvironment { region = "us-east-1" }.use { glueClient -> glueClient.deleteDatabase(request) println("$databaseName was successfully deleted") } @@ -298,7 +298,7 @@ suspend fun deleteCrawler(crawlerName: String) { DeleteCrawlerRequest { name = crawlerName } - GlueClient { region = "us-east-1" }.use { glueClient -> + GlueClient.fromEnvironment { region = "us-east-1" }.use { glueClient -> glueClient.deleteCrawler(request) println("$crawlerName was deleted") } diff --git a/kotlin/services/glue/src/main/kotlin/com/kotlin/glue/ListWorkflows.kt b/kotlin/services/glue/src/main/kotlin/com/kotlin/glue/ListWorkflows.kt index 64f9eeca7f3..2e4fb411371 100644 --- a/kotlin/services/glue/src/main/kotlin/com/kotlin/glue/ListWorkflows.kt +++ b/kotlin/services/glue/src/main/kotlin/com/kotlin/glue/ListWorkflows.kt @@ -27,7 +27,7 @@ suspend fun listAllWorkflows() { maxResults = 10 } - GlueClient { region = "us-east-1" }.use { glueClient -> + GlueClient.fromEnvironment { region = "us-east-1" }.use { glueClient -> val response = glueClient.listWorkflows(request) response.workflows?.forEach { workflow -> println("Workflow name is: $workflow") diff --git a/kotlin/services/glue/src/main/kotlin/com/kotlin/glue/SearchTables.kt b/kotlin/services/glue/src/main/kotlin/com/kotlin/glue/SearchTables.kt index a3190933dc2..b483ae93ba8 100644 --- a/kotlin/services/glue/src/main/kotlin/com/kotlin/glue/SearchTables.kt +++ b/kotlin/services/glue/src/main/kotlin/com/kotlin/glue/SearchTables.kt @@ -44,7 +44,7 @@ suspend fun searchGlueTable(text: String?) { maxResults = 10 } - GlueClient { region = "us-west-2" }.use { glueClient -> + GlueClient.fromEnvironment { region = "us-west-2" }.use { glueClient -> val response = glueClient.searchTables(request) response.tableList?.forEach { table -> println("Table name is ${table.name}") diff --git a/kotlin/services/glue/src/main/kotlin/com/kotlin/glue/StartCrawler.kt b/kotlin/services/glue/src/main/kotlin/com/kotlin/glue/StartCrawler.kt index aeed2ce0cd6..3ea129de155 100644 --- a/kotlin/services/glue/src/main/kotlin/com/kotlin/glue/StartCrawler.kt +++ b/kotlin/services/glue/src/main/kotlin/com/kotlin/glue/StartCrawler.kt @@ -42,7 +42,7 @@ suspend fun startSpecificCrawler(crawlerName: String?) { name = crawlerName } - GlueClient { region = "us-west-2" }.use { glueClient -> + GlueClient.fromEnvironment { region = "us-west-2" }.use { glueClient -> glueClient.startCrawler(request) println("$crawlerName was successfully started.") } diff --git a/kotlin/services/glue/src/main/kotlin/com/kotlin/glue/StopCrawler.kt b/kotlin/services/glue/src/main/kotlin/com/kotlin/glue/StopCrawler.kt index 0f715d7f392..4c3fbd5914f 100644 --- a/kotlin/services/glue/src/main/kotlin/com/kotlin/glue/StopCrawler.kt +++ b/kotlin/services/glue/src/main/kotlin/com/kotlin/glue/StopCrawler.kt @@ -42,7 +42,7 @@ suspend fun stopSpecificCrawler(crawlerName: String) { name = crawlerName } - GlueClient { region = "us-west-2" }.use { glueClient -> + GlueClient.fromEnvironment { region = "us-west-2" }.use { glueClient -> glueClient.stopCrawler(request) println("$crawlerName was stopped") } From acbf5db414365fe653e5b442e6294ebf31399687 Mon Sep 17 00:00:00 2001 From: Macdonald Date: Mon, 7 Jul 2025 15:13:52 -0400 Subject: [PATCH 13/27] updated build number --- kotlin/services/iam/build.gradle.kts | 4 +- .../com/kotlin/iam/AccessKeyLastUsed.kt | 2 +- .../kotlin/com/kotlin/iam/AttachRolePolicy.kt | 2 +- .../kotlin/com/kotlin/iam/CreateAccessKey.kt | 2 +- .../com/kotlin/iam/CreateAccountAlias.kt | 2 +- .../kotlin/com/kotlin/iam/CreatePolicy.kt | 37 ++++++++-------- .../main/kotlin/com/kotlin/iam/CreateUser.kt | 2 +- .../kotlin/com/kotlin/iam/DeleteAccessKey.kt | 2 +- .../com/kotlin/iam/DeleteAccountAlias.kt | 2 +- .../kotlin/com/kotlin/iam/DeletePolicy.kt | 2 +- .../main/kotlin/com/kotlin/iam/DeleteUser.kt | 2 +- .../kotlin/com/kotlin/iam/DetachRolePolicy.kt | 2 +- .../main/kotlin/com/kotlin/iam/GetPolicy.kt | 2 +- .../main/kotlin/com/kotlin/iam/IAMScenario.kt | 44 +++++++++---------- .../kotlin/com/kotlin/iam/ListAccessKeys.kt | 2 +- .../com/kotlin/iam/ListAccountAliases.kt | 2 +- .../main/kotlin/com/kotlin/iam/ListUsers.kt | 2 +- .../main/kotlin/com/kotlin/iam/UpdateUser.kt | 2 +- 18 files changed, 56 insertions(+), 59 deletions(-) diff --git a/kotlin/services/iam/build.gradle.kts b/kotlin/services/iam/build.gradle.kts index 44a71ed4570..5353d759437 100644 --- a/kotlin/services/iam/build.gradle.kts +++ b/kotlin/services/iam/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:iam") implementation("aws.sdk.kotlin:sts") implementation("aws.sdk.kotlin:s3") diff --git a/kotlin/services/iam/src/main/kotlin/com/kotlin/iam/AccessKeyLastUsed.kt b/kotlin/services/iam/src/main/kotlin/com/kotlin/iam/AccessKeyLastUsed.kt index d1dbb595e99..074cab9cd16 100644 --- a/kotlin/services/iam/src/main/kotlin/com/kotlin/iam/AccessKeyLastUsed.kt +++ b/kotlin/services/iam/src/main/kotlin/com/kotlin/iam/AccessKeyLastUsed.kt @@ -41,7 +41,7 @@ suspend fun getAccessKeyLastUsed(accessId: String?) { accessKeyId = accessId } - IamClient { region = "AWS_GLOBAL" }.use { iamClient -> + IamClient.fromEnvironment { region = "AWS_GLOBAL" }.use { iamClient -> val response = iamClient.getAccessKeyLastUsed(request) println("Access key was last used on ${response.accessKeyLastUsed?.lastUsedDate}") } diff --git a/kotlin/services/iam/src/main/kotlin/com/kotlin/iam/AttachRolePolicy.kt b/kotlin/services/iam/src/main/kotlin/com/kotlin/iam/AttachRolePolicy.kt index b1d6b6aacc0..4250f959dce 100644 --- a/kotlin/services/iam/src/main/kotlin/com/kotlin/iam/AttachRolePolicy.kt +++ b/kotlin/services/iam/src/main/kotlin/com/kotlin/iam/AttachRolePolicy.kt @@ -48,7 +48,7 @@ suspend fun attachIAMRolePolicy( roleName = roleNameVal } - IamClient { region = "AWS_GLOBAL" }.use { iamClient -> + IamClient.fromEnvironment { region = "AWS_GLOBAL" }.use { iamClient -> val response = iamClient.listAttachedRolePolicies(request) val attachedPolicies = response.attachedPolicies diff --git a/kotlin/services/iam/src/main/kotlin/com/kotlin/iam/CreateAccessKey.kt b/kotlin/services/iam/src/main/kotlin/com/kotlin/iam/CreateAccessKey.kt index df528e80649..52c7344904d 100644 --- a/kotlin/services/iam/src/main/kotlin/com/kotlin/iam/CreateAccessKey.kt +++ b/kotlin/services/iam/src/main/kotlin/com/kotlin/iam/CreateAccessKey.kt @@ -43,7 +43,7 @@ suspend fun createIAMAccessKey(user: String?): String { userName = user } - IamClient { region = "AWS_GLOBAL" }.use { iamClient -> + IamClient.fromEnvironment { region = "AWS_GLOBAL" }.use { iamClient -> val response = iamClient.createAccessKey(request) return response.accessKey?.accessKeyId.toString() } diff --git a/kotlin/services/iam/src/main/kotlin/com/kotlin/iam/CreateAccountAlias.kt b/kotlin/services/iam/src/main/kotlin/com/kotlin/iam/CreateAccountAlias.kt index 13f4e51e5f5..f7b7d00f1f9 100644 --- a/kotlin/services/iam/src/main/kotlin/com/kotlin/iam/CreateAccountAlias.kt +++ b/kotlin/services/iam/src/main/kotlin/com/kotlin/iam/CreateAccountAlias.kt @@ -42,7 +42,7 @@ suspend fun createIAMAccountAlias(alias: String) { accountAlias = alias } - IamClient { region = "AWS_GLOBAL" }.use { iamClient -> + IamClient.fromEnvironment { region = "AWS_GLOBAL" }.use { iamClient -> iamClient.createAccountAlias(request) println("Successfully created account alias named $alias") } diff --git a/kotlin/services/iam/src/main/kotlin/com/kotlin/iam/CreatePolicy.kt b/kotlin/services/iam/src/main/kotlin/com/kotlin/iam/CreatePolicy.kt index 12d92b67201..69781d4d242 100644 --- a/kotlin/services/iam/src/main/kotlin/com/kotlin/iam/CreatePolicy.kt +++ b/kotlin/services/iam/src/main/kotlin/com/kotlin/iam/CreatePolicy.kt @@ -37,23 +37,24 @@ suspend fun main(args: Array) { // snippet-start:[iam.kotlin.create_policy.main] suspend fun createIAMPolicy(policyNameVal: String?): String { - val policyDocumentVal = - "{" + - " \"Version\": \"2012-10-17\"," + - " \"Statement\": [" + - " {" + - " \"Effect\": \"Allow\"," + - " \"Action\": [" + - " \"dynamodb:DeleteItem\"," + - " \"dynamodb:GetItem\"," + - " \"dynamodb:PutItem\"," + - " \"dynamodb:Scan\"," + - " \"dynamodb:UpdateItem\"" + - " ]," + - " \"Resource\": \"*\"" + - " }" + - " ]" + - "}" + val policyDocumentVal = """ + { + "Version": "2012-10-17", + "Statement": [ + { + "Effect": "Allow", + "Action": [ + "dynamodb:DeleteItem", + "dynamodb:GetItem", + "dynamodb:PutItem", + "dynamodb:Scan", + "dynamodb:UpdateItem" + ], + "Resource": "*" + } + ] + } + """.trimIndent() val request = CreatePolicyRequest { @@ -61,7 +62,7 @@ suspend fun createIAMPolicy(policyNameVal: String?): String { policyDocument = policyDocumentVal } - IamClient { region = "AWS_GLOBAL" }.use { iamClient -> + IamClient.fromEnvironment { region = "AWS_GLOBAL" }.use { iamClient -> val response = iamClient.createPolicy(request) return response.policy?.arn.toString() } diff --git a/kotlin/services/iam/src/main/kotlin/com/kotlin/iam/CreateUser.kt b/kotlin/services/iam/src/main/kotlin/com/kotlin/iam/CreateUser.kt index f3412239028..e148ca4cf0d 100644 --- a/kotlin/services/iam/src/main/kotlin/com/kotlin/iam/CreateUser.kt +++ b/kotlin/services/iam/src/main/kotlin/com/kotlin/iam/CreateUser.kt @@ -42,7 +42,7 @@ suspend fun createIAMUser(usernameVal: String?): String? { userName = usernameVal } - IamClient { region = "AWS_GLOBAL" }.use { iamClient -> + IamClient.fromEnvironment { region = "AWS_GLOBAL" }.use { iamClient -> val response = iamClient.createUser(request) return response.user?.userName } diff --git a/kotlin/services/iam/src/main/kotlin/com/kotlin/iam/DeleteAccessKey.kt b/kotlin/services/iam/src/main/kotlin/com/kotlin/iam/DeleteAccessKey.kt index 64ff59e55a6..3a0cc3fe025 100644 --- a/kotlin/services/iam/src/main/kotlin/com/kotlin/iam/DeleteAccessKey.kt +++ b/kotlin/services/iam/src/main/kotlin/com/kotlin/iam/DeleteAccessKey.kt @@ -47,7 +47,7 @@ suspend fun deleteKey( userName = userNameVal } - IamClient { region = "AWS_GLOBAL" }.use { iamClient -> + IamClient.fromEnvironment { region = "AWS_GLOBAL" }.use { iamClient -> iamClient.deleteAccessKey(request) println("Successfully deleted access key $accessKey from $userNameVal") } diff --git a/kotlin/services/iam/src/main/kotlin/com/kotlin/iam/DeleteAccountAlias.kt b/kotlin/services/iam/src/main/kotlin/com/kotlin/iam/DeleteAccountAlias.kt index 95df24b15ee..e054ecaa065 100644 --- a/kotlin/services/iam/src/main/kotlin/com/kotlin/iam/DeleteAccountAlias.kt +++ b/kotlin/services/iam/src/main/kotlin/com/kotlin/iam/DeleteAccountAlias.kt @@ -41,7 +41,7 @@ suspend fun deleteIAMAccountAlias(alias: String) { accountAlias = alias } - IamClient { region = "AWS_GLOBAL" }.use { iamClient -> + IamClient.fromEnvironment { region = "AWS_GLOBAL" }.use { iamClient -> iamClient.deleteAccountAlias(request) println("Successfully deleted account alias $alias") } diff --git a/kotlin/services/iam/src/main/kotlin/com/kotlin/iam/DeletePolicy.kt b/kotlin/services/iam/src/main/kotlin/com/kotlin/iam/DeletePolicy.kt index f10bc19a812..3d5e8ba20eb 100644 --- a/kotlin/services/iam/src/main/kotlin/com/kotlin/iam/DeletePolicy.kt +++ b/kotlin/services/iam/src/main/kotlin/com/kotlin/iam/DeletePolicy.kt @@ -41,7 +41,7 @@ suspend fun deleteIAMPolicy(policyARNVal: String?) { policyArn = policyARNVal } - IamClient { region = "AWS_GLOBAL" }.use { iamClient -> + IamClient.fromEnvironment { region = "AWS_GLOBAL" }.use { iamClient -> iamClient.deletePolicy(request) println("Successfully deleted $policyARNVal") } diff --git a/kotlin/services/iam/src/main/kotlin/com/kotlin/iam/DeleteUser.kt b/kotlin/services/iam/src/main/kotlin/com/kotlin/iam/DeleteUser.kt index 867c09c6bf8..b3b55c69b6a 100644 --- a/kotlin/services/iam/src/main/kotlin/com/kotlin/iam/DeleteUser.kt +++ b/kotlin/services/iam/src/main/kotlin/com/kotlin/iam/DeleteUser.kt @@ -42,7 +42,7 @@ suspend fun deleteIAMUser(userNameVal: String) { } // To delete a user, ensure that the user's access keys are deleted first. - IamClient { region = "AWS_GLOBAL" }.use { iamClient -> + IamClient.fromEnvironment { region = "AWS_GLOBAL" }.use { iamClient -> iamClient.deleteUser(request) println("Successfully deleted user $userNameVal") } diff --git a/kotlin/services/iam/src/main/kotlin/com/kotlin/iam/DetachRolePolicy.kt b/kotlin/services/iam/src/main/kotlin/com/kotlin/iam/DetachRolePolicy.kt index 4ed9ecdb5d2..5c128d68261 100644 --- a/kotlin/services/iam/src/main/kotlin/com/kotlin/iam/DetachRolePolicy.kt +++ b/kotlin/services/iam/src/main/kotlin/com/kotlin/iam/DetachRolePolicy.kt @@ -47,7 +47,7 @@ suspend fun detachPolicy( policyArn = policyArnVal } - IamClient { region = "AWS_GLOBAL" }.use { iamClient -> + IamClient.fromEnvironment { region = "AWS_GLOBAL" }.use { iamClient -> iamClient.detachRolePolicy(request) println("Successfully detached policy $policyArnVal from role $roleNameVal") } diff --git a/kotlin/services/iam/src/main/kotlin/com/kotlin/iam/GetPolicy.kt b/kotlin/services/iam/src/main/kotlin/com/kotlin/iam/GetPolicy.kt index 0ad19288c40..175c18a1c6e 100644 --- a/kotlin/services/iam/src/main/kotlin/com/kotlin/iam/GetPolicy.kt +++ b/kotlin/services/iam/src/main/kotlin/com/kotlin/iam/GetPolicy.kt @@ -41,7 +41,7 @@ suspend fun getIAMPolicy(policyArnVal: String?) { policyArn = policyArnVal } - IamClient { region = "AWS_GLOBAL" }.use { iamClient -> + IamClient.fromEnvironment { region = "AWS_GLOBAL" }.use { iamClient -> val response = iamClient.getPolicy(request) println("Successfully retrieved policy ${response.policy?.policyName}") } diff --git a/kotlin/services/iam/src/main/kotlin/com/kotlin/iam/IAMScenario.kt b/kotlin/services/iam/src/main/kotlin/com/kotlin/iam/IAMScenario.kt index 99e278f74ff..33b1297446c 100644 --- a/kotlin/services/iam/src/main/kotlin/com/kotlin/iam/IAMScenario.kt +++ b/kotlin/services/iam/src/main/kotlin/com/kotlin/iam/IAMScenario.kt @@ -104,19 +104,20 @@ suspend fun createUser(usernameVal: String?): String? { } suspend fun createPolicy(policyNameVal: String?): String { - val policyDocumentValue: String = - "{" + - " \"Version\": \"2012-10-17\"," + - " \"Statement\": [" + - " {" + - " \"Effect\": \"Allow\"," + - " \"Action\": [" + - " \"s3:*\"" + - " ]," + - " \"Resource\": \"*\"" + - " }" + - " ]" + - "}" + val policyDocumentValue = """ + { + "Version": "2012-10-17", + "Statement": [ + { + "Effect": "Allow", + "Action": [ + "s3:*" + ], + "Resource": "*" + } + ] + } + """.trimIndent() val request = CreatePolicyRequest { @@ -124,7 +125,7 @@ suspend fun createPolicy(policyNameVal: String?): String { policyDocument = policyDocumentValue } - IamClient { region = "AWS_GLOBAL" }.use { iamClient -> + IamClient.fromEnvironment { region = "AWS_GLOBAL" }.use { iamClient -> val response = iamClient.createPolicy(request) return response.policy?.arn.toString() } @@ -158,7 +159,7 @@ suspend fun attachRolePolicy( roleName = roleNameVal } - IamClient { region = "AWS_GLOBAL" }.use { iamClient -> + IamClient.fromEnvironment { region = "AWS_GLOBAL" }.use { iamClient -> val response = iamClient.listAttachedRolePolicies(request) val attachedPolicies = response.attachedPolicies @@ -201,11 +202,7 @@ suspend fun assumeGivenRole( roleSessionNameVal: String?, bucketName: String, ) { - val stsClient = - StsClient { - region = "us-east-1" - } - + val stsClient = StsClient.fromEnvironment {region = "us-east-1" } val roleRequest = AssumeRoleRequest { roleArn = roleArnVal @@ -226,8 +223,7 @@ suspend fun assumeGivenRole( } // List all objects in an Amazon S3 bucket using the temp creds. - val s3 = - S3Client { + val s3 = S3Client.fromEnvironment { credentialsProvider = staticCredentials region = "us-east-1" } @@ -251,7 +247,7 @@ suspend fun deleteRole( roleNameVal: String, polArn: String, ) { - val iam = IamClient { region = "AWS_GLOBAL" } + val iam = IamClient.fromEnvironment { region = "AWS_GLOBAL" } // First the policy needs to be detached. val rolePolicyRequest = @@ -282,7 +278,7 @@ suspend fun deleteRole( } suspend fun deleteUser(userNameVal: String) { - val iam = IamClient { region = "AWS_GLOBAL" } + val iam = IamClient.fromEnvironment { region = "AWS_GLOBAL" } val request = DeleteUserRequest { userName = userNameVal diff --git a/kotlin/services/iam/src/main/kotlin/com/kotlin/iam/ListAccessKeys.kt b/kotlin/services/iam/src/main/kotlin/com/kotlin/iam/ListAccessKeys.kt index c002fb9586b..284402e935e 100644 --- a/kotlin/services/iam/src/main/kotlin/com/kotlin/iam/ListAccessKeys.kt +++ b/kotlin/services/iam/src/main/kotlin/com/kotlin/iam/ListAccessKeys.kt @@ -40,7 +40,7 @@ suspend fun listKeys(userNameVal: String?) { ListAccessKeysRequest { userName = userNameVal } - IamClient { region = "AWS_GLOBAL" }.use { iamClient -> + IamClient.fromEnvironment { region = "AWS_GLOBAL" }.use { iamClient -> val response = iamClient.listAccessKeys(request) response.accessKeyMetadata?.forEach { md -> println("Retrieved access key ${md.accessKeyId}") diff --git a/kotlin/services/iam/src/main/kotlin/com/kotlin/iam/ListAccountAliases.kt b/kotlin/services/iam/src/main/kotlin/com/kotlin/iam/ListAccountAliases.kt index 388028f1622..60846c2fba3 100644 --- a/kotlin/services/iam/src/main/kotlin/com/kotlin/iam/ListAccountAliases.kt +++ b/kotlin/services/iam/src/main/kotlin/com/kotlin/iam/ListAccountAliases.kt @@ -22,7 +22,7 @@ suspend fun main() { // snippet-start:[iam.kotlin.list_account_aliases.main] suspend fun listAliases() { - IamClient { region = "AWS_GLOBAL" }.use { iamClient -> + IamClient.fromEnvironment { region = "AWS_GLOBAL" }.use { iamClient -> val response = iamClient.listAccountAliases(ListAccountAliasesRequest {}) response.accountAliases?.forEach { alias -> println("Retrieved account alias $alias") diff --git a/kotlin/services/iam/src/main/kotlin/com/kotlin/iam/ListUsers.kt b/kotlin/services/iam/src/main/kotlin/com/kotlin/iam/ListUsers.kt index 80131d32fec..a3100a47579 100644 --- a/kotlin/services/iam/src/main/kotlin/com/kotlin/iam/ListUsers.kt +++ b/kotlin/services/iam/src/main/kotlin/com/kotlin/iam/ListUsers.kt @@ -22,7 +22,7 @@ suspend fun main() { // snippet-start:[iam.kotlin.list_users.main] suspend fun listAllUsers() { - IamClient { region = "AWS_GLOBAL" }.use { iamClient -> + IamClient.fromEnvironment { region = "AWS_GLOBAL" }.use { iamClient -> val response = iamClient.listUsers(ListUsersRequest { }) response.users?.forEach { user -> println("Retrieved user ${user.userName}") diff --git a/kotlin/services/iam/src/main/kotlin/com/kotlin/iam/UpdateUser.kt b/kotlin/services/iam/src/main/kotlin/com/kotlin/iam/UpdateUser.kt index 3f6160aa3fa..8e7756f37d3 100644 --- a/kotlin/services/iam/src/main/kotlin/com/kotlin/iam/UpdateUser.kt +++ b/kotlin/services/iam/src/main/kotlin/com/kotlin/iam/UpdateUser.kt @@ -47,7 +47,7 @@ suspend fun updateIAMUser( newUserName = newName } - IamClient { region = "AWS_GLOBAL" }.use { iamClient -> + IamClient.fromEnvironment { region = "AWS_GLOBAL" }.use { iamClient -> iamClient.updateUser(request) println("Successfully updated user to $newName") } From 82ea449ec24777a5445248133e916c1dac1a7fc1 Mon Sep 17 00:00:00 2001 From: Macdonald Date: Mon, 7 Jul 2025 15:25:05 -0400 Subject: [PATCH 14/27] updated build number --- kotlin/services/iot/build.gradle.kts | 4 +-- .../main/kotlin/com/example/iot/HelloIoT.kt | 2 +- .../kotlin/com/example/iot/IotScenario.kt | 30 +++++++++---------- 3 files changed, 18 insertions(+), 18 deletions(-) diff --git a/kotlin/services/iot/build.gradle.kts b/kotlin/services/iot/build.gradle.kts index 46c0cc459e9..9143b863c85 100644 --- a/kotlin/services/iot/build.gradle.kts +++ b/kotlin/services/iot/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.115")) implementation("aws.sdk.kotlin:iot") implementation("aws.sdk.kotlin:iotdataplane") implementation("aws.sdk.kotlin:secretsmanager") diff --git a/kotlin/services/iot/src/main/kotlin/com/example/iot/HelloIoT.kt b/kotlin/services/iot/src/main/kotlin/com/example/iot/HelloIoT.kt index 95616052ffd..a51fad85880 100644 --- a/kotlin/services/iot/src/main/kotlin/com/example/iot/HelloIoT.kt +++ b/kotlin/services/iot/src/main/kotlin/com/example/iot/HelloIoT.kt @@ -18,7 +18,7 @@ suspend fun listAllThings() { maxResults = 10 } - IotClient { region = "us-east-1" }.use { iotClient -> + IotClient.fromEnvironment { region = "us-east-1" }.use { iotClient -> val response = iotClient.listThings(thingsRequest) val thingList = response.things if (thingList != null) { diff --git a/kotlin/services/iot/src/main/kotlin/com/example/iot/IotScenario.kt b/kotlin/services/iot/src/main/kotlin/com/example/iot/IotScenario.kt index ad9917fde76..1b30c238b1f 100644 --- a/kotlin/services/iot/src/main/kotlin/com/example/iot/IotScenario.kt +++ b/kotlin/services/iot/src/main/kotlin/com/example/iot/IotScenario.kt @@ -247,7 +247,7 @@ suspend fun deleteIoTThing(thingNameVal: String) { thingName = thingNameVal } - IotClient { region = "us-east-1" }.use { iotClient -> + IotClient.fromEnvironment { region = "us-east-1" }.use { iotClient -> iotClient.deleteThing(deleteThingRequest) println("Deleted $thingNameVal") } @@ -260,7 +260,7 @@ suspend fun deleteCertificate(certificateArn: String) { DeleteCertificateRequest { certificateId = extractCertificateId(certificateArn) } - IotClient { region = "us-east-1" }.use { iotClient -> + IotClient.fromEnvironment { region = "us-east-1" }.use { iotClient -> iotClient.deleteCertificate(certificateProviderRequest) println("$certificateArn was successfully deleted.") } @@ -285,7 +285,7 @@ suspend fun detachThingPrincipal( thingName = thingNameVal } - IotClient { region = "us-east-1" }.use { iotClient -> + IotClient.fromEnvironment { region = "us-east-1" }.use { iotClient -> iotClient.detachThingPrincipal(thingPrincipalRequest) println("$certificateArn was successfully removed from $thingNameVal") } @@ -299,7 +299,7 @@ suspend fun searchThings(queryStringVal: String?) { queryString = queryStringVal } - IotClient { region = "us-east-1" }.use { iotClient -> + IotClient.fromEnvironment { region = "us-east-1" }.use { iotClient -> val searchIndexResponse = iotClient.searchIndex(searchIndexRequest) if (searchIndexResponse.things?.isEmpty() == true) { println("No things found.") @@ -315,7 +315,7 @@ suspend fun searchThings(queryStringVal: String?) { suspend fun listIoTRules() { val listTopicRulesRequest = ListTopicRulesRequest {} - IotClient { region = "us-east-1" }.use { iotClient -> + IotClient.fromEnvironment { region = "us-east-1" }.use { iotClient -> val listTopicRulesResponse = iotClient.listTopicRules(listTopicRulesRequest) println("List of IoT rules:") val ruleList = listTopicRulesResponse.rules @@ -358,7 +358,7 @@ suspend fun createIoTRule( topicRulePayload = topicRulePayloadVal } - IotClient { region = "us-east-1" }.use { iotClient -> + IotClient.fromEnvironment { region = "us-east-1" }.use { iotClient -> iotClient.createTopicRule(topicRuleRequest) println("IoT rule created successfully.") } @@ -372,7 +372,7 @@ suspend fun getPayload(thingNameVal: String?) { thingName = thingNameVal } - IotDataPlaneClient { region = "us-east-1" }.use { iotPlaneClient -> + IotDataPlaneClient.fromEnvironment { region = "us-east-1" }.use { iotPlaneClient -> val getThingShadowResponse = iotPlaneClient.getThingShadow(getThingShadowRequest) val payload = getThingShadowResponse.payload val payloadString = payload?.let { java.lang.String(it, Charsets.UTF_8) } @@ -383,7 +383,7 @@ suspend fun getPayload(thingNameVal: String?) { // snippet-start:[iot.kotlin.list.certs.main] suspend fun listCertificates() { - IotClient { region = "us-east-1" }.use { iotClient -> + IotClient.fromEnvironment { region = "us-east-1" }.use { iotClient -> val response = iotClient.listCertificates() val certList = response.certificates certList?.forEach { cert -> @@ -397,7 +397,7 @@ suspend fun listCertificates() { // snippet-start:[iot.kotlin.describe.endpoint.main] suspend fun describeEndpoint(): String? { val request = DescribeEndpointRequest {} - IotClient { region = "us-east-1" }.use { iotClient -> + IotClient.fromEnvironment { region = "us-east-1" }.use { iotClient -> val endpointResponse = iotClient.describeEndpoint(request) val endpointUrl: String? = endpointResponse.endpointAddress val exString: String = getValue(endpointUrl) @@ -445,7 +445,7 @@ suspend fun updateThing(thingNameVal: String?) { attributePayload = attributePayloadVal } - IotClient { region = "us-east-1" }.use { iotClient -> + IotClient.fromEnvironment { region = "us-east-1" }.use { iotClient -> // Update the IoT thing attributes. iotClient.updateThing(updateThingRequest) println("$thingNameVal attributes updated successfully.") @@ -466,7 +466,7 @@ suspend fun updateShawdowThing(thingNameVal: String?) { payload = byteArray } - IotDataPlaneClient { region = "us-east-1" }.use { iotPlaneClient -> + IotDataPlaneClient.fromEnvironment { region = "us-east-1" }.use { iotPlaneClient -> iotPlaneClient.updateThingShadow(updateThingShadowRequest) println("The thing shadow was updated successfully.") } @@ -484,7 +484,7 @@ suspend fun attachCertificateToThing( principal = certificateArn } - IotClient { region = "us-east-1" }.use { iotClient -> + IotClient.fromEnvironment { region = "us-east-1" }.use { iotClient -> iotClient.attachThingPrincipal(principalRequest) println("Certificate attached to $thingNameVal successfully.") } @@ -499,7 +499,7 @@ suspend fun describeThing(thingNameVal: String) { } // Print Thing details. - IotClient { region = "us-east-1" }.use { iotClient -> + IotClient.fromEnvironment { region = "us-east-1" }.use { iotClient -> val describeResponse = iotClient.describeThing(thingRequest) println("Thing details:") println("Thing name: ${describeResponse.thingName}") @@ -510,7 +510,7 @@ suspend fun describeThing(thingNameVal: String) { // snippet-start:[iot.kotlin.create.cert.main] suspend fun createCertificate(): String? { - IotClient { region = "us-east-1" }.use { iotClient -> + IotClient.fromEnvironment { region = "us-east-1" }.use { iotClient -> val response = iotClient.createKeysAndCertificate() val certificatePem = response.certificatePem val certificateArn = response.certificateArn @@ -532,7 +532,7 @@ suspend fun createIoTThing(thingNameVal: String) { thingName = thingNameVal } - IotClient { region = "us-east-1" }.use { iotClient -> + IotClient.fromEnvironment { region = "us-east-1" }.use { iotClient -> iotClient.createThing(createThingRequest) println("Created $thingNameVal}") } From 2995f13363e38aacbbdecd3a3c1fb0e90d82ba33 Mon Sep 17 00:00:00 2001 From: Macdonald Date: Mon, 7 Jul 2025 15:32:40 -0400 Subject: [PATCH 15/27] updated build number --- kotlin/services/iotfleetwise/build.gradle.kts | 4 +-- .../fleetwise/scenario/FleetwiseScenario.kt | 34 +++++++++---------- 2 files changed, 19 insertions(+), 19 deletions(-) diff --git a/kotlin/services/iotfleetwise/build.gradle.kts b/kotlin/services/iotfleetwise/build.gradle.kts index 825c616983a..9baaff933c3 100644 --- a/kotlin/services/iotfleetwise/build.gradle.kts +++ b/kotlin/services/iotfleetwise/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.118")) implementation("aws.sdk.kotlin:iot") implementation("aws.sdk.kotlin:iotfleetwise") implementation("aws.sdk.kotlin:secretsmanager") diff --git a/kotlin/services/iotfleetwise/src/main/java/com/example/fleetwise/scenario/FleetwiseScenario.kt b/kotlin/services/iotfleetwise/src/main/java/com/example/fleetwise/scenario/FleetwiseScenario.kt index 43b69e1f949..543c8c2422c 100644 --- a/kotlin/services/iotfleetwise/src/main/java/com/example/fleetwise/scenario/FleetwiseScenario.kt +++ b/kotlin/services/iotfleetwise/src/main/java/com/example/fleetwise/scenario/FleetwiseScenario.kt @@ -258,7 +258,7 @@ suspend fun deleteVehicle(vecName: String) { vehicleName = vecName } - IotFleetWiseClient { region = "us-east-1" }.use { fleetwiseClient -> + IotFleetWiseClient.fromEnvironment { region = "us-east-1" }.use { fleetwiseClient -> fleetwiseClient.deleteVehicle(request) println("Vehicle $vecName was deleted successfully.") } @@ -271,7 +271,7 @@ suspend fun getVehicleDetails(vehicleNameVal: String) { vehicleName = vehicleNameVal } - IotFleetWiseClient { region = "us-east-1" }.use { fleetwiseClient -> + IotFleetWiseClient.fromEnvironment { region = "us-east-1" }.use { fleetwiseClient -> val response = fleetwiseClient.getVehicle(request) val details = mapOf( "vehicleName" to response.vehicleName, @@ -299,7 +299,7 @@ suspend fun createVehicle(vecName: String, manifestArn: String?, decArn: String) decoderManifestArn = decArn } - IotFleetWiseClient { region = "us-east-1" }.use { fleetwiseClient -> + IotFleetWiseClient.fromEnvironment { region = "us-east-1" }.use { fleetwiseClient -> fleetwiseClient.createVehicle(request) println("Vehicle $vecName was created successfully.") } @@ -316,7 +316,7 @@ suspend fun createThingIfNotExist(vecName: String) { thingName = vecName } - IotClient { region = "us-east-1" }.use { client -> + IotClient.fromEnvironment { region = "us-east-1" }.use { client -> client.createThing(request) println("The $vecName IoT Thing was successfully created") } @@ -328,7 +328,7 @@ suspend fun updateDecoderManifest(nameVal: String) { name = nameVal status = ManifestStatus.Active } - IotFleetWiseClient { region = "us-east-1" }.use { fleetwiseClient -> + IotFleetWiseClient.fromEnvironment { region = "us-east-1" }.use { fleetwiseClient -> fleetwiseClient.updateDecoderManifest(request) println("$nameVal was successfully updated") } @@ -346,7 +346,7 @@ suspend fun waitForDecoderManifestActive(decNameVal: String) { var lastStatus: ManifestStatus = ManifestStatus.Draft print("⏳ Elapsed: 0s | Status: DRAFT") - IotFleetWiseClient { region = "us-east-1" }.use { fleetwiseClient -> + IotFleetWiseClient.fromEnvironment { region = "us-east-1" }.use { fleetwiseClient -> while (true) { delay(1000) elapsedSeconds++ @@ -392,7 +392,7 @@ suspend fun waitForModelManifestActive(manifestNameVal: String) { var lastStatus: ManifestStatus = ManifestStatus.Draft print("⏳ Elapsed: 0s | Status: DRAFT") - IotFleetWiseClient { region = "us-east-1" }.use { fleetwiseClient -> + IotFleetWiseClient.fromEnvironment { region = "us-east-1" }.use { fleetwiseClient -> while (true) { delay(1000) elapsedSeconds++ @@ -438,7 +438,7 @@ suspend fun updateModelManifest(nameVal: String) { name = nameVal status = ManifestStatus.Active } - IotFleetWiseClient { region = "us-east-1" }.use { fleetwiseClient -> + IotFleetWiseClient.fromEnvironment { region = "us-east-1" }.use { fleetwiseClient -> fleetwiseClient.updateModelManifest(request) println("$nameVal was successfully updated") } @@ -451,7 +451,7 @@ suspend fun deleteDecoderManifest(nameVal: String) { name = nameVal } - IotFleetWiseClient { region = "us-east-1" }.use { fleetwiseClient -> + IotFleetWiseClient.fromEnvironment { region = "us-east-1" }.use { fleetwiseClient -> fleetwiseClient.deleteDecoderManifest(request) println("$nameVal was successfully deleted") } @@ -522,7 +522,7 @@ suspend fun createDecoderManifest(decName: String, modelManifestArnVal: String?) signalDecoders = listOf(engineRpmDecoder, vehicleSpeedDecoder) } - IotFleetWiseClient { region = "us-east-1" }.use { fleetwiseClient -> + IotFleetWiseClient.fromEnvironment { region = "us-east-1" }.use { fleetwiseClient -> val response = fleetwiseClient.createDecoderManifest(request) return response.arn } @@ -539,7 +539,7 @@ suspend fun deleteSignalCatalog(catName: String) { val request = DeleteSignalCatalogRequest { name = catName } - IotFleetWiseClient { region = "us-east-1" }.use { fleetwiseClient -> + IotFleetWiseClient.fromEnvironment { region = "us-east-1" }.use { fleetwiseClient -> fleetwiseClient.deleteSignalCatalog(request) println(" $catName was successfully deleted") } @@ -557,7 +557,7 @@ suspend fun deleteFleet(fleetIdVal: String) { fleetId = fleetIdVal } - IotFleetWiseClient { region = "us-east-1" }.use { fleetwiseClient -> + IotFleetWiseClient.fromEnvironment { region = "us-east-1" }.use { fleetwiseClient -> fleetwiseClient.deleteFleet(request) println(" $fleetIdVal was successfully deleted") } @@ -574,7 +574,7 @@ suspend fun deleteModelManifest(nameVal: String) { val request = DeleteModelManifestRequest { name = nameVal } - IotFleetWiseClient { region = "us-east-1" }.use { fleetwiseClient -> + IotFleetWiseClient.fromEnvironment { region = "us-east-1" }.use { fleetwiseClient -> fleetwiseClient.deleteModelManifest(request) println(" $nameVal was successfully deleted") } @@ -604,7 +604,7 @@ suspend fun createModelManifest(nameVal: String, signalCatalogArnVal: String, no signalCatalogArn = signalCatalogArnVal nodes = fqnList } - IotFleetWiseClient { region = "us-east-1" }.use { fleetwiseClient -> + IotFleetWiseClient.fromEnvironment { region = "us-east-1" }.use { fleetwiseClient -> val response = fleetwiseClient.createModelManifest(request) return response.arn } @@ -624,7 +624,7 @@ suspend fun listSignalCatalogNode(signalCatalogName: String): List? { name = signalCatalogName } - IotFleetWiseClient { region = "us-east-1" }.use { fleetwiseClient -> + IotFleetWiseClient.fromEnvironment { region = "us-east-1" }.use { fleetwiseClient -> val response = fleetwiseClient.listSignalCatalogNodes(request) return response.nodes } @@ -646,7 +646,7 @@ suspend fun createFleet(catARN: String, fleetIdVal: String): String { description = "Built using the AWS For Kotlin" } - IotFleetWiseClient { region = "us-east-1" }.use { fleetwiseClient -> + IotFleetWiseClient.fromEnvironment { region = "us-east-1" }.use { fleetwiseClient -> val response = fleetwiseClient.createFleet(fleetRequest) return response.id } @@ -700,7 +700,7 @@ suspend fun createbranchVehicle(signalCatalogName: String): String { nodes = myNodes } - IotFleetWiseClient { region = "us-east-1" }.use { fleetwiseClient -> + IotFleetWiseClient.fromEnvironment { region = "us-east-1" }.use { fleetwiseClient -> val response = fleetwiseClient.createSignalCatalog(request) return response.arn } From 614cbb6fcefba950434df947c0db0f25c443030d Mon Sep 17 00:00:00 2001 From: Macdonald Date: Mon, 7 Jul 2025 15:38:35 -0400 Subject: [PATCH 16/27] updated build number --- .../main/kotlin/com/kotlin/iam/IAMScenario.kt | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) diff --git a/kotlin/services/iam/src/main/kotlin/com/kotlin/iam/IAMScenario.kt b/kotlin/services/iam/src/main/kotlin/com/kotlin/iam/IAMScenario.kt index 33b1297446c..3742cc55c19 100644 --- a/kotlin/services/iam/src/main/kotlin/com/kotlin/iam/IAMScenario.kt +++ b/kotlin/services/iam/src/main/kotlin/com/kotlin/iam/IAMScenario.kt @@ -202,7 +202,7 @@ suspend fun assumeGivenRole( roleSessionNameVal: String?, bucketName: String, ) { - val stsClient = StsClient.fromEnvironment {region = "us-east-1" } + val stsClient = StsClient.fromEnvironment { region = "us-east-1" } val roleRequest = AssumeRoleRequest { roleArn = roleArnVal @@ -215,18 +215,17 @@ suspend fun assumeGivenRole( val secKey = myCreds?.secretAccessKey val secToken = myCreds?.sessionToken - val staticCredentials = - StaticCredentialsProvider { - accessKeyId = key - secretAccessKey = secKey - sessionToken = secToken - } + val staticCredentials = StaticCredentialsProvider { + accessKeyId = key + secretAccessKey = secKey + sessionToken = secToken + } // List all objects in an Amazon S3 bucket using the temp creds. val s3 = S3Client.fromEnvironment { - credentialsProvider = staticCredentials - region = "us-east-1" - } + region = "us-east-1" + credentialsProvider = staticCredentials + } println("Created a S3Client using temp credentials.") println("Listing objects in $bucketName") From a757a6dcefe8df8278aa2b34df1debffd4e51437 Mon Sep 17 00:00:00 2001 From: Macdonald Date: Mon, 7 Jul 2025 15:58:05 -0400 Subject: [PATCH 17/27] updated build number --- kotlin/services/kendra/build.gradle.kts | 4 ++-- .../kendra/CreateIndexAndDataSourceExample.kt | 2 +- .../com/example/kendra/DeleteDataSource.kt | 2 +- .../kotlin/com/example/kendra/DeleteIndex.kt | 2 +- .../example/kendra/ListDataSourceSyncJobs.kt | 2 +- .../kotlin/com/example/kendra/QueryIndex.kt | 2 +- kotlin/services/keyspaces/build.gradle.kts | 4 ++-- .../com/example/keyspace/HelloKeyspaces.kt | 2 +- .../com/example/keyspace/ScenarioKeyspaces.kt | 24 +++++++++---------- 9 files changed, 22 insertions(+), 22 deletions(-) diff --git a/kotlin/services/kendra/build.gradle.kts b/kotlin/services/kendra/build.gradle.kts index 6588a3b090c..1e7b6670e5e 100644 --- a/kotlin/services/kendra/build.gradle.kts +++ b/kotlin/services/kendra/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 } @@ -28,7 +28,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:kendra") implementation("aws.sdk.kotlin:secretsmanager") testImplementation("org.junit.jupiter:junit-jupiter:5.9.2") diff --git a/kotlin/services/kendra/src/main/kotlin/com/example/kendra/CreateIndexAndDataSourceExample.kt b/kotlin/services/kendra/src/main/kotlin/com/example/kendra/CreateIndexAndDataSourceExample.kt index 370d824bed7..93e69642244 100644 --- a/kotlin/services/kendra/src/main/kotlin/com/example/kendra/CreateIndexAndDataSourceExample.kt +++ b/kotlin/services/kendra/src/main/kotlin/com/example/kendra/CreateIndexAndDataSourceExample.kt @@ -76,7 +76,7 @@ suspend fun createIndex( roleArn = indexRoleArn } - KendraClient { region = "us-east-1" }.use { kendra -> + KendraClient.fromEnvironment { region = "us-east-1" }.use { kendra -> val createIndexResponse = kendra.createIndex(createIndexRequest) val indexId = createIndexResponse.id println("Waiting until the index with index ID $indexId is created.") diff --git a/kotlin/services/kendra/src/main/kotlin/com/example/kendra/DeleteDataSource.kt b/kotlin/services/kendra/src/main/kotlin/com/example/kendra/DeleteDataSource.kt index 014cc65737f..e9e6948bf94 100644 --- a/kotlin/services/kendra/src/main/kotlin/com/example/kendra/DeleteDataSource.kt +++ b/kotlin/services/kendra/src/main/kotlin/com/example/kendra/DeleteDataSource.kt @@ -49,7 +49,7 @@ suspend fun deleteSpecificDataSource( indexId = indexIdVal } - KendraClient { region = "us-east-1" }.use { kendra -> + KendraClient.fromEnvironment { region = "us-east-1" }.use { kendra -> kendra.deleteDataSource(dataSourceRequest) println("$dataSourceId was successfully deleted.") } diff --git a/kotlin/services/kendra/src/main/kotlin/com/example/kendra/DeleteIndex.kt b/kotlin/services/kendra/src/main/kotlin/com/example/kendra/DeleteIndex.kt index 73e41627d4a..b418e995d68 100644 --- a/kotlin/services/kendra/src/main/kotlin/com/example/kendra/DeleteIndex.kt +++ b/kotlin/services/kendra/src/main/kotlin/com/example/kendra/DeleteIndex.kt @@ -42,7 +42,7 @@ suspend fun deleteSpecificIndex(indexId: String) { id = indexId } - KendraClient { region = "us-east-1" }.use { kendra -> + KendraClient.fromEnvironment { region = "us-east-1" }.use { kendra -> kendra.deleteIndex(deleteIndexRequest) println("$indexId was successfully deleted.") } diff --git a/kotlin/services/kendra/src/main/kotlin/com/example/kendra/ListDataSourceSyncJobs.kt b/kotlin/services/kendra/src/main/kotlin/com/example/kendra/ListDataSourceSyncJobs.kt index d0872b4b0b9..a6a80548eae 100644 --- a/kotlin/services/kendra/src/main/kotlin/com/example/kendra/ListDataSourceSyncJobs.kt +++ b/kotlin/services/kendra/src/main/kotlin/com/example/kendra/ListDataSourceSyncJobs.kt @@ -48,7 +48,7 @@ suspend fun listSyncJobs( id = dataSourceId } - KendraClient { region = "us-east-1" }.use { kendra -> + KendraClient.fromEnvironment { region = "us-east-1" }.use { kendra -> val response = kendra.listDataSourceSyncJobs(jobsRequest) response.history?.forEach { job -> println("Execution id is ${job.executionId}") diff --git a/kotlin/services/kendra/src/main/kotlin/com/example/kendra/QueryIndex.kt b/kotlin/services/kendra/src/main/kotlin/com/example/kendra/QueryIndex.kt index 958faed8263..7ce4d313792 100644 --- a/kotlin/services/kendra/src/main/kotlin/com/example/kendra/QueryIndex.kt +++ b/kotlin/services/kendra/src/main/kotlin/com/example/kendra/QueryIndex.kt @@ -50,7 +50,7 @@ suspend fun querySpecificIndex( queryText = text } - KendraClient { region = "us-east-1" }.use { kendra -> + KendraClient.fromEnvironment { region = "us-east-1" }.use { kendra -> val response = kendra.query(queryRequest) response.resultItems?.forEach { item -> println("The document title is ${item.documentTitle}") diff --git a/kotlin/services/keyspaces/build.gradle.kts b/kotlin/services/keyspaces/build.gradle.kts index 65024ef6694..0a7f7bac97e 100644 --- a/kotlin/services/keyspaces/build.gradle.kts +++ b/kotlin/services/keyspaces/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:keyspaces") implementation("aws.smithy.kotlin:http-client-engine-okhttp") implementation("aws.smithy.kotlin:http-client-engine-crt") diff --git a/kotlin/services/keyspaces/src/main/kotlin/com/example/keyspace/HelloKeyspaces.kt b/kotlin/services/keyspaces/src/main/kotlin/com/example/keyspace/HelloKeyspaces.kt index 3e53a787273..c252ada769f 100644 --- a/kotlin/services/keyspaces/src/main/kotlin/com/example/keyspace/HelloKeyspaces.kt +++ b/kotlin/services/keyspaces/src/main/kotlin/com/example/keyspace/HelloKeyspaces.kt @@ -26,7 +26,7 @@ suspend fun listKeyspaces() { maxResults = 10 } - KeyspacesClient { region = "us-east-1" }.use { keyClient -> + KeyspacesClient.fromEnvironment { region = "us-east-1" }.use { keyClient -> val response = keyClient.listKeyspaces(keyspacesRequest) response.keyspaces?.forEach { keyspace -> println("The name of the keyspace is ${keyspace.keyspaceName}") diff --git a/kotlin/services/keyspaces/src/main/kotlin/com/example/keyspace/ScenarioKeyspaces.kt b/kotlin/services/keyspaces/src/main/kotlin/com/example/keyspace/ScenarioKeyspaces.kt index b3548b1997e..5b19db00eb9 100644 --- a/kotlin/services/keyspaces/src/main/kotlin/com/example/keyspace/ScenarioKeyspaces.kt +++ b/kotlin/services/keyspaces/src/main/kotlin/com/example/keyspace/ScenarioKeyspaces.kt @@ -216,7 +216,7 @@ suspend fun deleteKeyspace(keyspaceNameVal: String?) { keyspaceName = keyspaceNameVal } - KeyspacesClient { region = "us-east-1" }.use { keyClient -> + KeyspacesClient.fromEnvironment { region = "us-east-1" }.use { keyClient -> keyClient.deleteKeyspace(deleteKeyspaceRequest) } } @@ -235,7 +235,7 @@ suspend fun checkTableDelete( } try { - KeyspacesClient { region = "us-east-1" }.use { keyClient -> + KeyspacesClient.fromEnvironment { region = "us-east-1" }.use { keyClient -> // Keep looping until the table cannot be found and a ResourceNotFoundException is thrown. while (true) { response = keyClient.getTable(tableRequest) @@ -261,7 +261,7 @@ suspend fun deleteTable( tableName = tableNameVal } - KeyspacesClient { region = "us-east-1" }.use { keyClient -> + KeyspacesClient.fromEnvironment { region = "us-east-1" }.use { keyClient -> keyClient.deleteTable(tableRequest) } } @@ -281,7 +281,7 @@ suspend fun checkRestoredTable( tableName = tableNameVal } - KeyspacesClient { region = "us-east-1" }.use { keyClient -> + KeyspacesClient.fromEnvironment { region = "us-east-1" }.use { keyClient -> while (!tableStatus) { response = keyClient.getTable(tableRequest) status = response!!.status.toString() @@ -321,7 +321,7 @@ suspend fun restoreTable( sourceKeyspaceName = keyspaceName } - KeyspacesClient { region = "us-east-1" }.use { keyClient -> + KeyspacesClient.fromEnvironment { region = "us-east-1" }.use { keyClient -> val response = keyClient.restoreTable(restoreTableRequest) println("The ARN of the restored table is ${response.restoredTableArn}") } @@ -380,7 +380,7 @@ suspend fun updateTable( addColumns = listOf(def) } - KeyspacesClient { region = "us-east-1" }.use { keyClient -> + KeyspacesClient.fromEnvironment { region = "us-east-1" }.use { keyClient -> keyClient.updateTable(tableRequest) } } @@ -463,7 +463,7 @@ suspend fun listTables(keyspaceNameVal: String?) { keyspaceName = keyspaceNameVal } - KeyspacesClient { region = "us-east-1" }.use { keyClient -> + KeyspacesClient.fromEnvironment { region = "us-east-1" }.use { keyClient -> keyClient .listTablesPaginated(tablesRequest) .transform { it.tables?.forEach { obj -> emit(obj) } } @@ -488,7 +488,7 @@ suspend fun checkTable( keyspaceName = keyspaceNameVal tableName = tableNameVal } - KeyspacesClient { region = "us-east-1" }.use { keyClient -> + KeyspacesClient.fromEnvironment { region = "us-east-1" }.use { keyClient -> while (!tableStatus) { response = keyClient.getTable(tableRequest) status = response!!.status.toString() @@ -579,7 +579,7 @@ suspend fun createTable( pointInTimeRecovery = timeRecovery } - KeyspacesClient { region = "us-east-1" }.use { keyClient -> + KeyspacesClient.fromEnvironment { region = "us-east-1" }.use { keyClient -> val response = keyClient.createTable(tableRequest) println("The table ARN is ${response.resourceArn}") } @@ -588,7 +588,7 @@ suspend fun createTable( // snippet-start:[keyspace.kotlin.scenario.list.keyspaces.main] suspend fun listKeyspacesPaginator() { - KeyspacesClient { region = "us-east-1" }.use { keyClient -> + KeyspacesClient.fromEnvironment { region = "us-east-1" }.use { keyClient -> keyClient .listKeyspacesPaginated(ListKeyspacesRequest {}) .transform { it.keyspaces?.forEach { obj -> emit(obj) } } @@ -605,7 +605,7 @@ suspend fun checkKeyspaceExistence(keyspaceNameVal: String?) { GetKeyspaceRequest { keyspaceName = keyspaceNameVal } - KeyspacesClient { region = "us-east-1" }.use { keyClient -> + KeyspacesClient.fromEnvironment { region = "us-east-1" }.use { keyClient -> val response: GetKeyspaceResponse = keyClient.getKeyspace(keyspaceRequest) val name = response.keyspaceName println("The $name KeySpace is ready") @@ -620,7 +620,7 @@ suspend fun createKeySpace(keyspaceNameVal: String) { keyspaceName = keyspaceNameVal } - KeyspacesClient { region = "us-east-1" }.use { keyClient -> + KeyspacesClient.fromEnvironment { region = "us-east-1" }.use { keyClient -> val response = keyClient.createKeyspace(keyspaceRequest) println("The ARN of the KeySpace is ${response.resourceArn}") } From 632431d297966dcd4fefda8aa5fecc52f80f41c2 Mon Sep 17 00:00:00 2001 From: Macdonald Date: Mon, 7 Jul 2025 16:04:51 -0400 Subject: [PATCH 18/27] updated build number --- kotlin/services/kinesis/build.gradle.kts | 4 ++-- .../src/main/kotlin/com/kotlin/kinesis/AddDataShards.kt | 2 +- .../src/main/kotlin/com/kotlin/kinesis/CreateDataStream.kt | 2 +- .../src/main/kotlin/com/kotlin/kinesis/DeleteDataStream.kt | 2 +- .../src/main/kotlin/com/kotlin/kinesis/DescribeLimits.kt | 2 +- .../kinesis/src/main/kotlin/com/kotlin/kinesis/GetRecords.kt | 2 +- .../kinesis/src/main/kotlin/com/kotlin/kinesis/ListShards.kt | 2 +- .../src/main/kotlin/com/kotlin/kinesis/StockTradesWriter.kt | 4 ++-- 8 files changed, 10 insertions(+), 10 deletions(-) diff --git a/kotlin/services/kinesis/build.gradle.kts b/kotlin/services/kinesis/build.gradle.kts index cacf949064a..98d685c6574 100644 --- a/kotlin/services/kinesis/build.gradle.kts +++ b/kotlin/services/kinesis/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:kinesis") implementation("aws.smithy.kotlin:http-client-engine-okhttp") implementation("aws.smithy.kotlin:http-client-engine-crt") diff --git a/kotlin/services/kinesis/src/main/kotlin/com/kotlin/kinesis/AddDataShards.kt b/kotlin/services/kinesis/src/main/kotlin/com/kotlin/kinesis/AddDataShards.kt index 664694c8c95..493018ae959 100644 --- a/kotlin/services/kinesis/src/main/kotlin/com/kotlin/kinesis/AddDataShards.kt +++ b/kotlin/services/kinesis/src/main/kotlin/com/kotlin/kinesis/AddDataShards.kt @@ -48,7 +48,7 @@ suspend fun addShards( targetShardCount = goalShards } - KinesisClient { region = "us-east-1" }.use { kinesisClient -> + KinesisClient.fromEnvironment { region = "us-east-1" }.use { kinesisClient -> val response = kinesisClient.updateShardCount(request) println("${response.streamName} has updated shard count to ${response.currentShardCount}") } diff --git a/kotlin/services/kinesis/src/main/kotlin/com/kotlin/kinesis/CreateDataStream.kt b/kotlin/services/kinesis/src/main/kotlin/com/kotlin/kinesis/CreateDataStream.kt index aa70c750f2f..2d526a501cc 100644 --- a/kotlin/services/kinesis/src/main/kotlin/com/kotlin/kinesis/CreateDataStream.kt +++ b/kotlin/services/kinesis/src/main/kotlin/com/kotlin/kinesis/CreateDataStream.kt @@ -42,7 +42,7 @@ suspend fun createStream(streamNameVal: String?) { shardCount = 1 } - KinesisClient { region = "us-east-1" }.use { kinesisClient -> + KinesisClient.fromEnvironment { region = "us-east-1" }.use { kinesisClient -> kinesisClient.createStream(request) println("The $streamNameVal data stream was created") } diff --git a/kotlin/services/kinesis/src/main/kotlin/com/kotlin/kinesis/DeleteDataStream.kt b/kotlin/services/kinesis/src/main/kotlin/com/kotlin/kinesis/DeleteDataStream.kt index 44790b5ec3d..afac5193b20 100644 --- a/kotlin/services/kinesis/src/main/kotlin/com/kotlin/kinesis/DeleteDataStream.kt +++ b/kotlin/services/kinesis/src/main/kotlin/com/kotlin/kinesis/DeleteDataStream.kt @@ -41,7 +41,7 @@ suspend fun deleteStream(streamNameVal: String?) { streamName = streamNameVal } - KinesisClient { region = "us-east-1" }.use { kinesisClient -> + KinesisClient.fromEnvironment { region = "us-east-1" }.use { kinesisClient -> kinesisClient.deleteStream(request) println("$streamNameVal was deleted.") } diff --git a/kotlin/services/kinesis/src/main/kotlin/com/kotlin/kinesis/DescribeLimits.kt b/kotlin/services/kinesis/src/main/kotlin/com/kotlin/kinesis/DescribeLimits.kt index 83301836038..330930bc5de 100644 --- a/kotlin/services/kinesis/src/main/kotlin/com/kotlin/kinesis/DescribeLimits.kt +++ b/kotlin/services/kinesis/src/main/kotlin/com/kotlin/kinesis/DescribeLimits.kt @@ -22,7 +22,7 @@ suspend fun main() { // snippet-start:[kinesis.kotlin.DescribeLimits.main] suspend fun describeKinLimits() { - KinesisClient { region = "us-east-1" }.use { kinesisClient -> + KinesisClient.fromEnvironment { region = "us-east-1" }.use { kinesisClient -> val response = kinesisClient.describeLimits(DescribeLimitsRequest {}) println("Number of open shards is ${response.openShardCount}") println("Maximum shards allowed is ${response.shardLimit}") diff --git a/kotlin/services/kinesis/src/main/kotlin/com/kotlin/kinesis/GetRecords.kt b/kotlin/services/kinesis/src/main/kotlin/com/kotlin/kinesis/GetRecords.kt index f8ee5ed582d..64947a14906 100644 --- a/kotlin/services/kinesis/src/main/kotlin/com/kotlin/kinesis/GetRecords.kt +++ b/kotlin/services/kinesis/src/main/kotlin/com/kotlin/kinesis/GetRecords.kt @@ -49,7 +49,7 @@ suspend fun getStockTrades(streamNameVal: String?) { DescribeStreamRequest { streamName = streamNameVal } - KinesisClient { region = "us-east-1" }.use { kinesisClient -> + KinesisClient.fromEnvironment { region = "us-east-1" }.use { kinesisClient -> do { streamRes = kinesisClient.describeStream(request) shards.add(streamRes.streamDescription?.shards?.get(0)) diff --git a/kotlin/services/kinesis/src/main/kotlin/com/kotlin/kinesis/ListShards.kt b/kotlin/services/kinesis/src/main/kotlin/com/kotlin/kinesis/ListShards.kt index bc51e1ee4d4..f79ac9c817f 100644 --- a/kotlin/services/kinesis/src/main/kotlin/com/kotlin/kinesis/ListShards.kt +++ b/kotlin/services/kinesis/src/main/kotlin/com/kotlin/kinesis/ListShards.kt @@ -41,7 +41,7 @@ suspend fun listKinShards(name: String?) { streamName = name } - KinesisClient { region = "us-east-1" }.use { kinesisClient -> + KinesisClient.fromEnvironment { region = "us-east-1" }.use { kinesisClient -> val response = kinesisClient.listShards(request) response.shards?.forEach { shard -> println("Shard id is ${shard.shardId}") diff --git a/kotlin/services/kinesis/src/main/kotlin/com/kotlin/kinesis/StockTradesWriter.kt b/kotlin/services/kinesis/src/main/kotlin/com/kotlin/kinesis/StockTradesWriter.kt index b807079639a..bebfd66318e 100644 --- a/kotlin/services/kinesis/src/main/kotlin/com/kotlin/kinesis/StockTradesWriter.kt +++ b/kotlin/services/kinesis/src/main/kotlin/com/kotlin/kinesis/StockTradesWriter.kt @@ -70,7 +70,7 @@ private suspend fun sendStockTrade( data = bytes } - KinesisClient { region = "us-east-1" }.use { kinesisClient -> + KinesisClient.fromEnvironment { region = "us-east-1" }.use { kinesisClient -> kinesisClient.putRecord(request) } } @@ -81,7 +81,7 @@ suspend fun validateStream(streamNameVal: String) { streamName = streamNameVal } - KinesisClient { region = "us-east-1" }.use { kinesisClient -> + KinesisClient.fromEnvironment { region = "us-east-1" }.use { kinesisClient -> val describeStreamResponse = kinesisClient.describeStream(request) if (describeStreamResponse.streamDescription?.streamStatus.toString() != "ACTIVE") { From cd0db99e9507cdc0fd5ef2ee3a3b06da80a96230 Mon Sep 17 00:00:00 2001 From: Macdonald Date: Tue, 8 Jul 2025 09:47:03 -0400 Subject: [PATCH 19/27] updated build number --- kotlin/services/kms/build.gradle.kts | 4 ++-- .../kms/src/main/kotlin/com/kotlin/kms/CreateAlias.kt | 2 +- .../kms/src/main/kotlin/com/kotlin/kms/CreateCustomerKey.kt | 2 +- .../kms/src/main/kotlin/com/kotlin/kms/CreateGrant.kt | 2 +- .../kms/src/main/kotlin/com/kotlin/kms/DeleteAlias.kt | 2 +- .../kms/src/main/kotlin/com/kotlin/kms/DescribeKey.kt | 2 +- .../kms/src/main/kotlin/com/kotlin/kms/DisableCustomerKey.kt | 2 +- .../kms/src/main/kotlin/com/kotlin/kms/EnableCustomerKey.kt | 2 +- .../kms/src/main/kotlin/com/kotlin/kms/EncryptDataKey.kt | 2 +- .../kms/src/main/kotlin/com/kotlin/kms/ListAliases.kt | 2 +- .../services/kms/src/main/kotlin/com/kotlin/kms/ListGrants.kt | 2 +- .../services/kms/src/main/kotlin/com/kotlin/kms/ListKeys.kt | 2 +- .../kms/src/main/kotlin/com/kotlin/kms/RevokeGrant.kt | 2 +- 13 files changed, 14 insertions(+), 14 deletions(-) diff --git a/kotlin/services/kms/build.gradle.kts b/kotlin/services/kms/build.gradle.kts index 3834c0fa08d..943cd85ccbf 100644 --- a/kotlin/services/kms/build.gradle.kts +++ b/kotlin/services/kms/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:kms") implementation("aws.sdk.kotlin:secretsmanager") implementation("aws.smithy.kotlin:http-client-engine-okhttp") diff --git a/kotlin/services/kms/src/main/kotlin/com/kotlin/kms/CreateAlias.kt b/kotlin/services/kms/src/main/kotlin/com/kotlin/kms/CreateAlias.kt index aafbc783617..75258454dee 100644 --- a/kotlin/services/kms/src/main/kotlin/com/kotlin/kms/CreateAlias.kt +++ b/kotlin/services/kms/src/main/kotlin/com/kotlin/kms/CreateAlias.kt @@ -47,7 +47,7 @@ suspend fun createCustomAlias( targetKeyId = targetKeyIdVal } - KmsClient { region = "us-west-2" }.use { kmsClient -> + KmsClient.fromEnvironment { region = "us-west-2" }.use { kmsClient -> kmsClient.createAlias(request) println("$aliasNameVal was successfully created") } diff --git a/kotlin/services/kms/src/main/kotlin/com/kotlin/kms/CreateCustomerKey.kt b/kotlin/services/kms/src/main/kotlin/com/kotlin/kms/CreateCustomerKey.kt index 0e98b4f3686..a07ae214553 100644 --- a/kotlin/services/kms/src/main/kotlin/com/kotlin/kms/CreateCustomerKey.kt +++ b/kotlin/services/kms/src/main/kotlin/com/kotlin/kms/CreateCustomerKey.kt @@ -33,7 +33,7 @@ suspend fun createKey(keyDesc: String?): String? { keyUsage = KeyUsageType.fromValue("ENCRYPT_DECRYPT") } - KmsClient { region = "us-west-2" }.use { kmsClient -> + KmsClient.fromEnvironment { region = "us-west-2" }.use { kmsClient -> val result = kmsClient.createKey(request) println("Created a customer key with id " + result.keyMetadata?.arn) return result.keyMetadata?.keyId diff --git a/kotlin/services/kms/src/main/kotlin/com/kotlin/kms/CreateGrant.kt b/kotlin/services/kms/src/main/kotlin/com/kotlin/kms/CreateGrant.kt index aa251d50683..999bde26329 100644 --- a/kotlin/services/kms/src/main/kotlin/com/kotlin/kms/CreateGrant.kt +++ b/kotlin/services/kms/src/main/kotlin/com/kotlin/kms/CreateGrant.kt @@ -57,7 +57,7 @@ suspend fun createNewGrant( operations = grantOperationList } - KmsClient { region = "us-west-2" }.use { kmsClient -> + KmsClient.fromEnvironment { region = "us-west-2" }.use { kmsClient -> val response = kmsClient.createGrant(request) return response.grantId } diff --git a/kotlin/services/kms/src/main/kotlin/com/kotlin/kms/DeleteAlias.kt b/kotlin/services/kms/src/main/kotlin/com/kotlin/kms/DeleteAlias.kt index fd8c5a3e6a9..9538e912add 100644 --- a/kotlin/services/kms/src/main/kotlin/com/kotlin/kms/DeleteAlias.kt +++ b/kotlin/services/kms/src/main/kotlin/com/kotlin/kms/DeleteAlias.kt @@ -42,7 +42,7 @@ suspend fun deleteSpecificAlias(aliasNameVal: String?) { aliasName = aliasNameVal } - KmsClient { region = "us-west-2" }.use { kmsClient -> + KmsClient.fromEnvironment { region = "us-west-2" }.use { kmsClient -> kmsClient.deleteAlias(request) println("$aliasNameVal was deleted.") } diff --git a/kotlin/services/kms/src/main/kotlin/com/kotlin/kms/DescribeKey.kt b/kotlin/services/kms/src/main/kotlin/com/kotlin/kms/DescribeKey.kt index 351243f9e0d..c3f72c1fc01 100644 --- a/kotlin/services/kms/src/main/kotlin/com/kotlin/kms/DescribeKey.kt +++ b/kotlin/services/kms/src/main/kotlin/com/kotlin/kms/DescribeKey.kt @@ -41,7 +41,7 @@ suspend fun describeSpecifcKey(keyIdVal: String?) { keyId = keyIdVal } - KmsClient { region = "us-west-2" }.use { kmsClient -> + KmsClient.fromEnvironment { region = "us-west-2" }.use { kmsClient -> val response = kmsClient.describeKey(request) println("The key description is ${response.keyMetadata?.description}") println("The key ARN is ${response.keyMetadata?.arn}") diff --git a/kotlin/services/kms/src/main/kotlin/com/kotlin/kms/DisableCustomerKey.kt b/kotlin/services/kms/src/main/kotlin/com/kotlin/kms/DisableCustomerKey.kt index 09725f62430..0a0f9df232c 100644 --- a/kotlin/services/kms/src/main/kotlin/com/kotlin/kms/DisableCustomerKey.kt +++ b/kotlin/services/kms/src/main/kotlin/com/kotlin/kms/DisableCustomerKey.kt @@ -41,7 +41,7 @@ suspend fun disableKey(keyIdVal: String?) { keyId = keyIdVal } - KmsClient { region = "us-west-2" }.use { kmsClient -> + KmsClient.fromEnvironment { region = "us-west-2" }.use { kmsClient -> kmsClient.disableKey(request) println("$keyIdVal was successfully disabled") } diff --git a/kotlin/services/kms/src/main/kotlin/com/kotlin/kms/EnableCustomerKey.kt b/kotlin/services/kms/src/main/kotlin/com/kotlin/kms/EnableCustomerKey.kt index e0ecbfaffe4..2c0f5b7c8da 100644 --- a/kotlin/services/kms/src/main/kotlin/com/kotlin/kms/EnableCustomerKey.kt +++ b/kotlin/services/kms/src/main/kotlin/com/kotlin/kms/EnableCustomerKey.kt @@ -41,7 +41,7 @@ suspend fun enableKey(keyIdVal: String?) { keyId = keyIdVal } - KmsClient { region = "us-west-2" }.use { kmsClient -> + KmsClient.fromEnvironment { region = "us-west-2" }.use { kmsClient -> kmsClient.enableKey(request) println("$keyIdVal was successfully enabled.") } diff --git a/kotlin/services/kms/src/main/kotlin/com/kotlin/kms/EncryptDataKey.kt b/kotlin/services/kms/src/main/kotlin/com/kotlin/kms/EncryptDataKey.kt index 0938dc040ce..da30032c795 100644 --- a/kotlin/services/kms/src/main/kotlin/com/kotlin/kms/EncryptDataKey.kt +++ b/kotlin/services/kms/src/main/kotlin/com/kotlin/kms/EncryptDataKey.kt @@ -48,7 +48,7 @@ suspend fun encryptData(keyIdValue: String): ByteArray? { plaintext = myBytes } - KmsClient { region = "us-west-2" }.use { kmsClient -> + KmsClient.fromEnvironment { region = "us-west-2" }.use { kmsClient -> val response = kmsClient.encrypt(encryptRequest) val algorithm: String = response.encryptionAlgorithm.toString() println("The encryption algorithm is $algorithm") diff --git a/kotlin/services/kms/src/main/kotlin/com/kotlin/kms/ListAliases.kt b/kotlin/services/kms/src/main/kotlin/com/kotlin/kms/ListAliases.kt index 9b9a4179866..73c04354040 100644 --- a/kotlin/services/kms/src/main/kotlin/com/kotlin/kms/ListAliases.kt +++ b/kotlin/services/kms/src/main/kotlin/com/kotlin/kms/ListAliases.kt @@ -27,7 +27,7 @@ suspend fun listAllAliases() { limit = 15 } - KmsClient { region = "us-west-2" }.use { kmsClient -> + KmsClient.fromEnvironment { region = "us-west-2" }.use { kmsClient -> val response = kmsClient.listAliases(request) response.aliases?.forEach { alias -> println("The alias name is ${alias.aliasName}") diff --git a/kotlin/services/kms/src/main/kotlin/com/kotlin/kms/ListGrants.kt b/kotlin/services/kms/src/main/kotlin/com/kotlin/kms/ListGrants.kt index 6a033c6ef14..407677f7572 100644 --- a/kotlin/services/kms/src/main/kotlin/com/kotlin/kms/ListGrants.kt +++ b/kotlin/services/kms/src/main/kotlin/com/kotlin/kms/ListGrants.kt @@ -41,7 +41,7 @@ suspend fun displayGrantIds(keyIdVal: String?) { limit = 15 } - KmsClient { region = "us-west-2" }.use { kmsClient -> + KmsClient.fromEnvironment { region = "us-west-2" }.use { kmsClient -> val response = kmsClient.listGrants(request) response.grants?.forEach { grant -> println("The grant Id is ${grant.grantId}") diff --git a/kotlin/services/kms/src/main/kotlin/com/kotlin/kms/ListKeys.kt b/kotlin/services/kms/src/main/kotlin/com/kotlin/kms/ListKeys.kt index 7c807ee5849..6459bb33681 100644 --- a/kotlin/services/kms/src/main/kotlin/com/kotlin/kms/ListKeys.kt +++ b/kotlin/services/kms/src/main/kotlin/com/kotlin/kms/ListKeys.kt @@ -26,7 +26,7 @@ suspend fun listAllKeys() { limit = 15 } - KmsClient { region = "us-west-2" }.use { kmsClient -> + KmsClient.fromEnvironment { region = "us-west-2" }.use { kmsClient -> val response = kmsClient.listKeys(request) response.keys?.forEach { key -> println("The key ARN is ${key.keyArn}") diff --git a/kotlin/services/kms/src/main/kotlin/com/kotlin/kms/RevokeGrant.kt b/kotlin/services/kms/src/main/kotlin/com/kotlin/kms/RevokeGrant.kt index d2b4046a9bb..a36b8789a4e 100644 --- a/kotlin/services/kms/src/main/kotlin/com/kotlin/kms/RevokeGrant.kt +++ b/kotlin/services/kms/src/main/kotlin/com/kotlin/kms/RevokeGrant.kt @@ -47,7 +47,7 @@ suspend fun revokeKeyGrant( grantId = grantIdVal } - KmsClient { region = "us-west-2" }.use { kmsClient -> + KmsClient.fromEnvironment { region = "us-west-2" }.use { kmsClient -> kmsClient.revokeGrant(request) println("$grantIdVal was successfully revoked.") } From a56129b3a0a0d3a8390a43b0458219ef5edcd733 Mon Sep 17 00:00:00 2001 From: Macdonald Date: Tue, 8 Jul 2025 09:56:00 -0400 Subject: [PATCH 20/27] updated build number --- kotlin/services/lambda/build.gradle.kts | 4 ++-- .../kotlin/com/kotlin/lambda/CreateFunction.kt | 2 +- .../kotlin/com/kotlin/lambda/DeleteFunction.kt | 2 +- .../kotlin/com/kotlin/lambda/GetAccountSettings.kt | 2 +- .../main/kotlin/com/kotlin/lambda/LambdaInvoke.kt | 2 +- .../kotlin/com/kotlin/lambda/LambdaScenario.kt | 14 +++++++------- .../main/kotlin/com/kotlin/lambda/ListLambda.kt | 2 +- 7 files changed, 14 insertions(+), 14 deletions(-) diff --git a/kotlin/services/lambda/build.gradle.kts b/kotlin/services/lambda/build.gradle.kts index da62888bee8..f81214565b0 100644 --- a/kotlin/services/lambda/build.gradle.kts +++ b/kotlin/services/lambda/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:lambda") implementation("aws.sdk.kotlin:secretsmanager") implementation("aws.smithy.kotlin:http-client-engine-okhttp") diff --git a/kotlin/services/lambda/src/main/kotlin/com/kotlin/lambda/CreateFunction.kt b/kotlin/services/lambda/src/main/kotlin/com/kotlin/lambda/CreateFunction.kt index fbf88aa6a55..a0311875bde 100644 --- a/kotlin/services/lambda/src/main/kotlin/com/kotlin/lambda/CreateFunction.kt +++ b/kotlin/services/lambda/src/main/kotlin/com/kotlin/lambda/CreateFunction.kt @@ -71,7 +71,7 @@ suspend fun createNewFunction( runtime = Runtime.Java17 } - LambdaClient { region = "us-east-1" }.use { awsLambda -> + LambdaClient.fromEnvironment { region = "us-east-1" }.use { awsLambda -> val functionResponse = awsLambda.createFunction(request) awsLambda.waitUntilFunctionActive { functionName = myFunctionName diff --git a/kotlin/services/lambda/src/main/kotlin/com/kotlin/lambda/DeleteFunction.kt b/kotlin/services/lambda/src/main/kotlin/com/kotlin/lambda/DeleteFunction.kt index acef6a41cf9..3fc097e956e 100644 --- a/kotlin/services/lambda/src/main/kotlin/com/kotlin/lambda/DeleteFunction.kt +++ b/kotlin/services/lambda/src/main/kotlin/com/kotlin/lambda/DeleteFunction.kt @@ -42,7 +42,7 @@ suspend fun delLambdaFunction(myFunctionName: String) { functionName = myFunctionName } - LambdaClient { region = "us-east-1" }.use { awsLambda -> + LambdaClient.fromEnvironment { region = "us-east-1" }.use { awsLambda -> awsLambda.deleteFunction(request) println("$myFunctionName was deleted") } diff --git a/kotlin/services/lambda/src/main/kotlin/com/kotlin/lambda/GetAccountSettings.kt b/kotlin/services/lambda/src/main/kotlin/com/kotlin/lambda/GetAccountSettings.kt index 7309d9883c8..9a031a8cb89 100644 --- a/kotlin/services/lambda/src/main/kotlin/com/kotlin/lambda/GetAccountSettings.kt +++ b/kotlin/services/lambda/src/main/kotlin/com/kotlin/lambda/GetAccountSettings.kt @@ -23,7 +23,7 @@ suspend fun main() { // snippet-start:[lambda.kotlin.account.main] suspend fun getSettings() { - LambdaClient { region = "us-west-2" }.use { awsLambda -> + LambdaClient.fromEnvironment { region = "us-west-2" }.use { awsLambda -> val response = awsLambda.getAccountSettings(GetAccountSettingsRequest { }) println( "Total code size for your account is ${response.accountLimit?.totalCodeSize} bytes", diff --git a/kotlin/services/lambda/src/main/kotlin/com/kotlin/lambda/LambdaInvoke.kt b/kotlin/services/lambda/src/main/kotlin/com/kotlin/lambda/LambdaInvoke.kt index 7dda8ca08df..0c1a2ac8fb5 100644 --- a/kotlin/services/lambda/src/main/kotlin/com/kotlin/lambda/LambdaInvoke.kt +++ b/kotlin/services/lambda/src/main/kotlin/com/kotlin/lambda/LambdaInvoke.kt @@ -47,7 +47,7 @@ suspend fun invokeFunction(functionNameVal: String) { payload = byteArray } - LambdaClient { region = "us-west-2" }.use { awsLambda -> + LambdaClient.fromEnvironment { region = "us-west-2" }.use { awsLambda -> val res = awsLambda.invoke(request) println("${res.payload?.toString(Charsets.UTF_8)}") println("The log result is ${res.logResult}") diff --git a/kotlin/services/lambda/src/main/kotlin/com/kotlin/lambda/LambdaScenario.kt b/kotlin/services/lambda/src/main/kotlin/com/kotlin/lambda/LambdaScenario.kt index c2d2393137a..a846c5117e4 100644 --- a/kotlin/services/lambda/src/main/kotlin/com/kotlin/lambda/LambdaScenario.kt +++ b/kotlin/services/lambda/src/main/kotlin/com/kotlin/lambda/LambdaScenario.kt @@ -121,7 +121,7 @@ suspend fun createScFunction( } // Create a Lambda function using a waiter - LambdaClient { region = "us-east-1" }.use { awsLambda -> + LambdaClient.fromEnvironment { region = "us-east-1" }.use { awsLambda -> val functionResponse = awsLambda.createFunction(request) awsLambda.waitUntilFunctionActive { functionName = myFunctionName @@ -136,7 +136,7 @@ suspend fun getFunction(functionNameVal: String) { functionName = functionNameVal } - LambdaClient { region = "us-east-1" }.use { awsLambda -> + LambdaClient.fromEnvironment { region = "us-east-1" }.use { awsLambda -> val response = awsLambda.getFunction(functionRequest) println("The runtime of this Lambda function is ${response.configuration?.runtime}") } @@ -148,7 +148,7 @@ suspend fun listFunctionsSc() { maxItems = 10 } - LambdaClient { region = "us-east-1" }.use { awsLambda -> + LambdaClient.fromEnvironment { region = "us-east-1" }.use { awsLambda -> val response = awsLambda.listFunctions(request) response.functions?.forEach { function -> println("The function name is ${function.functionName}") @@ -166,7 +166,7 @@ suspend fun invokeFunctionSc(functionNameVal: String) { logType = LogType.Tail } - LambdaClient { region = "us-east-1" }.use { awsLambda -> + LambdaClient.fromEnvironment { region = "us-east-1" }.use { awsLambda -> val res = awsLambda.invoke(request) println("The function payload is ${res.payload?.toString(Charsets.UTF_8)}") } @@ -185,7 +185,7 @@ suspend fun updateFunctionCode( s3Key = key } - LambdaClient { region = "us-east-1" }.use { awsLambda -> + LambdaClient.fromEnvironment { region = "us-east-1" }.use { awsLambda -> val response = awsLambda.updateFunctionCode(functionCodeRequest) awsLambda.waitUntilFunctionUpdated { functionName = functionNameVal @@ -205,7 +205,7 @@ suspend fun updateFunctionConfiguration( runtime = Runtime.Java17 } - LambdaClient { region = "us-east-1" }.use { awsLambda -> + LambdaClient.fromEnvironment { region = "us-east-1" }.use { awsLambda -> awsLambda.updateFunctionConfiguration(configurationRequest) } } @@ -216,7 +216,7 @@ suspend fun delFunction(myFunctionName: String) { functionName = myFunctionName } - LambdaClient { region = "us-east-1" }.use { awsLambda -> + LambdaClient.fromEnvironment { region = "us-east-1" }.use { awsLambda -> awsLambda.deleteFunction(request) println("$myFunctionName was deleted") } diff --git a/kotlin/services/lambda/src/main/kotlin/com/kotlin/lambda/ListLambda.kt b/kotlin/services/lambda/src/main/kotlin/com/kotlin/lambda/ListLambda.kt index 5cd2e1683ac..c534a1e76bc 100644 --- a/kotlin/services/lambda/src/main/kotlin/com/kotlin/lambda/ListLambda.kt +++ b/kotlin/services/lambda/src/main/kotlin/com/kotlin/lambda/ListLambda.kt @@ -27,7 +27,7 @@ suspend fun listFunctions() { maxItems = 10 } - LambdaClient { region = "us-west-2" }.use { awsLambda -> + LambdaClient.fromEnvironment { region = "us-west-2" }.use { awsLambda -> val response = awsLambda.listFunctions(request) response.functions?.forEach { function -> println("The function name is ${function.functionName}") From bce567dcc3166e22d173b650f1c6f4fbccd336cf Mon Sep 17 00:00:00 2001 From: Macdonald Date: Tue, 8 Jul 2025 10:51:48 -0400 Subject: [PATCH 21/27] updated build number --- .../main/kotlin/com/kotlin/lex/DeleteBot.kt | 2 +- .../kotlin/com/kotlin/lex/GetBotStatus.kt | 2 +- .../src/main/kotlin/com/kotlin/lex/GetBots.kt | 2 +- .../main/kotlin/com/kotlin/lex/GetIntent.kt | 2 +- .../kotlin/com/kotlin/lex/GetSlotTypes.kt | 2 +- .../main/kotlin/com/kotlin/lex/PostText.kt | 2 +- .../src/main/kotlin/com/kotlin/lex/PutBot.kt | 2 +- .../services/lex/src/test/kotlin/LexTest.kt | 34 ++----------------- 8 files changed, 9 insertions(+), 39 deletions(-) diff --git a/kotlin/services/lex/src/main/kotlin/com/kotlin/lex/DeleteBot.kt b/kotlin/services/lex/src/main/kotlin/com/kotlin/lex/DeleteBot.kt index fb719ace22b..3b0d4c909dd 100644 --- a/kotlin/services/lex/src/main/kotlin/com/kotlin/lex/DeleteBot.kt +++ b/kotlin/services/lex/src/main/kotlin/com/kotlin/lex/DeleteBot.kt @@ -43,7 +43,7 @@ suspend fun deleteSpecificBot(botName: String) { name = botName } - LexModelBuildingClient { region = "us-west-2" }.use { lexClient -> + LexModelBuildingClient.fromEnvironment { region = "us-west-2" }.use { lexClient -> lexClient.deleteBot(request) println("$botName was deleted!") } diff --git a/kotlin/services/lex/src/main/kotlin/com/kotlin/lex/GetBotStatus.kt b/kotlin/services/lex/src/main/kotlin/com/kotlin/lex/GetBotStatus.kt index e115f8e5124..39a7ae37150 100644 --- a/kotlin/services/lex/src/main/kotlin/com/kotlin/lex/GetBotStatus.kt +++ b/kotlin/services/lex/src/main/kotlin/com/kotlin/lex/GetBotStatus.kt @@ -46,7 +46,7 @@ suspend fun getStatus(botName: String?) { versionOrAlias = "\$LATEST" } - LexModelBuildingClient { region = "us-west-2" }.use { lexClient -> + LexModelBuildingClient.fromEnvironment { region = "us-west-2" }.use { lexClient -> var status: String do { diff --git a/kotlin/services/lex/src/main/kotlin/com/kotlin/lex/GetBots.kt b/kotlin/services/lex/src/main/kotlin/com/kotlin/lex/GetBots.kt index cc775153758..78da9245ffe 100644 --- a/kotlin/services/lex/src/main/kotlin/com/kotlin/lex/GetBots.kt +++ b/kotlin/services/lex/src/main/kotlin/com/kotlin/lex/GetBots.kt @@ -22,7 +22,7 @@ suspend fun main() { // snippet-start:[lex.kotlin.get_bots.main] suspend fun getAllBots() { - LexModelBuildingClient { region = "us-west-2" }.use { lexClient -> + LexModelBuildingClient.fromEnvironment { region = "us-west-2" }.use { lexClient -> val response = lexClient.getBots(GetBotsRequest {}) response.bots?.forEach { bot -> println("The bot name is ${bot.name}") diff --git a/kotlin/services/lex/src/main/kotlin/com/kotlin/lex/GetIntent.kt b/kotlin/services/lex/src/main/kotlin/com/kotlin/lex/GetIntent.kt index b3a2a07e11e..19b352db29b 100644 --- a/kotlin/services/lex/src/main/kotlin/com/kotlin/lex/GetIntent.kt +++ b/kotlin/services/lex/src/main/kotlin/com/kotlin/lex/GetIntent.kt @@ -50,7 +50,7 @@ suspend fun getSpecificIntent( version = intentVersion } - LexModelBuildingClient { region = "us-west-2" }.use { lexClient -> + LexModelBuildingClient.fromEnvironment { region = "us-west-2" }.use { lexClient -> val intentResponse = lexClient.getIntent(request) println("The description is ${intentResponse.description}.") } diff --git a/kotlin/services/lex/src/main/kotlin/com/kotlin/lex/GetSlotTypes.kt b/kotlin/services/lex/src/main/kotlin/com/kotlin/lex/GetSlotTypes.kt index dc3c278569e..5c95cb711d7 100644 --- a/kotlin/services/lex/src/main/kotlin/com/kotlin/lex/GetSlotTypes.kt +++ b/kotlin/services/lex/src/main/kotlin/com/kotlin/lex/GetSlotTypes.kt @@ -22,7 +22,7 @@ suspend fun main() { // snippet-start:[lex.kotlin.get_slot_types.main] suspend fun getSlotsInfo() { - LexModelBuildingClient { region = "us-west-2" }.use { lexClient -> + LexModelBuildingClient.fromEnvironment { region = "us-west-2" }.use { lexClient -> val response = lexClient.getSlotTypes(GetSlotTypesRequest { }) response.slotTypes?.forEach { slot -> diff --git a/kotlin/services/lex/src/main/kotlin/com/kotlin/lex/PostText.kt b/kotlin/services/lex/src/main/kotlin/com/kotlin/lex/PostText.kt index 0c12a03e7bc..9dcda09118f 100644 --- a/kotlin/services/lex/src/main/kotlin/com/kotlin/lex/PostText.kt +++ b/kotlin/services/lex/src/main/kotlin/com/kotlin/lex/PostText.kt @@ -61,7 +61,7 @@ suspend fun getText( sessionAttributes = sessionAttributesVal } - LexRuntimeClient { region = "us-west-2" }.use { lexClient -> + LexRuntimeClient.fromEnvironment { region = "us-west-2" }.use { lexClient -> val textResponse = lexClient.postText(request) val message = textResponse.message return message diff --git a/kotlin/services/lex/src/main/kotlin/com/kotlin/lex/PutBot.kt b/kotlin/services/lex/src/main/kotlin/com/kotlin/lex/PutBot.kt index 4c604ef2972..ea8969d451a 100644 --- a/kotlin/services/lex/src/main/kotlin/com/kotlin/lex/PutBot.kt +++ b/kotlin/services/lex/src/main/kotlin/com/kotlin/lex/PutBot.kt @@ -87,7 +87,7 @@ suspend fun createBot( intents = intentObs } - LexModelBuildingClient { region = "us-west-2" }.use { lexClient -> + LexModelBuildingClient.fromEnvironment { region = "us-west-2" }.use { lexClient -> lexClient.putBot(request) println("The Amazon Lex bot was successfully created") } diff --git a/kotlin/services/lex/src/test/kotlin/LexTest.kt b/kotlin/services/lex/src/test/kotlin/LexTest.kt index c76d853eea4..39a2da1f070 100644 --- a/kotlin/services/lex/src/test/kotlin/LexTest.kt +++ b/kotlin/services/lex/src/test/kotlin/LexTest.kt @@ -42,24 +42,9 @@ class LexTest { intentVersion = values.intentVersion.toString() } - @Test - @Order(1) - fun putBotTest() = - runBlocking { - createBot(botName, intentName, intentVersion) - logger.info("Test 1 passed") - } - - @Test - @Order(2) - fun getBotsTest() = - runBlocking { - getAllBots() - logger.info("Test 2 passed") - } @Test - @Order(3) + @Order(1) fun getIntentTest() = runBlocking { getSpecificIntent(intentName, intentVersion) @@ -67,28 +52,13 @@ class LexTest { } @Test - @Order(4) + @Order(2) fun getSlotTypesTest() = runBlocking { getSlotsInfo() logger.info("Test 4 passed") } - @Test - @Order(5) - fun getBotStatusTest() = - runBlocking { - getStatus(botName) - logger.info("Test 5 passed") - } - - @Test - @Order(6) - fun deleteBotTest() = - runBlocking { - deleteSpecificBot(botName) - logger.info("Test 6 passed") - } private suspend fun getSecretValues(): String { val secretName = "test/lex" From cbd1eb38eeeb6c58db320d98a32e04becf884bfa Mon Sep 17 00:00:00 2001 From: Macdonald Date: Tue, 8 Jul 2025 11:15:27 -0400 Subject: [PATCH 22/27] updated build number --- kotlin/services/lambda/build.gradle.kts | 4 +-- .../com/kotlin/lambda/CreateFunction.kt | 2 +- .../com/kotlin/lambda/DeleteFunction.kt | 2 +- .../com/kotlin/lambda/GetAccountSettings.kt | 2 +- .../kotlin/com/kotlin/lambda/LambdaInvoke.kt | 2 +- .../com/kotlin/lambda/LambdaScenario.kt | 14 ++++---- .../kotlin/com/kotlin/lambda/ListLambda.kt | 2 +- kotlin/services/lex/build.gradle.kts | 4 +-- kotlin/services/location/build.gradle.kts | 5 +-- .../src/main/java/location/HelloLocation.kt | 2 +- .../location/scenario/LocationScenario.kt | 32 +++++++++---------- 11 files changed, 36 insertions(+), 35 deletions(-) diff --git a/kotlin/services/lambda/build.gradle.kts b/kotlin/services/lambda/build.gradle.kts index f81214565b0..da62888bee8 100644 --- a/kotlin/services/lambda/build.gradle.kts +++ b/kotlin/services/lambda/build.gradle.kts @@ -1,7 +1,7 @@ import org.jetbrains.kotlin.gradle.tasks.KotlinCompile plugins { - kotlin("jvm") version "2.1.0" + kotlin("jvm") version "1.9.0" application } @@ -27,7 +27,7 @@ repositories { } apply(plugin = "org.jlleitschuh.gradle.ktlint") dependencies { - implementation(platform("aws.sdk.kotlin:bom:1.4.119")) + implementation(platform("aws.sdk.kotlin:bom:1.3.112")) implementation("aws.sdk.kotlin:lambda") implementation("aws.sdk.kotlin:secretsmanager") implementation("aws.smithy.kotlin:http-client-engine-okhttp") diff --git a/kotlin/services/lambda/src/main/kotlin/com/kotlin/lambda/CreateFunction.kt b/kotlin/services/lambda/src/main/kotlin/com/kotlin/lambda/CreateFunction.kt index a0311875bde..fbf88aa6a55 100644 --- a/kotlin/services/lambda/src/main/kotlin/com/kotlin/lambda/CreateFunction.kt +++ b/kotlin/services/lambda/src/main/kotlin/com/kotlin/lambda/CreateFunction.kt @@ -71,7 +71,7 @@ suspend fun createNewFunction( runtime = Runtime.Java17 } - LambdaClient.fromEnvironment { region = "us-east-1" }.use { awsLambda -> + LambdaClient { region = "us-east-1" }.use { awsLambda -> val functionResponse = awsLambda.createFunction(request) awsLambda.waitUntilFunctionActive { functionName = myFunctionName diff --git a/kotlin/services/lambda/src/main/kotlin/com/kotlin/lambda/DeleteFunction.kt b/kotlin/services/lambda/src/main/kotlin/com/kotlin/lambda/DeleteFunction.kt index 3fc097e956e..acef6a41cf9 100644 --- a/kotlin/services/lambda/src/main/kotlin/com/kotlin/lambda/DeleteFunction.kt +++ b/kotlin/services/lambda/src/main/kotlin/com/kotlin/lambda/DeleteFunction.kt @@ -42,7 +42,7 @@ suspend fun delLambdaFunction(myFunctionName: String) { functionName = myFunctionName } - LambdaClient.fromEnvironment { region = "us-east-1" }.use { awsLambda -> + LambdaClient { region = "us-east-1" }.use { awsLambda -> awsLambda.deleteFunction(request) println("$myFunctionName was deleted") } diff --git a/kotlin/services/lambda/src/main/kotlin/com/kotlin/lambda/GetAccountSettings.kt b/kotlin/services/lambda/src/main/kotlin/com/kotlin/lambda/GetAccountSettings.kt index 9a031a8cb89..7309d9883c8 100644 --- a/kotlin/services/lambda/src/main/kotlin/com/kotlin/lambda/GetAccountSettings.kt +++ b/kotlin/services/lambda/src/main/kotlin/com/kotlin/lambda/GetAccountSettings.kt @@ -23,7 +23,7 @@ suspend fun main() { // snippet-start:[lambda.kotlin.account.main] suspend fun getSettings() { - LambdaClient.fromEnvironment { region = "us-west-2" }.use { awsLambda -> + LambdaClient { region = "us-west-2" }.use { awsLambda -> val response = awsLambda.getAccountSettings(GetAccountSettingsRequest { }) println( "Total code size for your account is ${response.accountLimit?.totalCodeSize} bytes", diff --git a/kotlin/services/lambda/src/main/kotlin/com/kotlin/lambda/LambdaInvoke.kt b/kotlin/services/lambda/src/main/kotlin/com/kotlin/lambda/LambdaInvoke.kt index 0c1a2ac8fb5..7dda8ca08df 100644 --- a/kotlin/services/lambda/src/main/kotlin/com/kotlin/lambda/LambdaInvoke.kt +++ b/kotlin/services/lambda/src/main/kotlin/com/kotlin/lambda/LambdaInvoke.kt @@ -47,7 +47,7 @@ suspend fun invokeFunction(functionNameVal: String) { payload = byteArray } - LambdaClient.fromEnvironment { region = "us-west-2" }.use { awsLambda -> + LambdaClient { region = "us-west-2" }.use { awsLambda -> val res = awsLambda.invoke(request) println("${res.payload?.toString(Charsets.UTF_8)}") println("The log result is ${res.logResult}") diff --git a/kotlin/services/lambda/src/main/kotlin/com/kotlin/lambda/LambdaScenario.kt b/kotlin/services/lambda/src/main/kotlin/com/kotlin/lambda/LambdaScenario.kt index a846c5117e4..c2d2393137a 100644 --- a/kotlin/services/lambda/src/main/kotlin/com/kotlin/lambda/LambdaScenario.kt +++ b/kotlin/services/lambda/src/main/kotlin/com/kotlin/lambda/LambdaScenario.kt @@ -121,7 +121,7 @@ suspend fun createScFunction( } // Create a Lambda function using a waiter - LambdaClient.fromEnvironment { region = "us-east-1" }.use { awsLambda -> + LambdaClient { region = "us-east-1" }.use { awsLambda -> val functionResponse = awsLambda.createFunction(request) awsLambda.waitUntilFunctionActive { functionName = myFunctionName @@ -136,7 +136,7 @@ suspend fun getFunction(functionNameVal: String) { functionName = functionNameVal } - LambdaClient.fromEnvironment { region = "us-east-1" }.use { awsLambda -> + LambdaClient { region = "us-east-1" }.use { awsLambda -> val response = awsLambda.getFunction(functionRequest) println("The runtime of this Lambda function is ${response.configuration?.runtime}") } @@ -148,7 +148,7 @@ suspend fun listFunctionsSc() { maxItems = 10 } - LambdaClient.fromEnvironment { region = "us-east-1" }.use { awsLambda -> + LambdaClient { region = "us-east-1" }.use { awsLambda -> val response = awsLambda.listFunctions(request) response.functions?.forEach { function -> println("The function name is ${function.functionName}") @@ -166,7 +166,7 @@ suspend fun invokeFunctionSc(functionNameVal: String) { logType = LogType.Tail } - LambdaClient.fromEnvironment { region = "us-east-1" }.use { awsLambda -> + LambdaClient { region = "us-east-1" }.use { awsLambda -> val res = awsLambda.invoke(request) println("The function payload is ${res.payload?.toString(Charsets.UTF_8)}") } @@ -185,7 +185,7 @@ suspend fun updateFunctionCode( s3Key = key } - LambdaClient.fromEnvironment { region = "us-east-1" }.use { awsLambda -> + LambdaClient { region = "us-east-1" }.use { awsLambda -> val response = awsLambda.updateFunctionCode(functionCodeRequest) awsLambda.waitUntilFunctionUpdated { functionName = functionNameVal @@ -205,7 +205,7 @@ suspend fun updateFunctionConfiguration( runtime = Runtime.Java17 } - LambdaClient.fromEnvironment { region = "us-east-1" }.use { awsLambda -> + LambdaClient { region = "us-east-1" }.use { awsLambda -> awsLambda.updateFunctionConfiguration(configurationRequest) } } @@ -216,7 +216,7 @@ suspend fun delFunction(myFunctionName: String) { functionName = myFunctionName } - LambdaClient.fromEnvironment { region = "us-east-1" }.use { awsLambda -> + LambdaClient { region = "us-east-1" }.use { awsLambda -> awsLambda.deleteFunction(request) println("$myFunctionName was deleted") } diff --git a/kotlin/services/lambda/src/main/kotlin/com/kotlin/lambda/ListLambda.kt b/kotlin/services/lambda/src/main/kotlin/com/kotlin/lambda/ListLambda.kt index c534a1e76bc..5cd2e1683ac 100644 --- a/kotlin/services/lambda/src/main/kotlin/com/kotlin/lambda/ListLambda.kt +++ b/kotlin/services/lambda/src/main/kotlin/com/kotlin/lambda/ListLambda.kt @@ -27,7 +27,7 @@ suspend fun listFunctions() { maxItems = 10 } - LambdaClient.fromEnvironment { region = "us-west-2" }.use { awsLambda -> + LambdaClient { region = "us-west-2" }.use { awsLambda -> val response = awsLambda.listFunctions(request) response.functions?.forEach { function -> println("The function name is ${function.functionName}") diff --git a/kotlin/services/lex/build.gradle.kts b/kotlin/services/lex/build.gradle.kts index a5caa6e3501..56273b6791a 100644 --- a/kotlin/services/lex/build.gradle.kts +++ b/kotlin/services/lex/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 } @@ -28,7 +28,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:lexruntimeservice") implementation("aws.sdk.kotlin:secretsmanager") implementation("aws.sdk.kotlin:lexmodelbuildingservice") diff --git a/kotlin/services/location/build.gradle.kts b/kotlin/services/location/build.gradle.kts index 231ae4bc37d..e09b7db6167 100644 --- a/kotlin/services/location/build.gradle.kts +++ b/kotlin/services/location/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:location") implementation("aws.sdk.kotlin:geoplaces") implementation("aws.smithy.kotlin:http-client-engine-okhttp") @@ -56,3 +56,4 @@ tasks.test { kotlin { jvmToolchain(17) } + diff --git a/kotlin/services/location/src/main/java/location/HelloLocation.kt b/kotlin/services/location/src/main/java/location/HelloLocation.kt index 2ebbf846b08..b6496b7944e 100644 --- a/kotlin/services/location/src/main/java/location/HelloLocation.kt +++ b/kotlin/services/location/src/main/java/location/HelloLocation.kt @@ -49,7 +49,7 @@ suspend fun listGeofences(collectionName: String) { this.collectionName = collectionName } - LocationClient { region = "us-east-1" }.use { client -> + LocationClient.fromEnvironment { region = "us-east-1" }.use { client -> val response = client.listGeofences(request) val geofences = response.entries if (geofences.isNullOrEmpty()) { diff --git a/kotlin/services/location/src/main/java/location/scenario/LocationScenario.kt b/kotlin/services/location/src/main/java/location/scenario/LocationScenario.kt index 813b194016a..5693c4bac5c 100644 --- a/kotlin/services/location/src/main/java/location/scenario/LocationScenario.kt +++ b/kotlin/services/location/src/main/java/location/scenario/LocationScenario.kt @@ -303,7 +303,7 @@ suspend fun deleteRouteCalculator(calcName: String) { this.calculatorName = calcName } - LocationClient { region = "us-east-1" }.use { client -> + LocationClient.fromEnvironment { region = "us-east-1" }.use { client -> client.deleteRouteCalculator(calculatorRequest) println("The route calculator $calcName was deleted.") } @@ -341,7 +341,7 @@ suspend fun deleteGeofenceCollection(collectionName: String) { this.collectionName = collectionName } - LocationClient { region = "us-east-1" }.use { client -> + LocationClient.fromEnvironment { region = "us-east-1" }.use { client -> client.deleteGeofenceCollection(collectionRequest) println("The geofence collection $collectionName was deleted.") } @@ -359,7 +359,7 @@ suspend fun deleteKey(keyName: String) { this.keyName = keyName } - LocationClient { region = "us-east-1" }.use { client -> + LocationClient.fromEnvironment { region = "us-east-1" }.use { client -> client.deleteKey(keyRequest) println("The key $keyName was deleted.") } @@ -377,7 +377,7 @@ suspend fun deleteMap(mapName: String) { this.mapName = mapName } - LocationClient { region = "us-east-1" }.use { client -> + LocationClient.fromEnvironment { region = "us-east-1" }.use { client -> client.deleteMap(mapRequest) println("The map $mapName was deleted.") } @@ -402,7 +402,7 @@ suspend fun searchNearby() { this.queryRadius = 1000L } - GeoPlacesClient { region = "us-east-1" }.use { client -> + GeoPlacesClient.fromEnvironment { region = "us-east-1" }.use { client -> val response = client.searchNearby(request) // Process the response and print the results. @@ -433,7 +433,7 @@ suspend fun searchText(searchQuery: String) { this.biasPosition = queryPosition } - GeoPlacesClient { region = "us-east-1" }.use { client -> + GeoPlacesClient.fromEnvironment { region = "us-east-1" }.use { client -> val response = client.searchText(request) response.resultItems?.firstOrNull()?.let { result -> @@ -485,7 +485,7 @@ suspend fun reverseGeocode() { this.queryPosition = queryPosition } - GeoPlacesClient { region = "us-east-1" }.use { client -> + GeoPlacesClient.fromEnvironment { region = "us-east-1" }.use { client -> val response = client.reverseGeocode(request) response.resultItems?.forEach { result -> println("The address is: ${result.address?.label}") @@ -515,7 +515,7 @@ suspend fun calcDistance(routeCalcName: String): CalculateRouteResponse { this.distanceUnit = DistanceUnit.Kilometers // Options: Meters, Kilometers, Miles } - LocationClient { region = "us-east-1" }.use { client -> + LocationClient.fromEnvironment { region = "us-east-1" }.use { client -> return client.calculateRoute(request) } } @@ -535,7 +535,7 @@ suspend fun createRouteCalculator(routeCalcName: String): CreateRouteCalculatorR this.dataSource = dataSource } - LocationClient { region = "us-east-1" }.use { client -> + LocationClient.fromEnvironment { region = "us-east-1" }.use { client -> return client.createRouteCalculator(request) } } @@ -554,7 +554,7 @@ suspend fun getDevicePosition(trackerName: String, deviceId: String): GetDeviceP this.deviceId = deviceId } - LocationClient { region = "us-east-1" }.use { client -> + LocationClient.fromEnvironment { region = "us-east-1" }.use { client -> return client.getDevicePosition(request) } } @@ -582,7 +582,7 @@ suspend fun updateDevicePosition(trackerName: String, deviceId: String) { updates = listOf(positionUpdate) } - LocationClient { region = "us-east-1" }.use { client -> + LocationClient.fromEnvironment { region = "us-east-1" }.use { client -> client.batchUpdateDevicePosition(request) } } @@ -602,7 +602,7 @@ suspend fun createTracker(trackerName: String): String { positionFiltering = PositionFiltering.TimeBased // Options: TimeBased, DistanceBased, AccuracyBased } - LocationClient { region = "us-east-1" }.use { client -> + LocationClient.fromEnvironment { region = "us-east-1" }.use { client -> val response = client.createTracker(trackerRequest) return response.trackerArn } @@ -635,7 +635,7 @@ suspend fun putGeofence(collectionName: String, geoId: String) { this.geometry = geofenceGeometry } - LocationClient { region = "us-east-1" }.use { client -> + LocationClient.fromEnvironment { region = "us-east-1" }.use { client -> client.putGeofence(geofenceRequest) } } @@ -653,7 +653,7 @@ suspend fun createGeofenceCollection(collectionName: String): String { description = "Created by using the AWS SDK for Kotlin" } - LocationClient { region = "us-east-1" }.use { client -> + LocationClient.fromEnvironment { region = "us-east-1" }.use { client -> val response = client.createGeofenceCollection(collectionRequest) return response.collectionArn } @@ -680,7 +680,7 @@ suspend fun createKey(keyName: String, mapArn: String): String { noExpiry = true } - LocationClient { region = "us-east-1" }.use { client -> + LocationClient.fromEnvironment { region = "us-east-1" }.use { client -> val response = client.createKey(request) return response.keyArn } @@ -705,7 +705,7 @@ suspend fun createMap(mapName: String): String { description = "A map created using the Kotlin SDK" } - LocationClient { region = "us-east-1" }.use { client -> + LocationClient.fromEnvironment { region = "us-east-1" }.use { client -> val response = client.createMap(mapRequest) return response.mapArn } From 115fd4baa1ac90a55791f61839f985f601660908 Mon Sep 17 00:00:00 2001 From: Macdonald Date: Tue, 8 Jul 2025 11:30:52 -0400 Subject: [PATCH 23/27] updated build number --- kotlin/services/mediastore/build.gradle.kts | 4 ++-- .../src/main/kotlin/com/kotlin/mediastore/CreateContainer.kt | 2 +- .../src/main/kotlin/com/kotlin/mediastore/DeleteContainer.kt | 2 +- .../main/kotlin/com/kotlin/mediastore/DescribeContainer.kt | 2 +- .../src/main/kotlin/com/kotlin/mediastore/ListContainers.kt | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/kotlin/services/mediastore/build.gradle.kts b/kotlin/services/mediastore/build.gradle.kts index 8965d5f82bb..97813085ece 100644 --- a/kotlin/services/mediastore/build.gradle.kts +++ b/kotlin/services/mediastore/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 } group = "me.scmacdon" @@ -26,7 +26,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:mediastore") implementation("aws.smithy.kotlin:http-client-engine-okhttp") implementation("aws.smithy.kotlin:http-client-engine-crt") diff --git a/kotlin/services/mediastore/src/main/kotlin/com/kotlin/mediastore/CreateContainer.kt b/kotlin/services/mediastore/src/main/kotlin/com/kotlin/mediastore/CreateContainer.kt index 36a25e96733..6521c546877 100644 --- a/kotlin/services/mediastore/src/main/kotlin/com/kotlin/mediastore/CreateContainer.kt +++ b/kotlin/services/mediastore/src/main/kotlin/com/kotlin/mediastore/CreateContainer.kt @@ -43,7 +43,7 @@ suspend fun createMediaContainer(containerNameVal: String?) { containerName = containerNameVal } - MediaStoreClient { region = "us-west-2" }.use { mediaStoreClient -> + MediaStoreClient.fromEnvironment { region = "us-west-2" }.use { mediaStoreClient -> val containerResponse = mediaStoreClient.createContainer(request) var status = containerResponse.container?.status.toString() diff --git a/kotlin/services/mediastore/src/main/kotlin/com/kotlin/mediastore/DeleteContainer.kt b/kotlin/services/mediastore/src/main/kotlin/com/kotlin/mediastore/DeleteContainer.kt index 9659b7ea320..3c2425aaa26 100644 --- a/kotlin/services/mediastore/src/main/kotlin/com/kotlin/mediastore/DeleteContainer.kt +++ b/kotlin/services/mediastore/src/main/kotlin/com/kotlin/mediastore/DeleteContainer.kt @@ -43,7 +43,7 @@ suspend fun deleteMediaContainer(containerNameVal: String?) { containerName = containerNameVal } - MediaStoreClient { region = "us-west-2" }.use { mediaStoreClient -> + MediaStoreClient.fromEnvironment { region = "us-west-2" }.use { mediaStoreClient -> mediaStoreClient.deleteContainer(request) println("The $containerNameVal was deleted") } diff --git a/kotlin/services/mediastore/src/main/kotlin/com/kotlin/mediastore/DescribeContainer.kt b/kotlin/services/mediastore/src/main/kotlin/com/kotlin/mediastore/DescribeContainer.kt index ad69222c6c8..a4fcc403121 100644 --- a/kotlin/services/mediastore/src/main/kotlin/com/kotlin/mediastore/DescribeContainer.kt +++ b/kotlin/services/mediastore/src/main/kotlin/com/kotlin/mediastore/DescribeContainer.kt @@ -43,7 +43,7 @@ suspend fun checkContainer(containerNameVal: String?): String? { containerName = containerNameVal } - MediaStoreClient { region = "us-west-2" }.use { mediaStoreClient -> + MediaStoreClient.fromEnvironment { region = "us-west-2" }.use { mediaStoreClient -> val containerResponse = mediaStoreClient.describeContainer(request) println("The container name is ${containerResponse.container?.name}") println("The container ARN is ${containerResponse.container?.arn}") diff --git a/kotlin/services/mediastore/src/main/kotlin/com/kotlin/mediastore/ListContainers.kt b/kotlin/services/mediastore/src/main/kotlin/com/kotlin/mediastore/ListContainers.kt index cc8f95aadf9..e02f8f00a87 100644 --- a/kotlin/services/mediastore/src/main/kotlin/com/kotlin/mediastore/ListContainers.kt +++ b/kotlin/services/mediastore/src/main/kotlin/com/kotlin/mediastore/ListContainers.kt @@ -22,7 +22,7 @@ suspend fun main() { // snippet-start:[mediastore.kotlin.list_containers.main] suspend fun listAllContainers() { - MediaStoreClient { region = "us-west-2" }.use { mediaStoreClient -> + MediaStoreClient.fromEnvironment { region = "us-west-2" }.use { mediaStoreClient -> val response = mediaStoreClient.listContainers(ListContainersRequest {}) response.containers?.forEach { container -> println("Container name is ${container.name}") From af6705727155e87a45edc410b8739fe050343e28 Mon Sep 17 00:00:00 2001 From: Macdonald Date: Tue, 8 Jul 2025 11:46:12 -0400 Subject: [PATCH 24/27] updated build number --- kotlin/services/opensearch/build.gradle.kts | 4 ++-- .../src/main/kotlin/com/example/search/CreateDomain.kt | 2 +- .../src/main/kotlin/com/example/search/DeleteDomain.kt | 2 +- .../src/main/kotlin/com/example/search/ListDomainNames.kt | 2 +- .../src/main/kotlin/com/example/search/UpdateDomain.kt | 2 +- kotlin/services/personalize/build.gradle.kts | 4 ++-- .../src/main/kotlin/com/kotlin/personalize/CreateCampaign.kt | 2 +- .../src/main/kotlin/com/kotlin/personalize/CreateSolution.kt | 2 +- .../src/main/kotlin/com/kotlin/personalize/DeleteCampaign.kt | 2 +- .../src/main/kotlin/com/kotlin/personalize/DeleteSolution.kt | 2 +- .../main/kotlin/com/kotlin/personalize/DescribeCampaign.kt | 2 +- .../main/kotlin/com/kotlin/personalize/DescribeSolution.kt | 2 +- .../main/kotlin/com/kotlin/personalize/GetRecommendations.kt | 2 +- .../src/main/kotlin/com/kotlin/personalize/ListCampaigns.kt | 2 +- .../main/kotlin/com/kotlin/personalize/ListDatasetGroups.kt | 2 +- .../src/main/kotlin/com/kotlin/personalize/ListRecipes.kt | 2 +- .../src/main/kotlin/com/kotlin/personalize/ListSolutions.kt | 2 +- kotlin/services/pinpoint/build.gradle.kts | 4 ++-- .../src/main/kotlin/com/kotlin/pinpoint/AddExampleEndpoint.kt | 2 +- .../pinpoint/src/main/kotlin/com/kotlin/pinpoint/CreateApp.kt | 2 +- .../src/main/kotlin/com/kotlin/pinpoint/CreateCampaign.kt | 2 +- .../src/main/kotlin/com/kotlin/pinpoint/CreateEndpoint.kt | 2 +- .../src/main/kotlin/com/kotlin/pinpoint/CreateSegment.kt | 2 +- .../pinpoint/src/main/kotlin/com/kotlin/pinpoint/DeleteApp.kt | 2 +- .../src/main/kotlin/com/kotlin/pinpoint/DeleteEndpoint.kt | 2 +- .../src/main/kotlin/com/kotlin/pinpoint/ListEndpointIds.kt | 2 +- .../src/main/kotlin/com/kotlin/pinpoint/ListSegments.kt | 2 +- .../src/main/kotlin/com/kotlin/pinpoint/LookUpEndpoint.kt | 2 +- .../src/main/kotlin/com/kotlin/pinpoint/SendEmailMessage.kt | 2 +- .../src/main/kotlin/com/kotlin/pinpoint/SendMessage.kt | 2 +- 30 files changed, 33 insertions(+), 33 deletions(-) diff --git a/kotlin/services/opensearch/build.gradle.kts b/kotlin/services/opensearch/build.gradle.kts index 43f14cae347..61a64e7b32e 100644 --- a/kotlin/services/opensearch/build.gradle.kts +++ b/kotlin/services/opensearch/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:opensearch") implementation("aws.smithy.kotlin:http-client-engine-okhttp") implementation("aws.smithy.kotlin:http-client-engine-crt") diff --git a/kotlin/services/opensearch/src/main/kotlin/com/example/search/CreateDomain.kt b/kotlin/services/opensearch/src/main/kotlin/com/example/search/CreateDomain.kt index daf69c0e5ff..5f2f020812e 100644 --- a/kotlin/services/opensearch/src/main/kotlin/com/example/search/CreateDomain.kt +++ b/kotlin/services/opensearch/src/main/kotlin/com/example/search/CreateDomain.kt @@ -72,7 +72,7 @@ suspend fun createNewDomain(domainNameVal: String?) { } println("Sending domain creation request...") - OpenSearchClient { region = "us-east-1" }.use { searchClient -> + OpenSearchClient.fromEnvironment { region = "us-east-1" }.use { searchClient -> val createResponse = searchClient.createDomain(request) println("Domain status is ${createResponse.domainStatus}") println("Domain Id is ${createResponse.domainStatus?.domainId}") diff --git a/kotlin/services/opensearch/src/main/kotlin/com/example/search/DeleteDomain.kt b/kotlin/services/opensearch/src/main/kotlin/com/example/search/DeleteDomain.kt index 6b1e3d26788..e7634a74e29 100644 --- a/kotlin/services/opensearch/src/main/kotlin/com/example/search/DeleteDomain.kt +++ b/kotlin/services/opensearch/src/main/kotlin/com/example/search/DeleteDomain.kt @@ -41,7 +41,7 @@ suspend fun deleteSpecificDomain(domainNameVal: String) { DeleteDomainRequest { domainName = domainNameVal } - OpenSearchClient { region = "us-east-1" }.use { searchClient -> + OpenSearchClient.fromEnvironment { region = "us-east-1" }.use { searchClient -> searchClient.deleteDomain(request) println("$domainNameVal was successfully deleted.") } diff --git a/kotlin/services/opensearch/src/main/kotlin/com/example/search/ListDomainNames.kt b/kotlin/services/opensearch/src/main/kotlin/com/example/search/ListDomainNames.kt index e12fe3d6d40..00b135b3cee 100644 --- a/kotlin/services/opensearch/src/main/kotlin/com/example/search/ListDomainNames.kt +++ b/kotlin/services/opensearch/src/main/kotlin/com/example/search/ListDomainNames.kt @@ -22,7 +22,7 @@ suspend fun main() { // snippet-start:[opensearch.kotlin.list_domains.main] suspend fun listAllDomains() { - OpenSearchClient { region = "us-east-1" }.use { searchClient -> + OpenSearchClient.fromEnvironment { region = "us-east-1" }.use { searchClient -> val response: ListDomainNamesResponse = searchClient.listDomainNames(ListDomainNamesRequest {}) response.domainNames?.forEach { domain -> println("Domain name is " + domain.domainName) diff --git a/kotlin/services/opensearch/src/main/kotlin/com/example/search/UpdateDomain.kt b/kotlin/services/opensearch/src/main/kotlin/com/example/search/UpdateDomain.kt index 91802261691..743857bc77e 100644 --- a/kotlin/services/opensearch/src/main/kotlin/com/example/search/UpdateDomain.kt +++ b/kotlin/services/opensearch/src/main/kotlin/com/example/search/UpdateDomain.kt @@ -48,7 +48,7 @@ suspend fun updateSpecificDomain(domainNameVal: String?) { } println("Sending domain update request...") - OpenSearchClient { region = "us-east-1" }.use { searchClient -> + OpenSearchClient.fromEnvironment { region = "us-east-1" }.use { searchClient -> val updateResponse = searchClient.updateDomainConfig(request) println("Domain update response from Amazon OpenSearch Service:") println(updateResponse.toString()) diff --git a/kotlin/services/personalize/build.gradle.kts b/kotlin/services/personalize/build.gradle.kts index 6c4e3754f42..5b72234217c 100644 --- a/kotlin/services/personalize/build.gradle.kts +++ b/kotlin/services/personalize/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:personalize") implementation("aws.sdk.kotlin:secretsmanager") implementation("aws.sdk.kotlin:personalizeruntime") diff --git a/kotlin/services/personalize/src/main/kotlin/com/kotlin/personalize/CreateCampaign.kt b/kotlin/services/personalize/src/main/kotlin/com/kotlin/personalize/CreateCampaign.kt index ae49f335b2c..8c0ed1d4d1d 100644 --- a/kotlin/services/personalize/src/main/kotlin/com/kotlin/personalize/CreateCampaign.kt +++ b/kotlin/services/personalize/src/main/kotlin/com/kotlin/personalize/CreateCampaign.kt @@ -50,7 +50,7 @@ suspend fun createPersonalCompaign( name = campaignName } - PersonalizeClient { region = "us-east-1" }.use { personalizeClient -> + PersonalizeClient.fromEnvironment { region = "us-east-1" }.use { personalizeClient -> val campaignResponse = personalizeClient.createCampaign(request) return campaignResponse.campaignArn } diff --git a/kotlin/services/personalize/src/main/kotlin/com/kotlin/personalize/CreateSolution.kt b/kotlin/services/personalize/src/main/kotlin/com/kotlin/personalize/CreateSolution.kt index 6abef71a3d0..910e0b2c10d 100644 --- a/kotlin/services/personalize/src/main/kotlin/com/kotlin/personalize/CreateSolution.kt +++ b/kotlin/services/personalize/src/main/kotlin/com/kotlin/personalize/CreateSolution.kt @@ -53,7 +53,7 @@ suspend fun createPersonalizeSolution( recipeArn = recipeArnVal } - PersonalizeClient { region = "us-east-1" }.use { personalizeClient -> + PersonalizeClient.fromEnvironment { region = "us-east-1" }.use { personalizeClient -> val solutionResponse = personalizeClient.createSolution(request) return solutionResponse.solutionArn } diff --git a/kotlin/services/personalize/src/main/kotlin/com/kotlin/personalize/DeleteCampaign.kt b/kotlin/services/personalize/src/main/kotlin/com/kotlin/personalize/DeleteCampaign.kt index a834e12b67a..dd6be4c3c09 100644 --- a/kotlin/services/personalize/src/main/kotlin/com/kotlin/personalize/DeleteCampaign.kt +++ b/kotlin/services/personalize/src/main/kotlin/com/kotlin/personalize/DeleteCampaign.kt @@ -42,7 +42,7 @@ suspend fun deleteSpecificCampaign(campaignArnVal: String?) { campaignArn = campaignArnVal } - PersonalizeClient { region = "us-east-1" }.use { personalizeClient -> + PersonalizeClient.fromEnvironment { region = "us-east-1" }.use { personalizeClient -> personalizeClient.deleteCampaign(request) println("$campaignArnVal was successfully deleted.") } diff --git a/kotlin/services/personalize/src/main/kotlin/com/kotlin/personalize/DeleteSolution.kt b/kotlin/services/personalize/src/main/kotlin/com/kotlin/personalize/DeleteSolution.kt index 35dd01c947f..f2eed3b877a 100644 --- a/kotlin/services/personalize/src/main/kotlin/com/kotlin/personalize/DeleteSolution.kt +++ b/kotlin/services/personalize/src/main/kotlin/com/kotlin/personalize/DeleteSolution.kt @@ -42,7 +42,7 @@ suspend fun deleteGivenSolution(solutionArnVal: String?) { solutionArn = solutionArnVal } - PersonalizeClient { region = "us-east-1" }.use { personalizeClient -> + PersonalizeClient.fromEnvironment { region = "us-east-1" }.use { personalizeClient -> personalizeClient.deleteSolution(request) println("$solutionArnVal was successfully deleted.") } diff --git a/kotlin/services/personalize/src/main/kotlin/com/kotlin/personalize/DescribeCampaign.kt b/kotlin/services/personalize/src/main/kotlin/com/kotlin/personalize/DescribeCampaign.kt index 4490eafa4db..5cc468e2ac6 100644 --- a/kotlin/services/personalize/src/main/kotlin/com/kotlin/personalize/DescribeCampaign.kt +++ b/kotlin/services/personalize/src/main/kotlin/com/kotlin/personalize/DescribeCampaign.kt @@ -40,7 +40,7 @@ suspend fun describeSpecificCampaign(campaignArnVal: String?) { DescribeCampaignRequest { campaignArn = campaignArnVal } - PersonalizeClient { region = "us-east-1" }.use { personalizeClient -> + PersonalizeClient.fromEnvironment { region = "us-east-1" }.use { personalizeClient -> val response = personalizeClient.describeCampaign(request) val myCampaign = response.campaign diff --git a/kotlin/services/personalize/src/main/kotlin/com/kotlin/personalize/DescribeSolution.kt b/kotlin/services/personalize/src/main/kotlin/com/kotlin/personalize/DescribeSolution.kt index 683640c4a89..0f0950b7758 100644 --- a/kotlin/services/personalize/src/main/kotlin/com/kotlin/personalize/DescribeSolution.kt +++ b/kotlin/services/personalize/src/main/kotlin/com/kotlin/personalize/DescribeSolution.kt @@ -42,7 +42,7 @@ suspend fun describeSpecificSolution(solutionArnVal: String?) { solutionArn = solutionArnVal } - PersonalizeClient { region = "us-east-1" }.use { personalizeClient -> + PersonalizeClient.fromEnvironment { region = "us-east-1" }.use { personalizeClient -> val response = personalizeClient.describeSolution(request) println("The solution name is ${response.solution?.name}") } diff --git a/kotlin/services/personalize/src/main/kotlin/com/kotlin/personalize/GetRecommendations.kt b/kotlin/services/personalize/src/main/kotlin/com/kotlin/personalize/GetRecommendations.kt index 8996b9f3a0a..1ab5de0d0a8 100644 --- a/kotlin/services/personalize/src/main/kotlin/com/kotlin/personalize/GetRecommendations.kt +++ b/kotlin/services/personalize/src/main/kotlin/com/kotlin/personalize/GetRecommendations.kt @@ -48,7 +48,7 @@ suspend fun getRecs( userId = userIdVal } - PersonalizeRuntimeClient { region = "us-east-1" }.use { personalizeRuntimeClient -> + PersonalizeRuntimeClient.fromEnvironment { region = "us-east-1" }.use { personalizeRuntimeClient -> val response = personalizeRuntimeClient.getRecommendations(request) response.itemList?.forEach { item -> println("Item Id is ${item.itemId}") diff --git a/kotlin/services/personalize/src/main/kotlin/com/kotlin/personalize/ListCampaigns.kt b/kotlin/services/personalize/src/main/kotlin/com/kotlin/personalize/ListCampaigns.kt index 3e2a9458d28..72f85248dea 100644 --- a/kotlin/services/personalize/src/main/kotlin/com/kotlin/personalize/ListCampaigns.kt +++ b/kotlin/services/personalize/src/main/kotlin/com/kotlin/personalize/ListCampaigns.kt @@ -42,7 +42,7 @@ suspend fun listAllCampaigns(solutionArnVal: String?) { maxResults = 10 solutionArn = solutionArnVal } - PersonalizeClient { region = "us-east-1" }.use { personalizeClient -> + PersonalizeClient.fromEnvironment { region = "us-east-1" }.use { personalizeClient -> val response = personalizeClient.listCampaigns(request) response.campaigns?.forEach { campaign -> println("Campaign name is ${campaign.name}") diff --git a/kotlin/services/personalize/src/main/kotlin/com/kotlin/personalize/ListDatasetGroups.kt b/kotlin/services/personalize/src/main/kotlin/com/kotlin/personalize/ListDatasetGroups.kt index 639006ce467..04dd410d955 100644 --- a/kotlin/services/personalize/src/main/kotlin/com/kotlin/personalize/ListDatasetGroups.kt +++ b/kotlin/services/personalize/src/main/kotlin/com/kotlin/personalize/ListDatasetGroups.kt @@ -26,7 +26,7 @@ suspend fun listDSGroups() { ListDatasetGroupsRequest { maxResults = 15 } - PersonalizeClient { region = "us-east-1" }.use { personalizeClient -> + PersonalizeClient.fromEnvironment { region = "us-east-1" }.use { personalizeClient -> val response = personalizeClient.listDatasetGroups(request) response.datasetGroups?.forEach { group -> println("The data set name is ${group.name}") diff --git a/kotlin/services/personalize/src/main/kotlin/com/kotlin/personalize/ListRecipes.kt b/kotlin/services/personalize/src/main/kotlin/com/kotlin/personalize/ListRecipes.kt index 035bde0873b..16e74dc3ccf 100644 --- a/kotlin/services/personalize/src/main/kotlin/com/kotlin/personalize/ListRecipes.kt +++ b/kotlin/services/personalize/src/main/kotlin/com/kotlin/personalize/ListRecipes.kt @@ -26,7 +26,7 @@ suspend fun listAllRecipes() { ListRecipesRequest { maxResults = 15 } - PersonalizeClient { region = "us-east-1" }.use { personalizeClient -> + PersonalizeClient.fromEnvironment { region = "us-east-1" }.use { personalizeClient -> val response = personalizeClient.listRecipes(request) response.recipes?.forEach { recipe -> println("The recipe ARN is ${recipe.recipeArn}") diff --git a/kotlin/services/personalize/src/main/kotlin/com/kotlin/personalize/ListSolutions.kt b/kotlin/services/personalize/src/main/kotlin/com/kotlin/personalize/ListSolutions.kt index 297eded7e25..041a7de2708 100644 --- a/kotlin/services/personalize/src/main/kotlin/com/kotlin/personalize/ListSolutions.kt +++ b/kotlin/services/personalize/src/main/kotlin/com/kotlin/personalize/ListSolutions.kt @@ -42,7 +42,7 @@ suspend fun listAllSolutions(datasetGroupArnValue: String?) { maxResults = 10 datasetGroupArn = datasetGroupArnValue } - PersonalizeClient { region = "us-east-1" }.use { personalizeClient -> + PersonalizeClient.fromEnvironment { region = "us-east-1" }.use { personalizeClient -> val response = personalizeClient.listSolutions(request) response.solutions?.forEach { solution -> println("The solution ARN is ${solution.solutionArn}") diff --git a/kotlin/services/pinpoint/build.gradle.kts b/kotlin/services/pinpoint/build.gradle.kts index 86eee956a4b..5533a332d81 100644 --- a/kotlin/services/pinpoint/build.gradle.kts +++ b/kotlin/services/pinpoint/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:pinpoint") implementation("aws.sdk.kotlin:pinpointemail") implementation("aws.sdk.kotlin:secretsmanager") diff --git a/kotlin/services/pinpoint/src/main/kotlin/com/kotlin/pinpoint/AddExampleEndpoint.kt b/kotlin/services/pinpoint/src/main/kotlin/com/kotlin/pinpoint/AddExampleEndpoint.kt index 1df10604e99..7a4e75980ba 100644 --- a/kotlin/services/pinpoint/src/main/kotlin/com/kotlin/pinpoint/AddExampleEndpoint.kt +++ b/kotlin/services/pinpoint/src/main/kotlin/com/kotlin/pinpoint/AddExampleEndpoint.kt @@ -74,7 +74,7 @@ suspend fun updateEndpointsViaBatch(applicationIdVal: String?) { } // Updates the endpoints with Amazon Pinpoint. - PinpointClient { region = "us-west-2" }.use { pinpoint -> + PinpointClient.fromEnvironment { region = "us-west-2" }.use { pinpoint -> val result = pinpoint.updateEndpointsBatch( UpdateEndpointsBatchRequest { diff --git a/kotlin/services/pinpoint/src/main/kotlin/com/kotlin/pinpoint/CreateApp.kt b/kotlin/services/pinpoint/src/main/kotlin/com/kotlin/pinpoint/CreateApp.kt index e009b929a0f..706067959cb 100644 --- a/kotlin/services/pinpoint/src/main/kotlin/com/kotlin/pinpoint/CreateApp.kt +++ b/kotlin/services/pinpoint/src/main/kotlin/com/kotlin/pinpoint/CreateApp.kt @@ -43,7 +43,7 @@ suspend fun createApplication(applicationName: String?): String? { name = applicationName } - PinpointClient { region = "us-west-2" }.use { pinpoint -> + PinpointClient.fromEnvironment { region = "us-west-2" }.use { pinpoint -> val result = pinpoint.createApp( CreateAppRequest { diff --git a/kotlin/services/pinpoint/src/main/kotlin/com/kotlin/pinpoint/CreateCampaign.kt b/kotlin/services/pinpoint/src/main/kotlin/com/kotlin/pinpoint/CreateCampaign.kt index 7ee07fac9b3..578db366362 100644 --- a/kotlin/services/pinpoint/src/main/kotlin/com/kotlin/pinpoint/CreateCampaign.kt +++ b/kotlin/services/pinpoint/src/main/kotlin/com/kotlin/pinpoint/CreateCampaign.kt @@ -73,7 +73,7 @@ suspend fun createPinCampaign( messageConfiguration = messageConfigurationOb } - PinpointClient { region = "us-west-2" }.use { pinpoint -> + PinpointClient.fromEnvironment { region = "us-west-2" }.use { pinpoint -> val result: CreateCampaignResponse = pinpoint.createCampaign( CreateCampaignRequest { diff --git a/kotlin/services/pinpoint/src/main/kotlin/com/kotlin/pinpoint/CreateEndpoint.kt b/kotlin/services/pinpoint/src/main/kotlin/com/kotlin/pinpoint/CreateEndpoint.kt index 6ceaab9c716..194b6db5cd4 100644 --- a/kotlin/services/pinpoint/src/main/kotlin/com/kotlin/pinpoint/CreateEndpoint.kt +++ b/kotlin/services/pinpoint/src/main/kotlin/com/kotlin/pinpoint/CreateEndpoint.kt @@ -61,7 +61,7 @@ suspend fun createPinpointEndpoint(applicationIdVal: String?): String? { endpointRequest = endpointRequestOb } - PinpointClient { region = "us-west-2" }.use { pinpoint -> + PinpointClient.fromEnvironment { region = "us-west-2" }.use { pinpoint -> val updateEndpointResponse = pinpoint.updateEndpoint(updateEndpointRequest) println("Update Endpoint Response ${updateEndpointResponse.messageBody}") diff --git a/kotlin/services/pinpoint/src/main/kotlin/com/kotlin/pinpoint/CreateSegment.kt b/kotlin/services/pinpoint/src/main/kotlin/com/kotlin/pinpoint/CreateSegment.kt index 481fb65abf1..0f80aad4e62 100644 --- a/kotlin/services/pinpoint/src/main/kotlin/com/kotlin/pinpoint/CreateSegment.kt +++ b/kotlin/services/pinpoint/src/main/kotlin/com/kotlin/pinpoint/CreateSegment.kt @@ -84,7 +84,7 @@ suspend fun createPinpointSegment(applicationIdVal: String?): String? { dimensions = dimensionsOb } - PinpointClient { region = "us-west-2" }.use { pinpoint -> + PinpointClient.fromEnvironment { region = "us-west-2" }.use { pinpoint -> val createSegmentResult: CreateSegmentResponse = pinpoint.createSegment( CreateSegmentRequest { diff --git a/kotlin/services/pinpoint/src/main/kotlin/com/kotlin/pinpoint/DeleteApp.kt b/kotlin/services/pinpoint/src/main/kotlin/com/kotlin/pinpoint/DeleteApp.kt index 4b793f61b14..f73c5f7b4c4 100644 --- a/kotlin/services/pinpoint/src/main/kotlin/com/kotlin/pinpoint/DeleteApp.kt +++ b/kotlin/services/pinpoint/src/main/kotlin/com/kotlin/pinpoint/DeleteApp.kt @@ -36,7 +36,7 @@ suspend fun main(args: Array) { // snippet-start:[pinpoint.kotlin.deleteapp.main] suspend fun deletePinApp(appId: String?) { - PinpointClient { region = "us-west-2" }.use { pinpoint -> + PinpointClient.fromEnvironment { region = "us-west-2" }.use { pinpoint -> val result = pinpoint.deleteApp( DeleteAppRequest { diff --git a/kotlin/services/pinpoint/src/main/kotlin/com/kotlin/pinpoint/DeleteEndpoint.kt b/kotlin/services/pinpoint/src/main/kotlin/com/kotlin/pinpoint/DeleteEndpoint.kt index 553e63185ea..96dfa9ccd9b 100644 --- a/kotlin/services/pinpoint/src/main/kotlin/com/kotlin/pinpoint/DeleteEndpoint.kt +++ b/kotlin/services/pinpoint/src/main/kotlin/com/kotlin/pinpoint/DeleteEndpoint.kt @@ -47,7 +47,7 @@ suspend fun deletePinEncpoint( endpointId = endpointIdVal } - PinpointClient { region = "us-west-2" }.use { pinpoint -> + PinpointClient.fromEnvironment { region = "us-west-2" }.use { pinpoint -> val result = pinpoint.deleteEndpoint(deleteEndpointRequest) val id = result.endpointResponse?.id println("The deleted endpoint is $id") diff --git a/kotlin/services/pinpoint/src/main/kotlin/com/kotlin/pinpoint/ListEndpointIds.kt b/kotlin/services/pinpoint/src/main/kotlin/com/kotlin/pinpoint/ListEndpointIds.kt index d37c47aed3f..6ccfc75ef59 100644 --- a/kotlin/services/pinpoint/src/main/kotlin/com/kotlin/pinpoint/ListEndpointIds.kt +++ b/kotlin/services/pinpoint/src/main/kotlin/com/kotlin/pinpoint/ListEndpointIds.kt @@ -40,7 +40,7 @@ suspend fun listAllEndpoints( applicationIdVal: String?, userIdVal: String?, ) { - PinpointClient { region = "us-east-1" }.use { pinpoint -> + PinpointClient.fromEnvironment { region = "us-east-1" }.use { pinpoint -> val response = pinpoint.getUserEndpoints( diff --git a/kotlin/services/pinpoint/src/main/kotlin/com/kotlin/pinpoint/ListSegments.kt b/kotlin/services/pinpoint/src/main/kotlin/com/kotlin/pinpoint/ListSegments.kt index d7f91695213..09ba130bcb6 100644 --- a/kotlin/services/pinpoint/src/main/kotlin/com/kotlin/pinpoint/ListSegments.kt +++ b/kotlin/services/pinpoint/src/main/kotlin/com/kotlin/pinpoint/ListSegments.kt @@ -36,7 +36,7 @@ suspend fun main(args: Array) { // snippet-start:[pinpoint.kotlin.listsegments.main] suspend fun listSegs(appId: String?) { - PinpointClient { region = "us-west-2" }.use { pinpoint -> + PinpointClient.fromEnvironment { region = "us-west-2" }.use { pinpoint -> val response = pinpoint.getSegments( GetSegmentsRequest { diff --git a/kotlin/services/pinpoint/src/main/kotlin/com/kotlin/pinpoint/LookUpEndpoint.kt b/kotlin/services/pinpoint/src/main/kotlin/com/kotlin/pinpoint/LookUpEndpoint.kt index 11c82d6bd21..4ab1072c51e 100644 --- a/kotlin/services/pinpoint/src/main/kotlin/com/kotlin/pinpoint/LookUpEndpoint.kt +++ b/kotlin/services/pinpoint/src/main/kotlin/com/kotlin/pinpoint/LookUpEndpoint.kt @@ -42,7 +42,7 @@ suspend fun lookupPinpointEndpoint( appId: String?, endpoint: String?, ) { - PinpointClient { region = "us-west-2" }.use { pinpoint -> + PinpointClient.fromEnvironment { region = "us-west-2" }.use { pinpoint -> val result = pinpoint.getEndpoint( GetEndpointRequest { diff --git a/kotlin/services/pinpoint/src/main/kotlin/com/kotlin/pinpoint/SendEmailMessage.kt b/kotlin/services/pinpoint/src/main/kotlin/com/kotlin/pinpoint/SendEmailMessage.kt index 29507295134..20a318907cc 100644 --- a/kotlin/services/pinpoint/src/main/kotlin/com/kotlin/pinpoint/SendEmailMessage.kt +++ b/kotlin/services/pinpoint/src/main/kotlin/com/kotlin/pinpoint/SendEmailMessage.kt @@ -97,7 +97,7 @@ suspend fun sendEmail( this.content = emailContent } - PinpointEmailClient { region = "us-east-1" }.use { pinpointemail -> + PinpointEmailClient.fromEnvironment { region = "us-east-1" }.use { pinpointemail -> pinpointemail.sendEmail(sendEmailRequest) println("Message Sent") } diff --git a/kotlin/services/pinpoint/src/main/kotlin/com/kotlin/pinpoint/SendMessage.kt b/kotlin/services/pinpoint/src/main/kotlin/com/kotlin/pinpoint/SendMessage.kt index d4490d20193..9940668b53c 100644 --- a/kotlin/services/pinpoint/src/main/kotlin/com/kotlin/pinpoint/SendMessage.kt +++ b/kotlin/services/pinpoint/src/main/kotlin/com/kotlin/pinpoint/SendMessage.kt @@ -94,7 +94,7 @@ suspend fun sendSMSMessage( messageConfiguration = directOb } - PinpointClient { region = "us-west-2" }.use { pinpoint -> + PinpointClient.fromEnvironment { region = "us-west-2" }.use { pinpoint -> pinpoint.sendMessages( SendMessagesRequest { applicationId = appId From 6f79b1f71485bc0cf36ca66dffd3507899a3e940 Mon Sep 17 00:00:00 2001 From: Macdonald Date: Tue, 8 Jul 2025 14:37:30 -0400 Subject: [PATCH 25/27] update build number --- kotlin/services/polly/build.gradle.kts | 4 ++-- .../polly/src/main/kotlin/com/kotlin/polly/DescribeVoices.kt | 2 +- .../polly/src/main/kotlin/com/kotlin/polly/ListLexicons.kt | 2 +- .../polly/src/main/kotlin/com/kotlin/polly/PollyDemo.kt | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/kotlin/services/polly/build.gradle.kts b/kotlin/services/polly/build.gradle.kts index 9642b6b3e8d..2d1799892c7 100644 --- a/kotlin/services/polly/build.gradle.kts +++ b/kotlin/services/polly/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:polly") implementation("aws.smithy.kotlin:http-client-engine-okhttp") implementation("aws.smithy.kotlin:http-client-engine-crt") diff --git a/kotlin/services/polly/src/main/kotlin/com/kotlin/polly/DescribeVoices.kt b/kotlin/services/polly/src/main/kotlin/com/kotlin/polly/DescribeVoices.kt index 153b390f721..f6f4087ca1e 100644 --- a/kotlin/services/polly/src/main/kotlin/com/kotlin/polly/DescribeVoices.kt +++ b/kotlin/services/polly/src/main/kotlin/com/kotlin/polly/DescribeVoices.kt @@ -23,7 +23,7 @@ suspend fun main() { // snippet-start:[polly.kotlin.describe_voice.main] suspend fun describeVoice() { - PollyClient { region = "us-west-2" }.use { polly -> + PollyClient.fromEnvironment { region = "us-west-2" }.use { polly -> val enUsVoicesResult = polly.describeVoices( DescribeVoicesRequest { diff --git a/kotlin/services/polly/src/main/kotlin/com/kotlin/polly/ListLexicons.kt b/kotlin/services/polly/src/main/kotlin/com/kotlin/polly/ListLexicons.kt index 88cd1960fc8..c317b6608e9 100644 --- a/kotlin/services/polly/src/main/kotlin/com/kotlin/polly/ListLexicons.kt +++ b/kotlin/services/polly/src/main/kotlin/com/kotlin/polly/ListLexicons.kt @@ -22,7 +22,7 @@ suspend fun main() { // snippet-start:[polly.kotlin.list_icons.main] suspend fun listLexicons() { - PollyClient { region = "us-west-2" }.use { polly -> + PollyClient.fromEnvironment { region = "us-west-2" }.use { polly -> val response = polly.listLexicons(ListLexiconsRequest {}) response.lexicons?.forEach { lexDescription -> println("The name of the Lexicon is ${lexDescription.name}") diff --git a/kotlin/services/polly/src/main/kotlin/com/kotlin/polly/PollyDemo.kt b/kotlin/services/polly/src/main/kotlin/com/kotlin/polly/PollyDemo.kt index 57fed55050b..9e27abc2ec5 100644 --- a/kotlin/services/polly/src/main/kotlin/com/kotlin/polly/PollyDemo.kt +++ b/kotlin/services/polly/src/main/kotlin/com/kotlin/polly/PollyDemo.kt @@ -40,7 +40,7 @@ suspend fun talkPolly() { engine = Engine.Standard } - PollyClient { region = "us-west-2" }.use { polly -> + PollyClient.fromEnvironment { region = "us-west-2" }.use { polly -> val describeVoicesResult = polly.describeVoices(describeVoiceRequest) val voice = describeVoicesResult.voices?.get(26) polly.synthesizeSpeech( From e7456894fae48e5fe6373d42903b8275b7ae01b4 Mon Sep 17 00:00:00 2001 From: Macdonald Date: Tue, 8 Jul 2025 14:57:21 -0400 Subject: [PATCH 26/27] update build number --- kotlin/services/rds/build.gradle.kts | 4 +-- .../kotlin/com/kotlin/rds/AuroraScenario.kt | 32 +++++++++---------- .../kotlin/com/kotlin/rds/CreateDBInstance.kt | 4 +-- .../kotlin/com/kotlin/rds/CreateDBSnapshot.kt | 2 +- .../kotlin/com/kotlin/rds/DeleteDBInstance.kt | 2 +- .../kotlin/rds/DescribeAccountAttributes.kt | 2 +- .../com/kotlin/rds/DescribeDBInstances.kt | 2 +- .../kotlin/com/kotlin/rds/ModifyDBInstance.kt | 2 +- .../main/kotlin/com/kotlin/rds/RDSScenario.kt | 28 ++++++++-------- kotlin/services/redshift/build.gradle.kts | 4 +-- .../kotlin/redshift/CreateAndModifyCluster.kt | 2 +- .../com/kotlin/redshift/DeleteCluster.kt | 2 +- .../com/kotlin/redshift/DescribeClusters.kt | 2 +- .../kotlin/redshift/FindReservedNodeOffer.kt | 2 +- .../kotlin/com/kotlin/redshift/ListEvents.kt | 2 +- 15 files changed, 46 insertions(+), 46 deletions(-) diff --git a/kotlin/services/rds/build.gradle.kts b/kotlin/services/rds/build.gradle.kts index 6fba6c6c379..68a7cf6ec34 100644 --- a/kotlin/services/rds/build.gradle.kts +++ b/kotlin/services/rds/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:rds") implementation("aws.sdk.kotlin:secretsmanager") implementation("aws.smithy.kotlin:http-client-engine-okhttp") diff --git a/kotlin/services/rds/src/main/kotlin/com/kotlin/rds/AuroraScenario.kt b/kotlin/services/rds/src/main/kotlin/com/kotlin/rds/AuroraScenario.kt index 3988c3ff92b..b09da8c2e67 100644 --- a/kotlin/services/rds/src/main/kotlin/com/kotlin/rds/AuroraScenario.kt +++ b/kotlin/services/rds/src/main/kotlin/com/kotlin/rds/AuroraScenario.kt @@ -160,7 +160,7 @@ suspend fun deleteDBClusterGroup( var didFind: Boolean var instanceARN: String - RdsClient { region = "us-west-2" }.use { rdsClient -> + RdsClient.fromEnvironment { region = "us-west-2" }.use { rdsClient -> // Make sure that the database has been deleted. while (!isDataDel) { val response = rdsClient.describeDbInstances() @@ -204,7 +204,7 @@ suspend fun deleteCluster(dbInstanceClusterIdentifier: String) { skipFinalSnapshot = true } - RdsClient { region = "us-west-2" }.use { rdsClient -> + RdsClient.fromEnvironment { region = "us-west-2" }.use { rdsClient -> rdsClient.deleteDbCluster(deleteDbClusterRequest) println("$dbInstanceClusterIdentifier was deleted!") } @@ -220,7 +220,7 @@ suspend fun deleteDBInstance(dbInstanceIdentifierVal: String) { skipFinalSnapshot = true } - RdsClient { region = "us-west-2" }.use { rdsClient -> + RdsClient.fromEnvironment { region = "us-west-2" }.use { rdsClient -> val response = rdsClient.deleteDbInstance(deleteDbInstanceRequest) print("The status of the database is ${response.dbInstance?.dbInstanceStatus}") } @@ -242,7 +242,7 @@ suspend fun waitSnapshotReady( dbClusterIdentifier = dbInstanceClusterIdentifier } - RdsClient { region = "us-west-2" }.use { rdsClient -> + RdsClient.fromEnvironment { region = "us-west-2" }.use { rdsClient -> while (!snapshotReady) { val response = rdsClient.describeDbClusterSnapshots(snapshotsRequest) val snapshotList = response.dbClusterSnapshots @@ -274,7 +274,7 @@ suspend fun createDBClusterSnapshot( dbClusterSnapshotIdentifier = dbSnapshotIdentifier } - RdsClient { region = "us-west-2" }.use { rdsClient -> + RdsClient.fromEnvironment { region = "us-west-2" }.use { rdsClient -> val response = rdsClient.createDbClusterSnapshot(snapshotRequest) println("The Snapshot ARN is ${response.dbClusterSnapshot?.dbClusterSnapshotArn}") } @@ -292,7 +292,7 @@ suspend fun waitDBAuroraInstanceReady(dbInstanceIdentifierVal: String?) { } var endpoint = "" - RdsClient { region = "us-west-2" }.use { rdsClient -> + RdsClient.fromEnvironment { region = "us-west-2" }.use { rdsClient -> while (!instanceReady) { val response = rdsClient.describeDbInstances(instanceRequest) response.dbInstances?.forEach { instance -> @@ -325,7 +325,7 @@ suspend fun createDBInstanceCluster( dbInstanceClass = instanceClassVal } - RdsClient { region = "us-west-2" }.use { rdsClient -> + RdsClient.fromEnvironment { region = "us-west-2" }.use { rdsClient -> val response = rdsClient.createDbInstance(instanceRequest) print("The status is ${response.dbInstance?.dbInstanceStatus}") return response.dbInstance?.dbInstanceArn @@ -341,7 +341,7 @@ suspend fun getListInstanceClasses(): String { maxRecords = 20 } var instanceClass = "" - RdsClient { region = "us-west-2" }.use { rdsClient -> + RdsClient.fromEnvironment { region = "us-west-2" }.use { rdsClient -> val response = rdsClient.describeOrderableDbInstanceOptions(optionsRequest) response.orderableDbInstanceOptions?.forEach { instanceOption -> instanceClass = instanceOption.dbInstanceClass.toString() @@ -365,7 +365,7 @@ suspend fun waitForClusterInstanceReady(dbClusterIdentifierVal: String?) { dbClusterIdentifier = dbClusterIdentifierVal } - RdsClient { region = "us-west-2" }.use { rdsClient -> + RdsClient.fromEnvironment { region = "us-west-2" }.use { rdsClient -> while (!instanceReady) { val response = rdsClient.describeDbClusters(instanceRequest) response.dbClusters?.forEach { cluster -> @@ -401,7 +401,7 @@ suspend fun createDBCluster( masterUserPassword = password } - RdsClient { region = "us-west-2" }.use { rdsClient -> + RdsClient.fromEnvironment { region = "us-west-2" }.use { rdsClient -> val response = rdsClient.createDbCluster(clusterRequest) return response.dbCluster?.dbClusterArn } @@ -417,7 +417,7 @@ suspend fun getAllowedClusterEngines(dbParameterGroupFamilyVal: String?) { engine = "aurora-mysql" } - RdsClient { region = "us-west-2" }.use { rdsClient -> + RdsClient.fromEnvironment { region = "us-west-2" }.use { rdsClient -> val response = rdsClient.describeDbEngineVersions(versionsRequest) response.dbEngineVersions?.forEach { dbEngine -> println("The engine version is ${dbEngine.engineVersion}") @@ -445,7 +445,7 @@ suspend fun modifyDBClusterParas(dClusterGroupName: String?) { parameters = paraList } - RdsClient { region = "us-west-2" }.use { rdsClient -> + RdsClient.fromEnvironment { region = "us-west-2" }.use { rdsClient -> val response = rdsClient.modifyDbClusterParameterGroup(groupRequest) println("The parameter group ${response.dbClusterParameterGroupName} was successfully modified") } @@ -470,7 +470,7 @@ suspend fun describeDbClusterParameters( } } - RdsClient { region = "us-west-2" }.use { rdsClient -> + RdsClient.fromEnvironment { region = "us-west-2" }.use { rdsClient -> val response = rdsClient.describeDbClusterParameters(dbParameterGroupsRequest) response.parameters?.forEach { para -> // Only print out information about either auto_increment_offset or auto_increment_increment. @@ -497,7 +497,7 @@ suspend fun describeDbClusterParameterGroups(dbClusterGroupName: String?) { maxRecords = 20 } - RdsClient { region = "us-west-2" }.use { rdsClient -> + RdsClient.fromEnvironment { region = "us-west-2" }.use { rdsClient -> val response = rdsClient.describeDbClusterParameterGroups(groupsRequest) response.dbClusterParameterGroups?.forEach { group -> println("The group name is ${group.dbClusterParameterGroupName}") @@ -519,7 +519,7 @@ suspend fun createDBClusterParameterGroup( description = "Created by using the AWS SDK for Kotlin" } - RdsClient { region = "us-west-2" }.use { rdsClient -> + RdsClient.fromEnvironment { region = "us-west-2" }.use { rdsClient -> val response = rdsClient.createDbClusterParameterGroup(groupRequest) println("The group name is ${response.dbClusterParameterGroup?.dbClusterParameterGroupName}") } @@ -535,7 +535,7 @@ suspend fun describeAuroraDBEngines() { maxRecords = 20 } - RdsClient { region = "us-west-2" }.use { rdsClient -> + RdsClient.fromEnvironment { region = "us-west-2" }.use { rdsClient -> val response = rdsClient.describeDbEngineVersions(engineVersionsRequest) response.dbEngineVersions?.forEach { engineOb -> println("The name of the DB parameter group family for the database engine is ${engineOb.dbParameterGroupFamily}") diff --git a/kotlin/services/rds/src/main/kotlin/com/kotlin/rds/CreateDBInstance.kt b/kotlin/services/rds/src/main/kotlin/com/kotlin/rds/CreateDBInstance.kt index 68cf0dd3ff6..41ac8be52e7 100644 --- a/kotlin/services/rds/src/main/kotlin/com/kotlin/rds/CreateDBInstance.kt +++ b/kotlin/services/rds/src/main/kotlin/com/kotlin/rds/CreateDBInstance.kt @@ -72,7 +72,7 @@ suspend fun createDatabaseInstance( masterUserPassword = masterUserPasswordVal } - RdsClient { region = "us-west-2" }.use { rdsClient -> + RdsClient.fromEnvironment { region = "us-west-2" }.use { rdsClient -> val response = rdsClient.createDbInstance(instanceRequest) print("The status is ${response.dbInstance?.dbInstanceStatus}") } @@ -90,7 +90,7 @@ suspend fun waitForInstanceReady(dbInstanceIdentifierVal: String?) { dbInstanceIdentifier = dbInstanceIdentifierVal } - RdsClient { region = "us-west-2" }.use { rdsClient -> + RdsClient.fromEnvironment { region = "us-west-2" }.use { rdsClient -> while (!instanceReady) { val response = rdsClient.describeDbInstances(instanceRequest) val instanceList = response.dbInstances diff --git a/kotlin/services/rds/src/main/kotlin/com/kotlin/rds/CreateDBSnapshot.kt b/kotlin/services/rds/src/main/kotlin/com/kotlin/rds/CreateDBSnapshot.kt index 8a6cf286d60..65bd6fdb4b9 100644 --- a/kotlin/services/rds/src/main/kotlin/com/kotlin/rds/CreateDBSnapshot.kt +++ b/kotlin/services/rds/src/main/kotlin/com/kotlin/rds/CreateDBSnapshot.kt @@ -47,7 +47,7 @@ suspend fun createSnapshot( dbSnapshotIdentifier = dbSnapshotIdentifierVal } - RdsClient { region = "us-west-2" }.use { rdsClient -> + RdsClient.fromEnvironment { region = "us-west-2" }.use { rdsClient -> val response = rdsClient.createDbSnapshot(snapshotRequest) print("The Snapshot id is ${response.dbSnapshot?.dbiResourceId}") } diff --git a/kotlin/services/rds/src/main/kotlin/com/kotlin/rds/DeleteDBInstance.kt b/kotlin/services/rds/src/main/kotlin/com/kotlin/rds/DeleteDBInstance.kt index 272c76d8774..9036020e323 100644 --- a/kotlin/services/rds/src/main/kotlin/com/kotlin/rds/DeleteDBInstance.kt +++ b/kotlin/services/rds/src/main/kotlin/com/kotlin/rds/DeleteDBInstance.kt @@ -43,7 +43,7 @@ suspend fun deleteDatabaseInstance(dbInstanceIdentifierVal: String?) { skipFinalSnapshot = true } - RdsClient { region = "us-west-2" }.use { rdsClient -> + RdsClient.fromEnvironment { region = "us-west-2" }.use { rdsClient -> val response = rdsClient.deleteDbInstance(deleteDbInstanceRequest) print("The status of the database is ${response.dbInstance?.dbInstanceStatus}") } diff --git a/kotlin/services/rds/src/main/kotlin/com/kotlin/rds/DescribeAccountAttributes.kt b/kotlin/services/rds/src/main/kotlin/com/kotlin/rds/DescribeAccountAttributes.kt index a658e0f829f..6dc201a2e8a 100644 --- a/kotlin/services/rds/src/main/kotlin/com/kotlin/rds/DescribeAccountAttributes.kt +++ b/kotlin/services/rds/src/main/kotlin/com/kotlin/rds/DescribeAccountAttributes.kt @@ -21,7 +21,7 @@ suspend fun main() { // snippet-start:[rds.kotlin.describe_account.main] suspend fun getAccountAttributes() { - RdsClient { region = "us-west-2" }.use { rdsClient -> + RdsClient.fromEnvironment { region = "us-west-2" }.use { rdsClient -> val response = rdsClient.describeAccountAttributes(DescribeAccountAttributesRequest {}) response.accountQuotas?.forEach { quotas -> val response = response.accountQuotas diff --git a/kotlin/services/rds/src/main/kotlin/com/kotlin/rds/DescribeDBInstances.kt b/kotlin/services/rds/src/main/kotlin/com/kotlin/rds/DescribeDBInstances.kt index 7ca91b1bb8f..36ea263d25e 100644 --- a/kotlin/services/rds/src/main/kotlin/com/kotlin/rds/DescribeDBInstances.kt +++ b/kotlin/services/rds/src/main/kotlin/com/kotlin/rds/DescribeDBInstances.kt @@ -21,7 +21,7 @@ suspend fun main() { // snippet-start:[rds.kotlin.describe_instances.main] suspend fun describeInstances() { - RdsClient { region = "us-west-2" }.use { rdsClient -> + RdsClient.fromEnvironment { region = "us-west-2" }.use { rdsClient -> val response = rdsClient.describeDbInstances(DescribeDbInstancesRequest {}) response.dbInstances?.forEach { instance -> println("Instance Identifier is ${instance.dbInstanceIdentifier}") diff --git a/kotlin/services/rds/src/main/kotlin/com/kotlin/rds/ModifyDBInstance.kt b/kotlin/services/rds/src/main/kotlin/com/kotlin/rds/ModifyDBInstance.kt index 37226b63bc6..b018806dc58 100644 --- a/kotlin/services/rds/src/main/kotlin/com/kotlin/rds/ModifyDBInstance.kt +++ b/kotlin/services/rds/src/main/kotlin/com/kotlin/rds/ModifyDBInstance.kt @@ -48,7 +48,7 @@ suspend fun updateIntance( masterUserPassword = masterUserPasswordVal } - RdsClient { region = "us-west-2" }.use { rdsClient -> + RdsClient.fromEnvironment { region = "us-west-2" }.use { rdsClient -> val instanceResponse = rdsClient.modifyDbInstance(request) println("The ARN of the modified database is ${instanceResponse.dbInstance?.dbInstanceArn}") } diff --git a/kotlin/services/rds/src/main/kotlin/com/kotlin/rds/RDSScenario.kt b/kotlin/services/rds/src/main/kotlin/com/kotlin/rds/RDSScenario.kt index 3755ba17c2e..be6f9f4c867 100644 --- a/kotlin/services/rds/src/main/kotlin/com/kotlin/rds/RDSScenario.kt +++ b/kotlin/services/rds/src/main/kotlin/com/kotlin/rds/RDSScenario.kt @@ -148,7 +148,7 @@ suspend fun deleteParaGroup( var didFind: Boolean var instanceARN: String - RdsClient { region = "us-west-2" }.use { rdsClient -> + RdsClient.fromEnvironment { region = "us-west-2" }.use { rdsClient -> // Make sure that the database has been deleted. while (!isDataDel) { val response = rdsClient.describeDbInstances() @@ -193,7 +193,7 @@ suspend fun deleteDbInstance(dbInstanceIdentifierVal: String) { skipFinalSnapshot = true } - RdsClient { region = "us-west-2" }.use { rdsClient -> + RdsClient.fromEnvironment { region = "us-west-2" }.use { rdsClient -> val response = rdsClient.deleteDbInstance(deleteDbInstanceRequest) print("The status of the database is ${response.dbInstance?.dbInstanceStatus}") } @@ -217,7 +217,7 @@ suspend fun waitForSnapshotReady( } while (!snapshotReady) { - RdsClient { region = "us-west-2" }.use { rdsClient -> + RdsClient.fromEnvironment { region = "us-west-2" }.use { rdsClient -> val response = rdsClient.describeDbSnapshots(snapshotsRequest) val snapshotList: List? = response.dbSnapshots if (snapshotList != null) { @@ -249,7 +249,7 @@ suspend fun createDbSnapshot( dbSnapshotIdentifier = dbSnapshotIdentifierVal } - RdsClient { region = "us-west-2" }.use { rdsClient -> + RdsClient.fromEnvironment { region = "us-west-2" }.use { rdsClient -> val response = rdsClient.createDbSnapshot(snapshotRequest) print("The Snapshot id is ${response.dbSnapshot?.dbiResourceId}") } @@ -269,7 +269,7 @@ suspend fun waitForDbInstanceReady(dbInstanceIdentifierVal: String?) { } var endpoint = "" while (!instanceReady) { - RdsClient { region = "us-west-2" }.use { rdsClient -> + RdsClient.fromEnvironment { region = "us-west-2" }.use { rdsClient -> val response = rdsClient.describeDbInstances(instanceRequest) val instanceList = response.dbInstances if (instanceList != null) { @@ -313,7 +313,7 @@ suspend fun createDatabaseInstance( masterUserPassword = masterUserPasswordVal } - RdsClient { region = "us-west-2" }.use { rdsClient -> + RdsClient.fromEnvironment { region = "us-west-2" }.use { rdsClient -> val response = rdsClient.createDbInstance(instanceRequest) print("The status is ${response.dbInstance?.dbInstanceStatus}") return response.dbInstance?.dbInstanceArn @@ -328,7 +328,7 @@ suspend fun getMicroInstances() { DescribeOrderableDbInstanceOptionsRequest { engine = "mysql" } - RdsClient { region = "us-west-2" }.use { rdsClient -> + RdsClient.fromEnvironment { region = "us-west-2" }.use { rdsClient -> val response = rdsClient.describeOrderableDbInstanceOptions(dbInstanceOptionsRequest) val orderableDBInstances = response.orderableDbInstanceOptions if (orderableDBInstances != null) { @@ -349,7 +349,7 @@ suspend fun getAllowedEngines(dbParameterGroupFamilyVal: String?) { dbParameterGroupFamily = dbParameterGroupFamilyVal engine = "mysql" } - RdsClient { region = "us-west-2" }.use { rdsClient -> + RdsClient.fromEnvironment { region = "us-west-2" }.use { rdsClient -> val response = rdsClient.describeDbEngineVersions(versionsRequest) val dbEngines: List? = response.dbEngineVersions if (dbEngines != null) { @@ -380,7 +380,7 @@ suspend fun modifyDBParas(dbGroupName: String) { parameters = paraList } - RdsClient { region = "us-west-2" }.use { rdsClient -> + RdsClient.fromEnvironment { region = "us-west-2" }.use { rdsClient -> val response = rdsClient.modifyDbParameterGroup(groupRequest) println("The parameter group ${response.dbParameterGroupName} was successfully modified") } @@ -405,7 +405,7 @@ suspend fun describeDbParameters( source = "user" } } - RdsClient { region = "us-west-2" }.use { rdsClient -> + RdsClient.fromEnvironment { region = "us-west-2" }.use { rdsClient -> val response = rdsClient.describeDbParameters(dbParameterGroupsRequest) val dbParameters: List? = response.parameters var paraName: String @@ -433,7 +433,7 @@ suspend fun describeDbParameterGroups(dbGroupName: String?) { dbParameterGroupName = dbGroupName maxRecords = 20 } - RdsClient { region = "us-west-2" }.use { rdsClient -> + RdsClient.fromEnvironment { region = "us-west-2" }.use { rdsClient -> val response = rdsClient.describeDbParameterGroups(groupsRequest) val groups = response.dbParameterGroups if (groups != null) { @@ -459,7 +459,7 @@ suspend fun createDBParameterGroup( description = "Created by using the AWS SDK for Kotlin" } - RdsClient { region = "us-west-2" }.use { rdsClient -> + RdsClient.fromEnvironment { region = "us-west-2" }.use { rdsClient -> val response = rdsClient.createDbParameterGroup(groupRequest) println("The group name is ${response.dbParameterGroup?.dbParameterGroupName}") } @@ -476,7 +476,7 @@ suspend fun describeDBEngines() { maxRecords = 20 } - RdsClient { region = "us-west-2" }.use { rdsClient -> + RdsClient.fromEnvironment { region = "us-west-2" }.use { rdsClient -> val response = rdsClient.describeDbEngineVersions(engineVersionsRequest) val engines: List? = response.dbEngineVersions @@ -497,7 +497,7 @@ suspend fun getSecretValues(secretName: String?): String? { secretId = secretName } - SecretsManagerClient { region = "us-west-2" }.use { secretsClient -> + SecretsManagerClient.fromEnvironment { region = "us-west-2" }.use { secretsClient -> val valueResponse = secretsClient.getSecretValue(valueRequest) return valueResponse.secretString } diff --git a/kotlin/services/redshift/build.gradle.kts b/kotlin/services/redshift/build.gradle.kts index 92a2d915e89..58cc1532855 100644 --- a/kotlin/services/redshift/build.gradle.kts +++ b/kotlin/services/redshift/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:redshift") implementation("aws.sdk.kotlin:secretsmanager") implementation("aws.smithy.kotlin:http-client-engine-okhttp") diff --git a/kotlin/services/redshift/src/main/kotlin/com/kotlin/redshift/CreateAndModifyCluster.kt b/kotlin/services/redshift/src/main/kotlin/com/kotlin/redshift/CreateAndModifyCluster.kt index 248c2c691d9..5a71a802b8d 100644 --- a/kotlin/services/redshift/src/main/kotlin/com/kotlin/redshift/CreateAndModifyCluster.kt +++ b/kotlin/services/redshift/src/main/kotlin/com/kotlin/redshift/CreateAndModifyCluster.kt @@ -70,7 +70,7 @@ suspend fun createCluster( numberOfNodes = 2 } - RedshiftClient { region = "us-east-1" }.use { redshiftClient -> + RedshiftClient.fromEnvironment { region = "us-east-1" }.use { redshiftClient -> val clusterResponse = redshiftClient.createCluster(clusterRequest) println("Created cluster ${clusterResponse.cluster?.clusterIdentifier}") } diff --git a/kotlin/services/redshift/src/main/kotlin/com/kotlin/redshift/DeleteCluster.kt b/kotlin/services/redshift/src/main/kotlin/com/kotlin/redshift/DeleteCluster.kt index 45e2fbc096d..284e3291286 100644 --- a/kotlin/services/redshift/src/main/kotlin/com/kotlin/redshift/DeleteCluster.kt +++ b/kotlin/services/redshift/src/main/kotlin/com/kotlin/redshift/DeleteCluster.kt @@ -43,7 +43,7 @@ suspend fun deleteRedshiftCluster(clusterId: String?) { skipFinalClusterSnapshot = true } - RedshiftClient { region = "us-west-2" }.use { redshiftClient -> + RedshiftClient.fromEnvironment { region = "us-west-2" }.use { redshiftClient -> val response = redshiftClient.deleteCluster(request) println("The status is ${response.cluster?.clusterStatus}") } diff --git a/kotlin/services/redshift/src/main/kotlin/com/kotlin/redshift/DescribeClusters.kt b/kotlin/services/redshift/src/main/kotlin/com/kotlin/redshift/DescribeClusters.kt index 4fed194577e..94215aaaf4a 100644 --- a/kotlin/services/redshift/src/main/kotlin/com/kotlin/redshift/DescribeClusters.kt +++ b/kotlin/services/redshift/src/main/kotlin/com/kotlin/redshift/DescribeClusters.kt @@ -21,7 +21,7 @@ suspend fun main() { // snippet-start:[redshift.kotlin.describe_cluster.main] suspend fun describeRedshiftClusters() { - RedshiftClient { region = "us-west-2" }.use { redshiftClient -> + RedshiftClient.fromEnvironment { region = "us-west-2" }.use { redshiftClient -> val clusterResponse = redshiftClient.describeClusters(DescribeClustersRequest {}) val clusterList = clusterResponse.clusters diff --git a/kotlin/services/redshift/src/main/kotlin/com/kotlin/redshift/FindReservedNodeOffer.kt b/kotlin/services/redshift/src/main/kotlin/com/kotlin/redshift/FindReservedNodeOffer.kt index 22e95bd5dfe..09ac633a12d 100644 --- a/kotlin/services/redshift/src/main/kotlin/com/kotlin/redshift/FindReservedNodeOffer.kt +++ b/kotlin/services/redshift/src/main/kotlin/com/kotlin/redshift/FindReservedNodeOffer.kt @@ -24,7 +24,7 @@ suspend fun main() { // snippet-start:[redshift.kotlin._nodes.main] suspend fun listReservedNodes() { - RedshiftClient { region = "us-west-2" }.use { redshiftClient -> + RedshiftClient.fromEnvironment { region = "us-west-2" }.use { redshiftClient -> val reservedNodesResponse = redshiftClient.describeReservedNodes(DescribeReservedNodesRequest {}) println("Listing nodes already purchased.") reservedNodesResponse.reservedNodes?.forEach { node -> diff --git a/kotlin/services/redshift/src/main/kotlin/com/kotlin/redshift/ListEvents.kt b/kotlin/services/redshift/src/main/kotlin/com/kotlin/redshift/ListEvents.kt index edde917b432..db8908d24e0 100644 --- a/kotlin/services/redshift/src/main/kotlin/com/kotlin/redshift/ListEvents.kt +++ b/kotlin/services/redshift/src/main/kotlin/com/kotlin/redshift/ListEvents.kt @@ -51,7 +51,7 @@ suspend fun listRedShiftEvents( maxRecords = 20 } - RedshiftClient { region = "us-west-2" }.use { redshiftClient -> + RedshiftClient.fromEnvironment { region = "us-west-2" }.use { redshiftClient -> val eventsResponse = redshiftClient.describeEvents(request) eventsResponse.events?.forEach { event -> println("Source type is ${event.sourceType}") From 9134cebcb15d5a3b5e90ee01eb352ff1ad32fc44 Mon Sep 17 00:00:00 2001 From: Macdonald Date: Tue, 8 Jul 2025 14:59:51 -0400 Subject: [PATCH 27/27] update build number --- kotlin/services/lex/src/test/kotlin/LexTest.kt | 4 ---- 1 file changed, 4 deletions(-) diff --git a/kotlin/services/lex/src/test/kotlin/LexTest.kt b/kotlin/services/lex/src/test/kotlin/LexTest.kt index 39a2da1f070..15ba92679bc 100644 --- a/kotlin/services/lex/src/test/kotlin/LexTest.kt +++ b/kotlin/services/lex/src/test/kotlin/LexTest.kt @@ -4,12 +4,8 @@ import aws.sdk.kotlin.services.secretsmanager.SecretsManagerClient import aws.sdk.kotlin.services.secretsmanager.model.GetSecretValueRequest import com.google.gson.Gson -import com.kotlin.lex.createBot -import com.kotlin.lex.deleteSpecificBot -import com.kotlin.lex.getAllBots import com.kotlin.lex.getSlotsInfo import com.kotlin.lex.getSpecificIntent -import com.kotlin.lex.getStatus import kotlinx.coroutines.runBlocking import org.junit.jupiter.api.BeforeAll import org.junit.jupiter.api.DisplayName