revert trino_schema_prefix (#5477)

project-koku · Jan 30, 2025 · 39c7aaa · 39c7aaa
1 parent 3dbeb6d
commit 39c7aaa
Show file tree

Hide file tree

Showing 106 changed files with 245 additions and 401 deletions.
diff --git a/.env.example b/.env.example
@@ -40,7 +40,6 @@ 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_SCHEMA_PREFIX=""
 TRINO_S3A_OR_S3=s3
 
 AWS_CATALOG_ID=589173575009

diff --git a/deploy/clowdapp.yaml b/deploy/clowdapp.yaml
@@ -24,8 +24,6 @@ objects:
           value: ${CLOWDER_ENABLED}
         - name: SCHEMA_SUFFIX
           value: ${SCHEMA_SUFFIX}
-        - name: TRINO_SCHEMA_PREFIX
-          value: ${TRINO_SCHEMA_PREFIX}
         - name: TRINO_S3A_OR_S3
           value: ${TRINO_S3A_OR_S3}
         - name: DJANGO_SECRET_KEY
@@ -217,8 +215,6 @@ objects:
           value: ${CLOWDER_ENABLED}
         - name: SCHEMA_SUFFIX
           value: ${SCHEMA_SUFFIX}
-        - name: TRINO_SCHEMA_PREFIX
-          value: ${TRINO_SCHEMA_PREFIX}
         - name: TRINO_S3A_OR_S3
           value: ${TRINO_S3A_OR_S3}
         - name: DJANGO_SECRET_KEY
@@ -401,8 +397,6 @@ objects:
           value: ${CLOWDER_ENABLED}
         - name: SCHEMA_SUFFIX
           value: ${SCHEMA_SUFFIX}
-        - name: TRINO_SCHEMA_PREFIX
-          value: ${TRINO_SCHEMA_PREFIX}
         - name: TRINO_S3A_OR_S3
           value: ${TRINO_S3A_OR_S3}
         - name: APP_POD_NAME
@@ -464,8 +458,6 @@ objects:
           value: ${CLOWDER_ENABLED}
         - name: SCHEMA_SUFFIX
           value: ${SCHEMA_SUFFIX}
-        - name: TRINO_SCHEMA_PREFIX
-          value: ${TRINO_SCHEMA_PREFIX}
         - name: TRINO_S3A_OR_S3
           value: ${TRINO_S3A_OR_S3}
         - name: KAFKA_CONNECT
@@ -616,8 +608,6 @@ objects:
           value: ${CLOWDER_ENABLED}
         - name: SCHEMA_SUFFIX
           value: ${SCHEMA_SUFFIX}
-        - name: TRINO_SCHEMA_PREFIX
-          value: ${TRINO_SCHEMA_PREFIX}
         - name: TRINO_S3A_OR_S3
           value: ${TRINO_S3A_OR_S3}
         - name: MASU
@@ -820,8 +810,6 @@ objects:
           value: ${CLOWDER_ENABLED}
         - name: SCHEMA_SUFFIX
           value: ${SCHEMA_SUFFIX}
-        - name: TRINO_SCHEMA_PREFIX
-          value: ${TRINO_SCHEMA_PREFIX}
         - name: TRINO_S3A_OR_S3
           value: ${TRINO_S3A_OR_S3}
         - name: AWS_SHARED_CREDENTIALS_FILE
@@ -986,8 +974,6 @@ objects:
           value: ${CLOWDER_ENABLED}
         - name: SCHEMA_SUFFIX
           value: ${SCHEMA_SUFFIX}
-        - name: TRINO_SCHEMA_PREFIX
-          value: ${TRINO_SCHEMA_PREFIX}
         - name: TRINO_S3A_OR_S3
           value: ${TRINO_S3A_OR_S3}
         - name: SOURCES
@@ -1159,8 +1145,6 @@ objects:
           value: ${CLOWDER_ENABLED}
         - name: SCHEMA_SUFFIX
           value: ${SCHEMA_SUFFIX}
-        - name: TRINO_SCHEMA_PREFIX
-          value: ${TRINO_SCHEMA_PREFIX}
         - name: TRINO_S3A_OR_S3
           value: ${TRINO_S3A_OR_S3}
         - name: SOURCES
@@ -1329,8 +1313,6 @@ objects:
           value: ${CLOWDER_ENABLED}
         - name: SCHEMA_SUFFIX
           value: ${SCHEMA_SUFFIX}
-        - name: TRINO_SCHEMA_PREFIX
-          value: ${TRINO_SCHEMA_PREFIX}
         - name: TRINO_S3A_OR_S3
           value: ${TRINO_S3A_OR_S3}
         - name: AWS_SHARED_CREDENTIALS_FILE
@@ -1517,8 +1499,6 @@ objects:
           value: ${CLOWDER_ENABLED}
         - name: SCHEMA_SUFFIX
           value: ${SCHEMA_SUFFIX}
-        - name: TRINO_SCHEMA_PREFIX
-          value: ${TRINO_SCHEMA_PREFIX}
         - name: TRINO_S3A_OR_S3
           value: ${TRINO_S3A_OR_S3}
         - name: AWS_SHARED_CREDENTIALS_FILE
@@ -1711,8 +1691,6 @@ objects:
           value: ${CLOWDER_ENABLED}
         - name: SCHEMA_SUFFIX
           value: ${SCHEMA_SUFFIX}
-        - name: TRINO_SCHEMA_PREFIX
-          value: ${TRINO_SCHEMA_PREFIX}
         - name: TRINO_S3A_OR_S3
           value: ${TRINO_S3A_OR_S3}
         - name: AWS_SHARED_CREDENTIALS_FILE
@@ -1905,8 +1883,6 @@ objects:
           value: ${CLOWDER_ENABLED}
         - name: SCHEMA_SUFFIX
           value: ${SCHEMA_SUFFIX}
-        - name: TRINO_SCHEMA_PREFIX
-          value: ${TRINO_SCHEMA_PREFIX}
         - name: TRINO_S3A_OR_S3
           value: ${TRINO_S3A_OR_S3}
         - name: AWS_SHARED_CREDENTIALS_FILE
@@ -2099,8 +2075,6 @@ objects:
           value: ${CLOWDER_ENABLED}
         - name: SCHEMA_SUFFIX
           value: ${SCHEMA_SUFFIX}
-        - name: TRINO_SCHEMA_PREFIX
-          value: ${TRINO_SCHEMA_PREFIX}
         - name: TRINO_S3A_OR_S3
           value: ${TRINO_S3A_OR_S3}
         - name: AWS_SHARED_CREDENTIALS_FILE
@@ -2297,8 +2271,6 @@ objects:
           value: ${CLOWDER_ENABLED}
         - name: SCHEMA_SUFFIX
           value: ${SCHEMA_SUFFIX}
-        - name: TRINO_SCHEMA_PREFIX
-          value: ${TRINO_SCHEMA_PREFIX}
         - name: TRINO_S3A_OR_S3
           value: ${TRINO_S3A_OR_S3}
         - name: AWS_SHARED_CREDENTIALS_FILE
@@ -2495,8 +2467,6 @@ objects:
           value: ${CLOWDER_ENABLED}
         - name: SCHEMA_SUFFIX
           value: ${SCHEMA_SUFFIX}
-        - name: TRINO_SCHEMA_PREFIX
-          value: ${TRINO_SCHEMA_PREFIX}
         - name: TRINO_S3A_OR_S3
           value: ${TRINO_S3A_OR_S3}
         - name: AWS_SHARED_CREDENTIALS_FILE
@@ -2693,8 +2663,6 @@ objects:
           value: ${CLOWDER_ENABLED}
         - name: SCHEMA_SUFFIX
           value: ${SCHEMA_SUFFIX}
-        - name: TRINO_SCHEMA_PREFIX
-          value: ${TRINO_SCHEMA_PREFIX}
         - name: TRINO_S3A_OR_S3
           value: ${TRINO_S3A_OR_S3}
         - name: AWS_SHARED_CREDENTIALS_FILE
@@ -2889,8 +2857,6 @@ objects:
           value: ${CLOWDER_ENABLED}
         - name: SCHEMA_SUFFIX
           value: ${SCHEMA_SUFFIX}
-        - name: TRINO_SCHEMA_PREFIX
-          value: ${TRINO_SCHEMA_PREFIX}
         - name: TRINO_S3A_OR_S3
           value: ${TRINO_S3A_OR_S3}
         - name: AWS_SHARED_CREDENTIALS_FILE
@@ -3085,8 +3051,6 @@ objects:
           value: ${CLOWDER_ENABLED}
         - name: SCHEMA_SUFFIX
           value: ${SCHEMA_SUFFIX}
-        - name: TRINO_SCHEMA_PREFIX
-          value: ${TRINO_SCHEMA_PREFIX}
         - name: TRINO_S3A_OR_S3
           value: ${TRINO_S3A_OR_S3}
         - name: AWS_SHARED_CREDENTIALS_FILE
@@ -3281,8 +3245,6 @@ objects:
           value: ${CLOWDER_ENABLED}
         - name: SCHEMA_SUFFIX
           value: ${SCHEMA_SUFFIX}
-        - name: TRINO_SCHEMA_PREFIX
-          value: ${TRINO_SCHEMA_PREFIX}
         - name: TRINO_S3A_OR_S3
           value: ${TRINO_S3A_OR_S3}
         - name: AWS_SHARED_CREDENTIALS_FILE
@@ -3483,8 +3445,6 @@ objects:
           value: ${CLOWDER_ENABLED}
         - name: SCHEMA_SUFFIX
           value: ${SCHEMA_SUFFIX}
-        - name: TRINO_SCHEMA_PREFIX
-          value: ${TRINO_SCHEMA_PREFIX}
         - name: TRINO_S3A_OR_S3
           value: ${TRINO_S3A_OR_S3}
         - name: AWS_SHARED_CREDENTIALS_FILE
@@ -3685,8 +3645,6 @@ objects:
           value: ${CLOWDER_ENABLED}
         - name: SCHEMA_SUFFIX
           value: ${SCHEMA_SUFFIX}
-        - name: TRINO_SCHEMA_PREFIX
-          value: ${TRINO_SCHEMA_PREFIX}
         - name: TRINO_S3A_OR_S3
           value: ${TRINO_S3A_OR_S3}
         - name: AWS_SHARED_CREDENTIALS_FILE
@@ -3887,8 +3845,6 @@ objects:
           value: ${CLOWDER_ENABLED}
         - name: SCHEMA_SUFFIX
           value: ${SCHEMA_SUFFIX}
-        - name: TRINO_SCHEMA_PREFIX
-          value: ${TRINO_SCHEMA_PREFIX}
         - name: TRINO_S3A_OR_S3
           value: ${TRINO_S3A_OR_S3}
         - name: AWS_SHARED_CREDENTIALS_FILE
@@ -4081,8 +4037,6 @@ objects:
           value: ${CLOWDER_ENABLED}
         - name: SCHEMA_SUFFIX
           value: ${SCHEMA_SUFFIX}
-        - name: TRINO_SCHEMA_PREFIX
-          value: ${TRINO_SCHEMA_PREFIX}
         - name: TRINO_S3A_OR_S3
           value: ${TRINO_S3A_OR_S3}
         - name: AWS_SHARED_CREDENTIALS_FILE
@@ -4275,8 +4229,6 @@ objects:
           value: ${CLOWDER_ENABLED}
         - name: SCHEMA_SUFFIX
           value: ${SCHEMA_SUFFIX}
-        - name: TRINO_SCHEMA_PREFIX
-          value: ${TRINO_SCHEMA_PREFIX}
         - name: TRINO_S3A_OR_S3
           value: ${TRINO_S3A_OR_S3}
         - name: AWS_SHARED_CREDENTIALS_FILE
@@ -4469,8 +4421,6 @@ objects:
           value: ${CLOWDER_ENABLED}
         - name: SCHEMA_SUFFIX
           value: ${SCHEMA_SUFFIX}
-        - name: TRINO_SCHEMA_PREFIX
-          value: ${TRINO_SCHEMA_PREFIX}
         - name: TRINO_S3A_OR_S3
           value: ${TRINO_S3A_OR_S3}
         - name: AWS_SHARED_CREDENTIALS_FILE
@@ -4667,8 +4617,6 @@ objects:
           value: ${CLOWDER_ENABLED}
         - name: SCHEMA_SUFFIX
           value: ${SCHEMA_SUFFIX}
-        - name: TRINO_SCHEMA_PREFIX
-          value: ${TRINO_SCHEMA_PREFIX}
         - name: TRINO_S3A_OR_S3
           value: ${TRINO_S3A_OR_S3}
         - name: AWS_SHARED_CREDENTIALS_FILE
@@ -4865,8 +4813,6 @@ objects:
           value: ${CLOWDER_ENABLED}
         - name: SCHEMA_SUFFIX
           value: ${SCHEMA_SUFFIX}
-        - name: TRINO_SCHEMA_PREFIX
-          value: ${TRINO_SCHEMA_PREFIX}
         - name: TRINO_S3A_OR_S3
           value: ${TRINO_S3A_OR_S3}
         - name: AWS_SHARED_CREDENTIALS_FILE
@@ -5063,8 +5009,6 @@ objects:
           value: ${CLOWDER_ENABLED}
         - name: SCHEMA_SUFFIX
           value: ${SCHEMA_SUFFIX}
-        - name: TRINO_SCHEMA_PREFIX
-          value: ${TRINO_SCHEMA_PREFIX}
         - name: TRINO_S3A_OR_S3
           value: ${TRINO_S3A_OR_S3}
         - name: AWS_SHARED_CREDENTIALS_FILE
@@ -5255,8 +5199,6 @@ objects:
           value: ${CLOWDER_ENABLED}
         - name: SCHEMA_SUFFIX
           value: ${SCHEMA_SUFFIX}
-        - name: TRINO_SCHEMA_PREFIX
-          value: ${TRINO_SCHEMA_PREFIX}
         - name: TRINO_S3A_OR_S3
           value: ${TRINO_S3A_OR_S3}
         - name: AWS_SHARED_CREDENTIALS_FILE
@@ -5435,8 +5377,6 @@ objects:
           value: ${CLOWDER_ENABLED}
         - name: SCHEMA_SUFFIX
           value: ${SCHEMA_SUFFIX}
-        - name: TRINO_SCHEMA_PREFIX
-          value: ${TRINO_SCHEMA_PREFIX}
         - name: TRINO_S3A_OR_S3
           value: ${TRINO_S3A_OR_S3}
         - name: AWS_SHARED_CREDENTIALS_FILE
@@ -5618,8 +5558,6 @@ objects:
           value: ${AWS_SHARED_CREDENTIALS_FILE}
         - name: SCHEMA_SUFFIX
           value: ${SCHEMA_SUFFIX}
-        - name: TRINO_SCHEMA_PREFIX
-          value: ${TRINO_SCHEMA_PREFIX}
         - name: TRINO_S3A_OR_S3
           value: ${TRINO_S3A_OR_S3}
         - name: DEVELOPMENT
@@ -5670,8 +5608,6 @@ objects:
           value: ${AWS_SHARED_CREDENTIALS_FILE}
         - name: SCHEMA_SUFFIX
           value: ${SCHEMA_SUFFIX}
-        - name: TRINO_SCHEMA_PREFIX
-          value: ${TRINO_SCHEMA_PREFIX}
         - name: TRINO_S3A_OR_S3
           value: ${TRINO_S3A_OR_S3}
         - name: DEVELOPMENT
@@ -5840,8 +5776,6 @@ parameters:
     testing
   name: SCHEMA_SUFFIX
   value: ""
-- name: TRINO_SCHEMA_PREFIX
-  value: ""
 - name: TRINO_S3A_OR_S3
   value: s3a
 - name: S3_BUCKET_NAME

diff --git a/deploy/kustomize/base/base.yaml b/deploy/kustomize/base/base.yaml
@@ -77,8 +77,6 @@ objects:
           value: ${AWS_SHARED_CREDENTIALS_FILE}
         - name: SCHEMA_SUFFIX
           value: ${SCHEMA_SUFFIX}
-        - name: TRINO_SCHEMA_PREFIX
-          value: ${TRINO_SCHEMA_PREFIX}
         - name: TRINO_S3A_OR_S3
           value: ${TRINO_S3A_OR_S3}
         - name: DEVELOPMENT
@@ -132,8 +130,6 @@ objects:
           value: ${AWS_SHARED_CREDENTIALS_FILE}
         - name: SCHEMA_SUFFIX
           value: ${SCHEMA_SUFFIX}
-        - name: TRINO_SCHEMA_PREFIX
-          value: ${TRINO_SCHEMA_PREFIX}
         - name: TRINO_S3A_OR_S3
           value: ${TRINO_S3A_OR_S3}
         - name: DEVELOPMENT
@@ -297,8 +293,6 @@ parameters:
 - name: SCHEMA_SUFFIX
   description: DEVELOPMENT ONLY - used to prevent clashing Glue databases during ephemeral testing
   value: ""
-- name: TRINO_SCHEMA_PREFIX
-  value: ""
 - name: TRINO_S3A_OR_S3
   value: "s3a"
 - name: S3_BUCKET_NAME

diff --git a/deploy/kustomize/patches/koku-reads.yaml b/deploy/kustomize/patches/koku-reads.yaml
@@ -15,8 +15,6 @@
           value: ${CLOWDER_ENABLED}
         - name: SCHEMA_SUFFIX
           value: ${SCHEMA_SUFFIX}
-        - name: TRINO_SCHEMA_PREFIX
-          value: ${TRINO_SCHEMA_PREFIX}
         - name: TRINO_S3A_OR_S3
           value: ${TRINO_S3A_OR_S3}
         - name: DJANGO_SECRET_KEY

diff --git a/deploy/kustomize/patches/koku-writes.yaml b/deploy/kustomize/patches/koku-writes.yaml
@@ -22,8 +22,6 @@
           value: ${CLOWDER_ENABLED}
         - name: SCHEMA_SUFFIX
           value: ${SCHEMA_SUFFIX}
-        - name: TRINO_SCHEMA_PREFIX
-          value: ${TRINO_SCHEMA_PREFIX}
         - name: TRINO_S3A_OR_S3
           value: ${TRINO_S3A_OR_S3}
         - name: DJANGO_SECRET_KEY

diff --git a/deploy/kustomize/patches/listener.yaml b/deploy/kustomize/patches/listener.yaml
@@ -19,8 +19,6 @@
           value: ${CLOWDER_ENABLED}
         - name: SCHEMA_SUFFIX
           value: ${SCHEMA_SUFFIX}
-        - name: TRINO_SCHEMA_PREFIX
-          value: ${TRINO_SCHEMA_PREFIX}
         - name: TRINO_S3A_OR_S3
           value: ${TRINO_S3A_OR_S3}
         - name: KAFKA_CONNECT

diff --git a/deploy/kustomize/patches/masu.yaml b/deploy/kustomize/patches/masu.yaml
@@ -21,8 +21,6 @@
           value: ${CLOWDER_ENABLED}
         - name: SCHEMA_SUFFIX
           value: ${SCHEMA_SUFFIX}
-        - name: TRINO_SCHEMA_PREFIX
-          value: ${TRINO_SCHEMA_PREFIX}
         - name: TRINO_S3A_OR_S3
           value: ${TRINO_S3A_OR_S3}
         - name: MASU

diff --git a/deploy/kustomize/patches/nginx.yaml b/deploy/kustomize/patches/nginx.yaml
@@ -20,8 +20,6 @@
           value: ${CLOWDER_ENABLED}
         - name: SCHEMA_SUFFIX
           value: ${SCHEMA_SUFFIX}
-        - name: TRINO_SCHEMA_PREFIX
-          value: ${TRINO_SCHEMA_PREFIX}
         - name: TRINO_S3A_OR_S3
           value: ${TRINO_S3A_OR_S3}
         - name: APP_POD_NAME

diff --git a/deploy/kustomize/patches/scheduler.yaml b/deploy/kustomize/patches/scheduler.yaml
@@ -31,8 +31,6 @@
           value: ${CLOWDER_ENABLED}
         - name: SCHEMA_SUFFIX
           value: ${SCHEMA_SUFFIX}
-        - name: TRINO_SCHEMA_PREFIX
-          value: ${TRINO_SCHEMA_PREFIX}
         - name: TRINO_S3A_OR_S3
           value: ${TRINO_S3A_OR_S3}
         - name: AWS_SHARED_CREDENTIALS_FILE

diff --git a/deploy/kustomize/patches/sources-client.yaml b/deploy/kustomize/patches/sources-client.yaml
@@ -21,8 +21,6 @@
           value: ${CLOWDER_ENABLED}
         - name: SCHEMA_SUFFIX
           value: ${SCHEMA_SUFFIX}
-        - name: TRINO_SCHEMA_PREFIX
-          value: ${TRINO_SCHEMA_PREFIX}
         - name: TRINO_S3A_OR_S3
           value: ${TRINO_S3A_OR_S3}
         - name: SOURCES