diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index df45678bd870..c13462aece80 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -776,8 +776,8 @@ jobs: ABFS_ACCESS_KEY: ${{ secrets.AZURE_ABFS_ACCESSKEY }} S3_BUCKET: trino-ci-test AWS_REGION: us-east-2 - DATABRICKS_AWS_ACCESS_KEY_ID: ${{ secrets.TRINO_AWS_ACCESS_KEY_ID }} - DATABRICKS_AWS_SECRET_ACCESS_KEY: ${{ secrets.TRINO_AWS_SECRET_ACCESS_KEY }} + TRINO_AWS_ACCESS_KEY_ID: ${{ secrets.TRINO_AWS_ACCESS_KEY_ID }} + TRINO_AWS_SECRET_ACCESS_KEY: ${{ secrets.TRINO_AWS_SECRET_ACCESS_KEY }} DATABRICKS_73_JDBC_URL: ${{ secrets.DATABRICKS_73_JDBC_URL }} DATABRICKS_91_JDBC_URL: ${{ secrets.DATABRICKS_91_JDBC_URL }} DATABRICKS_104_JDBC_URL: ${{ secrets.DATABRICKS_104_JDBC_URL }} diff --git a/plugin/trino-delta-lake/README.md b/plugin/trino-delta-lake/README.md index 419158dc266b..9806a769da36 100644 --- a/plugin/trino-delta-lake/README.md +++ b/plugin/trino-delta-lake/README.md @@ -169,8 +169,8 @@ environment for Trino: ``` env S3_BUCKET=my-s3-bucket \ AWS_REGION=us-east-2 \ - DATABRICKS_AWS_SECRET_ACCESS_KEY=xxx \ - DATABRICKS_AWS_ACCESS_KEY_ID=xxx \ + TRINO_AWS_SECRET_ACCESS_KEY=xxx \ + TRINO_AWS_ACCESS_KEY_ID=xxx \ DATABRICKS_91_JDBC_URL='xxx' \ DATABRICKS_LOGIN=token \ DATABRICKS_TOKEN=xxx \ diff --git a/testing/trino-product-tests-launcher/src/main/java/io/trino/tests/product/launcher/env/environment/AbstractSinglenodeDeltaLakeDatabricks.java b/testing/trino-product-tests-launcher/src/main/java/io/trino/tests/product/launcher/env/environment/AbstractSinglenodeDeltaLakeDatabricks.java index 4b1585bc5de7..3ef9383e7a6e 100644 --- a/testing/trino-product-tests-launcher/src/main/java/io/trino/tests/product/launcher/env/environment/AbstractSinglenodeDeltaLakeDatabricks.java +++ b/testing/trino-product-tests-launcher/src/main/java/io/trino/tests/product/launcher/env/environment/AbstractSinglenodeDeltaLakeDatabricks.java @@ -76,9 +76,9 @@ public void extendEnvironment(Environment.Builder builder) private DockerContainer exportAWSCredentials(DockerContainer container) { - container = exportAWSCredential(container, "DATABRICKS_AWS_ACCESS_KEY_ID", "AWS_ACCESS_KEY_ID", true); - container = exportAWSCredential(container, "DATABRICKS_AWS_SECRET_ACCESS_KEY", "AWS_SECRET_ACCESS_KEY", true); - return exportAWSCredential(container, "DATABRICKS_AWS_SESSION_TOKEN", "AWS_SESSION_TOKEN", false); + container = exportAWSCredential(container, "TRINO_AWS_ACCESS_KEY_ID", "AWS_ACCESS_KEY_ID", true); + container = exportAWSCredential(container, "TRINO_AWS_SECRET_ACCESS_KEY", "AWS_SECRET_ACCESS_KEY", true); + return exportAWSCredential(container, "TRINO_AWS_SESSION_TOKEN", "AWS_SESSION_TOKEN", false); } private DockerContainer exportAWSCredential(DockerContainer container, String credentialEnvVariable, String containerEnvVariable, boolean required)