feat: renamed config options with prefixes; added aliases for old names

* secret-is-base64 -> jwt-secret-is-base64
* role-claim-key -> jwt-role-claim-key
* max-rows -> db-max-rows
* pre-request -> db-pre-request
* root-spec -> db-root-spec
* db-schema -> db-schemas

This is not a breaking change, because aliases are added as well.

refactor: sorted all config keys alphabetically where applicable

test/io-tests/configs/aliases.config

@@ -0,0 +1,9 @@
+db-anon-role = "required"
+db-uri = "required"
+
+db-schema = "provided_through_alias"
+max-rows = 1000
+pre-request = "check_alias"
+role-claim-key = ".aliased"
+root-spec = "open_alias"
+secret-is-base64 = true

test/io-tests/configs/app-settings.config

@@ -1,5 +1,5 @@
 db-uri = "$(POSTGREST_TEST_CONNECTION)"
-db-schema = "test"
+db-schemas = "test"
 db-anon-role = "postgrest_test_anonymous"
 db-pool = 1
 db-pool-timeout = 1

test/io-tests/configs/base64-secret-from-file.config

@@ -1,5 +1,5 @@
 db-uri = "$(POSTGREST_TEST_CONNECTION)"
-db-schema = "test"
+db-schemas = "test"
 db-anon-role = "postgrest_test_anonymous"
 db-pool = 1
 server-host = "127.0.0.1"
@@ -7,4 +7,4 @@ server-port = 49421
 
 # Read secret from a file: /dev/stdin (alias for standard input)
 jwt-secret = "@/dev/stdin"
-secret-is-base64 = true
+jwt-secret-is-base64 = true

test/io-tests/configs/dburi-from-file.config

@@ -1,5 +1,5 @@
 db-uri = "@/dev/stdin"
-db-schema = "test"
+db-schemas = "test"
 db-anon-role = "postgrest_test_anonymous"
 db-pool = 1
 server-host = "127.0.0.1"

test/io-tests/configs/defaults.config

@@ -1,3 +1,3 @@
 db-uri = "required"
-db-schema = "required"
+db-schemas = "required"
 db-anon-role = "required"

test/io-tests/configs/expected/aliases.config

@@ -0,0 +1,24 @@
+db-anon-role = "required"
+db-channel = "pgrst"
+db-channel-enabled = false
+db-extra-search-path = "public"
+db-max-rows = 1000
+db-pool = 10
+db-pool-timeout = 10
+db-pre-request = "check_alias"
+db-prepared-statements = true
+db-root-spec = "open_alias"
+db-schemas = "provided_through_alias"
+db-tx-end = "commit"
+db-uri = "required"
+jwt-aud = ""
+jwt-role-claim-key = ".\"aliased\""
+jwt-secret = ""
+jwt-secret-is-base64 = true
+log-level = "error"
+openapi-server-proxy-uri = ""
+raw-media-types = ""
+server-host = "!4"
+server-port = 3000
+server-unix-socket = ""
+server-unix-socket-mode = "660"

test/io-tests/configs/expected/defaults.config

@@ -1,24 +1,24 @@
-db-uri = "required"
-db-schema = "required"
 db-anon-role = "required"
-db-pool = 10
-db-pool-timeout = 10
-db-extra-search-path = "public"
 db-channel = "pgrst"
 db-channel-enabled = false
-db-tx-end = "commit"
+db-extra-search-path = "public"
+db-max-rows = ""
+db-pool = 10
+db-pool-timeout = 10
+db-pre-request = ""
 db-prepared-statements = true
+db-root-spec = ""
+db-schemas = "required"
+db-tx-end = "commit"
+db-uri = "required"
+jwt-aud = ""
+jwt-role-claim-key = ".\"role\""
+jwt-secret = ""
+jwt-secret-is-base64 = false
+log-level = "error"
+openapi-server-proxy-uri = ""
+raw-media-types = ""
 server-host = "!4"
 server-port = 3000
 server-unix-socket = ""
 server-unix-socket-mode = "660"
-openapi-server-proxy-uri = ""
-jwt-secret = ""
-jwt-aud = ""
-secret-is-base64 = false
-role-claim-key = ".\"role\""
-max-rows = ""
-pre-request = ""
-root-spec = ""
-raw-media-types = ""
-log-level = "error"

test/io-tests/configs/expected/no-defaults.config

@@ -1,26 +1,26 @@
-db-uri = "tmp_db"
-db-schema = "multi,tenant,setup"
 db-anon-role = "root"
-db-pool = 1
-db-pool-timeout = 100
-db-extra-search-path = "public,test"
 db-channel = "postgrest"
 db-channel-enabled = true
-db-tx-end = "rollback-allow-override"
+db-extra-search-path = "public,test"
+db-max-rows = 1000
+db-pool = 1
+db-pool-timeout = 100
+db-pre-request = "please_run_fast"
 db-prepared-statements = false
