chore: move ansible migration tests to nix flake check

amazon-arm64-nix.pkr.hcl

@@ -228,11 +228,6 @@ build {
     destination = "/tmp"
   }
 
-  provisioner "file" {
-    source = "ebssurrogate/files/unit-tests"
-    destination = "/tmp"
-  }
-
   # Copy ansible playbook
   provisioner "shell" {
     inline = ["mkdir /tmp/ansible-playbook"]

ansible/tasks/test-image.yml

@@ -1,9 +1,3 @@
-- name: install pg_prove
-  apt:
-    pkg:
-      - libtap-parser-sourcehandler-pgtap-perl
-  when: debpkg_mode
-
 # - name: Temporarily disable PG Sodium references in config
 #   become: yes
 #   become_user: postgres
@@ -16,9 +10,9 @@
   become_user: postgres
   shell:
     cmd: >
-      sed -i.bak 
-      -e 's/\(shared_preload_libraries = '\''.*\)pgsodium,\(.*'\''\)/\1\2/' 
-      -e 's/\(shared_preload_libraries = '\''.*\)supabase_vault,\(.*'\''\)/\1\2/' 
+      sed -i.bak
+      -e 's/\(shared_preload_libraries = '\''.*\)pgsodium,\(.*'\''\)/\1\2/'
+      -e 's/\(shared_preload_libraries = '\''.*\)supabase_vault,\(.*'\''\)/\1\2/'
       -e 's/\(shared_preload_libraries = '\''.*\), *supabase_vault'\''/\1'\''/'
       -e 's/pgsodium.getkey_script=/#pgsodium.getkey_script=/'
       /etc/postgresql/postgresql.conf
@@ -74,53 +68,6 @@
     LOCALE_ARCHIVE: /usr/lib/locale/locale-archive
   when: stage2_nix
 
-
-- name: Check psql_version and modify migrations if oriole-xx
-  block:
-    - name: Check if psql_version is psql_orioledb-xx
-      set_fact:
-        is_psql_oriole: "{{ psql_version in ['psql_orioledb-16', 'psql_orioledb-17'] }}"
-
-    - name: Remove specified extensions from SQL file
-      ansible.builtin.command:
-        cmd: >
-          sed -i '/\\ir.*\(timescaledb\|postgis\|pgrouting\|plv8\).*\.sql/d' /tmp/migrations/tests/extensions/test.sql
-      when: is_psql_oriole
-      become: yes
-
-    - name: Remove specified extension files from extensions directory
-      ansible.builtin.find:
-        paths: /tmp/migrations/tests/extensions
-        patterns: 
-          - '*timescaledb*.sql'
-          - '*plv8*.sql'
-          - '*postgis*.sql'
-          - '*pgrouting*.sql'
-      register: files_to_remove
-      when: is_psql_oriole
-
-    - name: Delete matched extension files
-      ansible.builtin.file:
-        path: "{{ item.path }}"
-        state: absent
-      loop: "{{ files_to_remove.files }}"
-      when: is_psql_oriole
-      become: yes
-
-- name: Run Unit tests (with filename unit-test-*) on Postgres Database
-  shell: /usr/bin/pg_prove -U postgres -h localhost -d postgres -v /tmp/unit-tests/unit-test-*.sql
-  register: retval
-  failed_when: retval.rc != 0
-  when: debpkg_mode or stage2_nix
-
-- name: Run migrations tests
-  shell: /usr/bin/pg_prove -U supabase_admin -h localhost -d postgres -v tests/test.sql
-  register: retval
-  failed_when: retval.rc != 0
-  when: debpkg_mode or stage2_nix
-  args:
-    chdir: /tmp/migrations
-
 - name: Re-enable PG Sodium references in config
   become: yes
   become_user: postgres
@@ -132,14 +79,6 @@
   shell: /usr/lib/postgresql/bin/psql --no-password --no-psqlrc -d postgres -h localhost -U supabase_admin -c 'SELECT pg_stat_statements_reset(); SELECT pg_stat_reset();'
   when: debpkg_mode or stage2_nix
 
-- name: remove pg_prove
-  apt:
-    pkg:
-      - libtap-parser-sourcehandler-pgtap-perl
-    state: absent
-    autoremove: yes
-  when: debpkg_mode
-
 - name: Stop Postgres Database
   become: yes
   become_user: postgres

ebssurrogate/scripts/surrogate-bootstrap-nix.sh

