Skip to content

Commit fe9eaab

Browse files
committed
Merge branch 'develop' into fix/set-default-transaction-read-only
2 parents ce49a14 + 08d0096 commit fe9eaab

File tree

9 files changed

+45
-15
lines changed

9 files changed

+45
-15
lines changed

ansible/files/postgres_exporter.service.j2

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ Description=Postgres Exporter
33

44
[Service]
55
Type=simple
6-
ExecStart=/opt/postgres_exporter/postgres_exporter --disable-settings-metrics --extend.query-path="/opt/postgres_exporter/queries.yml" --disable-default-metrics --no-collector.locks --no-collector.replication --no-collector.replication_slot --no-collector.stat_bgwriter --no-collector.stat_database --no-collector.stat_user_tables --no-collector.statio_user_tables --no-collector.wal
6+
ExecStart=/opt/postgres_exporter/postgres_exporter --disable-settings-metrics --extend.query-path="/opt/postgres_exporter/queries.yml" --disable-default-metrics --no-collector.locks --no-collector.replication --no-collector.replication_slot --no-collector.stat_bgwriter --no-collector.stat_database --no-collector.stat_user_tables --no-collector.statio_user_tables --no-collector.wal {% if qemu_mode is defined and qemu_mode %}--no-collector.database {% endif %}
77
User=postgres
88
Group=postgres
99
Restart=always

ansible/files/postgresql_config/supautils.conf.j2

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
supautils.extensions_parameter_overrides = '{"pg_cron":{"schema":"pg_catalog"}}'
2-
supautils.policy_grants = '{"postgres":["auth.audit_log_entries","auth.identities","auth.refresh_tokens","auth.sessions","auth.users","realtime.messages","storage.buckets","storage.migrations","storage.objects","storage.s3_multipart_uploads","storage.s3_multipart_uploads_parts"]}'
3-
supautils.drop_trigger_grants = '{"postgres":["auth.audit_log_entries","auth.identities","auth.refresh_tokens","auth.sessions","auth.users","realtime.messages","storage.buckets","storage.migrations","storage.objects","storage.s3_multipart_uploads","storage.s3_multipart_uploads_parts"]}'
2+
supautils.policy_grants = '{"postgres":["auth.audit_log_entries","auth.identities","auth.mfa_factors","auth.refresh_tokens","auth.sessions","auth.users","realtime.messages","storage.buckets","storage.migrations","storage.objects","storage.s3_multipart_uploads","storage.s3_multipart_uploads_parts"]}'
3+
supautils.drop_trigger_grants = '{"postgres":["auth.audit_log_entries","auth.identities","auth.mfa_factors","auth.refresh_tokens","auth.sessions","auth.users","realtime.messages","storage.buckets","storage.migrations","storage.objects","storage.s3_multipart_uploads","storage.s3_multipart_uploads_parts"]}'
44
# full list: address_standardizer, address_standardizer_data_us, adminpack, amcheck, autoinc, bloom, btree_gin, btree_gist, citext, cube, dblink, dict_int, dict_xsyn, earthdistance, file_fdw, fuzzystrmatch, hstore, http, hypopg, index_advisor, insert_username, intagg, intarray, isn, lo, ltree, moddatetime, old_snapshot, orioledb, pageinspect, pg_buffercache, pg_cron, pg_freespacemap, pg_graphql, pg_hashids, pg_jsonschema, pg_net, pg_prewarm, pg_repack, pg_stat_monitor, pg_stat_statements, pg_surgery, pg_tle, pg_trgm, pg_visibility, pg_walinspect, pgaudit, pgcrypto, pgjwt, pgmq, pgroonga, pgroonga_database, pgrouting, pgrowlocks, pgsodium, pgstattuple, pgtap, plcoffee, pljava, plls, plpgsql, plpgsql_check, plv8, postgis, postgis_raster, postgis_sfcgal, postgis_tiger_geocoder, postgis_topology, postgres_fdw, refint, rum, seg, sslinfo, supabase_vault, supautils, tablefunc, tcn, timescaledb, tsm_system_rows, tsm_system_time, unaccent, uuid-ossp, vector, wrappers, xml2
55
# omitted because may be unsafe: adminpack, amcheck, file_fdw, lo, old_snapshot, pageinspect, pg_freespacemap, pg_surgery, pg_visibility
66
# omitted because deprecated: intagg, xml2