+db-root-spec = "openapi_v3"
+db-schemas = "multi,tenant,setup"
+db-tx-end = "rollback-allow-override"
+db-uri = "tmp_db"
+jwt-aud = "https://postgrest.org"
+jwt-role-claim-key = ".\"user\"[0].\"real-role\""
+jwt-secret = "c2VjdXJpdHl0aHJvdWdob2JzY3VyaXR5"
+jwt-secret-is-base64 = true
+log-level = "info"
+openapi-server-proxy-uri = "https://postgrest.org"
+raw-media-types = "application/vnd.pgrst.config"
 server-host = "0.0.0.0"
 server-port = 80
 server-unix-socket = "/tmp/pgrst_io_test.sock"
 server-unix-socket-mode = "777"
-openapi-server-proxy-uri = "https://postgrest.org"
-jwt-secret = "c2VjdXJpdHl0aHJvdWdob2JzY3VyaXR5"
-jwt-aud = "https://postgrest.org"
-secret-is-base64 = true
-role-claim-key = ".\"user\"[0].\"real-role\""
-max-rows = 1000
-pre-request = "please_run_fast"
-root-spec = "openapi_v3"
-raw-media-types = "application/vnd.pgrst.config"
-log-level = "info"
 app.settings.test = "test"
 app.settings.test2 = "test"

test/io-tests/configs/no-defaults.config

@@ -1,26 +1,26 @@
-db-uri = "tmp_db"
-db-schema = "multi,   tenant,setup"
 db-anon-role = "root"
-db-pool = 1
-db-pool-timeout = 100
-db-extra-search-path = "public, test"
 db-channel = "postgrest"
 db-channel-enabled = true
-db-tx-end = "rollback-allow-override"
+db-extra-search-path = "public, test"
+db-max-rows = 1000
+db-pool = 1
+db-pool-timeout = 100
+db-pre-request = "please_run_fast"
 db-prepared-statements = false
+db-root-spec = "openapi_v3"
+db-schemas = "multi,   tenant,setup"
+db-tx-end = "rollback-allow-override"
+db-uri = "tmp_db"
+jwt-aud = "https://postgrest.org"
+jwt-role-claim-key = ".user[0].\"real-role\""
+jwt-secret = "c2VjdXJpdHl0aHJvdWdob2JzY3VyaXR5"
+jwt-secret-is-base64 = true
+log-level = "info"
+openapi-server-proxy-uri = "https://postgrest.org"
+raw-media-types = "application/vnd.pgrst.config"
 server-host = "0.0.0.0"
 server-port = 80
 server-unix-socket = "/tmp/pgrst_io_test.sock"
 server-unix-socket-mode = "777"
-openapi-server-proxy-uri = "https://postgrest.org"
-jwt-secret = "c2VjdXJpdHl0aHJvdWdob2JzY3VyaXR5"
-jwt-aud = "https://postgrest.org"
-secret-is-base64 = true
-role-claim-key = ".user[0].\"real-role\""
-max-rows = 1000
-pre-request = "please_run_fast"
-root-spec = "openapi_v3"
-raw-media-types = "application/vnd.pgrst.config"
-log-level = "info"
 app.settings.test = "test"
 app.settings.test2 = "test"

test/io-tests/configs/role-claim-key.config

@@ -1,8 +1,8 @@
 db-uri = "$(POSTGREST_TEST_CONNECTION)"
-db-schema = "test"
+db-schemas = "test"
 db-anon-role = "postgrest_test_anonymous"
 db-pool = 1
 server-host = "127.0.0.1"
 server-port = 49421
-role-claim-key = "$(ROLE_CLAIM_KEY)"
+jwt-role-claim-key = "$(ROLE_CLAIM_KEY)"
 jwt-secret = "reallyreallyreallyreallyverysafe"

test/io-tests/configs/secret-from-file.config

@@ -1,5 +1,5 @@
 db-uri = "$(POSTGREST_TEST_CONNECTION)"
-db-schema = "test"
+db-schemas = "test"
 db-anon-role = "postgrest_test_anonymous"
 db-pool = 1
 server-host = "127.0.0.1"
@@ -7,4 +7,4 @@ server-port = 49421
 
 # Read secret from a file: /dev/stdin (alias for standard input)
 jwt-secret = "@/dev/stdin"
-secret-is-base64 = false
+jwt-secret-is-base64 = false

test/io-tests/configs/sigusr2-settings.config

@@ -1,5 +1,5 @@
 db-uri = "$(POSTGREST_TEST_CONNECTION)"
-db-schema = "test"
+db-schemas = "test"
 db-anon-role = "postgrest_test_anonymous"
 db-pool = 1
 server-host = "127.0.0.1"

test/io-tests/configs/simple.config

@@ -1,5 +1,5 @@
 db-uri = "$(POSTGREST_TEST_CONNECTION)"
-db-schema = "test"
+db-schemas = "test"
 db-anon-role = "postgrest_test_anonymous"
 db-pool = 1
 server-host = "127.0.0.1"

test/io-tests/configs/unix-socket.config

@@ -1,5 +1,5 @@
 db-uri = "$(POSTGREST_TEST_CONNECTION)"
-db-schema = "test"
+db-schemas = "test"
 db-anon-role = "postgrest_test_anonymous"
 db-pool = 1
 server-host = "127.0.0.1"