Skip to content

Commit 466e9d2

Browse files
AWSChrisAWSChris
authored
Merge branch 'main' into bedrock-invoke-flow-action
2 parents b8f6f51 + cc62d01 commit 466e9d2

File tree

147 files changed

+1114
-1133
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

147 files changed

+1114
-1133
lines changed

‎kotlin/services/apigateway/build.gradle.kts‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,8 @@ dependencies {
3636
implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.6.4")
3737
implementation("com.fasterxml.jackson.core:jackson-databind:2.14.2")
3838
implementation("com.google.code.gson:gson:2.10")
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/apigateway/src/test/kotlin/APIGatewayTest.kt‎

Lines changed: 7 additions & 22 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.apigateway.ApiGatewayClient
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.util.Random
2324

2425
@TestInstance(TestInstance.Lifecycle.PER_CLASS)
2526
@TestMethodOrder(OrderAnnotation::class)
2627
class APIGatewayTest {
28+
private val logger: Logger = LoggerFactory.getLogger(APIGatewayTest::class.java)
2729
lateinit var apiGatewayClient: ApiGatewayClient
2830
private var restApiId = ""
2931
private var httpMethod = ""
@@ -34,7 +36,6 @@ class APIGatewayTest {
3436
@BeforeAll
3537
fun setup() = runBlocking {
3638
apiGatewayClient = ApiGatewayClient { region = "us-east-1" }
37-
// Get values from AWS Secrets Manager.
3839
val random = Random()
3940
val randomNum = random.nextInt(10000 - 1 + 1) + 1
4041
val gson = Gson()
@@ -44,49 +45,34 @@ class APIGatewayTest {
4445
httpMethod = values.httpMethod.toString()
4546
restApiName = values.restApiName.toString() + randomNum
4647
stageName = values.stageName.toString()
47-
48-
/*
49-
val input: InputStream = this.javaClass.getClassLoader().getResourceAsStream("config.properties")
50-
val prop = Properties()
51-
52-
// load the properties file.
53-
prop.load(input)
54-
55-
// Populate the data members required for all tests
56-
restApiId = prop.getProperty("restApiId")
57-
resourceId = prop.getProperty("resourceId")
58-
httpMethod = prop.getProperty("httpMethod")
59-
restApiName = prop.getProperty("restApiName")
60-
stageName = prop.getProperty("stageName")
61-
*/
6248
}
6349

6450
@Test
6551
@Order(1)
6652
fun createRestApiTest() = runBlocking {
6753
newApiId = createAPI(restApiId).toString()
68-
println("Test 2 passed")
54+
logger.info("Test 1 passed")
6955
}
7056

7157
@Test
7258
@Order(2)
7359
fun getDeploymentsTest() = runBlocking {
7460
getAllDeployments(newApiId)
75-
println("Test 4 passed")
61+
logger.info("Test 2 passed")
7662
}
7763

7864
@Test
7965
@Order(3)
8066
fun getAllStagesTest() = runBlocking {
8167
getAllStages(newApiId)
82-
println("Test 5 passed")
68+
logger.info("Test 3 passed")
8369
}
8470

8571
@Test
8672
@Order(4)
8773
fun deleteRestApi() = runBlocking {
8874
deleteAPI(newApiId)
89-
println("Test 6 passed")
75+
logger.info("Test 4 passed")
9076
}
9177

9278
private suspend fun getSecretValues(): String {
@@ -96,7 +82,6 @@ class APIGatewayTest {
9682
}
9783
SecretsManagerClient {
9884
region = "us-east-1"
99-
credentialsProvider = EnvironmentCredentialsProvider()
10085
}.use { secretClient ->
10186
val valueResponse = secretClient.getSecretValue(valueRequest)
10287
return valueResponse.secretString.toString()

‎kotlin/services/apigateway/src/test/resources/logback.xml‎

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>

‎kotlin/services/appsync/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/appsync/src/test/kotlin/AppSyncTest.kt‎

Lines changed: 10 additions & 20 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.example.appsync.createDS
@@ -21,10 +20,13 @@ import org.junit.jupiter.api.Order
2120
import org.junit.jupiter.api.Test
2221
import org.junit.jupiter.api.TestInstance
2322
import org.junit.jupiter.api.TestMethodOrder
23+
import org.slf4j.Logger
24+
import org.slf4j.LoggerFactory
2425

2526
@TestInstance(TestInstance.Lifecycle.PER_CLASS)
2627
@TestMethodOrder(OrderAnnotation::class)
2728
class AppSyncTest {
29+
private val logger: Logger = LoggerFactory.getLogger(AppSyncTest::class.java)
2830
private var apiId = ""
2931
private var dsName = ""
3032
private var dsRole = ""
@@ -42,17 +44,6 @@ class AppSyncTest {
4244
dsName = values.dsName.toString()
4345
dsRole = values.dsRole.toString()
4446
tableName = values.tableName.toString()
45-
46-
// Uncomment this code block if you prefer using a config.properties file to retrieve AWS values required for these tests.
47-
/*
48-
val input: InputStream = this.javaClass.getClassLoader().getResourceAsStream("config.properties")
49-
val prop = Properties()
50-
prop.load(input)
51-
apiId = prop.getProperty("apiId")
52-
dsName = prop.getProperty("dsName")
53-
dsRole = prop.getProperty("dsRole")
54-
tableName = prop.getProperty("tableName")
55-
*/
5647
}
5748

5849
@Test
@@ -61,7 +52,7 @@ class AppSyncTest {
6152
runBlocking {
6253
keyId = createKey(apiId).toString()
6354
assertTrue(!keyId.isEmpty())
64-
println("Test 1 passed")
55+
logger.info("Test 1 passed")
6556
}
6657

6758
@Test
@@ -72,47 +63,47 @@ class AppSyncTest {
7263
if (dsARN != null) {
7364
assertTrue(dsARN.isNotEmpty())
7465
}
75-
println("Test 2 passed")
66+
logger.info("Test 2 passed")
7667
}
7768

7869
@Test
7970
@Order(3)
8071
fun getDataSource() =
8172
runBlocking {
8273
getDS(apiId, dsName)
83-
println("Test 3 passed")
74+
logger.info("Test 3 passed")
8475
}
8576

8677
@Test
8778
@Order(4)
8879
fun listGraphqlApis() =
8980
runBlocking {
9081
getKeys(apiId)
91-
println("Test 4 passed")
82+
logger.info("Test 4 passed")
9283
}
9384

9485
@Test
9586
@Order(5)
9687
fun listApiKeys() =
9788
runBlocking {
9889
getKeys(apiId)
99-
println("Test 5 passed")
90+
logger.info("Test 5 passed")
10091
}
10192

10293
@Test
10394
@Order(6)
10495
fun deleteDataSource() =
10596
runBlocking {
10697
deleteDS(apiId, dsName)
107-
println("Test 6 passed")
98+
logger.info("Test 6 passed")
10899
}
109100

110101
@Test
111102
@Order(7)
112103
fun deleteApiKey() =
113104
runBlocking {
114105
deleteKey(keyId, apiId)
115-
println("Test 7 passed")
106+
logger.info("Test 7 passed")
116107
}
117108

118109
private suspend fun getSecretValues(): String {
@@ -123,7 +114,6 @@ class AppSyncTest {
123114
}
124115
SecretsManagerClient {
125116
region = "us-east-1"
126-
credentialsProvider = EnvironmentCredentialsProvider()
127117
}.use { secretClient ->
128118
val valueResponse = secretClient.getSecretValue(valueRequest)
129119
return valueResponse.secretString.toString()

‎kotlin/services/appsync/src/test/resources/logback.xml‎

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>

‎kotlin/services/athena/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")
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/athena/src/test/kotlin/AthenaTest.kt‎

Lines changed: 8 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22
// SPDX-License-Identifier: Apache-2.0
33
// SPDX-License-Identifier: Apache-2.0
44

5-
import aws.sdk.kotlin.runtime.auth.credentials.EnvironmentCredentialsProvider
65
import aws.sdk.kotlin.services.secretsmanager.SecretsManagerClient
76
import aws.sdk.kotlin.services.secretsmanager.model.GetSecretValueRequest
87
import com.google.gson.Gson
@@ -23,10 +22,13 @@ import org.junit.jupiter.api.Order
2322
import org.junit.jupiter.api.Test
2423
import org.junit.jupiter.api.TestInstance
2524
import org.junit.jupiter.api.TestMethodOrder
25+
import org.slf4j.Logger
26+
import org.slf4j.LoggerFactory
2627

2728
@TestInstance(TestInstance.Lifecycle.PER_CLASS)
2829
@TestMethodOrder(OrderAnnotation::class)
2930
class AthenaTest {
31+
private val logger: Logger = LoggerFactory.getLogger(AthenaTest::class.java)
3032
private var nameQuery: String? = null
3133
private var queryString: String? = null
3234
private var database: String? = null
@@ -43,39 +45,28 @@ class AthenaTest {
4345
queryString = values.queryString.toString()
4446
database = values.database.toString()
4547
outputLocation = values.outputLocation.toString()
46-
47-
// Uncomment this code block if you prefer using a config.properties file to retrieve AWS values required for these tests.
48-
/*
49-
val input: InputStream = this.javaClass.getClassLoader().getResourceAsStream("config.properties")
50-
val prop = Properties()
51-
prop.load(input)
52-
nameQuery = prop.getProperty("nameQuery")
53-
queryString = prop.getProperty("queryString")
54-
database = prop.getProperty("database")
55-
outputLocation = prop.getProperty("outputLocation")
56-
*/
5748
}
5849

5950
@Test
6051
@Order(1)
6152
fun createNamedQueryTest() = runBlocking {
6253
queryId = createNamedQuery(queryString.toString(), nameQuery.toString(), database.toString())
6354
queryId?.let { assertTrue(it.isNotEmpty()) }
64-
println("Test 1 passed")
55+
logger.info("Test 1 passed")
6556
}
6657

6758
@Test
6859
@Order(2)
6960
fun listNamedQueryTest() = runBlocking {
7061
listNamedQueries()
71-
println("Test 2 passed")
62+
logger.info("Test 2 passed")
7263
}
7364

7465
@Test
7566
@Order(3)
7667
fun listQueryExecutionsTest() = runBlocking {
7768
listQueryIds()
78-
println("Test 3 passed")
69+
logger.info("Test 3 passed")
7970
}
8071

8172
@Test
@@ -84,14 +75,14 @@ class AthenaTest {
8475
val queryExecutionId = submitAthenaQuery(queryString.toString(), database.toString(), outputLocation.toString())
8576
waitForQueryToComplete(queryExecutionId)
8677
processResultRows(queryExecutionId)
87-
println("Test 4 passed")
78+
logger.info("Test 4 passed")
8879
}
8980

9081
@Test
9182
@Order(5)
9283
fun deleteNamedQueryTest() = runBlocking {
9384
deleteQueryName(queryId)
94-
println("Test 5 passed")
85+
logger.info("Test 5 passed")
9586
}
9687

9788
private suspend fun getSecretValues(): String {
@@ -101,7 +92,6 @@ class AthenaTest {
10192
}
10293
SecretsManagerClient {
10394
region = "us-east-1"
104-
credentialsProvider = EnvironmentCredentialsProvider()
10595
}.use { secretClient ->
10696
val valueResponse = secretClient.getSecretValue(valueRequest)
10797
return valueResponse.secretString.toString()

‎kotlin/services/athena/src/test/resources/logback.xml‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
<configuration>
2+
<appender name="Console" class="ch.qos.logback.core.ConsoleAppender">
3+
<encoder>
4+
<pattern>%level %logger{36} - %msg%n</pattern>
5+
</encoder>
6+
</appender>
7+
8+
<root level="info">
9+
<appender-ref ref="Console"/>
10+
</root>
11+
</configuration>

‎kotlin/services/cloudformation/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")
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"

0 commit comments

Comments
 (0)