Skip to content

Commit d7170f8

Browse files
committed
added logging functionality
1 parent a76d14a commit d7170f8

File tree

3 files changed

+24
-21
lines changed

3 files changed

+24
-21
lines changed

kotlin/services/forecast/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/forecast/src/test/kotlin/ForecastKotlinTest.kt

Lines changed: 11 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
// Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
22
// SPDX-License-Identifier: Apache-2.0
3-
import aws.sdk.kotlin.runtime.auth.credentials.EnvironmentCredentialsProvider
43
import aws.sdk.kotlin.services.secretsmanager.SecretsManagerClient
54
import aws.sdk.kotlin.services.secretsmanager.model.GetSecretValueRequest
65
import com.google.gson.Gson
@@ -22,12 +21,15 @@ 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
import java.util.Random
2627
import java.util.concurrent.TimeUnit
2728

2829
@TestInstance(TestInstance.Lifecycle.PER_CLASS)
2930
@TestMethodOrder(OrderAnnotation::class)
3031
class ForecastKotlinTest {
32+
private val logger: Logger = LoggerFactory.getLogger(ForecastKotlinTest::class.java)
3133
private var predictorARN = ""
3234
private var forecastArn = "" // set in test 3
3335
private var forecastName = ""
@@ -46,17 +48,6 @@ class ForecastKotlinTest {
4648
predictorARN = values.predARN.toString()
4749
forecastName = values.forecastName.toString() + randomNum
4850
dataSetName = values.dataSet.toString() + randomNum
49-
50-
/*
51-
// load the properties file.
52-
val input: InputStream = this.javaClass.getClassLoader().getResourceAsStream("config.properties")
53-
val prop = Properties()
54-
prop.load(input)
55-
forecastName = prop.getProperty("forecastName")
56-
dataSetName = prop.getProperty("dataSetName")
57-
predictorARN = prop.getProperty("predictorARN")
58-
existingforecastDelete = prop.getProperty("existingforecastDelete")
59-
*/
6051
}
6152

6253
@Test
@@ -65,7 +56,7 @@ class ForecastKotlinTest {
6556
runBlocking {
6657
myDataSetARN = createForecastDataSet(dataSetName).toString()
6758
assertTrue(!myDataSetARN.isEmpty())
68-
println("Test 1 passed")
59+
logger.info("Test 1 passed")
6960
}
7061

7162
@Test
@@ -74,47 +65,47 @@ class ForecastKotlinTest {
7465
runBlocking {
7566
forecastArn = createNewForecast(forecastName, predictorARN).toString()
7667
assertTrue(!forecastArn.isEmpty())
77-
println("Test 2 passed")
68+
logger.info("Test 2 passed")
7869
}
7970

8071
@Test
8172
@Order(3)
8273
fun listDataSets() =
8374
runBlocking {
8475
listForecastDataSets()
85-
println("Test 3 passed")
76+
logger.info("Test 3 passed")
8677
}
8778

8879
@Test
8980
@Order(4)
9081
fun listDataSetGroups() =
9182
runBlocking {
9283
listDataGroups()
93-
println("Test 4 passed")
84+
logger.info("Test 4 passed")
9485
}
9586

9687
@Test
9788
@Order(5)
9889
fun listForecasts() =
9990
runBlocking {
10091
listAllForeCasts()
101-
println("Test 5 passed")
92+
logger.info("Test 5 passed")
10293
}
10394

10495
@Test
10596
@Order(6)
10697
fun describeForecast() =
10798
runBlocking {
10899
describe(forecastArn)
109-
println("Test 6 passed")
100+
logger.info("Test 6 passed")
110101
}
111102

112103
@Test
113104
@Order(7)
114105
fun deleteDataSet() =
115106
runBlocking {
116107
deleteForecastDataSet(myDataSetARN)
117-
println("Test 7 passed")
108+
logger.info("Test 7 passed")
118109
}
119110

120111
@Test
@@ -124,7 +115,7 @@ class ForecastKotlinTest {
124115
println("Wait 40 mins for resource to become available.")
125116
TimeUnit.MINUTES.sleep(40)
126117
delForecast(forecastArn)
127-
println("Test 8 passed")
118+
logger.info("Test 8 passed")
128119
}
129120

130121
private suspend fun getSecretValues(): String {
@@ -135,7 +126,6 @@ class ForecastKotlinTest {
135126
}
136127
SecretsManagerClient {
137128
region = "us-east-1"
138-
credentialsProvider = EnvironmentCredentialsProvider()
139129
}.use { secretClient ->
140130
val valueResponse = secretClient.getSecretValue(valueRequest)
141131
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)