Skip to content

Commit c23384f

Browse files
committed
added logging functionality
1 parent d2b8258 commit c23384f

File tree

3 files changed

+29
-31
lines changed

3 files changed

+29
-31
lines changed

kotlin/services/iam/build.gradle.kts

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,8 @@ dependencies {
3838
implementation("com.googlecode.json-simple:json-simple:1.1.1")
3939
testImplementation("org.junit.jupiter:junit-jupiter:5.9.2")
4040
implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.6.4")
41+
implementation("org.slf4j:slf4j-api:2.0.15")
42+
implementation("org.slf4j:slf4j-simple:2.0.15")
4143
}
4244
tasks.withType<KotlinCompile> {
4345
kotlinOptions.jvmTarget = "17"

kotlin/services/iam/src/test/kotlin/IAMTest.kt

Lines changed: 16 additions & 31 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,11 +27,14 @@ import org.junit.jupiter.api.Order
2827
import org.junit.jupiter.api.Test
2928
import org.junit.jupiter.api.TestInstance
3029
import org.junit.jupiter.api.TestMethodOrder
30+
import org.slf4j.Logger
31+
import org.slf4j.LoggerFactory
3132
import kotlin.random.Random
3233

3334
@TestInstance(TestInstance.Lifecycle.PER_CLASS)
3435
@TestMethodOrder(OrderAnnotation::class)
3536
class IAMTest {
37+
private val logger: Logger = LoggerFactory.getLogger(IAMTest::class.java)
3638
private var userName = ""
3739
private var policyName = ""
3840
private var roleName = ""
@@ -64,22 +66,6 @@ class IAMTest {
6466
roleSessionName = values.roleName.toString()
6567
fileLocationSc = values.fileLocationSc.toString()
6668
bucketNameSc = values.bucketNameSc.toString()
67-
68-
/*
69-
val input: InputStream = this.javaClass.getClassLoader().getResourceAsStream("config.properties")
70-
val prop = Properties()
71-
prop.load(input)
72-
userName = prop.getProperty("userName")
73-
policyName = prop.getProperty("policyName")
74-
roleName = prop.getProperty("roleName")
75-
accountAlias = prop.getProperty("accountAlias")
76-
policyNameSc = prop.getProperty("policyNameSc")
77-
usernameSc = prop.getProperty("usernameSc")
78-
roleNameSc = prop.getProperty("roleNameSc")
79-
roleSessionName = prop.getProperty("roleSessionName")
80-
fileLocationSc = prop.getProperty("fileLocationSc")
81-
bucketNameSc = prop.getProperty("bucketNameSc")
82-
*/
8369
}
8470

8571
@Test
@@ -90,7 +76,7 @@ class IAMTest {
9076
if (result != null) {
9177
Assertions.assertTrue(!result.isEmpty())
9278
}
93-
println("Test 1 passed")
79+
logger.info("Test 1 passed")
9480
}
9581

9682
@Test
@@ -99,7 +85,7 @@ class IAMTest {
9985
runBlocking {
10086
policyARN = createIAMPolicy(policyName)
10187
Assertions.assertTrue(!policyARN.isEmpty())
102-
println("Test 2 passed")
88+
logger.info("Test 2 passed")
10389
}
10490

10591
@Test
@@ -108,87 +94,87 @@ class IAMTest {
10894
runBlocking {
10995
keyId = createIAMAccessKey(userName)
11096
Assertions.assertTrue(!keyId.isEmpty())
111-
println("Test 3 passed")
97+
logger.info("Test 3 passed")
11298
}
11399

114100
@Test
115101
@Order(4)
116102
fun attachRolePolicyTest() =
117103
runBlocking {
118104
attachIAMRolePolicy(roleName, policyARN)
119-
println("Test 4 passed")
105+
logger.info("Test 4 passed")
120106
}
121107

122108
@Test
123109
@Order(5)
124110
fun detachRolePolicyTest() =
125111
runBlocking {
126112
detachPolicy(roleName, policyARN)
127-
println("Test 5 passed")
113+
logger.info("Test 5 passed")
128114
}
129115

130116
@Test
131117
@Order(6)
132118
fun getPolicyTest() =
133119
runBlocking {
134120
getIAMPolicy(policyARN)
135-
println("Test 6 passed")
121+
logger.info("Test 6 passed")
136122
}
137123

138124
@Test
139125
@Order(7)
140126
fun listAccessKeysTest() =
141127
runBlocking {
142128
listKeys(userName)
143-
println("Test 7 passed")
129+
logger.info("Test 7 passed")
144130
}
145131

146132
@Test
147133
@Order(8)
148134
fun listUsersTest() =
149135
runBlocking {
150136
listAllUsers()
151-
println("Test 8 passed")
137+
logger.info("Test 8 passed")
152138
}
153139

154140
@Test
155141
@Order(9)
156142
fun createAccountAliasTest() =
157143
runBlocking {
158144
createIAMAccountAlias(accountAlias)
159-
println("Test 9 passed")
145+
logger.info("Test 9 passed")
160146
}
161147

162148
@Test
163149
@Order(10)
164150
fun deleteAccountAliasTest() =
165151
runBlocking {
166152
deleteIAMAccountAlias(accountAlias)
167-
println("Test 10 passed")
153+
logger.info("Test 10 passed")
168154
}
169155

170156
@Test
171157
@Order(11)
172158
fun deletePolicyTest() =
173159
runBlocking {
174160
deleteIAMPolicy(policyARN)
175-
println("Test 11 passed")
161+
logger.info("Test 11 passed")
176162
}
177163

178164
@Test
179165
@Order(12)
180166
fun deleteAccessKeyTest() =
181167
runBlocking {
182168
deleteKey(userName, keyId)
183-
println("Test 12 passed")
169+
logger.info("Test 12 passed")
184170
}
185171

186172
@Test
187173
@Order(13)
188174
fun deleteUserTest() =
189175
runBlocking {
190176
deleteIAMUser(userName)
191-
println("Test 13 passed")
177+
logger.info("Test 13 passed")
192178
}
193179

194180
private suspend fun getSecretValues(): String {
@@ -199,7 +185,6 @@ class IAMTest {
199185
}
200186
SecretsManagerClient {
201187
region = "us-east-1"
202-
credentialsProvider = EnvironmentCredentialsProvider()
203188
}.use { secretClient ->
204189
val valueResponse = secretClient.getSecretValue(valueRequest)
205190
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)