chore: sort config dump alphabetically

src/PostgREST/Config.hs

@@ -161,7 +161,7 @@ dumpOpenApiMode = \case
 -- | Dump the config
 toText :: AppConfig -> Text
 toText conf =
-  unlines $ (\(k, v) -> k <> " = " <> v) <$> pgrstSettings ++ appSettings
+  unlines $ sort $ (\(k, v) -> k <> " = " <> v) <$> pgrstSettings ++ appSettings
   where
     -- apply conf to all pgrst settings
     pgrstSettings = (\(k, v) -> (k, v conf)) <$>

test/io/configs/expected/aliases.config

@@ -1,31 +1,33 @@
+admin-server-host = "!4"
+admin-server-port = ""
 client-error-verbosity = "verbose"
 db-aggregates-enabled = false
 db-anon-role = ""
 db-channel = "pgrst"
 db-channel-enabled = true
+db-config = true
 db-extra-search-path = "public"
 db-hoisted-tx-settings = "statement_timeout,plan_filter.statement_cost_limit,default_transaction_isolation"
 db-max-rows = 1000
 db-plan-enabled = false
 db-pool = 10
 db-pool-acquisition-timeout = 10
-db-pool-max-lifetime = 1800
-db-pool-max-idletime = 5
 db-pool-automatic-recovery = true
+db-pool-max-idletime = 5
+db-pool-max-lifetime = 1800
+db-pre-config = ""
 db-pre-request = "check_alias"
 db-prepared-statements = true
 db-root-spec = "open_alias"
 db-schemas = "provided_through_alias"
-db-config = true
-db-pre-config = ""
 db-timezone-enabled = true
 db-tx-end = "commit"
 db-uri = "postgresql://"
 jwt-aud = ""
+jwt-cache-max-entries = 1000
 jwt-role-claim-key = ".\"aliased\""
 jwt-secret = ""
 jwt-secret-is-base64 = true
-jwt-cache-max-entries = 1000
 log-level = "error"
 log-query = false
 openapi-mode = "follow-privileges"
@@ -34,9 +36,7 @@ openapi-server-proxy-uri = ""
 server-cors-allowed-origins = ""
 server-host = "!4"
 server-port = 3000
-server-trace-header = ""
 server-timing-enabled = false
+server-trace-header = ""
 server-unix-socket = ""
 server-unix-socket-mode = "660"
-admin-server-host = "!4"
-admin-server-port = ""

test/io/configs/expected/boolean-numeric.config

@@ -1,31 +1,33 @@
+admin-server-host = "!4"
+admin-server-port = ""
 client-error-verbosity = "verbose"
 db-aggregates-enabled = false
 db-anon-role = ""
 db-channel = "pgrst"
 db-channel-enabled = true
+db-config = true
 db-extra-search-path = "public"
 db-hoisted-tx-settings = "statement_timeout,plan_filter.statement_cost_limit,default_transaction_isolation"
 db-max-rows = ""
 db-plan-enabled = false
 db-pool = 10
 db-pool-acquisition-timeout = 10
-db-pool-max-lifetime = 1800
-db-pool-max-idletime = 30
 db-pool-automatic-recovery = true
+db-pool-max-idletime = 30
+db-pool-max-lifetime = 1800
+db-pre-config = ""
 db-pre-request = ""
 db-prepared-statements = false
 db-root-spec = ""
 db-schemas = "public"
-db-config = true
-db-pre-config = ""
 db-timezone-enabled = true
 db-tx-end = "commit"
 db-uri = "postgresql://"
 jwt-aud = ""
+jwt-cache-max-entries = 1000
 jwt-role-claim-key = ".\"role\""
 jwt-secret = ""
 jwt-secret-is-base64 = true
-jwt-cache-max-entries = 1000
 log-level = "error"
 log-query = false
 openapi-mode = "follow-privileges"
@@ -34,9 +36,7 @@ openapi-server-proxy-uri = ""
 server-cors-allowed-origins = ""
 server-host = "!4"
 server-port = 3000
-server-trace-header = ""
 server-timing-enabled = false
+server-trace-header = ""
 server-unix-socket = ""
 server-unix-socket-mode = "660"
-admin-server-host = "!4"
-admin-server-port = ""

test/io/configs/expected/boolean-string.config

@@ -1,31 +1,33 @@
+admin-server-host = "!4"
+admin-server-port = ""
 client-error-verbosity = "verbose"
 db-aggregates-enabled = false
 db-anon-role = ""
 db-channel = "pgrst"
 db-channel-enabled = true
