This is an automated email from the ASF dual-hosted git repository. mblow pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/asterixdb.git
commit 3d6cbcc845387e494bfd55d6d9c42208c950afa5 Author: Michael Blow <[email protected]> AuthorDate: Wed Jan 17 14:31:09 2024 -0500 [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]> --- .../test/java/org/apache/asterix/test/common/TestConstants.java | 2 +- .../test/external_dataset/aws/AwsS3ExternalDatasetTest.java | 2 +- .../common/custom-buffer-size/external_dataset.000.ddl.sqlpp | 8 ++++---- .../external-dataset/s3/anonymous_no_auth/test.000.ddl.sqlpp | 2 +- .../external-dataset/s3/anonymous_no_auth/test.001.ddl.sqlpp | 2 +- .../external-dataset/s3/anonymous_no_auth/test.002.ddl.sqlpp | 2 +- .../s3/create-with-session-token/test.000.ddl.sqlpp | 2 +- .../s3/non-s3-region/external_dataset.000.ddl.sqlpp | 2 +- .../parquet-anonymous-access.00.ddl.sqlpp | 2 +- .../parquet-temporary-access.00.ddl.sqlpp | 2 +- 10 files changed, 13 insertions(+), 13 deletions(-) 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 f721aabe5f..a2fbb37a9c 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 class TestConstants { 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 785e67632e..2971342850 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 @@ public class AwsS3ExternalDatasetTest { // 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 22a30ca4c7..df7f788f39 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 @@ create external dataset test1(test) using S3 ( ("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 @@ create external dataset test2(test) using S3 ( ("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 @@ create external dataset test3(test) using S3 ( ("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 @@ create external dataset test4(test) using S3 ( ("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 13cfe8aa90..51640866af 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 @@ drop dataset test if exists; 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 b8d0945d1b..a46a43a059 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 @@ drop dataset test if exists; 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 9eda057c36..23306e05ea 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 @@ create type test as open { 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 3d62e1547f..0a4297823e 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 @@ CREATE EXTERNAL DATASET test(test) USING S3 ( ("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 4d0941da4b..1b91ae828c 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 @@ create external dataset test(test) using S3 ( ("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 2337ac4440..47167c29a2 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 TYPE ParquetType AS { 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 15ec56abf0..ddad7f02a4 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 @@ CREATE EXTERNAL DATASET ParquetDataset(ParquetType) USING S3 ( ("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"),
