Skip to content

Commit da7bc56

Browse files
committed
Fix header contains check for Lambda-Runtime-Aws-Request-Id since .contains() directly on Ktor headers doesn't work
Remove extra printlns
1 parent 8f95d79 commit da7bc56

File tree

2 files changed

+7
-2
lines changed

2 files changed

+7
-2
lines changed

src/commonMain/kotlin/com/batchofcode/lambdaruntime/client/CommonAwsRuntimeClient.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ package com.batchofcode.lambdaruntime.client
22

33
import com.batchofcode.lambdaruntime.client.exception.BadRequestException
44
import com.batchofcode.lambdaruntime.handler.InvocationRequest
5+
import com.batchofcode.lambdaruntime.util.containsKey
56
import com.batchofcode.lambdaruntime.util.fromMap
67
import io.ktor.client.HttpClient
78
import io.ktor.client.request.post
@@ -24,14 +25,13 @@ class CommonAwsRuntimeClient(private val client: HttpClient) {
2425
}
2526

2627
suspend fun processRequests(client: HttpClient, handler: (InvocationRequest) -> String) {
27-
println("Requesting invocation from http://${EnvironmentConfiguration.lambdaRuntimeApi}/2018-06-01/runtime/invocation/next")
2828
val invocationHttpRequest =
2929
client.request<HttpResponse>{
3030
url("http://${EnvironmentConfiguration.lambdaRuntimeApi}/2018-06-01/runtime/invocation/next")
3131
method = HttpMethod.Get
3232
}
3333
try {
34-
if (!invocationHttpRequest.headers.contains("Lambda-Runtime-Aws-Request-Id")) {
34+
if (!invocationHttpRequest.headers.containsKey("Lambda-Runtime-Aws-Request-Id")) {
3535
return
3636
}
3737
val invocationRequest = RequestMapper.mapRequest(invocationHttpRequest)
Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,15 @@
11
package com.batchofcode.lambdaruntime.util
22

3+
import io.ktor.http.Headers
34
import io.ktor.http.HeadersBuilder
45

56
fun HeadersBuilder.fromMap(headers: Map<String, String>) {
67
this.clear()
78
headers.forEach {
89
this.append(it.key, it.value)
910
}
11+
}
12+
13+
fun Headers.containsKey(key: String): Boolean {
14+
return this.entries().any { it.key == key }
1015
}

0 commit comments

Comments
 (0)