Skip to content

Commit b55c025

Browse files
samrosesamrose
authored
Merge branch 'develop' into sam/oriole17
2 parents 1f955df + f28c5d1 commit b55c025

File tree

11 files changed

+45
-313
lines changed

11 files changed

+45
-313
lines changed

‎.github/workflows/ami-release-nix.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ jobs:
5656
- name: Run checks if triggered manually
5757
if: ${{ github.event_name == 'workflow_dispatch' }}
5858
run: |
59-
SUFFIX=$(sudo nix run nixpkgs#yq -- '.postgres_release["postgres${{ matrix.postgres_version }}"]' ansible/vars.yml | sed -E 's/[0-9\.]+(.*)$/\1/')
59+
SUFFIX=$(sudo nix run nixpkgs#yq -- ".postgres_release[\"postgres${{ matrix.postgres_version }}\"]" ansible/vars.yml | sed -E 's/[0-9\.]+(.*)$/\1/')
6060
if [[ -z $SUFFIX ]] ; then
6161
echo "Version must include non-numeric characters if built manually."
6262
exit 1

‎ansible/files/envoy_config/lds.yaml‎

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -258,6 +258,9 @@ resources:
258258
max_program_size: 150
259259
regex: >-
260260
/auth/v1/(verify|callback|authorize|sso/saml/(acs|metadata|slo)|\.well-known/(openid-configuration|jwks\.json))
261+
request_headers_to_remove:
262+
- apikey
263+
- sb-opk
261264
route:
262265
cluster: gotrue
263266
regex_rewrite:
@@ -271,6 +274,9 @@ resources:
271274
typed_per_filter_config: *ref_0
272275
- match:
273276
prefix: /auth/v1/
277+
request_headers_to_remove:
278+
- apikey
279+
- sb-opk
274280
route:
275281
cluster: gotrue
276282
prefix_rewrite: /
@@ -282,6 +288,7 @@ resources:
282288
present_match: true
283289
request_headers_to_remove:
284290
- apikey
291+
- sb-opk
285292
route:
286293
cluster: postgrest
287294
prefix_rewrite: /
@@ -295,6 +302,7 @@ resources:
295302
prefix: /rest/v1/
296303
request_headers_to_remove:
297304
- apikey
305+
- sb-opk
298306
route:
299307
cluster: postgrest
300308
prefix_rewrite: /
@@ -311,6 +319,7 @@ resources:
311319
present_match: true
312320
request_headers_to_remove:
313321
- apikey
322+
- sb-opk
314323
route:
315324
cluster: postgrest_admin
316325
prefix_rewrite: /
@@ -323,6 +332,7 @@ resources:
323332
prefix: /rest-admin/v1/
324333
request_headers_to_remove:
325334
- apikey
335+
- sb-opk
326336
route:
327337
cluster: postgrest_admin
328338
prefix_rewrite: /
@@ -332,18 +342,25 @@ resources:
332342
header:
333343
key: Content-Profile
334344
value: graphql_public
345+
request_headers_to_remove:
346+
- apikey
347+
- sb-opk
335348
route:
336349
cluster: postgrest
337350
prefix_rewrite: /rpc/graphql
338351
timeout: 125s
339352
- match:
340353
prefix: /admin/v1/
354+
request_headers_to_remove:
355+
- sb-opk
341356
route:
342357
cluster: admin_api
343358
prefix_rewrite: /
344359
timeout: 600s
345360
- match:
346361
prefix: /customer/v1/privileged/
362+
request_headers_to_remove:
363+
- sb-opk
347364
route:
348365
cluster: admin_api
349366
prefix_rewrite: /privileged/
@@ -367,6 +384,8 @@ resources:
367384
treat_missing_header_as_empty: true
368385
- match:
369386
prefix: /metrics/aggregated
387+
request_headers_to_remove:
388+
- sb-opk
370389
route:
371390
cluster: admin_api
372391
prefix_rewrite: /supabase-internal/metrics

‎ansible/files/postgresql_config/supautils.conf.j2‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,10 @@
11
supautils.extensions_parameter_overrides = '{"pg_cron":{"schema":"pg_catalog"}}'
22
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-
# 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, 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
3+
# 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
44
# omitted because may be unsafe: adminpack, amcheck, file_fdw, lo, old_snapshot, pageinspect, pg_buffercache, pg_freespacemap, pg_surgery, pg_visibility
55
# omitted because deprecated: intagg, xml2
6-
supautils.privileged_extensions = 'address_standardizer, address_standardizer_data_us, autoinc, bloom, btree_gin, btree_gist, citext, cube, dblink, dict_int, dict_xsyn, earthdistance, fuzzystrmatch, hstore, http, hypopg, index_advisor, insert_username, intarray, isn, ltree, moddatetime, orioledb, pg_cron, pg_graphql, pg_hashids, pg_jsonschema, pg_net, pg_partman, pg_repack, pg_stat_monitor, pg_stat_statements, pg_tle, pg_trgm, pg_walinspect, pgaudit, pgcrypto, pgjwt, pg_prewarm, pgmq, pgroonga, pgroonga_database, pgrouting, pgrowlocks, pgstattuple, pgsodium, 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'
6+
# omitted because doesn't require superuser: pgmq
7+
supautils.privileged_extensions = 'address_standardizer, address_standardizer_data_us, autoinc, bloom, btree_gin, btree_gist, citext, cube, dblink, dict_int, dict_xsyn, earthdistance, fuzzystrmatch, hstore, http, hypopg, index_advisor, insert_username, intarray, isn, ltree, moddatetime, orioledb, pg_cron, pg_graphql, pg_hashids, pg_jsonschema, pg_net, pg_prewarm, pg_repack, pg_stat_monitor, pg_stat_statements, pg_tle, pg_trgm, pg_walinspect, pgaudit, pgcrypto, pgjwt, 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'
78
supautils.privileged_extensions_custom_scripts_path = '/etc/postgresql-custom/extension-custom-scripts'
89
supautils.privileged_extensions_superuser = 'supabase_admin'
910
supautils.privileged_role = 'postgres'

‎ansible/vars.yml‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,12 +8,11 @@ postgres_major:
88
- "orioledb-17"
99

1010
# Full version strings for each major version
11-
# TOD PR uncomment these lines
11+
# TODO PR uncomment these lines
1212
postgres_release:
13-
#postgres15: "15.8.1.003-staging-5"
14-
#postgres16: "16.3.1.000-staging-5"
15-
#postgresorioledb-16: "orioledb-16.3.1.000-staging-12"
1613
postgresorioledb-17: "orioledb-17.0.1.000-staging-3"
14+
#postgres15: "15.8.1.005"
15+
#postgres16: "16.3.1.011"
1716

1817
# Non Postgres Extensions
1918
pgbouncer_release: "1.19.0"

‎flake.nix‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -127,7 +127,6 @@
127127
./nix/ext/pg_hashids.nix
128128
./nix/ext/pgsodium.nix
129129
./nix/ext/pg_graphql.nix
130-
./nix/ext/pg_partman.nix
131130
./nix/ext/pg_stat_monitor.nix
132131
./nix/ext/pg_jsonschema.nix
133132
./nix/ext/pgvector.nix

0 commit comments

Comments
 (0)