Improve dependency configuration to support testing with the latest version of AWS SDK v1.

lukeina2z · lukeina2z · commit 6fd55874e989 · 2025-06-16T08:22:30.000-07:00
diff --git a/instrumentation/aws-sdk/aws-sdk-1.11/library/build.gradle.kts b/instrumentation/aws-sdk/aws-sdk-1.11/library/build.gradle.kts
@@ -23,7 +23,8 @@ dependencies {
   latestDepTestLibrary("com.amazonaws:aws-java-sdk-sqs:1.12.583") // documented limitation
 }
 
-if (!(findProperty("testLatestDeps") as Boolean)) {
+val testLatestDeps = findProperty("testLatestDeps") as Boolean
+if (!testLatestDeps) {
   configurations.testRuntimeClasspath {
     resolutionStrategy {
       eachDependency {
@@ -42,7 +43,8 @@ testing {
       dependencies {
         implementation(project())
         implementation(project(":instrumentation:aws-sdk:aws-sdk-1.11:testing"))
-        implementation("com.amazonaws:aws-java-sdk-secretsmanager:1.12.80")
+        version = if (testLatestDeps) "latest.release" else "1.12.80"
+        implementation("com.amazonaws:aws-java-sdk-secretsmanager:$version")
       }
     }
   }

Original file line number	Diff line number	Diff line change
`@@ -23,7 +23,8 @@ dependencies {`
`23`	`23`	`latestDepTestLibrary("com.amazonaws:aws-java-sdk-sqs:1.12.583") // documented limitation`
`24`	`24`	`}`
`25`	`25`
`26`		`-if (!(findProperty("testLatestDeps") as Boolean)) {`
	`26`	`+val testLatestDeps = findProperty("testLatestDeps") as Boolean`
	`27`	`+if (!testLatestDeps) {`
`27`	`28`	`configurations.testRuntimeClasspath {`
`28`	`29`	`resolutionStrategy {`
`29`	`30`	`eachDependency {`
`@@ -42,7 +43,8 @@ testing {`
`42`	`43`	`dependencies {`
`43`	`44`	`implementation(project())`
`44`	`45`	`implementation(project(":instrumentation:aws-sdk:aws-sdk-1.11:testing"))`
`45`		`- implementation("com.amazonaws:aws-java-sdk-secretsmanager:1.12.80")`
	`46`	`+ version = if (testLatestDeps) "latest.release" else "1.12.80"`
	`47`	`+ implementation("com.amazonaws:aws-java-sdk-secretsmanager:$version")`
`46`	`48`	`}`
`47`	`49`	`}`
`48`	`50`	`}`