From f7405ce916d91bac3806af9d0664b6b41914cf49 Mon Sep 17 00:00:00 2001
From: maskarb <mskarbek@redhat.com>
Date: Fri, 7 Feb 2025 16:17:43 -0500
Subject: [PATCH] remove MINIO_ keys

---
 .env.example                                     | 11 ++++++-----
 dev/containers/trino/etc/catalog/glue.properties |  4 ++--
 dev/containers/trino/etc/catalog/hive.properties |  4 ++--
 docker-compose.yml                               |  4 ++--
 4 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/.env.example b/.env.example
index 3ff19e303d..072d5cf910 100644
--- a/.env.example
+++ b/.env.example
@@ -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
diff --git a/dev/containers/trino/etc/catalog/glue.properties b/dev/containers/trino/etc/catalog/glue.properties
index 05d225ff67..d472b77c31 100644
--- a/dev/containers/trino/etc/catalog/glue.properties
+++ b/dev/containers/trino/etc/catalog/glue.properties
@@ -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
diff --git a/dev/containers/trino/etc/catalog/hive.properties b/dev/containers/trino/etc/catalog/hive.properties
index 05cd0b7f01..8c80c4543e 100644
--- a/dev/containers/trino/etc/catalog/hive.properties
+++ b/dev/containers/trino/etc/catalog/hive.properties
@@ -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}
diff --git a/docker-compose.yml b/docker-compose.yml
index 18b6e952de..d392469e47 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -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