Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix(storage): Upgrade SDK to fix EOF exception #2558

Merged
merged 3 commits into from
Aug 15, 2023
Merged

fix(storage): Upgrade SDK to fix EOF exception #2558

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
593dd8b
fix(storage): Upgrade SDK to fix EOF exception
sdhuka Aug 11, 2023
4c9c0cd
fix compile errors
sdhuka Aug 14, 2023
acdf05f
add slf4j dependency
sdhuka Aug 15, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions aws-api/src/main/java/com/amplifyframework/api/aws/sigv4/AWS4Signer.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@

package com.amplifyframework.api.aws.sigv4

import aws.smithy.kotlin.runtime.InternalApi
import aws.smithy.kotlin.runtime.auth.awscredentials.CredentialsProvider
import aws.smithy.kotlin.runtime.auth.awssigning.AwsSignedBodyHeader
import aws.smithy.kotlin.runtime.auth.awssigning.AwsSigningConfig
Expand All @@ -32,6 +33,7 @@ abstract class AWS4Signer(private val regionName: String) {
/**
* Async signing
*/
@OptIn(InternalApi::class)
suspend fun sign(
httpRequest: HttpRequest,
credentialsProvider: CredentialsProvider,
Expand All @@ -50,6 +52,7 @@ abstract class AWS4Signer(private val regionName: String) {
/**
* Sign synchronously
*/
@OptIn(InternalApi::class)
fun signBlocking(
httpRequest: HttpRequest,
credentialsProvider: CredentialsProvider,
Expand Down
2 changes: 2 additions & 0 deletions ...in/java/com/amplifyframework/logging/cloudwatch/DefaultRemoteLoggingConstraintProvider.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@
*/
package com.amplifyframework.logging.cloudwatch

import aws.smithy.kotlin.runtime.InternalApi
import aws.smithy.kotlin.runtime.auth.awscredentials.CredentialsProvider
import aws.smithy.kotlin.runtime.auth.awssigning.AwsSigningConfig
import aws.smithy.kotlin.runtime.auth.awssigning.DefaultAwsSigner
Expand Down Expand Up @@ -54,6 +55,7 @@ class DefaultRemoteLoggingConstraintProvider @JvmOverloads constructor(
explicitNulls = false
}

@OptIn(InternalApi::class)
override fun fetchLoggingConfig(onSuccess: Consumer<LoggingConstraints>, onError: Consumer<Exception>) {
coroutineScope.launch {
try {
Expand Down
4 changes: 3 additions & 1 deletion ...apter/src/main/java/com/amplifyframework/geo/maplibre/http/AWSRequestSignerInterceptor.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@

package com.amplifyframework.geo.maplibre.http

import aws.smithy.kotlin.runtime.InternalApi
import aws.smithy.kotlin.runtime.auth.awssigning.AwsSigningConfig
import aws.smithy.kotlin.runtime.auth.awssigning.DefaultAwsSigner
import aws.smithy.kotlin.runtime.http.Headers as AwsHeaders
Expand Down Expand Up @@ -93,6 +94,7 @@ internal class AWSRequestSignerInterceptor(
return this.url(urlBuilder.build())
}

@OptIn(InternalApi::class)
@Throws(SignCredentialsException::class)
private suspend fun signRequest(request: Request): HttpRequest {
val url = request.url
Expand All @@ -119,7 +121,7 @@ internal class AWSRequestSignerInterceptor(
url.queryParameterNames.map { name ->
url.queryParameter(name)?.let { append(name, it) }
}
},
}
)

val bodyBytes: ByteArray = getBytes(request.body)
Expand Down
6 changes: 3 additions & 3 deletions settings.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,8 +94,8 @@ dependencyResolutionManagement {
/* When updating kotlin sdk or kotlin smithy,
ensure compatible versions used in aws-sdk-kotlin root gradle.properties
*/
version(awsKotlinSdk, "0.28.0-beta") // ensure proper awsSmithyKotlin version also set
version(awsSmithyKotlin, "0.22.0") // ensure proper awsKotlinSdk version also set
version(awsKotlinSdk, "0.29.1-beta") // ensure proper awsSmithyKotlin version also set
version(awsSmithyKotlin, "0.25.0") // ensure proper awsKotlinSdk version also set

library("aws-credentials", "aws.smithy.kotlin", "aws-credentials").versionRef(awsSmithyKotlin)
library("aws-signing", "aws.smithy.kotlin", "aws-signing-default").versionRef(awsSmithyKotlin)
Expand All @@ -104,7 +104,7 @@ dependencyResolutionManagement {
library(
"aws-cognitoidentityprovider",
"aws.sdk.kotlin",
"cognitoidentityprovider",
"cognitoidentityprovider"
).versionRef(awsKotlinSdk)
library("aws-comprehend", "aws.sdk.kotlin", "comprehend").versionRef(awsKotlinSdk)
library("aws-location", "aws.sdk.kotlin", "location").versionRef(awsKotlinSdk)
Expand Down
Loading