+db-config = true
 db-extra-search-path = "public"
 db-hoisted-tx-settings = "statement_timeout,plan_filter.statement_cost_limit,default_transaction_isolation"
 db-max-rows = ""
 db-plan-enabled = false
 db-pool = 10
 db-pool-acquisition-timeout = 10
-db-pool-max-lifetime = 1800
-db-pool-max-idletime = 30
 db-pool-automatic-recovery = true
+db-pool-max-idletime = 30
+db-pool-max-lifetime = 1800
+db-pre-config = ""
 db-pre-request = ""
 db-prepared-statements = false
 db-root-spec = ""
 db-schemas = "public"
-db-config = true
-db-pre-config = ""
 db-timezone-enabled = true
 db-tx-end = "commit"
 db-uri = "postgresql://"
 jwt-aud = ""
+jwt-cache-max-entries = 1000
 jwt-role-claim-key = ".\"role\""
 jwt-secret = ""
 jwt-secret-is-base64 = true
-jwt-cache-max-entries = 1000
 log-level = "error"
 log-query = false
 openapi-mode = "follow-privileges"
@@ -34,9 +36,7 @@ openapi-server-proxy-uri = ""
 server-cors-allowed-origins = ""
 server-host = "!4"
 server-port = 3000
-server-trace-header = ""
 server-timing-enabled = false
+server-trace-header = ""
 server-unix-socket = ""
 server-unix-socket-mode = "660"
-admin-server-host = "!4"
-admin-server-port = ""

test/io/configs/expected/defaults.config

@@ -1,31 +1,33 @@
+admin-server-host = "!4"
+admin-server-port = ""
 client-error-verbosity = "verbose"
 db-aggregates-enabled = false
 db-anon-role = ""
 db-channel = "pgrst"
 db-channel-enabled = true
+db-config = false
 db-extra-search-path = "public"
 db-hoisted-tx-settings = "statement_timeout,plan_filter.statement_cost_limit,default_transaction_isolation"
 db-max-rows = ""
 db-plan-enabled = false
 db-pool = 10
 db-pool-acquisition-timeout = 10
-db-pool-max-lifetime = 1800
-db-pool-max-idletime = 30
 db-pool-automatic-recovery = true
+db-pool-max-idletime = 30
+db-pool-max-lifetime = 1800
+db-pre-config = ""
 db-pre-request = ""
 db-prepared-statements = true
 db-root-spec = ""
 db-schemas = "public"
-db-config = false
-db-pre-config = ""
 db-timezone-enabled = true
 db-tx-end = "commit"
 db-uri = "postgresql://"
 jwt-aud = ""
+jwt-cache-max-entries = 1000
 jwt-role-claim-key = ".\"role\""
 jwt-secret = ""
 jwt-secret-is-base64 = false
-jwt-cache-max-entries = 1000
 log-level = "error"
 log-query = false
 openapi-mode = "follow-privileges"
@@ -34,9 +36,7 @@ openapi-server-proxy-uri = ""
 server-cors-allowed-origins = ""
 server-host = "!4"
 server-port = 3000
-server-trace-header = ""
 server-timing-enabled = false
+server-trace-header = ""
 server-unix-socket = ""
 server-unix-socket-mode = "660"
-admin-server-host = "!4"
-admin-server-port = ""

test/io/configs/expected/jspath-str-op-dump1.config

@@ -1,31 +1,33 @@
+admin-server-host = "!4"
+admin-server-port = ""
 client-error-verbosity = "verbose"
 db-aggregates-enabled = false
 db-anon-role = ""
 db-channel = "pgrst"
 db-channel-enabled = true
+db-config = true
 db-extra-search-path = "public"
 db-hoisted-tx-settings = "statement_timeout,plan_filter.statement_cost_limit,default_transaction_isolation"
 db-max-rows = ""
 db-plan-enabled = false
 db-pool = 10
 db-pool-acquisition-timeout = 10
-db-pool-max-lifetime = 1800
-db-pool-max-idletime = 30
 db-pool-automatic-recovery = true
+db-pool-max-idletime = 30
+db-pool-max-lifetime = 1800
+db-pre-config = ""
 db-pre-request = ""
 db-prepared-statements = true
 db-root-spec = ""
 db-schemas = "public"
-db-config = true
-db-pre-config = ""
 db-timezone-enabled = true
 db-tx-end = "commit"
 db-uri = "postgresql://"
 jwt-aud = ""
