[COST-4315] - upgrade local and ephemeral to Postgres 14 (#4705)

project-koku · Oct 13, 2023 · 6cfd95b · 6cfd95b
1 parent d39a292
commit 6cfd95b
Show file tree

Hide file tree

Showing 6 changed files with 11 additions and 6 deletions.
diff --git a/.github/postgres/docker-compose.yaml b/.github/postgres/docker-compose.yaml
@@ -2,7 +2,7 @@ version: '3'
 
 services:
   db:
-    image: postgres:13
+    image: postgres:14
     environment:
     - DATABASE_NAME=${DATABASE_NAME-postgres}
     - POSTGRES_USER=${DATABASE_USER-postgres}

diff --git a/deploy/clowdapp.yaml b/deploy/clowdapp.yaml
@@ -4329,7 +4329,7 @@ parameters:
   value: koku
 - name: DATABASE_VERSION
   required: true
-  value: "13"
+  value: "14"
 - name: CLOWDER_ENABLED
   required: true
   value: "True"

diff --git a/deploy/kustomize/base/base.yaml b/deploy/kustomize/base/base.yaml
@@ -216,7 +216,7 @@ parameters:
   value: koku
 - name: DATABASE_VERSION
   required: true
-  value: "13"
+  value: "14"
 - name: CLOWDER_ENABLED
   required: true
   value: "True"

diff --git a/dev/containers/postgresql/Dockerfile b/dev/containers/postgresql/Dockerfile
@@ -1,4 +1,4 @@
-from postgres:13
+from postgres:14
 
 ARG USER_ID=999
 ARG GROUP_ID=999

diff --git a/docker-compose.yml b/docker-compose.yml
@@ -444,7 +444,7 @@ services:
 
   db:
     container_name: koku-db
-    image: koku-db:13
+    image: koku-db:14
     build:
       context: dev/containers/postgresql
       args:

diff --git a/koku/masu/test/api/test_db_performance.py b/koku/masu/test/api/test_db_performance.py
@@ -174,7 +174,12 @@ def test_explain(self):
                 with DBPerformanceStats("KOKU", CONFIGURATOR) as dbp:
                     res = dbp.explain_sql(bad_sql)
 
-        expected = [{"query_plan": "Result  (cost=0.00..0.01 rows=1 width=4)\n  Output: 1", "query_text": "select 1"}]
+        expected = [
+            {
+                "query_plan": "Result  (cost=0.00..0.01 rows=1 width=4)\n  Output: 1\nQuery Identifier: 1147616880456321454",  # noqa: E501
+                "query_text": "select 1",
+            }
+        ]
 
         with DBPerformanceStats("KOKU", CONFIGURATOR) as dbp:
             res = dbp.explain_sql("select 1")