Skip to content

Commit

Permalink
remove MINIO_ keys
Browse files Browse the repository at this point in the history
  • Loading branch information
maskarb committed Feb 7, 2025
1 parent a72c5e1 commit f7405ce
Show file tree
Hide file tree
Showing 4 changed files with 12 additions and 11 deletions.
11 changes: 6 additions & 5 deletions .env.example
Original file line number Diff line number Diff line change
Expand Up @@ -40,14 +40,15 @@ AWS_RESOURCE_NAME=YOUR_COST_MANAGEMENT_AWS_ARN

# Glue
SCHEMA_SUFFIX="" # if DEVELOPMENT=True, this can be left empty and will default to $USER; otherwise, set this value to something unique
TRINO_S3A_OR_S3=s3
TRINO_S3A_OR_S3=s3a
# set HIVE_PROPERTIES_FILE=glue.properties to utilize AWS Glue Data Catalog (swap HIVE_PROPERTIES_FILE and GLUE_PROPERTIES_FILE)
HIVE_PROPERTIES_FILE=hive.properties
GLUE_PROPERTIES_FILE=glue.properties

# MINIO_ vars are used by the docker containers
# set MINIO_ENDPOINT and S3_ENDPOINT to https://s3.amazonaws.com to utilize real S3
MINIO_ENDPOINT=http://koku-minio:9000
MINIO_ACCESS_KEY=kokuminioaccess
MINIO_SECRET=kokuminiosecret
# S3_ vars are used by the localhost
S3_ENDPOINT=http://localhost:9000
# set S3_ACCESS_KEY and S3_SECRET equal to AWS_ACCESS_KEY_ID and AWS_SECRET_ACCESS_KEY to utilize real S3
S3_ACCESS_KEY=kokuminioaccess
S3_SECRET=kokuminiosecret
# AWS_ credentials are used by Trino to connect to AWS Glue
Expand Down
4 changes: 2 additions & 2 deletions dev/containers/trino/etc/catalog/glue.properties
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@ fs.hadoop.enabled=false
fs.native-s3.enabled=true
s3.region=${ENV:AWS_REGION}
s3.endpoint=${ENV:MINIO_ENDPOINT}
s3.aws-access-key=${ENV:MINIO_ACCESS_KEY}
s3.aws-secret-key=${ENV:MINIO_SECRET}
s3.aws-access-key=${ENV:S3_ACCESS_KEY}
s3.aws-secret-key=${ENV:S3_SECRET}
s3.path-style-access=true

hive.metastore.glue.default-warehouse-dir=${ENV:TRINO_S3A_OR_S3}://${ENV:S3_BUCKET_NAME}/data
Expand Down
4 changes: 2 additions & 2 deletions dev/containers/trino/etc/catalog/hive.properties
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@ hive.parquet.use-column-names=true

fs.native-s3.enabled=true

s3.aws-access-key=${ENV:MINIO_ACCESS_KEY}
s3.aws-secret-key=${ENV:MINIO_SECRET}
s3.aws-access-key=${ENV:S3_ACCESS_KEY}
s3.aws-secret-key=${ENV:S3_SECRET}
s3.endpoint=${ENV:MINIO_ENDPOINT}
s3.path-style-access=true
s3.region=${ENV:AWS_REGION}
Expand Down
4 changes: 2 additions & 2 deletions docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -665,8 +665,8 @@ services:
- TRINO_LOG_LEVEL=${LOG_LEVEL-INFO}
- TRINO_S3A_OR_S3=${TRINO_S3A_OR_S3-s3a}
- MINIO_ENDPOINT=${MINIO_ENDPOINT-http://koku-minio:9000}
- MINIO_ACCESS_KEY=${MINIO_ACCESS_KEY-kokuminioaccess}
- MINIO_SECRET=${MINIO_SECRET-kokuminiosecret}
- S3_ACCESS_KEY=${S3_ACCESS_KEY-kokuminioaccess}
- S3_SECRET=${S3_SECRET-kokuminiosecret}
- AWS_ACCESS_KEY_ID=${AWS_ACCESS_KEY_ID-kokuminioaccess}
- AWS_SECRET_ACCESS_KEY=${AWS_SECRET_ACCESS_KEY-kokuminiosecret}
- AWS_REGION=us-east-1
Expand Down

0 comments on commit f7405ce

Please sign in to comment.