@@ -22,10 +22,13 @@ import org.junit.jupiter.api.Order
2222import org.junit.jupiter.api.Test
2323import org.junit.jupiter.api.TestInstance
2424import org.junit.jupiter.api.TestMethodOrder
25+ import org.slf4j.Logger
26+ import org.slf4j.LoggerFactory
2527
2628@TestInstance(TestInstance .Lifecycle .PER_CLASS )
2729@TestMethodOrder(OrderAnnotation ::class )
2830class CloudtrailKotlinTest {
31+ private val logger: Logger = LoggerFactory .getLogger(CloudtrailKotlinTest ::class .java)
2932 private var trailName = " "
3033 private var s3BucketName = " "
3134
@@ -37,57 +40,46 @@ class CloudtrailKotlinTest {
3740 val values: SecretValues = gson.fromJson<SecretValues >(json, SecretValues ::class .java)
3841 trailName = values.trailName.toString()
3942 s3BucketName = values.s3BucketName.toString()
40-
41- // Uncomment this code block if you prefer using a config.properties file to retrieve AWS values required for these tests.
42- /*
43- val input: InputStream = this.javaClass.getClassLoader().getResourceAsStream("config.properties")
44- val prop = Properties()
45-
46- // load the properties file.
47- prop.load(input)
48- trailName = prop.getProperty("trailName")
49- s3BucketName = prop.getProperty("s3BucketName")
50- */
5143 }
5244
5345 @Test
5446 @Order(1 )
5547 fun createTrail () =
5648 runBlocking {
5749 createNewTrail(trailName, s3BucketName)
58- println (" Test 1 passed" )
50+ logger.info (" Test 1 passed" )
5951 }
6052
6153 @Test
6254 @Order(2 )
6355 fun putEventSelectors () =
6456 runBlocking {
6557 setSelector(trailName)
66- println (" Test 2 passed" )
58+ logger.info (" Test 2 passed" )
6759 }
6860
6961 @Test
7062 @Order(3 )
7163 fun getEventSelectors () =
7264 runBlocking {
7365 getSelectors(trailName)
74- println (" Test 3 passed" )
66+ logger.info (" Test 3 passed" )
7567 }
7668
7769 @Test
7870 @Order(4 )
7971 fun lookupEvents () =
8072 runBlocking {
8173 lookupAllEvents()
82- println (" Test 4 passed" )
74+ logger.info (" Test 4 passed" )
8375 }
8476
8577 @Test
8678 @Order(5 )
8779 fun describeTrails () =
8880 runBlocking {
8981 describeSpecificTrails(trailName)
90- println (" Test 5 passed" )
82+ logger.info (" Test 5 passed" )
9183 }
9284
9385 @Test
@@ -96,15 +88,15 @@ class CloudtrailKotlinTest {
9688 runBlocking {
9789 startLog(trailName)
9890 stopLog(trailName)
99- println (" Test 6 passed" )
91+ logger.info (" Test 6 passed" )
10092 }
10193
10294 @Test
10395 @Order(7 )
10496 fun deleteTrail () =
10597 runBlocking {
10698 deleteSpecificTrail(trailName)
107- println (" Test 7 passed" )
99+ logger.info (" Test 7 passed" )
108100 }
109101
110102 private suspend fun getSecretValues (): String {
@@ -115,7 +107,6 @@ class CloudtrailKotlinTest {
115107 }
116108 SecretsManagerClient {
117109 region = " us-east-1"
118- credentialsProvider = EnvironmentCredentialsProvider ()
119110 }.use { secretClient ->
120111 val valueResponse = secretClient.getSecretValue(valueRequest)
121112 return valueResponse.secretString.toString()
0 commit comments