+jwt-cache-max-entries = 1000
 jwt-role-claim-key = ".\"roles\"[?(@ == \"role1\")]"
 jwt-secret = ""
 jwt-secret-is-base64 = false
-jwt-cache-max-entries = 1000
 log-level = "error"
 log-query = false
 openapi-mode = "follow-privileges"
@@ -34,9 +36,7 @@ openapi-server-proxy-uri = ""
 server-cors-allowed-origins = ""
 server-host = "!4"
 server-port = 3000
-server-trace-header = ""
 server-timing-enabled = false
+server-trace-header = ""
 server-unix-socket = ""
 server-unix-socket-mode = "660"
-admin-server-host = "!4"
-admin-server-port = ""

test/io/configs/expected/jspath-str-op-dump2.config

@@ -1,31 +1,33 @@
+admin-server-host = "!4"
+admin-server-port = ""
 client-error-verbosity = "verbose"
 db-aggregates-enabled = false
 db-anon-role = ""
 db-channel = "pgrst"
 db-channel-enabled = true
+db-config = true
 db-extra-search-path = "public"
 db-hoisted-tx-settings = "statement_timeout,plan_filter.statement_cost_limit,default_transaction_isolation"
 db-max-rows = ""
 db-plan-enabled = false
 db-pool = 10
 db-pool-acquisition-timeout = 10
-db-pool-max-lifetime = 1800
-db-pool-max-idletime = 30
 db-pool-automatic-recovery = true
+db-pool-max-idletime = 30
+db-pool-max-lifetime = 1800
+db-pre-config = ""
 db-pre-request = ""
 db-prepared-statements = true
 db-root-spec = ""
 db-schemas = "public"
-db-config = true
-db-pre-config = ""
 db-timezone-enabled = true
 db-tx-end = "commit"
 db-uri = "postgresql://"
 jwt-aud = ""
+jwt-cache-max-entries = 1000
 jwt-role-claim-key = ".\"roles\"[?(@ != \"role1\")]"
 jwt-secret = ""
 jwt-secret-is-base64 = false
-jwt-cache-max-entries = 1000
 log-level = "error"
 log-query = false
 openapi-mode = "follow-privileges"
@@ -34,9 +36,7 @@ openapi-server-proxy-uri = ""
 server-cors-allowed-origins = ""
 server-host = "!4"
 server-port = 3000
-server-trace-header = ""
 server-timing-enabled = false
+server-trace-header = ""
 server-unix-socket = ""
 server-unix-socket-mode = "660"
-admin-server-host = "!4"
-admin-server-port = ""

test/io/configs/expected/jspath-str-op-dump3.config

@@ -1,31 +1,33 @@
+admin-server-host = "!4"
+admin-server-port = ""
 client-error-verbosity = "verbose"
 db-aggregates-enabled = false
 db-anon-role = ""
 db-channel = "pgrst"
 db-channel-enabled = true
+db-config = true
 db-extra-search-path = "public"
 db-hoisted-tx-settings = "statement_timeout,plan_filter.statement_cost_limit,default_transaction_isolation"
 db-max-rows = ""
 db-plan-enabled = false
 db-pool = 10
 db-pool-acquisition-timeout = 10
-db-pool-max-lifetime = 1800
-db-pool-max-idletime = 30
 db-pool-automatic-recovery = true
+db-pool-max-idletime = 30
+db-pool-max-lifetime = 1800
+db-pre-config = ""
 db-pre-request = ""
 db-prepared-statements = true
 db-root-spec = ""
 db-schemas = "public"
-db-config = true
-db-pre-config = ""
 db-timezone-enabled = true
 db-tx-end = "commit"
 db-uri = "postgresql://"
 jwt-aud = ""
+jwt-cache-max-entries = 1000
 jwt-role-claim-key = ".\"roles\"[?(@ ^== \"role1\")]"
 jwt-secret = ""
 jwt-secret-is-base64 = false
-jwt-cache-max-entries = 1000
 log-level = "error"
 log-query = false
 openapi-mode = "follow-privileges"
@@ -34,9 +36,7 @@ openapi-server-proxy-uri = ""
 server-cors-allowed-origins = ""
 server-host = "!4"
 server-port = 3000
-server-trace-header = ""
 server-timing-enabled = false
+server-trace-header = ""
 server-unix-socket = ""
 server-unix-socket-mode = "660"
-admin-server-host = "!4"
-admin-server-port = ""