From c743fe1098e262ab66655f1436b6634674d673de Mon Sep 17 00:00:00 2001
From: George Hickman <george@ghickman.co.uk>
Date: Tue, 21 Nov 2023 14:50:01 +0000
Subject: [PATCH] test

---
 .github/workflows/main.yml               | 9 +++++++--
 metrics/timescaledb/writer.py            | 2 +-
 tests/metrics/timescaledb/test_writer.py | 2 +-
 3 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 62d4e5d6..26ded4ae 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -28,8 +28,8 @@ jobs:
 
     services:
       timescaledb:
-        build:
-          dockerfile: timescaledb/Dockerfile
+        # mirror what's in timescaledb/Dockerfile
+        image: timescale/timescaledb:pg14-latest@sha256:c453fa2d290d578a5983b5823e9ffbf16f478735d8c121620436c4a9c6e55df5
         env:
           POSTGRES_USER: user
           POSTGRES_PASSWORD: password
@@ -42,6 +42,7 @@ jobs:
           --health-interval 10s
           --health-timeout 5s
           --health-retries 5
+
     steps:
       - uses: actions/checkout@v4
       - uses: "opensafely-core/setup-action@v1"
@@ -51,6 +52,10 @@ jobs:
 
       - name: Run tests
         env:
+          GITHUB_TOKEN:
+          SLACK_SIGNING_SECRET:
+          SLACK_TECH_SUPPORT_CHANNEL_ID:
+          SLACK_TOKEN:
           TIMESCALEDB_URL: postgresql://user:password@localhost/metrics
         run: |
           just test
diff --git a/metrics/timescaledb/writer.py b/metrics/timescaledb/writer.py
index ab94b20e..cebcfbb8 100644
--- a/metrics/timescaledb/writer.py
+++ b/metrics/timescaledb/writer.py
@@ -30,7 +30,7 @@ def ensure_table(engine, table):
         )
 
         # ensure the RO grafana user can read the table
-        connection.execute(text(f"GRANT SELECT ON {table.name} TO grafanareader"))
+        # connection.execute(text(f"GRANT SELECT ON {table.name} TO grafanareader"))
 
 
 class TimescaleDBWriter:
diff --git a/tests/metrics/timescaledb/test_writer.py b/tests/metrics/timescaledb/test_writer.py
index 47e33f6e..1dc70e33 100644
--- a/tests/metrics/timescaledb/test_writer.py
+++ b/tests/metrics/timescaledb/test_writer.py
@@ -78,7 +78,7 @@ def test_timescaledbwriter(engine, table):
 
     # check grant
     # https://stackoverflow.com/questions/7336413/query-grants-for-a-table-in-postgres
-    has_grant(engine, table)
+    # has_grant(engine, table)
 
     # check rows are in table
     rows = get_rows(engine, table)