Skip to content

Commit bf20d31

Browse files
committed
added logging functionality
1 parent 04ff2fe commit bf20d31

File tree

3 files changed

+32
-67
lines changed

3 files changed

+32
-67
lines changed

kotlin/services/rds/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.1")
3636
testImplementation("org.junit.jupiter:junit-jupiter:5.9.2")
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/rds/src/test/kotlin/RDSTest.kt

Lines changed: 19 additions & 67 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,8 @@ import org.junit.jupiter.api.Order
3232
import org.junit.jupiter.api.Test
3333
import org.junit.jupiter.api.TestInstance
3434
import org.junit.jupiter.api.TestMethodOrder
35+
import org.slf4j.Logger
36+
import org.slf4j.LoggerFactory
3537
import java.util.Random
3638
import java.util.UUID
3739

@@ -42,6 +44,7 @@ import java.util.UUID
4244
@TestInstance(TestInstance.Lifecycle.PER_CLASS)
4345
@TestMethodOrder(OrderAnnotation::class)
4446
class RDSTest {
47+
private val logger: Logger = LoggerFactory.getLogger(RDSTest::class.java)
4548
private var dbInstanceIdentifier = ""
4649
private var dbSnapshotIdentifier = ""
4750
private var dbName = ""
@@ -75,116 +78,76 @@ class RDSTest {
7578
dbInstanceIdentifierSc = values.dbInstanceIdentifierSc + UUID.randomUUID()
7679
dbSnapshotIdentifierSc = values.dbSnapshotIdentifierSc + UUID.randomUUID()
7780
dbNameSc = values.dbNameSc + randomNum
78-
79-
// Uncomment this code block if you prefer using a config.properties file to retrieve AWS values required for these tests.
80-
81-
/*
82-
val input: InputStream = this.javaClass.getClassLoader().getResourceAsStream("config.properties")
83-
val prop = Properties()
84-
85-
// Load the properties file.
86-
prop.load(input)
87-
dbInstanceIdentifier = prop.getProperty("dbInstanceIdentifier")
88-
dbSnapshotIdentifier = prop.getProperty("dbSnapshotIdentifier")
89-
dbName = prop.getProperty("dbName")
90-
masterUsername = prop.getProperty("masterUsername")
91-
masterUserPassword = prop.getProperty("masterUserPassword")
92-
newMasterUserPassword = prop.getProperty("newMasterUserPassword")
93-
dbGroupNameSc = prop.getProperty("dbGroupNameSc")
94-
dbParameterGroupFamilySc = prop.getProperty("dbParameterGroupFamilySc")
95-
dbInstanceIdentifierSc = prop.getProperty("dbInstanceIdentifierSc")
96-
masterUsernameSc = prop.getProperty("masterUsernameSc")
97-
masterUserPasswordSc = prop.getProperty("masterUserPasswordSc")
98-
dbSnapshotIdentifierSc = prop.getProperty("dbSnapshotIdentifierSc")
99-
dbNameSc = prop.getProperty("dbNameSc")
100-
*/
10181
}
10282

10383
@Test
104-
@Order(2)
84+
@Order(1)
10585
fun createDBInstanceTest() =
10686
runBlocking {
10787
createDatabaseInstance(dbInstanceIdentifier, dbName, masterUsername, masterUserPassword)
108-
println("Test 2 passed")
88+
logger.info("Test 1 passed")
10989
}
11090

11191
@Test
112-
@Order(3)
92+
@Order(2)
11393
fun waitForInstanceReadyTest() =
11494
runBlocking {
11595
waitForInstanceReady(dbInstanceIdentifier)
116-
println("Test 3 passed")
96+
logger.info("Test 2 passed")
11797
}
11898

11999
@Test
120-
@Order(4)
100+
@Order(3)
121101
fun describeAccountAttributesTest() =
122102
runBlocking {
123103
getAccountAttributes()
124-
println("Test 4 passed")
104+
logger.info("Test 3 passed")
125105
}
126106

127107
@Test
128-
@Order(5)
108+
@Order(4)
129109
fun describeDBInstancesTest() =
130110
runBlocking {
131111
describeInstances()
132-
println("Test 5 passed")
112+
logger.info("Test 4 passed")
133113
}
134114

135115
@Test
136-
@Order(6)
116+
@Order(5)
137117
fun modifyDBInstanceTest() =
138118
runBlocking {
139119
updateIntance(dbInstanceIdentifier, newMasterUserPassword)
140-
println("Test 6 passed")
120+
logger.info("Test 5 passed")
141121
}
142122

143123
@Test
144-
@Order(7)
124+
@Order(6)
145125
fun createDBSnapshotTest() =
146126
runBlocking {
147127
createSnapshot(dbInstanceIdentifier, dbSnapshotIdentifier)
148-
println("Test 7 passed")
128+
logger.info("Test 6 passed")
149129
}
150130

151131
@Test
152-
@Order(8)
132+
@Order(7)
153133
fun deleteDBInstanceTest() =
154134
runBlocking {
155135
deleteDatabaseInstance(dbInstanceIdentifier)
156-
println("Test 8 passed")
136+
logger.info("Test 7 passed")
157137
}
158138

159139
@Test
160-
@Order(9)
140+
@Order(8)
161141
fun scenarioTest() =
162142
runBlocking {
163-
println("1. Return a list of the available DB engines")
164143
describeDBEngines()
165-
166-
println("2. Create a custom parameter group")
167144
createDBParameterGroup(dbGroupNameSc, dbParameterGroupFamilySc)
168-
169-
println("3. Get the parameter groups")
170145
describeDbParameterGroups(dbGroupNameSc)
171-
172-
println("4. Get the parameters in the group")
173146
describeDbParameters(dbGroupNameSc, 0)
174-
175-
println("5. Modify the auto_increment_offset parameter")
176147
modifyDBParas(dbGroupNameSc)
177-
178-
println("6. Display the updated value")
179148
describeDbParameters(dbGroupNameSc, -1)
180-
181-
println("7. Get a list of allowed engine versions")
182149
getAllowedEngines(dbParameterGroupFamilySc)
183-
184-
println("8. Get a list of micro instance classes available for the selected engine")
185150
getMicroInstances()
186-
187-
println("9. Create an RDS database instance that contains a MySql database and uses the parameter group")
188151
val dbARN =
189152
createDatabaseInstance(
190153
dbGroupNameSc,
@@ -193,25 +156,14 @@ class RDSTest {
193156
masterUsername,
194157
masterUserPassword,
195158
)
196-
println("The ARN of the new database is $dbARN")
197-
198-
println("10. Wait for DB instance to be ready")
199159
waitForDbInstanceReady(dbInstanceIdentifierSc)
200-
201-
println("11. Create a snapshot of the DB instance")
202160
createDbSnapshot(dbInstanceIdentifierSc, dbSnapshotIdentifierSc)
203-
204-
println("12. Wait for DB snapshot to be ready")
205161
waitForSnapshotReady(dbInstanceIdentifierSc, dbSnapshotIdentifierSc)
206-
207-
println("13. Delete the DB instance")
208162
deleteDbInstance(dbInstanceIdentifierSc)
209-
210-
println("14. Delete the parameter group")
211163
if (dbARN != null) {
212164
deleteParaGroup(dbGroupNameSc, dbARN)
213165
}
214-
println("The Scenario has successfully completed.")
166+
logger.info("Test 8 passed.")
215167
}
216168

217169
suspend fun getSecretValues(): String? {
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)