Skip to content

Commit cc62d01

Browse files
scmacdonscmacdon
authored
Kotlin Updated a Provider for tests and added logging functionality (#7226)
1 parent 7e25992 commit cc62d01

File tree

141 files changed

+1071
-1091
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

141 files changed

+1071
-1091
lines changed

‎kotlin/services/athena/build.gradle.kts‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,8 @@ dependencies {
3535
implementation("com.google.code.gson:gson:2.10")
3636
testImplementation("org.junit.jupiter:junit-jupiter:5.9.2")
3737
implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.6.4")
38+
implementation("org.slf4j:slf4j-api:2.0.15")
39+
implementation("org.slf4j:slf4j-simple:2.0.15")
3840
}
3941
tasks.withType<KotlinCompile> {
4042
kotlinOptions.jvmTarget = "17"

‎kotlin/services/athena/src/test/kotlin/AthenaTest.kt‎

Lines changed: 8 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22
// SPDX-License-Identifier: Apache-2.0
33
// SPDX-License-Identifier: Apache-2.0
44

5-
import aws.sdk.kotlin.runtime.auth.credentials.EnvironmentCredentialsProvider
65
import aws.sdk.kotlin.services.secretsmanager.SecretsManagerClient
76
import aws.sdk.kotlin.services.secretsmanager.model.GetSecretValueRequest
87
import com.google.gson.Gson
@@ -23,10 +22,13 @@ import org.junit.jupiter.api.Order
2322
import org.junit.jupiter.api.Test
2423
import org.junit.jupiter.api.TestInstance
2524
import org.junit.jupiter.api.TestMethodOrder
25+
import org.slf4j.Logger
26+
import org.slf4j.LoggerFactory
2627

2728
@TestInstance(TestInstance.Lifecycle.PER_CLASS)
2829
@TestMethodOrder(OrderAnnotation::class)
2930
class AthenaTest {
31+
private val logger: Logger = LoggerFactory.getLogger(AthenaTest::class.java)
3032
private var nameQuery: String? = null
3133
private var queryString: String? = null
3234
private var database: String? = null
@@ -43,39 +45,28 @@ class AthenaTest {
4345
queryString = values.queryString.toString()
4446
database = values.database.toString()
4547
outputLocation = values.outputLocation.toString()
46-
47-
// Uncomment this code block if you prefer using a config.properties file to retrieve AWS values required for these tests.
48-
/*
49-
val input: InputStream = this.javaClass.getClassLoader().getResourceAsStream("config.properties")
50-
val prop = Properties()
51-
prop.load(input)
52-
nameQuery = prop.getProperty("nameQuery")
53-
queryString = prop.getProperty("queryString")
54-
database = prop.getProperty("database")
55-
outputLocation = prop.getProperty("outputLocation")
56-
*/
5748
}
5849

5950
@Test
6051
@Order(1)
6152
fun createNamedQueryTest() = runBlocking {
6253
queryId = createNamedQuery(queryString.toString(), nameQuery.toString(), database.toString())
6354
queryId?.let { assertTrue(it.isNotEmpty()) }
64-
println("Test 1 passed")
55+
logger.info("Test 1 passed")
6556
}
6657

6758
@Test
6859
@Order(2)
6960
fun listNamedQueryTest() = runBlocking {
7061
listNamedQueries()
71-
println("Test 2 passed")
62+
logger.info("Test 2 passed")
7263
}
7364

7465
@Test
7566
@Order(3)
7667
fun listQueryExecutionsTest() = runBlocking {
7768
listQueryIds()
78-
println("Test 3 passed")
69+
logger.info("Test 3 passed")
7970
}
8071

8172
@Test
@@ -84,14 +75,14 @@ class AthenaTest {
8475
val queryExecutionId = submitAthenaQuery(queryString.toString(), database.toString(), outputLocation.toString())
8576
waitForQueryToComplete(queryExecutionId)
8677
processResultRows(queryExecutionId)
87-
println("Test 4 passed")
78+
logger.info("Test 4 passed")
8879
}
8980

9081
@Test
9182
@Order(5)
9283
fun deleteNamedQueryTest() = runBlocking {
9384
deleteQueryName(queryId)
94-
println("Test 5 passed")
85+
logger.info("Test 5 passed")
9586
}
9687

9788
private suspend fun getSecretValues(): String {
@@ -101,7 +92,6 @@ class AthenaTest {
10192
}
10293
SecretsManagerClient {
10394
region = "us-east-1"
104-
credentialsProvider = EnvironmentCredentialsProvider()
10595
}.use { secretClient ->
10696
val valueResponse = secretClient.getSecretValue(valueRequest)
10797
return valueResponse.secretString.toString()

‎kotlin/services/athena/src/test/resources/logback.xml‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
<configuration>
2+
<appender name="Console" class="ch.qos.logback.core.ConsoleAppender">
3+
<encoder>
4+
<pattern>%level %logger{36} - %msg%n</pattern>
5+
</encoder>
6+
</appender>
7+
8+
<root level="info">
9+
<appender-ref ref="Console"/>
10+
</root>
11+
</configuration>

‎kotlin/services/cloudformation/build.gradle.kts‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,8 @@ dependencies {
3535
implementation("com.google.code.gson:gson:2.10")
3636
testImplementation("org.junit.jupiter:junit-jupiter:5.9.2")
3737
implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.6.4")
38+
implementation("org.slf4j:slf4j-api:2.0.15")
39+
implementation("org.slf4j:slf4j-simple:2.0.15")
3840
}
3941
tasks.withType<KotlinCompile> {
4042
kotlinOptions.jvmTarget = "17"

‎kotlin/services/cloudformation/src/test/kotlin/CloudFormationTest.kt‎

Lines changed: 7 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
// Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
22
// SPDX-License-Identifier: Apache-2.0
33

4-
import aws.sdk.kotlin.runtime.auth.credentials.EnvironmentCredentialsProvider
54
import aws.sdk.kotlin.services.secretsmanager.SecretsManagerClient
65
import aws.sdk.kotlin.services.secretsmanager.model.GetSecretValueRequest
76
import com.google.gson.Gson
@@ -18,15 +17,16 @@ import org.junit.jupiter.api.Order
1817
import org.junit.jupiter.api.Test
1918
import org.junit.jupiter.api.TestInstance
2019
import org.junit.jupiter.api.TestMethodOrder
20+
import org.slf4j.Logger
21+
import org.slf4j.LoggerFactory
2122

2223
@TestInstance(TestInstance.Lifecycle.PER_CLASS)
2324
@TestMethodOrder(OrderAnnotation::class)
2425
class CloudFormationTest {
26+
private val logger: Logger = LoggerFactory.getLogger(CloudFormationTest::class.java)
2527
private var stackName = ""
2628
private var roleARN = ""
2729
private var location = ""
28-
private var key = ""
29-
private var value = ""
3030

3131
@BeforeAll
3232
fun setup() =
@@ -38,49 +38,38 @@ class CloudFormationTest {
3838
stackName = values.stackName.toString()
3939
roleARN = values.roleARN.toString()
4040
location = values.location.toString()
41-
42-
/*
43-
val input: InputStream = this.javaClass.getClassLoader().getResourceAsStream("config.properties")
44-
val prop = Properties()
45-
prop.load(input)
46-
stackName = prop.getProperty("stackName")
47-
roleARN = prop.getProperty("roleARN")
48-
location = prop.getProperty("location")
49-
key = prop.getProperty("key")
50-
value = prop.getProperty("value")
51-
*/
5241
}
5342

5443
@Test
5544
@Order(1)
5645
fun createStackTest() =
5746
runBlocking {
5847
createCFStack(stackName, roleARN, location)
59-
println("Test 1 passed")
48+
logger.info("Test 1 passed")
6049
}
6150

6251
@Test
6352
@Order(2)
6453
fun describeStacksTest() =
6554
runBlocking {
6655
describeAllStacks()
67-
println("Test 2 passed")
56+
logger.info("Test 2 passed")
6857
}
6958

7059
@Test
7160
@Order(3)
7261
fun getTemplateTest() =
7362
runBlocking {
7463
getSpecificTemplate(stackName)
75-
println("Test 3 passed")
64+
logger.info("Test 3 passed")
7665
}
7766

7867
@Test
7968
@Order(4)
8069
fun deleteStackTest() =
8170
runBlocking {
8271
deleteSpecificTemplate(stackName)
83-
println("Test 4 passed")
72+
logger.info("Test 4 passed")
8473
}
8574

8675
private suspend fun getSecretValues(): String {
@@ -91,7 +80,6 @@ class CloudFormationTest {
9180
}
9281
SecretsManagerClient {
9382
region = "us-east-1"
94-
credentialsProvider = EnvironmentCredentialsProvider()
9583
}.use { secretClient ->
9684
val valueResponse = secretClient.getSecretValue(valueRequest)
9785
return valueResponse.secretString.toString()

‎kotlin/services/cloudformation/src/test/resources/logback.xml‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
<configuration>
2+
<appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
3+
<encoder>
4+
<pattern>%d{yyyy-MM-dd HH:mm:ss} [%thread] %-5level %logger{36} - %msg%n</pattern>
5+
</encoder>
6+
</appender>
7+
8+
<root level="info">
9+
<appender-ref ref="STDOUT"/>
10+
</root>
11+
</configuration>

‎kotlin/services/cloudtrail/build.gradle.kts‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,8 @@ dependencies {
3535
implementation("com.google.code.gson:gson:2.10")
3636
testImplementation("org.junit.jupiter:junit-jupiter:5.9.2")
3737
implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.6.4")
38+
implementation("org.slf4j:slf4j-api:2.0.15")
39+
implementation("org.slf4j:slf4j-simple:2.0.15")
3840
}
3941
tasks.withType<KotlinCompile> {
4042
kotlinOptions.jvmTarget = "17"

‎kotlin/services/cloudtrail/src/test/kotlin/CloudtrailKotlinTest.kt‎

Lines changed: 10 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
// Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
22
// SPDX-License-Identifier: Apache-2.0
33

4-
import aws.sdk.kotlin.runtime.auth.credentials.EnvironmentCredentialsProvider
54
import aws.sdk.kotlin.services.secretsmanager.SecretsManagerClient
65
import aws.sdk.kotlin.services.secretsmanager.model.GetSecretValueRequest
76
import com.google.gson.Gson
@@ -22,10 +21,13 @@ import org.junit.jupiter.api.Order
2221
import org.junit.jupiter.api.Test
2322
import org.junit.jupiter.api.TestInstance
2423
import org.junit.jupiter.api.TestMethodOrder
24+
import org.slf4j.Logger
25+
import org.slf4j.LoggerFactory
2526

2627
@TestInstance(TestInstance.Lifecycle.PER_CLASS)
2728
@TestMethodOrder(OrderAnnotation::class)
2829
class CloudtrailKotlinTest {
30+
private val logger: Logger = LoggerFactory.getLogger(CloudtrailKotlinTest::class.java)
2931
private var trailName = ""
3032
private var s3BucketName = ""
3133

@@ -37,57 +39,46 @@ class CloudtrailKotlinTest {
3739
val values: SecretValues = gson.fromJson<SecretValues>(json, SecretValues::class.java)
3840
trailName = values.trailName.toString()
3941
s3BucketName = values.s3BucketName.toString()
40-
41-
// Uncomment this code block if you prefer using a config.properties file to retrieve AWS values required for these tests.
42-
/*
43-
val input: InputStream = this.javaClass.getClassLoader().getResourceAsStream("config.properties")
44-
val prop = Properties()
45-
46-
// load the properties file.
47-
prop.load(input)
48-
trailName = prop.getProperty("trailName")
49-
s3BucketName = prop.getProperty("s3BucketName")
50-
*/
5142
}
5243

5344
@Test
5445
@Order(1)
5546
fun createTrail() =
5647
runBlocking {
5748
createNewTrail(trailName, s3BucketName)
58-
println("Test 1 passed")
49+
logger.info("Test 1 passed")
5950
}
6051

6152
@Test
6253
@Order(2)
6354
fun putEventSelectors() =
6455
runBlocking {
6556
setSelector(trailName)
66-
println("Test 2 passed")
57+
logger.info("Test 2 passed")
6758
}
6859

6960
@Test
7061
@Order(3)
7162
fun getEventSelectors() =
7263
runBlocking {
7364
getSelectors(trailName)
74-
println("Test 3 passed")
65+
logger.info("Test 3 passed")
7566
}
7667

7768
@Test
7869
@Order(4)
7970
fun lookupEvents() =
8071
runBlocking {
8172
lookupAllEvents()
82-
println("Test 4 passed")
73+
logger.info("Test 4 passed")
8374
}
8475

8576
@Test
8677
@Order(5)
8778
fun describeTrails() =
8879
runBlocking {
8980
describeSpecificTrails(trailName)
90-
println("Test 5 passed")
81+
logger.info("Test 5 passed")
9182
}
9283

9384
@Test
@@ -96,15 +87,15 @@ class CloudtrailKotlinTest {
9687
runBlocking {
9788
startLog(trailName)
9889
stopLog(trailName)
99-
println("Test 6 passed")
90+
logger.info("Test 6 passed")
10091
}
10192

10293
@Test
10394
@Order(7)
10495
fun deleteTrail() =
10596
runBlocking {
10697
deleteSpecificTrail(trailName)
107-
println("Test 7 passed")
98+
logger.info("Test 7 passed")
10899
}
109100

110101
private suspend fun getSecretValues(): String {
@@ -115,7 +106,6 @@ class CloudtrailKotlinTest {
115106
}
116107
SecretsManagerClient {
117108
region = "us-east-1"
118-
credentialsProvider = EnvironmentCredentialsProvider()
119109
}.use { secretClient ->
120110
val valueResponse = secretClient.getSecretValue(valueRequest)
121111
return valueResponse.secretString.toString()

‎kotlin/services/cloudtrail/src/test/resources/logback.xml‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
<configuration>
2+
<appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
3+
<encoder>
4+
<pattern>%d{yyyy-MM-dd HH:mm:ss} [%thread] %-5level %logger{36} - %msg%n</pattern>
5+
</encoder>
6+
</appender>
7+
8+
<root level="info">
9+
<appender-ref ref="STDOUT"/>
10+
</root>
11+
</configuration>

‎kotlin/services/cloudwatch/build.gradle.kts‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,8 @@ dependencies {
4040
implementation("com.fasterxml.jackson.core:jackson-databind:2.14.2")
4141
testImplementation("org.junit.jupiter:junit-jupiter:5.9.2")
4242
implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.6.4")
43+
implementation("org.slf4j:slf4j-api:2.0.15")
44+
implementation("org.slf4j:slf4j-simple:2.0.15")
4345
}
4446
tasks.withType<KotlinCompile> {
4547
kotlinOptions.jvmTarget = "17"

0 commit comments

Comments
 (0)