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

Support @ServiceConnection endpoint attribute for S3Presigner #1310

Open
wants to merge 2 commits into
base: main
Choose a base branch
from
Open

Support @ServiceConnection endpoint attribute for S3Presigner #1310

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2990492
Support `@ServiceConnection` endpoint attribute for `S3Presigner`
kunalvarpe Dec 21, 2024
b68f9a9
Fix failing test
kunalvarpe Dec 23, 2024
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
9 changes: 3 additions & 6 deletions ...s-autoconfigure/src/main/java/io/awspring/cloud/autoconfigure/s3/S3AutoConfiguration.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -110,12 +110,9 @@ S3Presigner s3Presigner(S3Properties properties, AwsProperties awsProperties,
.credentialsProvider(credentialsProvider).region(AwsClientBuilderConfigurer.resolveRegion(properties,
connectionDetails.getIfAvailable(), regionProvider));

if (properties.getEndpoint() != null) {
builder.endpointOverride(properties.getEndpoint());
}
else if (awsProperties.getEndpoint() != null) {
builder.endpointOverride(awsProperties.getEndpoint());
}
Optional.ofNullable(properties.getEndpoint()).ifPresent(builder::endpointOverride);
Optional.ofNullable(awsProperties.getEndpoint()).ifPresent(builder::endpointOverride);
Optional.ofNullable(connectionDetails.getIfAvailable()).map(AwsConnectionDetails::getEndpoint).ifPresent(builder::endpointOverride);
Optional.ofNullable(awsProperties.getFipsEnabled()).ifPresent(builder::fipsEnabled);
Optional.ofNullable(awsProperties.getDualstackEnabled()).ifPresent(builder::dualstackEnabled);
return builder.build();
Expand Down
13 changes: 13 additions & 0 deletions .../test/java/io/awspring/cloud/testcontainers/AwsContainerConnectionDetailsFactoryTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@
import io.awspring.cloud.autoconfigure.ses.SesAutoConfiguration;
import io.awspring.cloud.autoconfigure.sns.SnsAutoConfiguration;
import io.awspring.cloud.autoconfigure.sqs.SqsAutoConfiguration;
import org.junit.jupiter.api.Disabled;
import org.junit.jupiter.api.Test;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.autoconfigure.ImportAutoConfiguration;
Expand All @@ -40,10 +41,14 @@
import org.testcontainers.utility.DockerImageName;
import software.amazon.awssdk.services.dynamodb.DynamoDbClient;
import software.amazon.awssdk.services.s3.S3Client;
import software.amazon.awssdk.services.s3.presigner.S3Presigner;
import software.amazon.awssdk.services.s3.presigner.model.GetObjectPresignRequest;
import software.amazon.awssdk.services.ses.SesClient;
import software.amazon.awssdk.services.sns.SnsClient;
import software.amazon.awssdk.services.sqs.SqsAsyncClient;

import java.time.Duration;

@SpringJUnitConfig
@Testcontainers(disabledWithoutDocker = true)
class AwsContainerConnectionDetailsFactoryTest {
Expand Down Expand Up @@ -88,6 +93,14 @@ void configuresS3ClientWithServiceConnection(@Autowired S3Client client) {
assertThatCode(client::listBuckets).doesNotThrowAnyException();
}

@Test
@Disabled
void configuresS3PresignerWithServiceConnection(@Autowired S3Presigner s3Presigner) {
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@maciejwalkowiak @MatejNedic
I have disabled this test because I am uncertain how to verify that the S3Presigner correctly references the endpoint property from the ServiceConnection. I noticed that most client tests simply call one of the basic methods and ensure that the call does not result in an exception.

In this case, I attempted to use the presignGetObject method for verification. However, this method requires several parameters to be set up, and it might also necessitate configuring an S3 bucket prior to running the test. This has left me uncertain whether my approach is correct. I would appreciate your opinion or guidance on how to proceed with this.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@maciejwalkowiak @MatejNedic @tomazfernandes
I have fixed the test, please let me know if I have validated test correctly.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@maciejwalkowiak @MatejNedic @tomazfernandes
Is there any way to retry the pipeline, because the test which is failing in the CI process is passing locally.

assertThatCode(() -> s3Presigner.presignGetObject(req1 -> req1.signatureDuration(Duration.ofSeconds(2))
.getObjectRequest(req2 -> req2.bucket("my-bucket").build())))
.doesNotThrowAnyException();
}

@Configuration(proxyBeanMethods = false)
@ImportAutoConfiguration({ AwsAutoConfiguration.class, CredentialsProviderAutoConfiguration.class,
RegionProviderAutoConfiguration.class, DynamoDbAutoConfiguration.class, SesAutoConfiguration.class,
Expand Down
Loading