Skip to content

Commit b9005d7

Browse files
committed
added logging functionality
1 parent 7e25992 commit b9005d7

File tree

3 files changed

+21
-17
lines changed

3 files changed

+21
-17
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 & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -23,10 +23,13 @@ import org.junit.jupiter.api.Order
2323
import org.junit.jupiter.api.Test
2424
import org.junit.jupiter.api.TestInstance
2525
import org.junit.jupiter.api.TestMethodOrder
26+
import org.slf4j.Logger
27+
import org.slf4j.LoggerFactory
2628

2729
@TestInstance(TestInstance.Lifecycle.PER_CLASS)
2830
@TestMethodOrder(OrderAnnotation::class)
2931
class AthenaTest {
32+
private val logger: Logger = LoggerFactory.getLogger(AthenaTest::class.java)
3033
private var nameQuery: String? = null
3134
private var queryString: String? = null
3235
private var database: String? = null
@@ -43,39 +46,28 @@ class AthenaTest {
4346
queryString = values.queryString.toString()
4447
database = values.database.toString()
4548
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-
*/
5749
}
5850

5951
@Test
6052
@Order(1)
6153
fun createNamedQueryTest() = runBlocking {
6254
queryId = createNamedQuery(queryString.toString(), nameQuery.toString(), database.toString())
6355
queryId?.let { assertTrue(it.isNotEmpty()) }
64-
println("Test 1 passed")
56+
logger.info("Test 1 passed")
6557
}
6658

6759
@Test
6860
@Order(2)
6961
fun listNamedQueryTest() = runBlocking {
7062
listNamedQueries()
71-
println("Test 2 passed")
63+
logger.info("Test 2 passed")
7264
}
7365

7466
@Test
7567
@Order(3)
7668
fun listQueryExecutionsTest() = runBlocking {
7769
listQueryIds()
78-
println("Test 3 passed")
70+
logger.info("Test 3 passed")
7971
}
8072

8173
@Test
@@ -84,14 +76,14 @@ class AthenaTest {
8476
val queryExecutionId = submitAthenaQuery(queryString.toString(), database.toString(), outputLocation.toString())
8577
waitForQueryToComplete(queryExecutionId)
8678
processResultRows(queryExecutionId)
87-
println("Test 4 passed")
79+
logger.info("Test 4 passed")
8880
}
8981

9082
@Test
9183
@Order(5)
9284
fun deleteNamedQueryTest() = runBlocking {
9385
deleteQueryName(queryId)
94-
println("Test 5 passed")
86+
logger.info("Test 5 passed")
9587
}
9688

9789
private suspend fun getSecretValues(): String {
@@ -101,7 +93,6 @@ class AthenaTest {
10193
}
10294
SecretsManagerClient {
10395
region = "us-east-1"
104-
credentialsProvider = EnvironmentCredentialsProvider()
10596
}.use { secretClient ->
10697
val valueResponse = secretClient.getSecretValue(valueRequest)
10798
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="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>

0 commit comments

Comments
 (0)