Skip to content

Commit 6adf634

Browse files
committed
added logging functionality
1 parent aa5de04 commit 6adf634

File tree

3 files changed

+27
-41
lines changed

3 files changed

+27
-41
lines changed

kotlin/services/cognito/build.gradle.kts

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,8 @@ dependencies {
3636
testImplementation("org.junit.jupiter:junit-jupiter:5.9.2")
3737
implementation("com.google.code.gson:gson:2.10")
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/cognito/src/test/kotlin/CognitoKotlinTest.kt

Lines changed: 14 additions & 41 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
@@ -25,11 +24,14 @@ import org.junit.jupiter.api.Order
2524
import org.junit.jupiter.api.Test
2625
import org.junit.jupiter.api.TestInstance
2726
import org.junit.jupiter.api.TestMethodOrder
27+
import org.slf4j.Logger
28+
import org.slf4j.LoggerFactory
2829
import java.util.UUID
2930

3031
@TestInstance(TestInstance.Lifecycle.PER_CLASS)
3132
@TestMethodOrder(OrderAnnotation::class)
3233
class CognitoKotlinTest {
34+
private val logger: Logger = LoggerFactory.getLogger(CognitoKotlinTest::class.java)
3335
private var userPoolName = ""
3436
private var identityId = ""
3537
private var userPoolId = "" // set in test 2
@@ -77,34 +79,6 @@ class CognitoKotlinTest {
7779
userNameMVP = values.userNameMVP.toString()
7880
passwordMVP = values.passwordMVP.toString()
7981
emailMVP = values.emailMVP.toString()
80-
81-
// Uncomment this code block if you prefer using a config.properties file to retrieve AWS values required for these tests.
82-
/*
83-
// load the properties file.
84-
val input: InputStream = this.javaClass.getClassLoader().getResourceAsStream("config.properties")
85-
val prop = Properties()
86-
prop.load(input)
87-
userPoolName = prop.getProperty("userPoolName")
88-
identityId = prop.getProperty("identityId")
89-
username = prop.getProperty("username")
90-
email = prop.getProperty("email")
91-
clientName = prop.getProperty("clientName")
92-
identityPoolName = prop.getProperty("identityPoolName")
93-
appId = prop.getProperty("appId")
94-
existingUserPoolId = prop.getProperty("existingUserPoolId")
95-
existingIdentityPoolId = prop.getProperty("existingIdentityPoolId")
96-
providerName = prop.getProperty("providerName")
97-
existingPoolName = prop.getProperty("existingPoolName")
98-
clientId = prop.getProperty("clientId")
99-
secretkey = prop.getProperty("secretkey")
100-
password = prop.getProperty("password")
101-
poolIdMVP = prop.getProperty("poolIdMVP")
102-
clientIdMVP = prop.getProperty("clientIdMVP")
103-
userNameMVP = prop.getProperty("userNameMVP")
104-
passwordMVP = prop.getProperty("passwordMVP")
105-
emailMVP = prop.getProperty("emailMVP")
106-
107-
*/
10882
}
10983

11084
@Test
@@ -113,55 +87,55 @@ class CognitoKotlinTest {
11387
runBlocking {
11488
userPoolId = createPool(userPoolName).toString()
11589
Assertions.assertTrue(!userPoolId.isEmpty())
116-
println("Test 1 passed")
90+
logger.info("Test 1 passed")
11791
}
11892

11993
@Test
12094
@Order(2)
12195
fun createAdminUserTest() =
12296
runBlocking {
12397
createNewUser(userPoolId, username, email, password)
124-
println("Test 2 passed")
98+
logger.info("Test 2 passed")
12599
}
126100

127101
@Test
128102
@Order(3)
129103
fun listUserPoolsTest() =
130104
runBlocking {
131105
getAllPools()
132-
println("Test 3 passed")
106+
logger.info("Test 3 passed")
133107
}
134108

135109
@Test
136110
@Order(4)
137111
fun listUserPoolClientsTest() =
138112
runBlocking {
139113
listAllUserPoolClients(existingUserPoolId)
140-
println("Test 4 passed")
114+
logger.info("Test 4 passed")
141115
}
142116

143117
@Test
144118
@Order(5)
145119
fun listUsersTest() =
146120
runBlocking {
147121
listAllUserPoolClients(existingUserPoolId)
148-
println("Test 5 passed")
122+
logger.info("Test 5 passed")
149123
}
150124

151125
@Test
152126
@Order(6)
153127
fun describeUserPoolTest() =
154128
runBlocking {
155129
describePool(existingUserPoolId)
156-
println("Test 6 passed")
130+
logger.info("Test 6 passed")
157131
}
158132

159133
@Test
160134
@Order(7)
161135
fun deleteUserPool() =
162136
runBlocking {
163137
delPool(userPoolId)
164-
println("Test 7 passed")
138+
logger.info("Test 7 passed")
165139
}
166140

167141
@Test
@@ -170,38 +144,37 @@ class CognitoKotlinTest {
170144
runBlocking {
171145
identityPoolId = createIdPool(identityPoolName).toString()
172146
Assertions.assertTrue(!identityPoolId.isEmpty())
173-
println("Test 8 passed")
147+
logger.info("Test 8 passed")
174148
}
175149

176150
@Test
177151
@Order(9)
178152
fun listIdentityProvidersTest() =
179153
runBlocking {
180154
getPools()
181-
println("Test 9 passed")
155+
logger.info("Test 9 passed")
182156
}
183157

184158
@Test
185159
@Order(10)
186160
fun listIdentitiesTest() =
187161
runBlocking {
188162
listPoolIdentities(identityPoolId)
189-
println("Test 10 passed")
163+
logger.info("Test 10 passed")
190164
}
191165

192166
@Test
193167
@Order(11)
194168
fun deleteIdentityPool() =
195169
runBlocking {
196170
deleteIdPool(identityPoolId)
197-
println("Test 11 passed")
171+
logger.info("Test 11 passed")
198172
}
199173

200174
private suspend fun getSecretValues(): String {
201175
val secretClient =
202176
SecretsManagerClient {
203177
region = "us-east-1"
204-
credentialsProvider = EnvironmentCredentialsProvider()
205178
}
206179
val secretName = "test/cognito"
207180
val valueRequest =
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)