>From Michael Blow <[email protected]>: Michael Blow has submitted this change. ( https://asterix-gerrit.ics.uci.edu/c/asterixdb/+/18128 )
Change subject: [NO ISSUE][*DB][EXT] Update tests for AWS SDK upgrade ...................................................................... [NO ISSUE][*DB][EXT] Update tests for AWS SDK upgrade Change-Id: I219585077d9d4d7ec5aada0de2b9f219cf9ab83c Reviewed-on: https://asterix-gerrit.ics.uci.edu/c/asterixdb/+/18128 Reviewed-by: Michael Blow <[email protected]> Reviewed-by: Hussain Towaileb <[email protected]> Tested-by: Michael Blow <[email protected]> --- M asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/external-dataset/s3/parquet-temporary-access/parquet-temporary-access.00.ddl.sqlpp M asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/external-dataset/s3/anonymous_no_auth/test.000.ddl.sqlpp M asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/external-dataset/s3/anonymous_no_auth/test.001.ddl.sqlpp M asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/external-dataset/s3/parquet-anonymous-access/parquet-anonymous-access.00.ddl.sqlpp M asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/external-dataset/common/custom-buffer-size/external_dataset.000.ddl.sqlpp M asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/external-dataset/s3/anonymous_no_auth/test.002.ddl.sqlpp M asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/external-dataset/s3/non-s3-region/external_dataset.000.ddl.sqlpp M asterixdb/asterix-app/src/test/java/org/apache/asterix/test/common/TestConstants.java M asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/external-dataset/s3/create-with-session-token/test.000.ddl.sqlpp M asterixdb/asterix-app/src/test/java/org/apache/asterix/test/external_dataset/aws/AwsS3ExternalDatasetTest.java 10 files changed, 26 insertions(+), 13 deletions(-) Approvals: Michael Blow: Looks good to me, but someone else must approve; Verified Hussain Towaileb: Looks good to me, approved diff --git a/asterixdb/asterix-app/src/test/java/org/apache/asterix/test/common/TestConstants.java b/asterixdb/asterix-app/src/test/java/org/apache/asterix/test/common/TestConstants.java index f721aab..a2fbb37 100644 --- a/asterixdb/asterix-app/src/test/java/org/apache/asterix/test/common/TestConstants.java +++ b/asterixdb/asterix-app/src/test/java/org/apache/asterix/test/common/TestConstants.java @@ -27,7 +27,7 @@ public static final String S3_REGION_PLACEHOLDER = "%region%"; public static final String S3_REGION_DEFAULT = "us-west-2"; public static final String S3_SERVICE_ENDPOINT_PLACEHOLDER = "%serviceEndpoint%"; - public static final String S3_SERVICE_ENDPOINT_DEFAULT = "http://localhost:8001";; + public static final String S3_SERVICE_ENDPOINT_DEFAULT = "http://127.0.0.1:8001";; public static final String S3_TEMPLATE = "(\"accessKeyId\"=\"" + S3_ACCESS_KEY_ID_DEFAULT + "\"),\n" + "(\"secretAccessKey\"=\"" + S3_SECRET_ACCESS_KEY_DEFAULT + "\"),\n" + "(\"region\"=\"" + S3_REGION_PLACEHOLDER + "\"),\n" + "(\"serviceEndpoint\"=\"" + S3_SERVICE_ENDPOINT_PLACEHOLDER + "\")"; diff --git a/asterixdb/asterix-app/src/test/java/org/apache/asterix/test/external_dataset/aws/AwsS3ExternalDatasetTest.java b/asterixdb/asterix-app/src/test/java/org/apache/asterix/test/external_dataset/aws/AwsS3ExternalDatasetTest.java index 785e676..2971342 100644 --- a/asterixdb/asterix-app/src/test/java/org/apache/asterix/test/external_dataset/aws/AwsS3ExternalDatasetTest.java +++ b/asterixdb/asterix-app/src/test/java/org/apache/asterix/test/external_dataset/aws/AwsS3ExternalDatasetTest.java @@ -98,7 +98,7 @@ // Service endpoint private static final int MOCK_SERVER_PORT = 8001; - private static final String MOCK_SERVER_HOSTNAME = "http://localhost:"; + MOCK_SERVER_PORT; + private static final String MOCK_SERVER_HOSTNAME = "http://127.0.0.1:"; + MOCK_SERVER_PORT; // Region, bucket and definitions private static final String MOCK_SERVER_REGION = "us-west-2"; diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/external-dataset/common/custom-buffer-size/external_dataset.000.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/external-dataset/common/custom-buffer-size/external_dataset.000.ddl.sqlpp index 22a30ca..df7f788 100644 --- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/external-dataset/common/custom-buffer-size/external_dataset.000.ddl.sqlpp +++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/external-dataset/common/custom-buffer-size/external_dataset.000.ddl.sqlpp @@ -30,7 +30,7 @@ ("accessKeyId"="dummyAccessKey"), ("secretAccessKey"="dummySecretKey"), ("region"="us-west-2"), -("serviceEndpoint"="http://localhost:8001";), +("serviceEndpoint"="http://127.0.0.1:8001";), ("container"="playground"), ("definition"="json-data/reviews/single-line/json"), ("format"="json")); @@ -40,7 +40,7 @@ ("accessKeyId"="dummyAccessKey"), ("secretAccessKey"="dummySecretKey"), ("region"="us-west-2"), -("serviceEndpoint"="http://localhost:8001";), +("serviceEndpoint"="http://127.0.0.1:8001";), ("container"="playground"), ("definition"="json-data/reviews/multi-lines/json"), ("format"="json")); @@ -50,7 +50,7 @@ ("accessKeyId"="dummyAccessKey"), ("secretAccessKey"="dummySecretKey"), ("region"="us-west-2"), -("serviceEndpoint"="http://localhost:8001";), +("serviceEndpoint"="http://127.0.0.1:8001";), ("container"="playground"), ("definition"="json-data/reviews/multi-lines-with-arrays/json"), ("format"="json")); @@ -60,7 +60,7 @@ ("accessKeyId"="dummyAccessKey"), ("secretAccessKey"="dummySecretKey"), ("region"="us-west-2"), -("serviceEndpoint"="http://localhost:8001";), +("serviceEndpoint"="http://127.0.0.1:8001";), ("container"="playground"), ("definition"="json-data/reviews/multi-lines-with-nested-objects/json"), ("format"="json")); diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/external-dataset/s3/anonymous_no_auth/test.000.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/external-dataset/s3/anonymous_no_auth/test.000.ddl.sqlpp index 13cfe8a..5164086 100644 --- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/external-dataset/s3/anonymous_no_auth/test.000.ddl.sqlpp +++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/external-dataset/s3/anonymous_no_auth/test.000.ddl.sqlpp @@ -29,7 +29,7 @@ CREATE EXTERNAL DATASET test(test) USING S3 ( ("accessKeyId"="dummyAccessKey"), ("region"="us-west-2"), -("serviceEndpoint"="http://localhost:8001";), +("serviceEndpoint"="http://127.0.0.1:8001";), ("container"="playground"), ("definition"="json-data/reviews/single-line/json"), ("format"="json") diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/external-dataset/s3/anonymous_no_auth/test.001.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/external-dataset/s3/anonymous_no_auth/test.001.ddl.sqlpp index b8d0945..a46a43a 100644 --- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/external-dataset/s3/anonymous_no_auth/test.001.ddl.sqlpp +++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/external-dataset/s3/anonymous_no_auth/test.001.ddl.sqlpp @@ -29,7 +29,7 @@ CREATE EXTERNAL DATASET test(test) USING S3 ( ("secretAccessKey"="dummySecretKey"), ("region"="us-west-2"), -("serviceEndpoint"="http://localhost:8001";), +("serviceEndpoint"="http://127.0.0.1:8001";), ("container"="playground"), ("definition"="json-data/reviews/single-line/json"), ("format"="json") diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/external-dataset/s3/anonymous_no_auth/test.002.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/external-dataset/s3/anonymous_no_auth/test.002.ddl.sqlpp index 9eda057..23306e0 100644 --- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/external-dataset/s3/anonymous_no_auth/test.002.ddl.sqlpp +++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/external-dataset/s3/anonymous_no_auth/test.002.ddl.sqlpp @@ -28,7 +28,7 @@ drop dataset test if exists; CREATE EXTERNAL DATASET test(test) USING S3 ( ("region"="us-west-2"), -("serviceEndpoint"="http://localhost:8001";), +("serviceEndpoint"="http://127.0.0.1:8001";), ("container"="playground"), ("definition"="json-data"), ("format"="json") diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/external-dataset/s3/create-with-session-token/test.000.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/external-dataset/s3/create-with-session-token/test.000.ddl.sqlpp index 3d62e15..0a42978 100644 --- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/external-dataset/s3/create-with-session-token/test.000.ddl.sqlpp +++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/external-dataset/s3/create-with-session-token/test.000.ddl.sqlpp @@ -31,7 +31,7 @@ ("secretAccessKey"="dummySecretKey"), ("sessionToken"="dummySessionToken"), ("region"="us-west-2"), -("serviceEndpoint"="http://localhost:8001";), +("serviceEndpoint"="http://127.0.0.1:8001";), ("container"="playground"), ("definition"="json-data/reviews/single-line/json"), ("format"="json") diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/external-dataset/s3/non-s3-region/external_dataset.000.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/external-dataset/s3/non-s3-region/external_dataset.000.ddl.sqlpp index 4d0941d..1b91ae8 100644 --- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/external-dataset/s3/non-s3-region/external_dataset.000.ddl.sqlpp +++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/external-dataset/s3/non-s3-region/external_dataset.000.ddl.sqlpp @@ -34,7 +34,7 @@ ("accessKeyId"="dummyAccessKey"), ("secretAccessKey"="dummySecretKey"), ("region"="some-new-region"), - ("serviceEndpoint"="http://localhost:8001";), + ("serviceEndpoint"="http://127.0.0.1:8001";), ("container"="playground"), ("definition"="json-data/reviews/single-line/json"), ("format"="json") diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/external-dataset/s3/parquet-anonymous-access/parquet-anonymous-access.00.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/external-dataset/s3/parquet-anonymous-access/parquet-anonymous-access.00.ddl.sqlpp index 2337ac4..47167c2 100644 --- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/external-dataset/s3/parquet-anonymous-access/parquet-anonymous-access.00.ddl.sqlpp +++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/external-dataset/s3/parquet-anonymous-access/parquet-anonymous-access.00.ddl.sqlpp @@ -26,7 +26,7 @@ CREATE EXTERNAL DATASET ParquetDataset(ParquetType) USING S3 ( ("region"="us-west-2"), -("serviceEndpoint"="http://localhost:8001";), +("serviceEndpoint"="http://127.0.0.1:8001";), ("container"="playground"), ("definition"="parquet-data/reviews"), ("format"="parquet"), diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/external-dataset/s3/parquet-temporary-access/parquet-temporary-access.00.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/external-dataset/s3/parquet-temporary-access/parquet-temporary-access.00.ddl.sqlpp index 15ec56a..ddad7f0 100644 --- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/external-dataset/s3/parquet-temporary-access/parquet-temporary-access.00.ddl.sqlpp +++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/external-dataset/s3/parquet-temporary-access/parquet-temporary-access.00.ddl.sqlpp @@ -29,7 +29,7 @@ ("secretAccessKey"="dummySecretKey"), ("sessionToken"="dummySessionToken"), ("region"="us-west-2"), -("serviceEndpoint"="http://localhost:8001";), +("serviceEndpoint"="http://127.0.0.1:8001";), ("container"="playground"), ("definition"="parquet-data/reviews"), ("format"="parquet"), -- To view, visit https://asterix-gerrit.ics.uci.edu/c/asterixdb/+/18128 To unsubscribe, or for help writing mail filters, visit https://asterix-gerrit.ics.uci.edu/settings Gerrit-Project: asterixdb Gerrit-Branch: stabilization-667a908755 Gerrit-Change-Id: I219585077d9d4d7ec5aada0de2b9f219cf9ab83c Gerrit-Change-Number: 18128 Gerrit-PatchSet: 5 Gerrit-Owner: Michael Blow <[email protected]> Gerrit-Reviewer: Anon. E. Moose #1000171 Gerrit-Reviewer: Hussain Towaileb <[email protected]> Gerrit-Reviewer: Jenkins <[email protected]> Gerrit-Reviewer: Michael Blow <[email protected]> Gerrit-MessageType: merged
