updated build number

scmacdon · scmacdon · commit acbf5db41436 · 2025-07-07T15:13:52.000-04:00
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -37,31 +37,32 @@ suspend fun main(args: Array<String>) {
 
 // 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 {
             policyName = policyNameVal
             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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -104,27 +104,28 @@ 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 {
             policyName = policyNameVal
             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
@@ -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
@@ -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
@@ -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
@@ -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")
     }

Original file line number	Diff line number	Diff line change
`@@ -41,7 +41,7 @@ suspend fun getAccessKeyLastUsed(accessId: String?) {`
`41`	`41`	`accessKeyId = accessId`
`42`	`42`	`}`
`43`	`43`
`44`		`- IamClient { region = "AWS_GLOBAL" }.use { iamClient ->`
	`44`	`+ IamClient.fromEnvironment { region = "AWS_GLOBAL" }.use { iamClient ->`
`45`	`45`	`val response = iamClient.getAccessKeyLastUsed(request)`
`46`	`46`	`println("Access key was last used on ${response.accessKeyLastUsed?.lastUsedDate}")`
`47`	`47`	`}`
Original file line number	Diff line number	Diff line change
`@@ -48,7 +48,7 @@ suspend fun attachIAMRolePolicy(`
`48`	`48`	`roleName = roleNameVal`
`49`	`49`	`}`
`50`	`50`
`51`		`- IamClient { region = "AWS_GLOBAL" }.use { iamClient ->`
	`51`	`+ IamClient.fromEnvironment { region = "AWS_GLOBAL" }.use { iamClient ->`
`52`	`52`	`val response = iamClient.listAttachedRolePolicies(request)`
`53`	`53`	`val attachedPolicies = response.attachedPolicies`
`54`	`54`
Original file line number	Diff line number	Diff line change
`@@ -43,7 +43,7 @@ suspend fun createIAMAccessKey(user: String?): String {`
`43`	`43`	`userName = user`
`44`	`44`	`}`
`45`	`45`
`46`		`- IamClient { region = "AWS_GLOBAL" }.use { iamClient ->`
	`46`	`+ IamClient.fromEnvironment { region = "AWS_GLOBAL" }.use { iamClient ->`
`47`	`47`	`val response = iamClient.createAccessKey(request)`
`48`	`48`	`return response.accessKey?.accessKeyId.toString()`
`49`	`49`	`}`
Original file line number	Diff line number	Diff line change
`@@ -42,7 +42,7 @@ suspend fun createIAMAccountAlias(alias: String) {`
`42`	`42`	`accountAlias = alias`
`43`	`43`	`}`
`44`	`44`
`45`		`- IamClient { region = "AWS_GLOBAL" }.use { iamClient ->`
	`45`	`+ IamClient.fromEnvironment { region = "AWS_GLOBAL" }.use { iamClient ->`
`46`	`46`	`iamClient.createAccountAlias(request)`
`47`	`47`	`println("Successfully created account alias named $alias")`
`48`	`48`	`}`
Original file line number	Diff line number	Diff line change
`@@ -47,7 +47,7 @@ suspend fun deleteKey(`
`47`	`47`	`userName = userNameVal`
`48`	`48`	`}`
`49`	`49`
`50`		`- IamClient { region = "AWS_GLOBAL" }.use { iamClient ->`
	`50`	`+ IamClient.fromEnvironment { region = "AWS_GLOBAL" }.use { iamClient ->`
`51`	`51`	`iamClient.deleteAccessKey(request)`
`52`	`52`	`println("Successfully deleted access key $accessKey from $userNameVal")`
`53`	`53`	`}`
Original file line number	Diff line number	Diff line change
`@@ -41,7 +41,7 @@ suspend fun deleteIAMAccountAlias(alias: String) {`
`41`	`41`	`accountAlias = alias`
`42`	`42`	`}`
`43`	`43`
`44`		`- IamClient { region = "AWS_GLOBAL" }.use { iamClient ->`
	`44`	`+ IamClient.fromEnvironment { region = "AWS_GLOBAL" }.use { iamClient ->`
`45`	`45`	`iamClient.deleteAccountAlias(request)`
`46`	`46`	`println("Successfully deleted account alias $alias")`
`47`	`47`	`}`