Skip to content

Commit 5963ef6

Browse files
committed
added logging functionality
1 parent d718aeb commit 5963ef6

File tree

3 files changed

+30
-30
lines changed

3 files changed

+30
-30
lines changed

kotlin/services/sns/build.gradle.kts

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

kotlin/services/sns/src/test/kotlin/SNSTest.kt

Lines changed: 17 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
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
3+
44
import aws.sdk.kotlin.services.secretsmanager.SecretsManagerClient
55
import aws.sdk.kotlin.services.secretsmanager.model.GetSecretValueRequest
66
import com.google.gson.Gson
@@ -26,11 +26,14 @@ import org.junit.jupiter.api.Order
2626
import org.junit.jupiter.api.Test
2727
import org.junit.jupiter.api.TestInstance
2828
import org.junit.jupiter.api.TestMethodOrder
29+
import org.slf4j.Logger
30+
import org.slf4j.LoggerFactory
2931
import java.util.Random
3032

3133
@TestInstance(TestInstance.Lifecycle.PER_CLASS)
3234
@TestMethodOrder(OrderAnnotation::class)
3335
class SNSTest {
36+
private val logger: Logger = LoggerFactory.getLogger(SNSTest::class.java)
3437
private var topicName = ""
3538
private var topicArn = "" // This value is dynamically set
3639
private var subArn = "" // This value is dynamically set
@@ -57,21 +60,6 @@ class SNSTest {
5760
lambdaarn = values.lambdaarn.toString()
5861
phone = values.phone.toString()
5962
message = values.message.toString()
60-
61-
/*
62-
// load the properties file.
63-
val input: InputStream = this.javaClass.getClassLoader().getResourceAsStream("config.properties")
64-
val prop = Properties()
65-
prop.load(input)
66-
topicName = prop.getProperty("topicName")
67-
attributeName = prop.getProperty("attributeName")
68-
attributeValue = prop.getProperty("attributeValue")
69-
email = prop.getProperty("email")
70-
lambdaarn = prop.getProperty("lambdaarn")
71-
phone = prop.getProperty("phone")
72-
message = prop.getProperty("message")
73-
existingsubarn = prop.getProperty("existingsubarn")
74-
*/
7563
}
7664

7765
@Test
@@ -80,103 +68,103 @@ class SNSTest {
8068
runBlocking {
8169
topicArn = createSNSTopic(topicName)
8270
Assertions.assertTrue(!topicArn.isEmpty())
83-
println("Test 1 passed")
71+
logger.info("Test 1 passed")
8472
}
8573

8674
@Test
8775
@Order(2)
8876
fun listTopicsTest() =
8977
runBlocking {
9078
listSNSTopics()
91-
println("Test 2 passed")
79+
logger.info("Test 2 passed")
9280
}
9381

9482
@Test
9583
@Order(3)
9684
fun setTopicAttributesTest() =
9785
runBlocking {
9886
setTopAttr(attributeName, topicArn, attributeValue)
99-
println("Test 3 passed")
87+
logger.info("Test 3 passed")
10088
}
10189

10290
@Test
10391
@Order(4)
10492
fun subscribeEmailTest() =
10593
runBlocking {
10694
subEmail(topicArn, email)
107-
println("Test 4 passed")
95+
logger.info("Test 4 passed")
10896
}
10997

11098
@Test
11199
@Order(5)
112100
fun subscribeLambdaTest() =
113101
runBlocking {
114102
subLambda(topicArn, lambdaarn)
115-
println("Test 5 passed")
103+
logger.info("Test 5 passed")
116104
}
117105

118106
@Test
119107
@Order(6)
120108
fun addTagsTest() =
121109
runBlocking {
122110
addTopicTags(topicArn)
123-
println("Test 6 passed")
111+
logger.info("Test 6 passed")
124112
}
125113

126114
@Test
127115
@Order(7)
128116
fun listTagsTest() =
129117
runBlocking {
130118
listTopicTags(topicArn)
131-
println("Test 7 passed")
119+
logger.info("Test 7 passed")
132120
}
133121

134122
@Test
135123
@Order(8)
136124
fun deleteTagTest() =
137125
runBlocking {
138126
removeTag(topicArn, "Team")
139-
println("Test 8 passed")
127+
logger.info("Test 8 passed")
140128
}
141129

142130
@Test
143131
@Order(10)
144132
fun subEmailTest() =
145133
runBlocking {
146134
subEmail(topicArn, email)
147-
println("Test 10 passed")
135+
logger.info("Test 10 passed")
148136
}
149137

150138
@Test
151139
@Order(11)
152140
fun pubTopicTest() =
153141
runBlocking {
154142
pubTopic(topicArn, message)
155-
println("Test 11 passed")
143+
logger.info("Test 11 passed")
156144
}
157145

158146
@Test
159147
@Order(12)
160148
fun listSubsTest() =
161149
runBlocking {
162150
listSNSSubscriptions()
163-
println("Test 12 passed")
151+
logger.info("Test 12 passed")
164152
}
165153

166154
@Test
167155
@Order(13)
168156
fun subscribeTextSMSTest() =
169157
runBlocking {
170158
subTextSNS(topicArn, phone)
171-
println("Test 14 passed")
159+
logger.info("Test 14 passed")
172160
}
173161

174162
@Test
175163
@Order(15)
176164
fun deleteTopicTest() =
177165
runBlocking {
178166
deleteSNSTopic(topicArn)
179-
println("Test 15 passed")
167+
logger.info("Test 15 passed")
180168
}
181169

182170
private suspend fun getSecretValues(): String {
@@ -187,7 +175,6 @@ class SNSTest {
187175
}
188176
SecretsManagerClient {
189177
region = "us-east-1"
190-
credentialsProvider = EnvironmentCredentialsProvider()
191178
}.use { secretClient ->
192179
val valueResponse = secretClient.getSecretValue(valueRequest)
193180
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)