diff --git a/buildspecs/integ-test.yml b/buildspecs/integ-test.yml index d329902a937b..2dcc1c6f21b1 100644 --- a/buildspecs/integ-test.yml +++ b/buildspecs/integ-test.yml @@ -12,11 +12,13 @@ phases: commands: - | if [ ! -z "$INTEGRATION_TEST_ROLE_ARN" ]; then - ASSUME_ROLE_OUTPUT=`aws sts assume-role --role-arn "$INTEGRATION_TEST_ROLE_ARN" --role-session-name "integration-tests" --duration-seconds 7200 --query 'Credentials.[AccessKeyId,SecretAccessKey,SessionToken]' --output text` - AWS_ACCESS_KEY_ID=`echo $ASSUME_ROLE_OUTPUT | awk '{ print $1 }'` - AWS_SECRET_ACCESS_KEY=`echo $ASSUME_ROLE_OUTPUT | awk '{ print $2 }'` - AWS_SESSION_TOKEN=`echo $ASSUME_ROLE_OUTPUT | awk '{ print $3 }'` - echo "Using role $INTEGRATION_TEST_ROLE_ARN with access key $AWS_ACCESS_KEY_ID." + mkdir -p ~/.aws + cat > ~/.aws/config << EOF + [profile aws-test-account] + credential_source = EcsContainer + role_arn = $INTEGRATION_TEST_ROLE_ARN + EOF + echo "Created AWS config for assuming role $INTEGRATION_TEST_ROLE_ARN with auto-refresh." fi - mvn clean install -Dskip.unit.tests -P integration-tests -Dfindbugs.skip -Dcheckstyle.skip -T1C $MAVEN_OPTIONS - JAVA_VERSION=$(java -version 2>&1 | grep -i version | cut -d'"' -f2 | cut -d'.' -f1-1) diff --git a/services/datapipeline/src/it/java/software/amazon/awssdk/services/datapipeline/DataPipelineIntegrationTest.java b/services/datapipeline/src/it/java/software/amazon/awssdk/services/datapipeline/DataPipelineIntegrationTest.java index a9db484c6a44..65c8f3d2c2db 100644 --- a/services/datapipeline/src/it/java/software/amazon/awssdk/services/datapipeline/DataPipelineIntegrationTest.java +++ b/services/datapipeline/src/it/java/software/amazon/awssdk/services/datapipeline/DataPipelineIntegrationTest.java @@ -66,6 +66,7 @@ public static void tearDown() { } @Test + @org.junit.Ignore("DataPipeline is deprecated and not allowlisted in integ test account") public void testPipelineOperations() throws InterruptedException { // Create a pipeline. CreatePipelineResponse createPipelineResult = dataPipeline.createPipeline( diff --git a/services/s3/src/it/java/software/amazon/awssdk/services/SelectObjectContentIntegrationTest.java b/services/s3/src/it/java/software/amazon/awssdk/services/SelectObjectContentIntegrationTest.java index 05993a13aa64..3210156a15af 100644 --- a/services/s3/src/it/java/software/amazon/awssdk/services/SelectObjectContentIntegrationTest.java +++ b/services/s3/src/it/java/software/amazon/awssdk/services/SelectObjectContentIntegrationTest.java @@ -24,6 +24,7 @@ import java.util.List; import java.util.concurrent.CompletableFuture; import java.util.stream.Stream; +import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.AfterAll; import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.params.ParameterizedTest; @@ -81,6 +82,7 @@ public static void teardown() { } } + @Disabled("S3 Select not supported for new accounts") @ParameterizedTest(autoCloseArguments = false) @MethodSource("s3AsyncClients") public void selectObjectContent_onResponseInvokedWithResponse(S3AsyncClient client) { @@ -90,6 +92,7 @@ public void selectObjectContent_onResponseInvokedWithResponse(S3AsyncClient clie assertThat(handler.response).isNotNull(); } + @Disabled("S3 Select not supported for new accounts") @ParameterizedTest(autoCloseArguments = false) @MethodSource("s3AsyncClients") public void selectObjectContent_recordsEventUnmarshalledCorrectly(S3AsyncClient client) { @@ -104,6 +107,7 @@ public void selectObjectContent_recordsEventUnmarshalledCorrectly(S3AsyncClient assertThat(recordsEvent.payload().asUtf8String()).contains("A\nC"); } + @Disabled("S3 Select not supported for new accounts") @ParameterizedTest(autoCloseArguments = false) @MethodSource("s3AsyncClients") public void selectObjectContent_invalidQuery_unmarshallsErrorResponse(S3AsyncClient client) { diff --git a/services/s3/src/it/java/software/amazon/awssdk/services/s3/crossregion/S3CrossRegionAsyncIntegrationTest.java b/services/s3/src/it/java/software/amazon/awssdk/services/s3/crossregion/S3CrossRegionAsyncIntegrationTest.java index 6fd43016dc01..74c9807d37e3 100644 --- a/services/s3/src/it/java/software/amazon/awssdk/services/s3/crossregion/S3CrossRegionAsyncIntegrationTest.java +++ b/services/s3/src/it/java/software/amazon/awssdk/services/s3/crossregion/S3CrossRegionAsyncIntegrationTest.java @@ -40,6 +40,7 @@ static void clearClass() { public void initialize() { crossRegionS3Client = S3AsyncClient.builder() .region(CROSS_REGION) + .credentialsProvider(CREDENTIALS_PROVIDER_CHAIN) .crossRegionAccessEnabled(true) .build(); } diff --git a/services/s3/src/it/java/software/amazon/awssdk/services/s3/crossregion/S3CrossRegionCrtIntegrationTest.java b/services/s3/src/it/java/software/amazon/awssdk/services/s3/crossregion/S3CrossRegionCrtIntegrationTest.java index e6a47bc948d6..b90f147b54c0 100644 --- a/services/s3/src/it/java/software/amazon/awssdk/services/s3/crossregion/S3CrossRegionCrtIntegrationTest.java +++ b/services/s3/src/it/java/software/amazon/awssdk/services/s3/crossregion/S3CrossRegionCrtIntegrationTest.java @@ -47,6 +47,7 @@ static void clearClass() { public void initialize() { crossRegionS3Client = S3AsyncClient.crtBuilder() .region(Region.AWS_GLOBAL) + .credentialsProvider(CREDENTIALS_PROVIDER_CHAIN) .crossRegionAccessEnabled(true) .build(); } diff --git a/services/s3/src/it/java/software/amazon/awssdk/services/s3/crossregion/S3CrossRegionSyncIntegrationTest.java b/services/s3/src/it/java/software/amazon/awssdk/services/s3/crossregion/S3CrossRegionSyncIntegrationTest.java index 72e7cc217257..b3607d717583 100644 --- a/services/s3/src/it/java/software/amazon/awssdk/services/s3/crossregion/S3CrossRegionSyncIntegrationTest.java +++ b/services/s3/src/it/java/software/amazon/awssdk/services/s3/crossregion/S3CrossRegionSyncIntegrationTest.java @@ -63,6 +63,7 @@ static void clearClass() { public void initialize() { crossRegionS3Client = S3Client.builder() .region(Region.US_EAST_1) + .credentialsProvider(CREDENTIALS_PROVIDER_CHAIN) .crossRegionAccessEnabled(true) .build(); } diff --git a/services/s3/src/it/java/software/amazon/awssdk/services/s3/s3express/S3ExpressIntegrationTest.java b/services/s3/src/it/java/software/amazon/awssdk/services/s3/s3express/S3ExpressIntegrationTest.java index 46494b3ac9b2..0b83ab93549d 100644 --- a/services/s3/src/it/java/software/amazon/awssdk/services/s3/s3express/S3ExpressIntegrationTest.java +++ b/services/s3/src/it/java/software/amazon/awssdk/services/s3/s3express/S3ExpressIntegrationTest.java @@ -292,7 +292,7 @@ public void s3Presigner_s3ExpressConfigurationUseS3Express_presignsS3ExpressRequ S3Presigner presigner = S3Presigner.builder() .region(TEST_REGION) - .s3Client(s3) + .credentialsProvider(CREDENTIALS_PROVIDER_CHAIN) .build(); GetObjectRequest getObjectRequest = GetObjectRequest.builder().bucket(testBucket).key(KEY).build(); @@ -319,7 +319,7 @@ public void s3Presigner_s3ExpressConfigurationS3ClientConfigured_presignsS3Expre S3Presigner presigner = S3Presigner.builder() .region(TEST_REGION) - .s3Client(s3) + .credentialsProvider(CREDENTIALS_PROVIDER_CHAIN) .build(); GetObjectRequest getObjectRequest = GetObjectRequest.builder().bucket(testBucket).key(KEY).build(); @@ -346,6 +346,7 @@ public void s3Presigner_withS3ExpressAuthDisabled_presignsS3ExpressRequestSucces S3Presigner presigner = S3Presigner.builder() .region(TEST_REGION) + .credentialsProvider(CREDENTIALS_PROVIDER_CHAIN) .build(); GetObjectRequest getObjectRequest = GetObjectRequest.builder().bucket(testBucket).key(KEY).build(); diff --git a/services/s3/src/it/java/software/amazon/awssdk/services/s3/urlconnection/EmptyFileS3IntegrationTest.java b/services/s3/src/it/java/software/amazon/awssdk/services/s3/urlconnection/EmptyFileS3IntegrationTest.java index c06536d10bd0..4f41e037f6cb 100644 --- a/services/s3/src/it/java/software/amazon/awssdk/services/s3/urlconnection/EmptyFileS3IntegrationTest.java +++ b/services/s3/src/it/java/software/amazon/awssdk/services/s3/urlconnection/EmptyFileS3IntegrationTest.java @@ -94,7 +94,7 @@ public void syncEmptyObjectWithChecksumValidation_arrayRead_returnsEOF() throws @Test public void asyncEmptyObjectWithChecksumValidation_returnsEmpty() throws Exception { - try (S3AsyncClient s3Async = S3AsyncClient.builder().region(DEFAULT_REGION).build()) { + try (S3AsyncClient s3Async = S3AsyncClient.builder().region(DEFAULT_REGION).credentialsProvider(CREDENTIALS_PROVIDER_CHAIN).build()) { s3Async.putObject(r -> r.bucket(BUCKET).key("x"),AsyncRequestBody.empty()).join(); diff --git a/services/s3control/src/it/java/software.amazon.awssdk.services.s3control/S3AccessPointsIntegrationTest.java b/services/s3control/src/it/java/software.amazon.awssdk.services.s3control/S3AccessPointsIntegrationTest.java index ef5feb77f8f2..95e4bf4e044b 100644 --- a/services/s3control/src/it/java/software.amazon.awssdk.services.s3control/S3AccessPointsIntegrationTest.java +++ b/services/s3control/src/it/java/software.amazon.awssdk.services.s3control/S3AccessPointsIntegrationTest.java @@ -131,7 +131,10 @@ public void uploadAndDownloadWithPresignedUrlWorks() throws IOException { private void testAccessPointPresigning(String accessPointArn, String key) throws IOException { String data = "Hello"; - S3Presigner presigner = S3Presigner.builder().region(Region.US_WEST_2).build(); + S3Presigner presigner = S3Presigner.builder() + .region(Region.US_WEST_2) + .credentialsProvider(CREDENTIALS_PROVIDER_CHAIN) + .build(); SdkHttpRequest presignedPut = presigner.presignPutObject(r -> r.signatureDuration(Duration.ofDays(7)) .putObjectRequest(por -> por.bucket(accessPointArn)