Skip to content

Commit e8bf222

Browse files
committed
added logging functionality
1 parent d2cdcd1 commit e8bf222

File tree

3 files changed

+25
-22
lines changed

3 files changed

+25
-22
lines changed

kotlin/services/sts/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.0")
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/sts/src/test/kotlin/Test2.kt renamed to kotlin/services/sts/src/test/kotlin/STSTest.kt

Lines changed: 12 additions & 22 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,10 +17,13 @@ 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)
24-
class Test2 {
25+
class STSTest {
26+
private val logger: Logger = LoggerFactory.getLogger(STSTest::class.java)
2527
private var roleArn = ""
2628
private var accessKeyId = ""
2729
private var roleSessionName = ""
@@ -36,49 +38,38 @@ class Test2 {
3638
roleArn = values.roleArn.toString()
3739
accessKeyId = values.accessKeyId.toString()
3840
roleSessionName = values.roleSessionName.toString()
39-
40-
/*
41-
val input: InputStream = this.javaClass.getClassLoader().getResourceAsStream("config.properties")
42-
val prop = Properties()
43-
prop.load(input)
44-
45-
// Populate the data members required for all tests.
46-
roleArn = prop.getProperty("roleArn")
47-
accessKeyId = prop.getProperty("accessKeyId")
48-
roleSessionName = prop.getProperty("roleSessionName")
49-
*/
5041
}
5142

5243
@Test
53-
@Order(2)
44+
@Order(1)
5445
fun assumeRoleTest() =
5546
runBlocking {
5647
assumeGivenRole(roleArn, roleSessionName)
57-
println("Test 2 passed")
48+
logger.info("Test 1 passed")
5849
}
5950

6051
@Test
61-
@Order(3)
52+
@Order(2)
6253
fun getSessionTokenTest() =
6354
runBlocking {
6455
getToken()
65-
println("Test 3 passed")
56+
logger.info("Test 2 passed")
6657
}
6758

6859
@Test
69-
@Order(4)
60+
@Order(3)
7061
fun getCallerIdentityTest() =
7162
runBlocking {
7263
getCallerId()
73-
println("Test 4 passed")
64+
logger.info("Test 3 passed")
7465
}
7566

7667
@Test
77-
@Order(5)
68+
@Order(4)
7869
fun getAccessKeyInfoTest() =
7970
runBlocking {
8071
getKeyInfo(accessKeyId)
81-
println("Test 5 passed")
72+
logger.info("Test 4 passed")
8273
}
8374

8475
private suspend fun getSecretValues(): String {
@@ -89,7 +80,6 @@ class Test2 {
8980
}
9081
SecretsManagerClient {
9182
region = "us-east-1"
92-
credentialsProvider = EnvironmentCredentialsProvider()
9383
}.use { secretClient ->
9484
val valueResponse = secretClient.getSecretValue(valueRequest)
9585
return valueResponse.secretString.toString()
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>

0 commit comments

Comments
 (0)