Skip to content

Commit 2326e00

Browse files
committed
added logging functionality
1 parent c05052e commit 2326e00

File tree

3 files changed

+27
-25
lines changed

3 files changed

+27
-25
lines changed

kotlin/services/personalize/build.gradle.kts

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

kotlin/services/personalize/src/test/kotlin/PersonalizeKotlinTest.kt

Lines changed: 14 additions & 25 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
@@ -28,10 +27,13 @@ import org.junit.jupiter.api.TestInstance
2827
import org.junit.jupiter.api.TestMethodOrder
2928
import java.util.UUID
3029
import java.util.concurrent.TimeUnit
30+
import org.slf4j.Logger
31+
import org.slf4j.LoggerFactory
3132

3233
@TestInstance(TestInstance.Lifecycle.PER_CLASS)
3334
@TestMethodOrder(OrderAnnotation::class)
3435
class PersonalizeKotlinTest {
36+
private val logger: Logger = LoggerFactory.getLogger(PersonalizeKotlinTest::class.java)
3537
private var datasetGroupArn = ""
3638
private var solutionArn = ""
3739
private var solutionVersionArn = ""
@@ -55,18 +57,6 @@ class PersonalizeKotlinTest {
5557
solutionName = values.solutionName.toString() + UUID.randomUUID()
5658
userId = values.userId.toString()
5759
campaignName = values.campaignName.toString() + UUID.randomUUID()
58-
/*
59-
val input: InputStream = this.javaClass.getClassLoader().getResourceAsStream("config.properties")
60-
val prop = Properties()
61-
prop.load(input)
62-
solutionName = prop.getProperty("solutionName")
63-
datasetGroupArn = prop.getProperty("datasetGroupArn")
64-
recipeArn = prop.getProperty("recipeArn")
65-
solutionVersionArn = prop.getProperty("solutionVersionArn")
66-
campaignName = prop.getProperty("campaignName")
67-
campaignArn = prop.getProperty("campaignArn")
68-
userId = prop.getProperty("userId")
69-
*/
7060
}
7161

7262
@Test
@@ -75,23 +65,23 @@ class PersonalizeKotlinTest {
7565
runBlocking {
7666
solutionArn = createPersonalizeSolution(datasetGroupArn, solutionName, recipeArn).toString()
7767
assertTrue(!solutionArn.isEmpty())
78-
println("Test 1 passed")
68+
logger.info("Test 1 passed")
7969
}
8070

8171
@Test
8272
@Order(2)
8373
fun listSolutions() =
8474
runBlocking {
8575
listAllSolutions(datasetGroupArn)
86-
println("Test 2 passed")
76+
logger.info("Test 2 passed")
8777
}
8878

8979
@Test
9080
@Order(3)
9181
fun describeSolution() =
9282
runBlocking {
9383
describeSpecificSolution(solutionArn)
94-
println("Test 3 passed")
84+
logger.info("Test 3 passed")
9585
}
9686

9787
@Test
@@ -100,7 +90,7 @@ class PersonalizeKotlinTest {
10090
runBlocking {
10191
newCampaignArn = createPersonalCompaign(solutionVersionArn, campaignName).toString()
10292
assertTrue(!newCampaignArn.isEmpty())
103-
println("Test 4 passed")
93+
logger.info("Test 4 passed")
10494
}
10595

10696
@Test
@@ -110,55 +100,55 @@ class PersonalizeKotlinTest {
110100
println("Wait 20 mins for resource to become available.")
111101
TimeUnit.MINUTES.sleep(20)
112102
describeSpecificCampaign(newCampaignArn)
113-
println("Test 5 passed")
103+
logger.info("Test 5 passed")
114104
}
115105

116106
@Test
117107
@Order(6)
118108
fun listCampaigns() =
119109
runBlocking {
120110
listAllCampaigns(solutionArn)
121-
println("Test 6 passed")
111+
logger.info("Test 6 passed")
122112
}
123113

124114
@Test
125115
@Order(7)
126116
fun listRecipes() =
127117
runBlocking {
128118
listAllRecipes()
129-
println("Test 7 passed")
119+
logger.info("Test 7 passed")
130120
}
131121

132122
@Test
133123
@Order(8)
134124
fun listDatasetGroups() =
135125
runBlocking {
136126
listDSGroups()
137-
println("Test 8 passed")
127+
logger.info("Test 8 passed")
138128
}
139129

140130
@Test
141131
@Order(9)
142132
fun deleteSolution() =
143133
runBlocking {
144134
deleteGivenSolution(solutionArn)
145-
println("Test 9 passed")
135+
logger.info("Test 9 passed")
146136
}
147137

148138
@Test
149139
@Order(10)
150140
fun getRecommendations() =
151141
runBlocking {
152142
getRecs(newCampaignArn, userId)
153-
println("Test 10 passed")
143+
logger.info("Test 10 passed")
154144
}
155145

156146
@Test
157147
@Order(11)
158148
fun deleteCampaign() =
159149
runBlocking {
160150
deleteSpecificCampaign(newCampaignArn)
161-
println("Test 11 passed")
151+
logger.info("Test 11 passed")
162152
}
163153

164154
private suspend fun getSecretValues(): String {
@@ -169,7 +159,6 @@ class PersonalizeKotlinTest {
169159
}
170160
SecretsManagerClient {
171161
region = "us-east-1"
172-
credentialsProvider = EnvironmentCredentialsProvider()
173162
}.use { secretClient ->
174163
val valueResponse = secretClient.getSecretValue(valueRequest)
175164
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)