Skip to content

Commit aa6ddf7

Browse files
committed
added logging functionality
1 parent c2b8705 commit aa6ddf7

File tree

3 files changed

+22
-16
lines changed

3 files changed

+22
-16
lines changed

kotlin/services/mediaconvert/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.0")
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/mediaconvert/src/test/kotlin/MCTest.kt

Lines changed: 9 additions & 16 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.mediaconvert.MediaConvertClient
65
import aws.sdk.kotlin.services.secretsmanager.SecretsManagerClient
76
import aws.sdk.kotlin.services.secretsmanager.model.GetSecretValueRequest
@@ -19,11 +18,14 @@ import org.junit.jupiter.api.Order
1918
import org.junit.jupiter.api.Test
2019
import org.junit.jupiter.api.TestInstance
2120
import org.junit.jupiter.api.TestMethodOrder
21+
import org.slf4j.Logger
22+
import org.slf4j.LoggerFactory
2223
import java.io.IOException
2324

2425
@TestInstance(TestInstance.Lifecycle.PER_CLASS)
2526
@TestMethodOrder(OrderAnnotation::class)
2627
class MCTest {
28+
private val logger: Logger = LoggerFactory.getLogger(MCTest::class.java)
2729
lateinit var mcClient: MediaConvertClient
2830
private var mcRoleARN = ""
2931
private var fileInput = ""
@@ -40,39 +42,31 @@ class MCTest {
4042
val values = gson.fromJson(json, SecretValues::class.java)
4143
mcRoleARN = values.mcRoleARN.toString()
4244
fileInput = values.fileInput.toString()
43-
/*
44-
45-
val input: InputStream = this.javaClass.getClassLoader().getResourceAsStream("config.properties")
46-
val prop = Properties()
47-
prop.load(input)
48-
mcRoleARN = prop.getProperty("mcRoleARN")
49-
fileInput = prop.getProperty("fileInput")
50-
*/
5145
}
5246

5347
@Test
54-
@Order(2)
48+
@Order(1)
5549
fun createJobTest() =
5650
runBlocking {
5751
jobId = createMediaJob(mcClient, mcRoleARN, fileInput).toString()
5852
assertTrue(!jobId.isEmpty()).toString()
59-
println("Test 2 passed")
53+
logger.info("Test 1 passed")
6054
}
6155

6256
@Test
63-
@Order(3)
57+
@Order(2)
6458
fun listJobsTest() =
6559
runBlocking {
6660
listCompleteJobs(mcClient)
67-
println("Test 3 passed")
61+
logger.info("Test 2 passed")
6862
}
6963

7064
@Test
71-
@Order(4)
65+
@Order(3)
7266
fun getJobTest() =
7367
runBlocking {
7468
getSpecificJob(mcClient, jobId)
75-
println("Test 4 passed")
69+
logger.info("Test 3 passed")
7670
}
7771

7872
private suspend fun getSecretValues(): String {
@@ -83,7 +77,6 @@ class MCTest {
8377
}
8478
SecretsManagerClient {
8579
region = "us-east-1"
86-
credentialsProvider = EnvironmentCredentialsProvider()
8780
}.use { secretClient ->
8881
val valueResponse = secretClient.getSecretValue(valueRequest)
8982
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)