ansible/manifest-playbook.yml

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -61,6 +61,22 @@
6161
shell: |
6262
cd /tmp && tar -cJf admin-mgr-{{ adminmgr_release }}-arm64.tar.xz admin-mgr
6363
64+
- name: Download supabase-admin-agent archive
65+
get_url:
66+
url: "https://supabase-public-artifacts-bucket.s3.amazonaws.com/supabase-admin-agent/v{{ supabase_admin_agent_release }}/supabase-admin-agent-{{ supabase_admin_agent_release }}-linux-arm64.tar.gz"
67+
dest: "/tmp/supabase-admin-agent.tar.gz"
68+
timeout: 90
69+
70+
- name: supabase-admin-agent - unpack archive in /tmp
71+
unarchive:
72+
remote_src: yes
73+
src: /tmp/supabase-admin-agent.tar.gz
74+
dest: /tmp
75+
76+
- name: supabase-admin-agent - pack archive
77+
shell: |
78+
cd /tmp && tar -cJf supabase-admin-agent-{{ supabase_admin_agent_release }}-arm64.tar.xz supabase-admin-agent
79+
6480
- name: upload archives
6581
shell: |
6682
aws s3 cp /tmp/{{ item.file }} s3://{{ internal_artifacts_bucket }}/upgrades/{{ item.service }}/{{ item.file }}
@@ -73,3 +89,5 @@
7389
file: supabase-admin-api-{{ adminapi_release }}-arm64.tar.xz
7490
- service: admin-mgr
7591
file: admin-mgr-{{ adminmgr_release }}-arm64.tar.xz
92+
- service: supabase-admin-agent
93+
file: supabase-admin-agent-{{ supabase_admin_agent_release }}-arm64.tar.xz

ansible/vars.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,9 @@ postgres_major:
99

1010
# Full version strings for each major version
1111
postgres_release:
12-
postgresorioledb-17: "17.0.1.106-orioledb"
13-
postgres17: "17.4.1.056"
14-
postgres15: "15.8.1.113"
12+
postgresorioledb-17: "17.5.1.003-orioledb"
13+
postgres17: "17.4.1.060"
14+
postgres15: "15.8.1.117"
1515

1616
# Non Postgres Extensions
1717
pgbouncer_release: "1.19.0"
@@ -53,7 +53,7 @@ postgres_exporter_release_checksum:
5353

5454
adminapi_release: 0.84.1
5555
adminmgr_release: 0.25.1
56-
supabase_admin_agent_release: 1.4.36
56+
supabase_admin_agent_release: 1.4.37
5757

5858
vector_x86_deb: "https://packages.timber.io/vector/0.48.X/vector_0.48.0-1_amd64.deb"
5959
vector_arm_deb: "https://packages.timber.io/vector/0.48.X/vector_0.48.0-1_arm64.deb"

migrations/schema-orioledb-17.sql

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22
-- PostgreSQL database dump
33
--
44

5-
-- Dumped from database version 17.0
6-
-- Dumped by pg_dump version 17.0
5+
-- Dumped from database version 17.5
6+
-- Dumped by pg_dump version 17.5
77

88
SET statement_timeout = 0;
99
SET lock_timeout = 0;

nix/config.nix

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -52,8 +52,8 @@ in
5252
};
5353
orioledb = {
5454
"17" = {
55-
version = "17_6";
56-
hash = "sha256-HbuTcXNanFOl9YfvlSzQJon8CfAhc8TFwo/y7jXy51w=";
55+
version = "17_11";
56+
hash = "sha256-RZYU955PmGZExfX2JKw1dIQMMuuswtAXpXjZ9CLbOsw=";
5757
};
5858
};
5959
};

nix/ext/orioledb.nix

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,18 +15,18 @@ stdenv.mkDerivation rec {
1515
src = fetchFromGitHub {
1616
owner = "orioledb";
1717
repo = "orioledb";
18-
rev = "beta10";
19-
sha256 = "sha256-O4OTi8ickylVXE9FURm5R++A+l15Z22YLna7OVzVMjc=";
18+
rev = "beta12";
19+
sha256 = "sha256-5dyVdKD1PzW+F5OPW3TR3OKBaJxxR3OhLbzK+o9Wf+Q=";
2020
};
21-
version = "beta10";
21+
version = "beta12";
2222
buildInputs = [
2323
curl
2424
libkrb5
2525
postgresql
2626
python3
2727
openssl
2828
];
29-
buildPhase = "make USE_PGXS=1 ORIOLEDB_PATCHSET_VERSION=6";
29+
buildPhase = "make USE_PGXS=1 ORIOLEDB_PATCHSET_VERSION=11";
3030
installPhase = ''
3131
runHook preInstall
3232

nix/tests/expected/roles.out

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -521,3 +521,8 @@ order by schema_order, schema_name, privilege_type, grantee, default_for;
521521
vault | USAGE | supabase_admin | supabase_admin
522522
(389 rows)
523523

524+
-- postgres can alter API roles' timeout
525+
set role postgres;
526+
alter role anon set statement_timeout = '10min';
527+
alter role anon reset statement_timeout;
528+
reset role;

nix/tests/sql/roles.sql

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -65,3 +65,10 @@ from (
6565
a.privilege_type in ('CREATE', 'USAGE')
6666
) sub
6767
order by schema_order, schema_name, privilege_type, grantee, default_for;
68+
69+
-- postgres can alter API roles' timeout
70+
set role postgres;
71+
alter role anon set statement_timeout = '10min';
72+
73+
alter role anon reset statement_timeout;
74+
reset role;

0 commit comments

Comments
 (0)