@@ -180,9 +180,6 @@ function setup_chroot_environment {
 	# Copy migrations
 	cp -r /tmp/migrations /mnt/tmp/
 
-	# Copy unit tests 
-	cp -r /tmp/unit-tests /mnt/tmp/
-
 	# Copy the bootstrap script into place and execute inside chroot
 	cp /tmp/chroot-bootstrap-nix.sh /mnt/tmp/chroot-bootstrap-nix.sh
 	chroot /mnt /tmp/chroot-bootstrap-nix.sh

flake.nix

@@ -807,6 +807,9 @@
                 exit 1
               fi
 
+              echo "Running migrations tests"
+              pg_prove -p 5435 -U supabase_admin -h localhost -d postgres -v ${./migrations/tests}/test.sql
+
               mkdir -p $out/regression_output
               if ! pg_regress \
                 --use-existing \

migrations/tests/extensions/01-postgis.sql

@@ -1,43 +1,38 @@
-BEGIN;
-create extension if not exists postgis_sfcgal with schema "extensions" cascade;
-ROLLBACK;
+begin;
+do $_$
+begin
+  if not exists (select 1 from pg_extension where extname = 'orioledb') then
+    -- create postgis tiger as supabase_admin
+    create extension if not exists postgis_tiger_geocoder cascade;
 
-BEGIN;
-create extension if not exists postgis_raster with schema "extensions" cascade;
-ROLLBACK;
+    -- \ir ansible/files/postgresql_extension_custom_scripts/postgis_tiger_geocoder/after-create.sql
+    grant usage on schema tiger, tiger_data to postgres with grant option;
+    grant all privileges on all tables in schema tiger, tiger_data to postgres with grant option;
+    grant all privileges on all routines in schema tiger, tiger_data to postgres with grant option;
+    grant all privileges on all sequences in schema tiger, tiger_data to postgres with grant option;
+    alter default privileges in schema tiger, tiger_data grant all on tables to postgres with grant option;
+    alter default privileges in schema tiger, tiger_data grant all on routines to postgres with grant option;
+    alter default privileges in schema tiger, tiger_data grant all on sequences to postgres with grant option;
+    SET search_path TO extensions, public, tiger, tiger_data;
+    -- postgres role should have access
+    set local role postgres;
+    perform tiger.pprint_addy(tiger.pagc_normalize_address('710 E Ben White Blvd, Austin, TX 78704'));
 
-BEGIN;
--- create postgis tiger as supabase_admin
-create extension if not exists address_standardizer with schema extensions;
-create extension if not exists postgis_tiger_geocoder cascade;
+    -- other roles can be granted access
+    grant usage on schema tiger, tiger_data to authenticated;
+    grant select on all tables in schema tiger, tiger_data to authenticated;
+    grant execute on all routines in schema tiger, tiger_data to authenticated;
 
--- \ir ansible/files/postgresql_extension_custom_scripts/postgis_tiger_geocoder/after-create.sql
-grant usage on schema tiger, tiger_data to postgres with grant option;
-grant all privileges on all tables in schema tiger, tiger_data to postgres with grant option;
-grant all privileges on all routines in schema tiger, tiger_data to postgres with grant option;
-grant all privileges on all sequences in schema tiger, tiger_data to postgres with grant option;
-alter default privileges in schema tiger, tiger_data grant all on tables to postgres with grant option;
-alter default privileges in schema tiger, tiger_data grant all on routines to postgres with grant option;
-alter default privileges in schema tiger, tiger_data grant all on sequences to postgres with grant option;
-SET search_path TO extensions, public, tiger, tiger_data;
--- postgres role should have access
-set local role postgres;
-select tiger.pprint_addy(tiger.pagc_normalize_address('710 E Ben White Blvd, Austin, TX 78704'));
+    -- authenticated role should have access now
+    set local role authenticated;
+    perform tiger.pprint_addy(tiger.pagc_normalize_address('710 E Ben White Blvd, Austin, TX 78704'));
+    reset role;
 
--- other roles can be granted access
-grant usage on schema tiger, tiger_data to authenticated;
-grant select on all tables in schema tiger, tiger_data to authenticated;
-grant execute on all routines in schema tiger, tiger_data to authenticated;
-
--- authenticated role should have access now
-set local role authenticated;
-select tiger.pprint_addy(tiger.pagc_normalize_address('710 E Ben White Blvd, Austin, TX 78704'));
-ROLLBACK;
-
-BEGIN;
--- address standardizer creates a table in extensions schema, owned by supabase_admin
-create extension if not exists address_standardizer_data_us with schema extensions;
--- postgres role should have access
-set local role postgres;
-select * from extensions.us_lex;
-ROLLBACK;
+    -- postgres role should have access to address_standardizer_data_us
+    set local role postgres;
+    perform 1 from us_lex;
+    reset role;
+  end if;
+end
+$_$;
+rollback;

migrations/tests/extensions/02-pgrouting.sql

@@ -1,3 +1,9 @@
-BEGIN;
-create extension if not exists pgrouting with schema "extensions" cascade;
-ROLLBACK;
+begin;
+do $_$
+begin
+  if not exists (select 1 from pg_extension where extname = 'orioledb') then
+    create extension if not exists pgrouting with schema "extensions" cascade;
+  end if;
+end
+$_$;
+rollback;

migrations/tests/extensions/10-timescaledb.sql

@@ -1,3 +1,9 @@
-BEGIN;
-create extension if not exists timescaledb with schema "extensions";
-ROLLBACK;
+begin;
+do $_$
+begin
+  if not exists (select 1 from pg_extension where extname = 'orioledb') then
+    create extension if not exists timescaledb with schema "extensions";
+  end if;
+end
+$_$;
+rollback;

migrations/tests/extensions/13-plv8.sql

@@ -1,3 +1,9 @@
-BEGIN;
-create extension if not exists plv8 with schema "pg_catalog";
-ROLLBACK;
+begin;
+do $_$
+begin
+  if not exists (select 1 from pg_extension where extname = 'orioledb') then
+    create extension if not exists plv8 with schema "pg_catalog";
+  end if;
+end
+$_$;
+rollback;

nix/docs/adding-new-package.md

@@ -131,7 +131,6 @@ buildPgrxExtension_0_11_3 rec {
   meta = with lib; {
     description = "JSON Schema Validation for PostgreSQL";
     homepage = "https://github.com/supabase/${pname}";
-    maintainers = with maintainers; [ samrose ];
     platforms = postgresql.meta.platforms;
     license = licenses.postgresql;
   };

nix/ext/hypopg.nix

@@ -24,7 +24,6 @@ stdenv.mkDerivation rec {
   meta = with lib; {
     description = "Hypothetical Indexes for PostgreSQL";
     homepage = "https://github.com/HypoPG/${pname}";
-    maintainers = with maintainers; [ samrose ];
     platforms = postgresql.meta.platforms;
     license = licenses.postgresql;
   };

nix/ext/index_advisor.nix

@@ -23,7 +23,6 @@ stdenv.mkDerivation rec {
   meta = with lib; {
     description = "Recommend indexes to improve query performance in PostgreSQL";
     homepage = "https://github.com/olirice/index_advisor";
-    maintainers = with maintainers; [ samrose ];
     platforms = postgresql.meta.platforms;
     license = licenses.postgresql;
   };

nix/ext/mecab-naist-jdic/default.nix

@@ -21,21 +21,20 @@ stdenv.mkDerivation rec {
     ${mecab}/libexec/mecab/mecab-dict-index -d . -o . -f UTF-8 -t utf-8
     runHook postBuild
   '';
-  
+
   installPhase = ''
     runHook preInstall
-    
+
     mkdir -p $out/lib/mecab/dic/naist-jdic
     cp *.dic *.bin *.def $out/lib/mecab/dic/naist-jdic/
-    
+
     runHook postInstall
   '';
-  
+
   meta = with lib; {
     description = "Naist Japanese Dictionary for MeCab";
     homepage = "https://taku910.github.io/mecab/";
     license = licenses.gpl2;
     platforms = platforms.unix;
-    maintainers = with maintainers; [ samrose ];
   };
-}
+}

nix/ext/orioledb.nix

@@ -14,24 +14,23 @@ stdenv.mkDerivation rec {
   buildPhase = "make USE_PGXS=1 ORIOLEDB_PATCHSET_VERSION=5";
   installPhase = ''
     runHook preInstall
-    
+
     mkdir -p $out/{lib,share/postgresql/extension}
 
     # Copy the extension library
     cp orioledb${postgresql.dlSuffix} $out/lib/
-    
+
     # Copy sql files from the sql directory
     cp sql/*.sql $out/share/postgresql/extension/
-    
+
     # Copy control file
     cp orioledb.control $out/share/postgresql/extension/
-        
+
     runHook postInstall
   '';
   doCheck = true;
   meta = with lib; {
     description = "orioledb";
-    maintainers = with maintainers; [ samrose ];
     platforms = postgresql.meta.platforms;
     license = licenses.postgresql;
   };

nix/ext/pg-safeupdate.nix

@@ -24,6 +24,5 @@ stdenv.mkDerivation rec {
     platforms   = postgresql.meta.platforms;
     license     = licenses.postgresql;
     broken      = versionOlder postgresql.version "14";
-    maintainers = with maintainers; [ samrose ];
   };
 }

nix/ext/pg_backtrace.nix

@@ -26,7 +26,6 @@ stdenv.mkDerivation rec {
   meta = with lib; {
     description = "Updated fork of pg_backtrace";
     homepage    = "https://github.com/pashkinelfe/pg_backtrace";
-    maintainers = with maintainers; [ samrose ];
     platforms   = postgresql.meta.platforms;
     license     = licenses.postgresql;
   };