updated build number

scmacdon · scmacdon · commit 8afd9a451a52 · 2025-07-09T10:03:51.000-04:00
diff --git a/kotlin/services/rekognition/build.gradle.kts b/kotlin/services/rekognition/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:rekognition")
     implementation("aws.sdk.kotlin:secretsmanager")
     implementation("aws.smithy.kotlin:http-client-engine-okhttp")
diff --git a/kotlin/services/rekognition/src/main/kotlin/com/kotlin/rekognition/AddFacesToCollection.kt b/kotlin/services/rekognition/src/main/kotlin/com/kotlin/rekognition/AddFacesToCollection.kt
@@ -58,7 +58,7 @@ suspend fun addToCollection(
             detectionAttributes = listOf(Attribute.Default)
         }
 
-    RekognitionClient { region = "us-east-1" }.use { rekClient ->
+    RekognitionClient.fromEnvironment { region = "us-east-1" }.use { rekClient ->
         val facesResponse = rekClient.indexFaces(request)
 
         // Display the results.
diff --git a/kotlin/services/rekognition/src/main/kotlin/com/kotlin/rekognition/CelebrityInfo.kt b/kotlin/services/rekognition/src/main/kotlin/com/kotlin/rekognition/CelebrityInfo.kt
@@ -41,7 +41,7 @@ suspend fun getCelebrityInfo(idVal: String?) {
             id = idVal
         }
 
-    RekognitionClient { region = "us-east-1" }.use { rekClient ->
+    RekognitionClient.fromEnvironment { region = "us-east-1" }.use { rekClient ->
         val response = rekClient.getCelebrityInfo(request)
 
         // Display celebrity information.
diff --git a/kotlin/services/rekognition/src/main/kotlin/com/kotlin/rekognition/CompareFaces.kt b/kotlin/services/rekognition/src/main/kotlin/com/kotlin/rekognition/CompareFaces.kt
@@ -66,7 +66,7 @@ suspend fun compareTwoFaces(
             similarityThreshold = similarityThresholdVal
         }
 
-    RekognitionClient { region = "us-east-1" }.use { rekClient ->
+    RekognitionClient.fromEnvironment { region = "us-east-1" }.use { rekClient ->
 
         val compareFacesResult = rekClient.compareFaces(facesRequest)
         val faceDetails = compareFacesResult.faceMatches
diff --git a/kotlin/services/rekognition/src/main/kotlin/com/kotlin/rekognition/CreateCollection.kt b/kotlin/services/rekognition/src/main/kotlin/com/kotlin/rekognition/CreateCollection.kt
@@ -41,7 +41,7 @@ suspend fun createMyCollection(collectionIdVal: String) {
             collectionId = collectionIdVal
         }
 
-    RekognitionClient { region = "us-east-1" }.use { rekClient ->
+    RekognitionClient.fromEnvironment { region = "us-east-1" }.use { rekClient ->
         val response = rekClient.createCollection(request)
         println("Collection ARN is ${response.collectionArn}")
         println("Status code is ${response.statusCode}")
diff --git a/kotlin/services/rekognition/src/main/kotlin/com/kotlin/rekognition/DeleteCollection.kt b/kotlin/services/rekognition/src/main/kotlin/com/kotlin/rekognition/DeleteCollection.kt
@@ -42,7 +42,7 @@ suspend fun deleteMyCollection(collectionIdVal: String) {
             collectionId = collectionIdVal
         }
 
-    RekognitionClient { region = "us-east-1" }.use { rekClient ->
+    RekognitionClient.fromEnvironment { region = "us-east-1" }.use { rekClient ->
         val response = rekClient.deleteCollection(request)
         println("The collectionId status is ${response.statusCode}")
     }
diff --git a/kotlin/services/rekognition/src/main/kotlin/com/kotlin/rekognition/DeleteFacesFromCollection.kt b/kotlin/services/rekognition/src/main/kotlin/com/kotlin/rekognition/DeleteFacesFromCollection.kt
@@ -45,7 +45,7 @@ suspend fun deleteFacesCollection(
             faceIds = listOf(faceIdVal)
         }
 
-    RekognitionClient { region = "us-east-1" }.use { rekClient ->
+    RekognitionClient.fromEnvironment { region = "us-east-1" }.use { rekClient ->
         rekClient.deleteFaces(deleteFacesRequest)
         println("$faceIdVal was deleted from the collection")
     }
diff --git a/kotlin/services/rekognition/src/main/kotlin/com/kotlin/rekognition/DescribeCollection.kt b/kotlin/services/rekognition/src/main/kotlin/com/kotlin/rekognition/DescribeCollection.kt
@@ -42,7 +42,7 @@ suspend fun describeColl(collectionName: String) {
             collectionId = collectionName
         }
 
-    RekognitionClient { region = "us-east-1" }.use { rekClient ->
+    RekognitionClient.fromEnvironment { region = "us-east-1" }.use { rekClient ->
         val response = rekClient.describeCollection(request)
         println("The collection Arn is ${response.collectionArn}")
         println("The collection contains this many faces ${response.faceCount}")
diff --git a/kotlin/services/rekognition/src/main/kotlin/com/kotlin/rekognition/DetectFaces.kt b/kotlin/services/rekognition/src/main/kotlin/com/kotlin/rekognition/DetectFaces.kt
@@ -50,7 +50,7 @@ suspend fun detectFacesinImage(sourceImage: String?) {
             image = souImage
         }
 
-    RekognitionClient { region = "us-east-1" }.use { rekClient ->
+    RekognitionClient.fromEnvironment { region = "us-east-1" }.use { rekClient ->
         val response = rekClient.detectFaces(request)
         response.faceDetails?.forEach { face ->
             val ageRange = face.ageRange
diff --git a/kotlin/services/rekognition/src/main/kotlin/com/kotlin/rekognition/DetectLabels.kt b/kotlin/services/rekognition/src/main/kotlin/com/kotlin/rekognition/DetectLabels.kt
@@ -48,7 +48,7 @@ suspend fun detectImageLabels(sourceImage: String) {
             maxLabels = 10
         }
 
-    RekognitionClient { region = "us-east-1" }.use { rekClient ->
+    RekognitionClient.fromEnvironment { region = "us-east-1" }.use { rekClient ->
         val response = rekClient.detectLabels(request)
         response.labels?.forEach { label ->
             println("${label.name} : ${label.confidence}")
diff --git a/kotlin/services/rekognition/src/main/kotlin/com/kotlin/rekognition/DetectModerationLabels.kt b/kotlin/services/rekognition/src/main/kotlin/com/kotlin/rekognition/DetectModerationLabels.kt
@@ -48,7 +48,7 @@ suspend fun detectModLabels(sourceImage: String) {
             minConfidence = 60f
         }
 
-    RekognitionClient { region = "us-east-1" }.use { rekClient ->
+    RekognitionClient.fromEnvironment { region = "us-east-1" }.use { rekClient ->
         val response = rekClient.detectModerationLabels(request)
         response.moderationLabels?.forEach { label ->
             println("Label: ${label.name} - Confidence: ${label.confidence} % Parent: ${label.parentName}")
diff --git a/kotlin/services/rekognition/src/main/kotlin/com/kotlin/rekognition/DetectPPE.kt b/kotlin/services/rekognition/src/main/kotlin/com/kotlin/rekognition/DetectPPE.kt
@@ -60,7 +60,7 @@ suspend fun displayGear(sourceImage: String) {
             summarizationAttributes = summarizationAttributesOb
         }
 
-    RekognitionClient { region = "us-east-1" }.use { rekClient ->
+    RekognitionClient.fromEnvironment { region = "us-east-1" }.use { rekClient ->
         val response = rekClient.detectProtectiveEquipment(request)
         response.persons?.forEach { person ->
             println("ID: " + person.id)
diff --git a/kotlin/services/rekognition/src/main/kotlin/com/kotlin/rekognition/DetectText.kt b/kotlin/services/rekognition/src/main/kotlin/com/kotlin/rekognition/DetectText.kt
@@ -48,7 +48,7 @@ suspend fun detectTextLabels(sourceImage: String?) {
             image = souImage
         }
 
-    RekognitionClient { region = "us-east-1" }.use { rekClient ->
+    RekognitionClient.fromEnvironment { region = "us-east-1" }.use { rekClient ->
         val response = rekClient.detectText(request)
         response.textDetections?.forEach { text ->
             println("Detected: ${text.detectedText}")
diff --git a/kotlin/services/rekognition/src/main/kotlin/com/kotlin/rekognition/ListCollections.kt b/kotlin/services/rekognition/src/main/kotlin/com/kotlin/rekognition/ListCollections.kt
@@ -25,7 +25,7 @@ suspend fun listAllCollections() {
             maxResults = 10
         }
 
-    RekognitionClient { region = "us-east-1" }.use { rekClient ->
+    RekognitionClient.fromEnvironment { region = "us-east-1" }.use { rekClient ->
         val response = rekClient.listCollections(request)
         response.collectionIds?.forEach { resultId ->
             println(resultId)
diff --git a/kotlin/services/rekognition/src/main/kotlin/com/kotlin/rekognition/ListFacesInCollection.kt b/kotlin/services/rekognition/src/main/kotlin/com/kotlin/rekognition/ListFacesInCollection.kt
@@ -41,7 +41,7 @@ suspend fun listFacesCollection(collectionIdVal: String?) {
             maxResults = 10
         }
 
-    RekognitionClient { region = "us-east-1" }.use { rekClient ->
+    RekognitionClient.fromEnvironment { region = "us-east-1" }.use { rekClient ->
         val response = rekClient.listFaces(request)
         response.faces?.forEach { face ->
             println("Confidence level there is a face: ${face.confidence}")
diff --git a/kotlin/services/rekognition/src/main/kotlin/com/kotlin/rekognition/RecognizeCelebrities.kt b/kotlin/services/rekognition/src/main/kotlin/com/kotlin/rekognition/RecognizeCelebrities.kt
@@ -48,7 +48,7 @@ suspend fun recognizeAllCelebrities(sourceImage: String?) {
             image = souImage
         }
 
-    RekognitionClient { region = "us-east-1" }.use { rekClient ->
+    RekognitionClient.fromEnvironment { region = "us-east-1" }.use { rekClient ->
         val response = rekClient.recognizeCelebrities(request)
         response.celebrityFaces?.forEach { celebrity ->
             println("Celebrity recognized: ${celebrity.name}")
diff --git a/kotlin/services/rekognition/src/main/kotlin/com/kotlin/rekognition/VideoDetectFaces.kt b/kotlin/services/rekognition/src/main/kotlin/com/kotlin/rekognition/VideoDetectFaces.kt
@@ -83,7 +83,7 @@ suspend fun startFaceDetection(
             video = vidOb
         }
 
-    RekognitionClient { region = "us-east-1" }.use { rekClient ->
+    RekognitionClient.fromEnvironment { region = "us-east-1" }.use { rekClient ->
         val startLabelDetectionResult = rekClient.startFaceDetection(request)
         startJobId = startLabelDetectionResult.jobId.toString()
     }
@@ -93,7 +93,7 @@ suspend fun getFaceResults() {
     var finished = false
     var status: String
     var yy = 0
-    RekognitionClient { region = "us-east-1" }.use { rekClient ->
+    RekognitionClient.fromEnvironment { region = "us-east-1" }.use { rekClient ->
         var response: GetFaceDetectionResponse? = null
 
         val recognitionRequest =
diff --git a/kotlin/services/rekognition/src/main/kotlin/com/kotlin/rekognition/VideoDetectInappropriate.kt b/kotlin/services/rekognition/src/main/kotlin/com/kotlin/rekognition/VideoDetectInappropriate.kt
@@ -81,7 +81,7 @@ suspend fun startModerationDetection(
             video = vidOb
         }
 
-    RekognitionClient { region = "us-east-1" }.use { rekClient ->
+    RekognitionClient.fromEnvironment { region = "us-east-1" }.use { rekClient ->
         val startModDetectionResult = rekClient.startContentModeration(request)
         startJobId = startModDetectionResult.jobId.toString()
     }
diff --git a/kotlin/services/rekognition/src/test/kotlin/RekognitionTest.kt b/kotlin/services/rekognition/src/test/kotlin/RekognitionTest.kt
@@ -113,24 +113,6 @@ class RekognitionTest {
             logger.info("Test 5 passed")
         }
 
-    @Test
-    @Order(6)
-    fun videoDetectFacesTest() =
-        runBlocking {
-            startFaceDetection(channel, bucketName, celVid)
-            getFaceResults()
-            logger.info("Test 6 passed")
-        }
-
-    @Test
-    @Order(7)
-    fun videoDetectInappropriateTest() =
-        runBlocking {
-            startModerationDetection(channel, bucketName, modVid)
-            getModResults()
-            logger.info("Test 7 passed")
-        }
-
     private suspend fun getSecretValues(): String {
         val secretName = "test/rekognition"
         val valueRequest =

Original file line number	Diff line number	Diff line change
`@@ -58,7 +58,7 @@ suspend fun addToCollection(`
`58`	`58`	`detectionAttributes = listOf(Attribute.Default)`
`59`	`59`	`}`
`60`	`60`
`61`		`- RekognitionClient { region = "us-east-1" }.use { rekClient ->`
	`61`	`+ RekognitionClient.fromEnvironment { region = "us-east-1" }.use { rekClient ->`
`62`	`62`	`val facesResponse = rekClient.indexFaces(request)`
`63`	`63`
`64`	`64`	`// Display the results.`
Original file line number	Diff line number	Diff line change
`@@ -41,7 +41,7 @@ suspend fun getCelebrityInfo(idVal: String?) {`
`41`	`41`	`id = idVal`
`42`	`42`	`}`
`43`	`43`
`44`		`- RekognitionClient { region = "us-east-1" }.use { rekClient ->`
	`44`	`+ RekognitionClient.fromEnvironment { region = "us-east-1" }.use { rekClient ->`
`45`	`45`	`val response = rekClient.getCelebrityInfo(request)`
`46`	`46`
`47`	`47`	`// Display celebrity information.`
Original file line number	Diff line number	Diff line change
`@@ -66,7 +66,7 @@ suspend fun compareTwoFaces(`
`66`	`66`	`similarityThreshold = similarityThresholdVal`
`67`	`67`	`}`
`68`	`68`
`69`		`- RekognitionClient { region = "us-east-1" }.use { rekClient ->`
	`69`	`+ RekognitionClient.fromEnvironment { region = "us-east-1" }.use { rekClient ->`
`70`	`70`
`71`	`71`	`val compareFacesResult = rekClient.compareFaces(facesRequest)`
`72`	`72`	`val faceDetails = compareFacesResult.faceMatches`
Original file line number	Diff line number	Diff line change
`@@ -41,7 +41,7 @@ suspend fun createMyCollection(collectionIdVal: String) {`
`41`	`41`	`collectionId = collectionIdVal`
`42`	`42`	`}`
`43`	`43`
`44`		`- RekognitionClient { region = "us-east-1" }.use { rekClient ->`
	`44`	`+ RekognitionClient.fromEnvironment { region = "us-east-1" }.use { rekClient ->`
`45`	`45`	`val response = rekClient.createCollection(request)`
`46`	`46`	`println("Collection ARN is ${response.collectionArn}")`
`47`	`47`	`println("Status code is ${response.statusCode}")`
Original file line number	Diff line number	Diff line change
`@@ -42,7 +42,7 @@ suspend fun deleteMyCollection(collectionIdVal: String) {`
`42`	`42`	`collectionId = collectionIdVal`
`43`	`43`	`}`
`44`	`44`
`45`		`- RekognitionClient { region = "us-east-1" }.use { rekClient ->`
	`45`	`+ RekognitionClient.fromEnvironment { region = "us-east-1" }.use { rekClient ->`
`46`	`46`	`val response = rekClient.deleteCollection(request)`
`47`	`47`	`println("The collectionId status is ${response.statusCode}")`
`48`	`48`	`}`
Original file line number	Diff line number	Diff line change
`@@ -45,7 +45,7 @@ suspend fun deleteFacesCollection(`
`45`	`45`	`faceIds = listOf(faceIdVal)`
`46`	`46`	`}`
`47`	`47`
`48`		`- RekognitionClient { region = "us-east-1" }.use { rekClient ->`
	`48`	`+ RekognitionClient.fromEnvironment { region = "us-east-1" }.use { rekClient ->`
`49`	`49`	`rekClient.deleteFaces(deleteFacesRequest)`
`50`	`50`	`println("$faceIdVal was deleted from the collection")`
`51`	`51`	`}`
Original file line number	Diff line number	Diff line change
`@@ -42,7 +42,7 @@ suspend fun describeColl(collectionName: String) {`
`42`	`42`	`collectionId = collectionName`
`43`	`43`	`}`
`44`	`44`
`45`		`- RekognitionClient { region = "us-east-1" }.use { rekClient ->`
	`45`	`+ RekognitionClient.fromEnvironment { region = "us-east-1" }.use { rekClient ->`
`46`	`46`	`val response = rekClient.describeCollection(request)`
`47`	`47`	`println("The collection Arn is ${response.collectionArn}")`
`48`	`48`	`println("The collection contains this many faces ${response.faceCount}")`
Original file line number	Diff line number	Diff line change
`@@ -50,7 +50,7 @@ suspend fun detectFacesinImage(sourceImage: String?) {`
`50`	`50`	`image = souImage`
`51`	`51`	`}`
`52`	`52`
`53`		`- RekognitionClient { region = "us-east-1" }.use { rekClient ->`
	`53`	`+ RekognitionClient.fromEnvironment { region = "us-east-1" }.use { rekClient ->`
`54`	`54`	`val response = rekClient.detectFaces(request)`
`55`	`55`	`response.faceDetails?.forEach { face ->`
`56`	`56`	`val ageRange = face.ageRange`
Original file line number	Diff line number	Diff line change
`@@ -48,7 +48,7 @@ suspend fun detectImageLabels(sourceImage: String) {`
`48`	`48`	`maxLabels = 10`
`49`	`49`	`}`
`50`	`50`
`51`		`- RekognitionClient { region = "us-east-1" }.use { rekClient ->`
	`51`	`+ RekognitionClient.fromEnvironment { region = "us-east-1" }.use { rekClient ->`
`52`	`52`	`val response = rekClient.detectLabels(request)`
`53`	`53`	`response.labels?.forEach { label ->`
`54`	`54`	`println("${label.name} : ${label.confidence}")`