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 410b6c8492d4d4052b338fa2f5a558c3e77d829d Author: Michael Blow <[email protected]> AuthorDate: Thu May 7 16:01:59 2020 -0400 [NO ISSUE][EXT] align credential parameters with aws terminology Change-Id: I277e32af64af032aff1761d2a15e8d0886cac157 Reviewed-on: https://asterix-gerrit.ics.uci.edu/c/asterixdb/+/6225 Integration-Tests: Jenkins <[email protected]> Tested-by: Jenkins <[email protected]> Reviewed-by: Michael Blow <[email protected]> Reviewed-by: Till Westmann <[email protected]> --- .../aws/s3/csv-header/query-dataset.001.ddl.sqlpp | 4 ++-- .../aws/s3/csv-no-header/query-dataset.001.ddl.sqlpp | 4 ++-- .../aws/s3/csv-warnings/query-dataset.002.ddl.sqlpp | 4 ++-- .../aws/s3/csv-warnings/query-dataset.007.ddl.sqlpp | 4 ++-- .../aws/s3/csv-warnings/query-dataset.010.ddl.sqlpp | 4 ++-- .../aws/s3/csv-warnings/query-dataset.012.ddl.sqlpp | 4 ++-- .../aws/s3/csv/csv/query-dataset.000.ddl.sqlpp | 4 ++-- .../aws/s3/csv/gz/query-dataset.000.ddl.sqlpp | 4 ++-- .../aws/s3/csv/mixed/query-dataset.000.ddl.sqlpp | 4 ++-- .../external_dataset.000.ddl.sqlpp | 4 ++-- .../aws/s3/json/gz/external_dataset.000.ddl.sqlpp | 16 ++++++++-------- .../aws/s3/json/json/external_dataset.000.ddl.sqlpp | 16 ++++++++-------- .../aws/s3/json/mixed/external_dataset.000.ddl.sqlpp | 16 ++++++++-------- .../aws/s3/jsonl/query-dataset.001.ddl.sqlpp | 4 ++-- .../aws/s3/negative/negative.000.ddl.sqlpp | 4 ++-- .../aws/s3/tsv-header/query-dataset.001.ddl.sqlpp | 4 ++-- .../aws/s3/tsv-no-header/query-dataset.001.ddl.sqlpp | 4 ++-- .../aws/s3/tsv-warnings/query-dataset.002.ddl.sqlpp | 4 ++-- .../aws/s3/tsv/gz/query-dataset.000.ddl.sqlpp | 4 ++-- .../aws/s3/tsv/mixed/query-dataset.000.ddl.sqlpp | 4 ++-- .../aws/s3/tsv/tsv/query-dataset.000.ddl.sqlpp | 4 ++-- .../input/record/reader/aws/AwsS3InputStream.java | 6 +++--- .../input/record/reader/aws/AwsS3InputStreamFactory.java | 6 +++--- .../asterix/external/util/ExternalDataConstants.java | 7 +++++-- 24 files changed, 71 insertions(+), 68 deletions(-) diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/external-dataset/aws/s3/csv-header/query-dataset.001.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/external-dataset/aws/s3/csv-header/query-dataset.001.ddl.sqlpp index 4830d68..54022fc 100644 --- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/external-dataset/aws/s3/csv-header/query-dataset.001.ddl.sqlpp +++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/external-dataset/aws/s3/csv-header/query-dataset.001.ddl.sqlpp @@ -26,8 +26,8 @@ CREATE TYPE t1 AS {f1: int, f2: int, f3: int, f4: string}; DROP DATASET ds1 IF EXISTS; CREATE EXTERNAL DATASET ds1(t1) USING S3 ( -("accessKey"="dummyAccessKey"), -("secretKey"="dummySecretKey"), +("accessKeyId"="dummyAccessKey"), +("secretAccessKey"="dummySecretKey"), ("region"="us-west-2"), ("serviceEndpoint"="http://localhost:8001";), ("container"="playground"), diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/external-dataset/aws/s3/csv-no-header/query-dataset.001.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/external-dataset/aws/s3/csv-no-header/query-dataset.001.ddl.sqlpp index 191ddff..9adec32 100644 --- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/external-dataset/aws/s3/csv-no-header/query-dataset.001.ddl.sqlpp +++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/external-dataset/aws/s3/csv-no-header/query-dataset.001.ddl.sqlpp @@ -26,8 +26,8 @@ CREATE TYPE t1 AS {f1: int, f2: int, f3: int, f4: string}; DROP DATASET ds1 IF EXISTS; CREATE EXTERNAL DATASET ds1(t1) USING S3 ( -("accessKey"="dummyAccessKey"), -("secretKey"="dummySecretKey"), +("accessKeyId"="dummyAccessKey"), +("secretAccessKey"="dummySecretKey"), ("region"="us-west-2"), ("serviceEndpoint"="http://localhost:8001";), ("container"="playground"), diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/external-dataset/aws/s3/csv-warnings/query-dataset.002.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/external-dataset/aws/s3/csv-warnings/query-dataset.002.ddl.sqlpp index 0eff4c8..f7c5c61 100644 --- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/external-dataset/aws/s3/csv-warnings/query-dataset.002.ddl.sqlpp +++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/external-dataset/aws/s3/csv-warnings/query-dataset.002.ddl.sqlpp @@ -28,8 +28,8 @@ CREATE TYPE t2 AS {f1: bigint, f2: bigint?, f3: double, f4: double?, f5: string, DROP DATASET ds1 IF EXISTS; CREATE EXTERNAL DATASET ds1(t1) USING S3 ( -("accessKey"="dummyAccessKey"), -("secretKey"="dummySecretKey"), +("accessKeyId"="dummyAccessKey"), +("secretAccessKey"="dummySecretKey"), ("region"="us-west-2"), ("serviceEndpoint"="http://localhost:8001";), ("container"="playground"), diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/external-dataset/aws/s3/csv-warnings/query-dataset.007.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/external-dataset/aws/s3/csv-warnings/query-dataset.007.ddl.sqlpp index cbfe44d..047a540 100644 --- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/external-dataset/aws/s3/csv-warnings/query-dataset.007.ddl.sqlpp +++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/external-dataset/aws/s3/csv-warnings/query-dataset.007.ddl.sqlpp @@ -21,8 +21,8 @@ USE test; DROP DATASET ds1 IF EXISTS; CREATE EXTERNAL DATASET ds1(t1) USING S3 ( -("accessKey"="dummyAccessKey"), -("secretKey"="dummySecretKey"), +("accessKeyId"="dummyAccessKey"), +("secretAccessKey"="dummySecretKey"), ("region"="us-west-2"), ("serviceEndpoint"="http://localhost:8001";), ("container"="playground"), diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/external-dataset/aws/s3/csv-warnings/query-dataset.010.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/external-dataset/aws/s3/csv-warnings/query-dataset.010.ddl.sqlpp index bd87ccb..575d46f 100644 --- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/external-dataset/aws/s3/csv-warnings/query-dataset.010.ddl.sqlpp +++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/external-dataset/aws/s3/csv-warnings/query-dataset.010.ddl.sqlpp @@ -21,8 +21,8 @@ USE test; DROP DATASET ds2 IF EXISTS; CREATE EXTERNAL DATASET ds2(t2) USING S3 ( -("accessKey"="dummyAccessKey"), -("secretKey"="dummySecretKey"), +("accessKeyId"="dummyAccessKey"), +("secretAccessKey"="dummySecretKey"), ("region"="us-west-2"), ("serviceEndpoint"="http://localhost:8001";), ("container"="playground"), diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/external-dataset/aws/s3/csv-warnings/query-dataset.012.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/external-dataset/aws/s3/csv-warnings/query-dataset.012.ddl.sqlpp index e394f2d..4148939 100644 --- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/external-dataset/aws/s3/csv-warnings/query-dataset.012.ddl.sqlpp +++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/external-dataset/aws/s3/csv-warnings/query-dataset.012.ddl.sqlpp @@ -21,8 +21,8 @@ USE test; DROP DATASET ds2 IF EXISTS; CREATE EXTERNAL DATASET ds2(t2) USING S3 ( -("accessKey"="dummyAccessKey"), -("secretKey"="dummySecretKey"), +("accessKeyId"="dummyAccessKey"), +("secretAccessKey"="dummySecretKey"), ("region"="us-west-2"), ("serviceEndpoint"="http://localhost:8001";), ("container"="playground"), diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/external-dataset/aws/s3/csv/csv/query-dataset.000.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/external-dataset/aws/s3/csv/csv/query-dataset.000.ddl.sqlpp index 5929d2d..54e0dc4 100644 --- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/external-dataset/aws/s3/csv/csv/query-dataset.000.ddl.sqlpp +++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/external-dataset/aws/s3/csv/csv/query-dataset.000.ddl.sqlpp @@ -26,8 +26,8 @@ CREATE TYPE test AS {id: int, year: int?, review: string, details: string?}; DROP DATASET test IF EXISTS; CREATE EXTERNAL DATASET test(test) USING S3 ( -("accessKey"="dummyAccessKey"), -("secretKey"="dummySecretKey"), +("accessKeyId"="dummyAccessKey"), +("secretAccessKey"="dummySecretKey"), ("region"="us-west-2"), ("serviceEndpoint"="http://localhost:8001";), ("container"="playground"), diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/external-dataset/aws/s3/csv/gz/query-dataset.000.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/external-dataset/aws/s3/csv/gz/query-dataset.000.ddl.sqlpp index 9683b18..413987d 100644 --- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/external-dataset/aws/s3/csv/gz/query-dataset.000.ddl.sqlpp +++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/external-dataset/aws/s3/csv/gz/query-dataset.000.ddl.sqlpp @@ -26,8 +26,8 @@ CREATE TYPE test AS {id: int, year: int?, review: string, details: string?}; DROP DATASET test IF EXISTS; CREATE EXTERNAL DATASET test(test) USING S3 ( -("accessKey"="dummyAccessKey"), -("secretKey"="dummySecretKey"), +("accessKeyId"="dummyAccessKey"), +("secretAccessKey"="dummySecretKey"), ("region"="us-west-2"), ("serviceEndpoint"="http://localhost:8001";), ("container"="playground"), diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/external-dataset/aws/s3/csv/mixed/query-dataset.000.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/external-dataset/aws/s3/csv/mixed/query-dataset.000.ddl.sqlpp index 7fe8fda..3ed6a3d 100644 --- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/external-dataset/aws/s3/csv/mixed/query-dataset.000.ddl.sqlpp +++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/external-dataset/aws/s3/csv/mixed/query-dataset.000.ddl.sqlpp @@ -26,8 +26,8 @@ CREATE TYPE test AS {id: int, year: int?, review: string, details: string?}; DROP DATASET test IF EXISTS; CREATE EXTERNAL DATASET test(test) USING S3 ( -("accessKey"="dummyAccessKey"), -("secretKey"="dummySecretKey"), +("accessKeyId"="dummyAccessKey"), +("secretAccessKey"="dummySecretKey"), ("region"="us-west-2"), ("serviceEndpoint"="http://localhost:8001";), ("container"="playground"), diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/external-dataset/aws/s3/empty-string-definition/external_dataset.000.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/external-dataset/aws/s3/empty-string-definition/external_dataset.000.ddl.sqlpp index 115967d..bb95094 100644 --- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/external-dataset/aws/s3/empty-string-definition/external_dataset.000.ddl.sqlpp +++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/external-dataset/aws/s3/empty-string-definition/external_dataset.000.ddl.sqlpp @@ -27,8 +27,8 @@ create type test as open { drop dataset test if exists; create external dataset test(test) using S3 ( -("accessKey"="dummyAccessKey"), -("secretKey"="dummySecretKey"), +("accessKeyId"="dummyAccessKey"), +("secretAccessKey"="dummySecretKey"), ("region"="us-west-2"), ("serviceEndpoint"="http://localhost:8001";), ("container"="fixed-data-bucket"), diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/external-dataset/aws/s3/json/gz/external_dataset.000.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/external-dataset/aws/s3/json/gz/external_dataset.000.ddl.sqlpp index b5b2c48..bd6c7ca 100644 --- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/external-dataset/aws/s3/json/gz/external_dataset.000.ddl.sqlpp +++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/external-dataset/aws/s3/json/gz/external_dataset.000.ddl.sqlpp @@ -27,8 +27,8 @@ create type test as open { drop dataset test1 if exists; create external dataset test1(test) using S3 ( -("accessKey"="dummyAccessKey"), -("secretKey"="dummySecretKey"), +("accessKeyId"="dummyAccessKey"), +("secretAccessKey"="dummySecretKey"), ("region"="us-west-2"), ("serviceEndpoint"="http://localhost:8001";), ("container"="playground"), @@ -38,8 +38,8 @@ create external dataset test1(test) using S3 ( drop dataset test2 if exists; create external dataset test2(test) using S3 ( -("accessKey"="dummyAccessKey"), -("secretKey"="dummySecretKey"), +("accessKeyId"="dummyAccessKey"), +("secretAccessKey"="dummySecretKey"), ("region"="us-west-2"), ("serviceEndpoint"="http://localhost:8001";), ("container"="playground"), @@ -49,8 +49,8 @@ create external dataset test2(test) using S3 ( drop dataset test3 if exists; create external dataset test3(test) using S3 ( -("accessKey"="dummyAccessKey"), -("secretKey"="dummySecretKey"), +("accessKeyId"="dummyAccessKey"), +("secretAccessKey"="dummySecretKey"), ("region"="us-west-2"), ("serviceEndpoint"="http://localhost:8001";), ("container"="playground"), @@ -60,8 +60,8 @@ create external dataset test3(test) using S3 ( drop dataset test4 if exists; create external dataset test4(test) using S3 ( -("accessKey"="dummyAccessKey"), -("secretKey"="dummySecretKey"), +("accessKeyId"="dummyAccessKey"), +("secretAccessKey"="dummySecretKey"), ("region"="us-west-2"), ("serviceEndpoint"="http://localhost:8001";), ("container"="playground"), diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/external-dataset/aws/s3/json/json/external_dataset.000.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/external-dataset/aws/s3/json/json/external_dataset.000.ddl.sqlpp index b6d875b..c3e0d20 100644 --- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/external-dataset/aws/s3/json/json/external_dataset.000.ddl.sqlpp +++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/external-dataset/aws/s3/json/json/external_dataset.000.ddl.sqlpp @@ -27,8 +27,8 @@ create type test as open { drop dataset test1 if exists; create external dataset test1(test) using S3 ( -("accessKey"="dummyAccessKey"), -("secretKey"="dummySecretKey"), +("accessKeyId"="dummyAccessKey"), +("secretAccessKey"="dummySecretKey"), ("region"="us-west-2"), ("serviceEndpoint"="http://localhost:8001";), ("container"="playground"), @@ -38,8 +38,8 @@ create external dataset test1(test) using S3 ( drop dataset test2 if exists; create external dataset test2(test) using S3 ( -("accessKey"="dummyAccessKey"), -("secretKey"="dummySecretKey"), +("accessKeyId"="dummyAccessKey"), +("secretAccessKey"="dummySecretKey"), ("region"="us-west-2"), ("serviceEndpoint"="http://localhost:8001";), ("container"="playground"), @@ -49,8 +49,8 @@ create external dataset test2(test) using S3 ( drop dataset test3 if exists; create external dataset test3(test) using S3 ( -("accessKey"="dummyAccessKey"), -("secretKey"="dummySecretKey"), +("accessKeyId"="dummyAccessKey"), +("secretAccessKey"="dummySecretKey"), ("region"="us-west-2"), ("serviceEndpoint"="http://localhost:8001";), ("container"="playground"), @@ -60,8 +60,8 @@ create external dataset test3(test) using S3 ( drop dataset test4 if exists; create external dataset test4(test) using S3 ( -("accessKey"="dummyAccessKey"), -("secretKey"="dummySecretKey"), +("accessKeyId"="dummyAccessKey"), +("secretAccessKey"="dummySecretKey"), ("region"="us-west-2"), ("serviceEndpoint"="http://localhost:8001";), ("container"="playground"), diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/external-dataset/aws/s3/json/mixed/external_dataset.000.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/external-dataset/aws/s3/json/mixed/external_dataset.000.ddl.sqlpp index ca492ea..32d8388 100644 --- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/external-dataset/aws/s3/json/mixed/external_dataset.000.ddl.sqlpp +++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/external-dataset/aws/s3/json/mixed/external_dataset.000.ddl.sqlpp @@ -27,8 +27,8 @@ create type test as open { drop dataset test1 if exists; create external dataset test1(test) using S3 ( -("accessKey"="dummyAccessKey"), -("secretKey"="dummySecretKey"), +("accessKeyId"="dummyAccessKey"), +("secretAccessKey"="dummySecretKey"), ("region"="us-west-2"), ("serviceEndpoint"="http://localhost:8001";), ("container"="playground"), @@ -38,8 +38,8 @@ create external dataset test1(test) using S3 ( drop dataset test2 if exists; create external dataset test2(test) using S3 ( -("accessKey"="dummyAccessKey"), -("secretKey"="dummySecretKey"), +("accessKeyId"="dummyAccessKey"), +("secretAccessKey"="dummySecretKey"), ("region"="us-west-2"), ("serviceEndpoint"="http://localhost:8001";), ("container"="playground"), @@ -49,8 +49,8 @@ create external dataset test2(test) using S3 ( drop dataset test3 if exists; create external dataset test3(test) using S3 ( -("accessKey"="dummyAccessKey"), -("secretKey"="dummySecretKey"), +("accessKeyId"="dummyAccessKey"), +("secretAccessKey"="dummySecretKey"), ("region"="us-west-2"), ("serviceEndpoint"="http://localhost:8001";), ("container"="playground"), @@ -60,8 +60,8 @@ create external dataset test3(test) using S3 ( drop dataset test4 if exists; create external dataset test4(test) using S3 ( -("accessKey"="dummyAccessKey"), -("secretKey"="dummySecretKey"), +("accessKeyId"="dummyAccessKey"), +("secretAccessKey"="dummySecretKey"), ("region"="us-west-2"), ("serviceEndpoint"="http://localhost:8001";), ("container"="playground"), diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/external-dataset/aws/s3/jsonl/query-dataset.001.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/external-dataset/aws/s3/jsonl/query-dataset.001.ddl.sqlpp index 6b2e0cd..75535fb 100644 --- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/external-dataset/aws/s3/jsonl/query-dataset.001.ddl.sqlpp +++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/external-dataset/aws/s3/jsonl/query-dataset.001.ddl.sqlpp @@ -26,8 +26,8 @@ CREATE TYPE t1 AS OPEN {}; DROP DATASET ds1 IF EXISTS; CREATE EXTERNAL DATASET ds1(t1) USING S3 ( -("accessKey"="dummyAccessKey"), -("secretKey"="dummySecretKey"), +("accessKeyId"="dummyAccessKey"), +("secretAccessKey"="dummySecretKey"), ("region"="us-west-2"), ("serviceEndpoint"="http://localhost:8001";), ("container"="playground"), diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/external-dataset/aws/s3/negative/negative.000.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/external-dataset/aws/s3/negative/negative.000.ddl.sqlpp index e0fc056..69768e8 100644 --- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/external-dataset/aws/s3/negative/negative.000.ddl.sqlpp +++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/external-dataset/aws/s3/negative/negative.000.ddl.sqlpp @@ -27,8 +27,8 @@ CREATE TYPE test AS {id: int, year: int?, review: string, details: string?}; DROP DATASET test IF EXISTS; CREATE EXTERNAL DATASET test(test) USING S3 ( -("accessKey"="dummyAccessKey"), -("secretKey"="dummySecretKey"), +("accessKeyId"="dummyAccessKey"), +("secretAccessKey"="dummySecretKey"), ("region"="us-west-2"), ("serviceEndpoint"="http://localhost:8001";), ("container"="playground"), diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/external-dataset/aws/s3/tsv-header/query-dataset.001.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/external-dataset/aws/s3/tsv-header/query-dataset.001.ddl.sqlpp index aab904a..265c884 100644 --- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/external-dataset/aws/s3/tsv-header/query-dataset.001.ddl.sqlpp +++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/external-dataset/aws/s3/tsv-header/query-dataset.001.ddl.sqlpp @@ -26,8 +26,8 @@ CREATE TYPE t1 AS {f1: int, f2: int, f3: int, f4: string}; DROP DATASET ds1 IF EXISTS; CREATE EXTERNAL DATASET ds1(t1) USING S3 ( -("accessKey"="dummyAccessKey"), -("secretKey"="dummySecretKey"), +("accessKeyId"="dummyAccessKey"), +("secretAccessKey"="dummySecretKey"), ("region"="us-west-2"), ("serviceEndpoint"="http://localhost:8001";), ("container"="playground"), diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/external-dataset/aws/s3/tsv-no-header/query-dataset.001.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/external-dataset/aws/s3/tsv-no-header/query-dataset.001.ddl.sqlpp index 135c9fd..aacf1bd 100644 --- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/external-dataset/aws/s3/tsv-no-header/query-dataset.001.ddl.sqlpp +++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/external-dataset/aws/s3/tsv-no-header/query-dataset.001.ddl.sqlpp @@ -26,8 +26,8 @@ CREATE TYPE t1 AS {f1: int, f2: int, f3: int, f4: string}; DROP DATASET ds1 IF EXISTS; CREATE EXTERNAL DATASET ds1(t1) USING S3 ( -("accessKey"="dummyAccessKey"), -("secretKey"="dummySecretKey"), +("accessKeyId"="dummyAccessKey"), +("secretAccessKey"="dummySecretKey"), ("region"="us-west-2"), ("serviceEndpoint"="http://localhost:8001";), ("container"="playground"), diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/external-dataset/aws/s3/tsv-warnings/query-dataset.002.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/external-dataset/aws/s3/tsv-warnings/query-dataset.002.ddl.sqlpp index 135c9fd..aacf1bd 100644 --- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/external-dataset/aws/s3/tsv-warnings/query-dataset.002.ddl.sqlpp +++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/external-dataset/aws/s3/tsv-warnings/query-dataset.002.ddl.sqlpp @@ -26,8 +26,8 @@ CREATE TYPE t1 AS {f1: int, f2: int, f3: int, f4: string}; DROP DATASET ds1 IF EXISTS; CREATE EXTERNAL DATASET ds1(t1) USING S3 ( -("accessKey"="dummyAccessKey"), -("secretKey"="dummySecretKey"), +("accessKeyId"="dummyAccessKey"), +("secretAccessKey"="dummySecretKey"), ("region"="us-west-2"), ("serviceEndpoint"="http://localhost:8001";), ("container"="playground"), diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/external-dataset/aws/s3/tsv/gz/query-dataset.000.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/external-dataset/aws/s3/tsv/gz/query-dataset.000.ddl.sqlpp index ac33d92..439eb0d 100644 --- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/external-dataset/aws/s3/tsv/gz/query-dataset.000.ddl.sqlpp +++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/external-dataset/aws/s3/tsv/gz/query-dataset.000.ddl.sqlpp @@ -26,8 +26,8 @@ CREATE TYPE test AS {id: int, year: int?, review: string, details: string?}; DROP DATASET test IF EXISTS; CREATE EXTERNAL DATASET test(test) USING S3 ( -("accessKey"="dummyAccessKey"), -("secretKey"="dummySecretKey"), +("accessKeyId"="dummyAccessKey"), +("secretAccessKey"="dummySecretKey"), ("region"="us-west-2"), ("serviceEndpoint"="http://localhost:8001";), ("container"="playground"), diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/external-dataset/aws/s3/tsv/mixed/query-dataset.000.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/external-dataset/aws/s3/tsv/mixed/query-dataset.000.ddl.sqlpp index a392c61..232a6d6 100644 --- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/external-dataset/aws/s3/tsv/mixed/query-dataset.000.ddl.sqlpp +++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/external-dataset/aws/s3/tsv/mixed/query-dataset.000.ddl.sqlpp @@ -26,8 +26,8 @@ CREATE TYPE test AS {id: int, year: int?, review: string, details: string?}; DROP DATASET test IF EXISTS; CREATE EXTERNAL DATASET test(test) USING S3 ( -("accessKey"="dummyAccessKey"), -("secretKey"="dummySecretKey"), +("accessKeyId"="dummyAccessKey"), +("secretAccessKey"="dummySecretKey"), ("region"="us-west-2"), ("serviceEndpoint"="http://localhost:8001";), ("container"="playground"), diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/external-dataset/aws/s3/tsv/tsv/query-dataset.000.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/external-dataset/aws/s3/tsv/tsv/query-dataset.000.ddl.sqlpp index f9b82d4..7a1c0e1 100644 --- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/external-dataset/aws/s3/tsv/tsv/query-dataset.000.ddl.sqlpp +++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/external-dataset/aws/s3/tsv/tsv/query-dataset.000.ddl.sqlpp @@ -26,8 +26,8 @@ CREATE TYPE test AS {id: int, year: int?, review: string, details: string?}; DROP DATASET test IF EXISTS; CREATE EXTERNAL DATASET test(test) USING S3 ( -("accessKey"="dummyAccessKey"), -("secretKey"="dummySecretKey"), +("accessKeyId"="dummyAccessKey"), +("secretAccessKey"="dummySecretKey"), ("region"="us-west-2"), ("serviceEndpoint"="http://localhost:8001";), ("container"="playground"), diff --git a/asterixdb/asterix-external-data/src/main/java/org/apache/asterix/external/input/record/reader/aws/AwsS3InputStream.java b/asterixdb/asterix-external-data/src/main/java/org/apache/asterix/external/input/record/reader/aws/AwsS3InputStream.java index d725687..a70848c 100644 --- a/asterixdb/asterix-external-data/src/main/java/org/apache/asterix/external/input/record/reader/aws/AwsS3InputStream.java +++ b/asterixdb/asterix-external-data/src/main/java/org/apache/asterix/external/input/record/reader/aws/AwsS3InputStream.java @@ -131,9 +131,9 @@ public class AwsS3InputStream extends AbstractMultipleInputStream { S3ClientBuilder builder = S3Client.builder(); // Credentials - String accessKey = configuration.get(AwsS3Constants.ACCESS_KEY_FIELD_NAME); - String secretKey = configuration.get(AwsS3Constants.SECRET_KEY_FIELD_NAME); - AwsBasicCredentials credentials = AwsBasicCredentials.create(accessKey, secretKey); + String accessKeyId = configuration.get(AwsS3Constants.ACCESS_KEY_ID_FIELD_NAME); + String secretAccessKey = configuration.get(AwsS3Constants.SECRET_ACCESS_KEY_FIELD_NAME); + AwsBasicCredentials credentials = AwsBasicCredentials.create(accessKeyId, secretAccessKey); builder.credentialsProvider(StaticCredentialsProvider.create(credentials)); // Region diff --git a/asterixdb/asterix-external-data/src/main/java/org/apache/asterix/external/input/record/reader/aws/AwsS3InputStreamFactory.java b/asterixdb/asterix-external-data/src/main/java/org/apache/asterix/external/input/record/reader/aws/AwsS3InputStreamFactory.java index f0da535..58a77b1 100644 --- a/asterixdb/asterix-external-data/src/main/java/org/apache/asterix/external/input/record/reader/aws/AwsS3InputStreamFactory.java +++ b/asterixdb/asterix-external-data/src/main/java/org/apache/asterix/external/input/record/reader/aws/AwsS3InputStreamFactory.java @@ -202,9 +202,9 @@ public class AwsS3InputStreamFactory implements IInputStreamFactory { S3ClientBuilder builder = S3Client.builder(); // Credentials - String accessKey = configuration.get(AwsS3Constants.ACCESS_KEY_FIELD_NAME); - String secretKey = configuration.get(AwsS3Constants.SECRET_KEY_FIELD_NAME); - AwsBasicCredentials credentials = AwsBasicCredentials.create(accessKey, secretKey); + String accessKeyId = configuration.get(AwsS3Constants.ACCESS_KEY_ID_FIELD_NAME); + String secretAccessKey = configuration.get(AwsS3Constants.SECRET_ACCESS_KEY_FIELD_NAME); + AwsBasicCredentials credentials = AwsBasicCredentials.create(accessKeyId, secretAccessKey); builder.credentialsProvider(StaticCredentialsProvider.create(credentials)); // Region diff --git a/asterixdb/asterix-external-data/src/main/java/org/apache/asterix/external/util/ExternalDataConstants.java b/asterixdb/asterix-external-data/src/main/java/org/apache/asterix/external/util/ExternalDataConstants.java index 9390d59..b0acf44 100644 --- a/asterixdb/asterix-external-data/src/main/java/org/apache/asterix/external/util/ExternalDataConstants.java +++ b/asterixdb/asterix-external-data/src/main/java/org/apache/asterix/external/util/ExternalDataConstants.java @@ -275,9 +275,12 @@ public class ExternalDataConstants { public static final String INVALID_VAL = "invalid value"; public static class AwsS3Constants { + private AwsS3Constants() { + } + public static final String REGION_FIELD_NAME = "region"; - public static final String ACCESS_KEY_FIELD_NAME = "accessKey"; - public static final String SECRET_KEY_FIELD_NAME = "secretKey"; + public static final String ACCESS_KEY_ID_FIELD_NAME = "accessKeyId"; + public static final String SECRET_ACCESS_KEY_FIELD_NAME = "secretAccessKey"; public static final String CONTAINER_NAME_FIELD_NAME = "container"; public static final String DEFINITION_FIELD_NAME = "definition"; public static final String SERVICE_END_POINT_FIELD_NAME = "serviceEndpoint";
