From 31caaa5d289a6d8c76aee209458a4d66d7fa66b2 Mon Sep 17 00:00:00 2001 From: Matt Mastracci Date: Wed, 13 Nov 2024 11:41:00 -0700 Subject: [PATCH] Reformat --- .github/workflows/test-uptodate.yml | 14 +- README.md | 87 +- connection_testcases.json | 1843 +++++++++-------- tests/basic/env.jsonc | 2 +- tests/basic/fs.jsonc | 2 +- tests/basic/opts.jsonc | 2 +- tests/error/credentials_file_not_found.jsonc | 2 +- tests/error/env_not_found.jsonc | 2 +- tests/error/exclusive_options.jsonc | 2 +- tests/error/file_not_found.jsonc | 2 +- tests/error/invalid_credentials_file.jsonc | 2 +- tests/error/invalid_database.jsonc | 2 +- tests/error/invalid_dsn.jsonc | 2 +- .../error/invalid_dsn_or_instance_name.jsonc | 2 +- tests/error/invalid_host.jsonc | 2 +- tests/error/invalid_instance_name.jsonc | 2 +- tests/error/invalid_port.jsonc | 2 +- tests/error/invalid_secret_key.jsonc | 2 +- tests/error/invalid_tls_security.jsonc | 2 +- tests/error/invalid_user.jsonc | 2 +- tests/error/multiple_compound_env.jsonc | 2 +- tests/error/multiple_compound_opts.jsonc | 2 +- tests/error/no_options_or_toml.jsonc | 2 +- tests/error/project_not_initialised.jsonc | 2 +- tests/error/secret_key_not_found.jsonc | 2 +- tests/error/unix_socket_unsupported.jsonc | 2 +- tests/override/certificate.jsonc | 2 +- tests/override/other.jsonc | 2 +- tools/rebuild.ts | 2 +- 29 files changed, 1007 insertions(+), 989 deletions(-) diff --git a/.github/workflows/test-uptodate.yml b/.github/workflows/test-uptodate.yml index d8d7fef..d3a1c5d 100644 --- a/.github/workflows/test-uptodate.yml +++ b/.github/workflows/test-uptodate.yml @@ -2,28 +2,28 @@ name: Check formatting on: push: - branches: [ "master", "main" ] + branches: ["master", "main"] pull_request: - branches: [ "master", "main" ] + branches: ["master", "main"] jobs: check-generated: runs-on: ubuntu-latest - + steps: - uses: actions/checkout@v3 - + - name: Setup Deno uses: denoland/setup-deno@v1 with: deno-version: v2.x - + - name: Format files run: deno fmt - + - name: Run rebuild script run: ./tools/rebuild.ts - + - name: Check for changes run: | if [ -n "$(git status --porcelain)" ]; then diff --git a/README.md b/README.md index 5c19d35..87f048a 100644 --- a/README.md +++ b/README.md @@ -1,24 +1,32 @@ # Shared Test Cases for EdgeDB Clients -This repository contains test cases for different EdgeDB client bindings -to implement consistent unit tests for connection parameters parsing, -project handling and so on. [The documentation]( -https://www.edgedb.com/docs/reference/connection) explains the fundamentals. +This repository contains test cases for different EdgeDB client bindings to +implement consistent unit tests for connection parameters parsing, project +handling and so on. +[The documentation](https://www.edgedb.com/docs/reference/connection) explains +the fundamentals. ## `connection_testcases.json` -This file contains test cases with different scenarios using the client API, -and the corresponding expected parsed connection parameters. The format is -a list of objects, each may contain the following input/output: +This is a generated file that combines `tests/**/*.jsonc` files into a single +file. + +## `tests/**/*.jsonc` + +These files contain test cases in JSONC format. + +These are test cases with different scenarios using the client API, and the +corresponding expected parsed connection parameters. The format is a list of +objects, each may contain the following input/output: ### Input - `opts` -This is usually the values passed directly to the client as options, -like the keyword arguments on `edgedb.create_client(...)` for Python, -or direct command arguments for the CLI. Possible values: +This is usually the values passed directly to the client as options, like the +keyword arguments on `edgedb.create_client(...)` for Python, or direct command +arguments for the CLI. Possible values: | key | value type | value | -|----------------------|-------------|-----------------------------------------------------------------------------------------------------------------------------------------------------| +| -------------------- | ----------- | --------------------------------------------------------------------------------------------------------------------------------------------------- | | `host` | string | the host name or IP of the server instance | | `port` | integer | the port of the server instance (test cases may contain strings and floats) | | `user` | string | database user for authentication | @@ -36,17 +44,20 @@ or direct command arguments for the CLI. Possible values: | `instance` | string | name of an EdgeDB instance | | `dsn` | string | EdgeDB DSN | -Note: some client bindings take a single positional argument -that can be either `dsn` or `instance`, depending on the format. +Note: some client bindings take a single positional argument that can be either +`dsn` or `instance`, depending on the format. -Note: `database` and `branch` are old and new way of referring to the same concept. They both exist for compatibility reasons during the deprecation period of `database`. They are generally mutually exclusive and must not be used at the same time. +Note: `database` and `branch` are old and new way of referring to the same +concept. They both exist for compatibility reasons during the deprecation period +of `database`. They are generally mutually exclusive and must not be used at the +same time. ### Input - `env` Environment variables present at the time of connecting. Possible values: | name | value | -|-------------------------------|-----------------------------------------------------| +| ----------------------------- | --------------------------------------------------- | | `EDGEDB_HOST` | same as `host` above | | `EDGEDB_PORT` | same as `port` above | | `EDGEDB_USER` | same as `user` above | @@ -67,24 +78,31 @@ Environment variables present at the time of connecting. Possible values: ### Input - `fs` -If `fs` is present, the test code should mock up the file system accordingly. Possible keys: - -* `cwd` - path to the current working directory as a string to run the test case. -* `homedir` - path to the home directory of the OS user as a string. -* `files` - a mapping of full path of files to their corresponding content. - * The key is a full path to the file, while the value is the content string of that file. - * Project stash directory is a special case where there is a `${HASH}` placeholder in the key. - The test code should replace `${HASH}` with hexadecimal SHA-1 of the full path to the - project directory specified below. The key represents a directory that contains 2 files - represented by the value in the form of an object: - * `instance-name` - contains only the name of the instance in the file content - * `cloud-profile` - optionally contains only the name of the cloud profile in the file content - * `project-path` - a symlink pointing to the full path to the project directory in the value +If `fs` is present, the test code should mock up the file system accordingly. +Possible keys: + +- `cwd` - path to the current working directory as a string to run the test + case. +- `homedir` - path to the home directory of the OS user as a string. +- `files` - a mapping of full path of files to their corresponding content. + - The key is a full path to the file, while the value is the content string of + that file. + - Project stash directory is a special case where there is a `${HASH}` + placeholder in the key. The test code should replace `${HASH}` with + hexadecimal SHA-1 of the full path to the project directory specified below. + The key represents a directory that contains 2 files represented by the + value in the form of an object: + - `instance-name` - contains only the name of the instance in the file + content + - `cloud-profile` - optionally contains only the name of the cloud profile + in the file content + - `project-path` - a symlink pointing to the full path to the project + directory in the value ### Input - `platform` -Value can be one of `macos` or `windows`, specifies the OS to run this test case. -This is only useful when `fs` is present. +Value can be one of `macos` or `windows`, specifies the OS to run this test +case. This is only useful when `fs` is present. If `platform` is absent while `fs` is present, the OS should be Linux. @@ -93,7 +111,7 @@ If `platform` is absent while `fs` is present, the OS should be Linux. Expected result of parsed connection parameters as an object, containing: | key | value type | value | -|----------------------|-----------------------|-----------------------------------------------------------------------------------------------------------------------------------------------------| +| -------------------- | --------------------- | --------------------------------------------------------------------------------------------------------------------------------------------------- | | `address` | list[string, integer] | the address of the server instance [host, port] | | `user` | string | database user for authentication | | `password` | string or `null` | optional password for authentication | @@ -107,10 +125,9 @@ Expected result of parsed connection parameters as an object, containing: ### Output - `error` -Expected error, value is currently an object with a single key `type`. -The value of `type` is an idendifier-like string indicating the actual -expected error, the test code should map this identifier to an actual -error type or message. +Expected error, value is currently an object with a single key `type`. The value +of `type` is an idendifier-like string indicating the actual expected error, the +test code should map this identifier to an actual error type or message. `result` and `error` are mutually exclusive. diff --git a/connection_testcases.json b/connection_testcases.json index 470dd4f..a98fd92 100644 --- a/connection_testcases.json +++ b/connection_testcases.json @@ -48,199 +48,13 @@ "docker_tcp_port" ] }, - { - "env": { - "EDGEDB_CLIENT_TLS_SECURITY": "insecure", - "EDGEDB_DSN": "edgedb://" - }, - "name": "basic_env_test_10", - "result": { - "address": [ - "localhost", - 5656 - ], - "branch": "__default__", - "database": "edgedb", - "password": null, - "secretKey": null, - "serverSettings": {}, - "tlsCAData": null, - "tlsSecurity": "insecure", - "tlsServerName": null, - "user": "edgedb", - "waitUntilAvailable": "PT30S" - } - }, - { - "env": { - "EDGEDB_CLIENT_TLS_SECURITY": "no_host_verification", - "EDGEDB_DSN": "edgedb://" - }, - "name": "basic_env_test_11", - "result": { - "address": [ - "localhost", - 5656 - ], - "branch": "__default__", - "database": "edgedb", - "password": null, - "secretKey": null, - "serverSettings": {}, - "tlsCAData": null, - "tlsSecurity": "no_host_verification", - "tlsServerName": null, - "user": "edgedb", - "waitUntilAvailable": "PT30S" - } - }, - { - "env": { - "EDGEDB_HOST": "test.local", - "EDGEDB_PORT": "12345" - }, - "name": "basic_env_test_12", - "result": { - "address": [ - "test.local", - 12345 - ], - "branch": "__default__", - "database": "edgedb", - "password": null, - "secretKey": null, - "serverSettings": {}, - "tlsCAData": null, - "tlsSecurity": "strict", - "tlsServerName": null, - "user": "edgedb", - "waitUntilAvailable": "PT30S" - } - }, - { - "env": { - "EDGEDB_DATABASE": "test_db", - "EDGEDB_DSN": "edgedb://testhost:1234/?database=db" - }, - "name": "basic_env_test_13", - "opts": {}, - "result": { - "address": [ - "testhost", - 1234 - ], - "branch": "test_db", - "database": "test_db", - "password": null, - "secretKey": null, - "serverSettings": {}, - "tlsCAData": null, - "tlsSecurity": "strict", - "tlsServerName": null, - "user": "edgedb", - "waitUntilAvailable": "PT30S" - } - }, - { - "env": { - "EDGEDB_HOST": "fe80::1ff:fe23:4567:890a%eth0", - "EDGEDB_PORT": "12341" - }, - "name": "basic_env_test_14", - "result": { - "address": [ - "fe80::1ff:fe23:4567:890a%eth0", - 12341 - ], - "branch": "__default__", - "database": "edgedb", - "password": null, - "secretKey": null, - "serverSettings": {}, - "tlsCAData": null, - "tlsSecurity": "strict", - "tlsServerName": null, - "user": "edgedb", - "waitUntilAvailable": "PT30S" - } - }, - { - "env": { - "EDGEDB_HOST": "sample", - "EDGEDB_WAIT_UNTIL_AVAILABLE": "PT10S" - }, - "name": "basic_env_test_15", - "result": { - "address": [ - "sample", - 5656 - ], - "branch": "__default__", - "database": "edgedb", - "password": null, - "secretKey": null, - "serverSettings": {}, - "tlsCAData": null, - "tlsSecurity": "strict", - "tlsServerName": null, - "user": "edgedb", - "waitUntilAvailable": "PT10S" - } - }, - { - "env": { - "EDGEDB_DSN": "edgedb://localhost:5555?wait_until_available=PT1H", - "EDGEDB_WAIT_UNTIL_AVAILABLE": "10 s" - }, - "name": "basic_env_test_16", - "result": { - "address": [ - "localhost", - 5555 - ], - "branch": "__default__", - "database": "edgedb", - "password": null, - "secretKey": null, - "serverSettings": {}, - "tlsCAData": null, - "tlsSecurity": "strict", - "tlsServerName": null, - "user": "edgedb", - "waitUntilAvailable": "PT10S" - } - }, - { - "env": { - "EDGEDB_DSN": "edgedb://testhost:1234/?branch=feature" - }, - "fs": {}, - "name": "basic_env_test_17", - "opts": {}, - "result": { - "address": [ - "testhost", - 1234 - ], - "branch": "feature", - "database": "feature", - "password": null, - "secretKey": null, - "serverSettings": {}, - "tlsCAData": null, - "tlsSecurity": "strict", - "tlsServerName": null, - "user": "edgedb", - "waitUntilAvailable": "PT30S" - } - }, { "env": { "EDGEDB_BRANCH": "experimental0", "EDGEDB_DSN": "edgedb://testhost:1234/feature" }, "fs": {}, - "name": "basic_env_test_18", + "name": "basic_env_test_10", "opts": {}, "result": { "address": [ @@ -265,7 +79,7 @@ "EDGEDB_DSN": "edgedb://testhost:1234/?branch=feature" }, "fs": {}, - "name": "basic_env_test_19", + "name": "basic_env_test_11", "opts": {}, "result": { "address": [ @@ -290,7 +104,7 @@ "EDGEDB_CLIENT_TLS_SECURITY": "no_host_verification", "EDGEDB_DSN": "edgedb://" }, - "name": "basic_env_test_2", + "name": "basic_env_test_12", "result": { "address": [ "localhost", @@ -314,7 +128,7 @@ "EDGEDB_DSN": "edgedb://testhost:1234/?branch=feature" }, "fs": {}, - "name": "basic_env_test_20", + "name": "basic_env_test_13", "opts": {}, "result": { "address": [ @@ -339,7 +153,7 @@ "EDGEDB_DSN": "edgedb://testhost:1234/?database=feature" }, "fs": {}, - "name": "basic_env_test_21", + "name": "basic_env_test_14", "opts": {}, "result": { "address": [ @@ -365,7 +179,7 @@ "EDGEDB_PORT": "1312" }, "fs": {}, - "name": "basic_env_test_22", + "name": "basic_env_test_15", "opts": {}, "result": { "address": [ @@ -389,7 +203,7 @@ "EDGEDB_CLIENT_TLS_SECURITY": "insecure", "EDGEDB_DSN": "edgedb://?tls_security=strict" }, - "name": "basic_env_test_23", + "name": "basic_env_test_16", "result": { "address": [ "localhost", @@ -412,7 +226,7 @@ "EDGEDB_HOST": "test.local", "GEL_PORT": "12345" }, - "name": "basic_env_test_24", + "name": "basic_env_test_17", "result": { "address": [ "test.local", @@ -436,7 +250,7 @@ "EDGEDB_PORT": "11111", "GEL_PORT": "12345" }, - "name": "basic_env_test_25", + "name": "basic_env_test_18", "result": { "address": [ "test.local", @@ -462,7 +276,7 @@ "EDGEDB_CLIENT_TLS_SECURITY": "no_host_verification", "EDGEDB_DSN": "edgedb://?tls_security=strict" }, - "name": "basic_env_test_26", + "name": "basic_env_test_19", "result": { "address": [ "localhost", @@ -480,12 +294,35 @@ "waitUntilAvailable": "PT30S" } }, + { + "env": { + "EDGEDB_CLIENT_TLS_SECURITY": "insecure", + "EDGEDB_DSN": "edgedb://" + }, + "name": "basic_env_test_2", + "result": { + "address": [ + "localhost", + 5656 + ], + "branch": "__default__", + "database": "edgedb", + "password": null, + "secretKey": null, + "serverSettings": {}, + "tlsCAData": null, + "tlsSecurity": "insecure", + "tlsServerName": null, + "user": "edgedb", + "waitUntilAvailable": "PT30S" + } + }, { "env": { "EDGEDB_DSN": "edgedb://", "EDGEDB_TLS_SERVER_NAME": "foo.example.com" }, - "name": "basic_env_test_27", + "name": "basic_env_test_20", "result": { "address": [ "localhost", @@ -507,7 +344,7 @@ "env": { "EDGEDB_DSN": "edgedb://localhost:5656/?tls_server_name=foo.example.com" }, - "name": "basic_env_test_28", + "name": "basic_env_test_21", "result": { "address": [ "localhost", @@ -531,7 +368,7 @@ "EDGEDB_DSN": "edgedb://", "EDGEDB_TLS_CA": "-----BEGIN CERTIFICATE-----\nMIICEjCCAXsCAg36MA0GCSqGSIb3DQEBBQUAMIGbMQswCQYDVQQGEwJKUDEOMAwG\nA1UECBMFVG9reW8xEDAOBgNVBAcTB0NodW8ta3UxETAPBgNVBAoTCEZyYW5rNERE\nMRgwFgYDVQQLEw9XZWJDZXJ0IFN1cHBvcnQxGDAWBgNVBAMTD0ZyYW5rNEREIFdl\nYiBDQTEjMCEGCSqGSIb3DQEJARYUc3VwcG9ydEBmcmFuazRkZC5jb20wHhcNMTIw\nODIyMDUyNjU0WhcNMTcwODIxMDUyNjU0WjBKMQswCQYDVQQGEwJKUDEOMAwGA1UE\nCAwFVG9reW8xETAPBgNVBAoMCEZyYW5rNEREMRgwFgYDVQQDDA93d3cuZXhhbXBs\nZS5jb20wXDANBgkqhkiG9w0BAQEFAANLADBIAkEAm/xmkHmEQrurE/0re/jeFRLl\n8ZPjBop7uLHhnia7lQG/5zDtZIUC3RVpqDSwBuw/NTweGyuP+o8AG98HxqxTBwID\nAQABMA0GCSqGSIb3DQEBBQUAA4GBABS2TLuBeTPmcaTaUW/LCB2NYOy8GMdzR1mx\n8iBIu2H6/E2tiY3RIevV2OW61qY2/XRQg7YPxx3ffeUugX9F4J/iPnnu1zAxxyBy\n2VguKv4SWjRFoRkIfIlHX0qVviMhSlNy2ioFLy7JcPZb+v3ftDGywUqcBiVDoea0\nHn+GmxZA\n-----END CERTIFICATE-----\n" }, - "name": "basic_env_test_29", + "name": "basic_env_test_22", "result": { "address": [ "localhost", @@ -555,7 +392,7 @@ "EDGEDB_CLIENT_TLS_SECURITY": "strict", "EDGEDB_DSN": "edgedb://" }, - "name": "basic_env_test_3", + "name": "basic_env_test_23", "result": { "address": [ "localhost", @@ -579,7 +416,7 @@ "EDGEDB_CLIENT_TLS_SECURITY": "default", "EDGEDB_DSN": "edgedb://" }, - "name": "basic_env_test_30", + "name": "basic_env_test_24", "result": { "address": [ "localhost", @@ -603,7 +440,7 @@ "EDGEDB_CLIENT_TLS_SECURITY": "insecure", "EDGEDB_DSN": "edgedb://" }, - "name": "basic_env_test_31", + "name": "basic_env_test_25", "result": { "address": [ "localhost", @@ -627,7 +464,7 @@ "EDGEDB_CLIENT_TLS_SECURITY": "default", "EDGEDB_DSN": "edgedb://" }, - "name": "basic_env_test_4", + "name": "basic_env_test_26", "result": { "address": [ "localhost", @@ -651,7 +488,7 @@ "EDGEDB_CLIENT_TLS_SECURITY": "insecure", "EDGEDB_DSN": "edgedb://" }, - "name": "basic_env_test_5", + "name": "basic_env_test_27", "result": { "address": [ "localhost", @@ -675,7 +512,7 @@ "EDGEDB_CLIENT_TLS_SECURITY": "no_host_verification", "EDGEDB_DSN": "edgedb://" }, - "name": "basic_env_test_6", + "name": "basic_env_test_28", "result": { "address": [ "localhost", @@ -699,7 +536,7 @@ "EDGEDB_CLIENT_TLS_SECURITY": "strict", "EDGEDB_DSN": "edgedb://" }, - "name": "basic_env_test_7", + "name": "basic_env_test_29", "result": { "address": [ "localhost", @@ -719,11 +556,10 @@ }, { "env": { - "EDGEDB_CLIENT_SECURITY": "strict", - "EDGEDB_CLIENT_TLS_SECURITY": "default", + "EDGEDB_CLIENT_TLS_SECURITY": "no_host_verification", "EDGEDB_DSN": "edgedb://" }, - "name": "basic_env_test_8", + "name": "basic_env_test_3", "result": { "address": [ "localhost", @@ -735,7 +571,31 @@ "secretKey": null, "serverSettings": {}, "tlsCAData": null, - "tlsSecurity": "strict", + "tlsSecurity": "no_host_verification", + "tlsServerName": null, + "user": "edgedb", + "waitUntilAvailable": "PT30S" + } + }, + { + "env": { + "EDGEDB_CLIENT_SECURITY": "strict", + "EDGEDB_CLIENT_TLS_SECURITY": "default", + "EDGEDB_DSN": "edgedb://" + }, + "name": "basic_env_test_30", + "result": { + "address": [ + "localhost", + 5656 + ], + "branch": "__default__", + "database": "edgedb", + "password": null, + "secretKey": null, + "serverSettings": {}, + "tlsCAData": null, + "tlsSecurity": "strict", "tlsServerName": null, "user": "edgedb", "waitUntilAvailable": "PT30S" @@ -747,7 +607,7 @@ "EDGEDB_CLIENT_TLS_SECURITY": "strict", "EDGEDB_DSN": "edgedb://" }, - "name": "basic_env_test_9", + "name": "basic_env_test_31", "result": { "address": [ "localhost", @@ -765,6 +625,146 @@ "waitUntilAvailable": "PT30S" } }, + { + "env": { + "EDGEDB_HOST": "test.local", + "EDGEDB_PORT": "12345" + }, + "name": "basic_env_test_4", + "result": { + "address": [ + "test.local", + 12345 + ], + "branch": "__default__", + "database": "edgedb", + "password": null, + "secretKey": null, + "serverSettings": {}, + "tlsCAData": null, + "tlsSecurity": "strict", + "tlsServerName": null, + "user": "edgedb", + "waitUntilAvailable": "PT30S" + } + }, + { + "env": { + "EDGEDB_DATABASE": "test_db", + "EDGEDB_DSN": "edgedb://testhost:1234/?database=db" + }, + "name": "basic_env_test_5", + "opts": {}, + "result": { + "address": [ + "testhost", + 1234 + ], + "branch": "test_db", + "database": "test_db", + "password": null, + "secretKey": null, + "serverSettings": {}, + "tlsCAData": null, + "tlsSecurity": "strict", + "tlsServerName": null, + "user": "edgedb", + "waitUntilAvailable": "PT30S" + } + }, + { + "env": { + "EDGEDB_HOST": "fe80::1ff:fe23:4567:890a%eth0", + "EDGEDB_PORT": "12341" + }, + "name": "basic_env_test_6", + "result": { + "address": [ + "fe80::1ff:fe23:4567:890a%eth0", + 12341 + ], + "branch": "__default__", + "database": "edgedb", + "password": null, + "secretKey": null, + "serverSettings": {}, + "tlsCAData": null, + "tlsSecurity": "strict", + "tlsServerName": null, + "user": "edgedb", + "waitUntilAvailable": "PT30S" + } + }, + { + "env": { + "EDGEDB_HOST": "sample", + "EDGEDB_WAIT_UNTIL_AVAILABLE": "PT10S" + }, + "name": "basic_env_test_7", + "result": { + "address": [ + "sample", + 5656 + ], + "branch": "__default__", + "database": "edgedb", + "password": null, + "secretKey": null, + "serverSettings": {}, + "tlsCAData": null, + "tlsSecurity": "strict", + "tlsServerName": null, + "user": "edgedb", + "waitUntilAvailable": "PT10S" + } + }, + { + "env": { + "EDGEDB_DSN": "edgedb://localhost:5555?wait_until_available=PT1H", + "EDGEDB_WAIT_UNTIL_AVAILABLE": "10 s" + }, + "name": "basic_env_test_8", + "result": { + "address": [ + "localhost", + 5555 + ], + "branch": "__default__", + "database": "edgedb", + "password": null, + "secretKey": null, + "serverSettings": {}, + "tlsCAData": null, + "tlsSecurity": "strict", + "tlsServerName": null, + "user": "edgedb", + "waitUntilAvailable": "PT10S" + } + }, + { + "env": { + "EDGEDB_DSN": "edgedb://testhost:1234/?branch=feature" + }, + "fs": {}, + "name": "basic_env_test_9", + "opts": {}, + "result": { + "address": [ + "testhost", + 1234 + ], + "branch": "feature", + "database": "feature", + "password": null, + "secretKey": null, + "serverSettings": {}, + "tlsCAData": null, + "tlsSecurity": "strict", + "tlsServerName": null, + "user": "edgedb", + "waitUntilAvailable": "PT30S" + } + }, { "env": {}, "fs": { @@ -1116,81 +1116,81 @@ { "name": "basic_opts_test_10", "opts": { - "dsn": "edgedb://", - "tlsSecurity": "no_host_verification" + "dsn": "edgedb://user3:123123@[::1]:5555/abcdef" }, "result": { "address": [ - "localhost", - 5656 + "::1", + 5555 ], - "branch": "__default__", - "database": "edgedb", - "password": null, + "branch": "abcdef", + "database": "abcdef", + "password": "123123", "secretKey": null, "serverSettings": {}, "tlsCAData": null, - "tlsSecurity": "no_host_verification", + "tlsSecurity": "strict", "tlsServerName": null, - "user": "edgedb", + "user": "user3", "waitUntilAvailable": "PT30S" } }, { "name": "basic_opts_test_11", "opts": { - "dsn": "edgedb://", - "tlsSecurity": "insecure" + "dsn": "edgedb://user3@[fe80::1ff:fe23:4567:890a%25eth0]:3000/ab" }, "result": { "address": [ - "localhost", - 5656 + "fe80::1ff:fe23:4567:890a%eth0", + 3000 ], - "branch": "__default__", - "database": "edgedb", + "branch": "ab", + "database": "ab", "password": null, "secretKey": null, "serverSettings": {}, "tlsCAData": null, - "tlsSecurity": "insecure", + "tlsSecurity": "strict", "tlsServerName": null, - "user": "edgedb", + "user": "user3", "waitUntilAvailable": "PT30S" } }, { "name": "basic_opts_test_12", "opts": { - "port": "1234" + "dsn": "edgedb://localhost?param=123&user=testuser&port=2222&database=testdb" }, "result": { "address": [ "localhost", - 1234 + 2222 ], - "branch": "__default__", - "database": "edgedb", + "branch": "testdb", + "database": "testdb", "password": null, "secretKey": null, - "serverSettings": {}, + "serverSettings": { + "param": "123" + }, "tlsCAData": null, "tlsSecurity": "strict", "tlsServerName": null, - "user": "edgedb", + "user": "testuser", "waitUntilAvailable": "PT30S" } }, { "name": "basic_opts_test_13", "opts": { - "dsn": "edgedb://", - "tlsServerName": "foo.example.com" + "host": "fe80::1ff:fe23:4567:890a%eth0", + "port": 12342 }, "result": { "address": [ - "localhost", - 5656 + "fe80::1ff:fe23:4567:890a%eth0", + 12342 ], "branch": "__default__", "database": "edgedb", @@ -1199,7 +1199,7 @@ "serverSettings": {}, "tlsCAData": null, "tlsSecurity": "strict", - "tlsServerName": "foo.example.com", + "tlsServerName": null, "user": "edgedb", "waitUntilAvailable": "PT30S" } @@ -1207,63 +1207,61 @@ { "name": "basic_opts_test_14", "opts": { - "dsn": "edgedb://", - "tlsCA": "-----BEGIN CERTIFICATE-----\nMIICEjCCAXsCAg36MA0GCSqGSIb3DQEBBQUAMIGbMQswCQYDVQQGEwJKUDEOMAwG\nA1UECBMFVG9reW8xEDAOBgNVBAcTB0NodW8ta3UxETAPBgNVBAoTCEZyYW5rNERE\nMRgwFgYDVQQLEw9XZWJDZXJ0IFN1cHBvcnQxGDAWBgNVBAMTD0ZyYW5rNEREIFdl\nYiBDQTEjMCEGCSqGSIb3DQEJARYUc3VwcG9ydEBmcmFuazRkZC5jb20wHhcNMTIw\nODIyMDUyNjU0WhcNMTcwODIxMDUyNjU0WjBKMQswCQYDVQQGEwJKUDEOMAwGA1UE\nCAwFVG9reW8xETAPBgNVBAoMCEZyYW5rNEREMRgwFgYDVQQDDA93d3cuZXhhbXBs\nZS5jb20wXDANBgkqhkiG9w0BAQEFAANLADBIAkEAm/xmkHmEQrurE/0re/jeFRLl\n8ZPjBop7uLHhnia7lQG/5zDtZIUC3RVpqDSwBuw/NTweGyuP+o8AG98HxqxTBwID\nAQABMA0GCSqGSIb3DQEBBQUAA4GBABS2TLuBeTPmcaTaUW/LCB2NYOy8GMdzR1mx\n8iBIu2H6/E2tiY3RIevV2OW61qY2/XRQg7YPxx3ffeUugX9F4J/iPnnu1zAxxyBy\n2VguKv4SWjRFoRkIfIlHX0qVviMhSlNy2ioFLy7JcPZb+v3ftDGywUqcBiVDoea0\nHn+GmxZA\n-----END CERTIFICATE-----\n", - "tlsSecurity": "strict" + "dsn": "edgedb://localhost:5555", + "waitUntilAvailable": "PT9M" }, "result": { "address": [ "localhost", - 5656 + 5555 ], "branch": "__default__", "database": "edgedb", "password": null, "secretKey": null, "serverSettings": {}, - "tlsCAData": "-----BEGIN CERTIFICATE-----\nMIICEjCCAXsCAg36MA0GCSqGSIb3DQEBBQUAMIGbMQswCQYDVQQGEwJKUDEOMAwG\nA1UECBMFVG9reW8xEDAOBgNVBAcTB0NodW8ta3UxETAPBgNVBAoTCEZyYW5rNERE\nMRgwFgYDVQQLEw9XZWJDZXJ0IFN1cHBvcnQxGDAWBgNVBAMTD0ZyYW5rNEREIFdl\nYiBDQTEjMCEGCSqGSIb3DQEJARYUc3VwcG9ydEBmcmFuazRkZC5jb20wHhcNMTIw\nODIyMDUyNjU0WhcNMTcwODIxMDUyNjU0WjBKMQswCQYDVQQGEwJKUDEOMAwGA1UE\nCAwFVG9reW8xETAPBgNVBAoMCEZyYW5rNEREMRgwFgYDVQQDDA93d3cuZXhhbXBs\nZS5jb20wXDANBgkqhkiG9w0BAQEFAANLADBIAkEAm/xmkHmEQrurE/0re/jeFRLl\n8ZPjBop7uLHhnia7lQG/5zDtZIUC3RVpqDSwBuw/NTweGyuP+o8AG98HxqxTBwID\nAQABMA0GCSqGSIb3DQEBBQUAA4GBABS2TLuBeTPmcaTaUW/LCB2NYOy8GMdzR1mx\n8iBIu2H6/E2tiY3RIevV2OW61qY2/XRQg7YPxx3ffeUugX9F4J/iPnnu1zAxxyBy\n2VguKv4SWjRFoRkIfIlHX0qVviMhSlNy2ioFLy7JcPZb+v3ftDGywUqcBiVDoea0\nHn+GmxZA\n-----END CERTIFICATE-----\n", + "tlsCAData": null, "tlsSecurity": "strict", "tlsServerName": null, "user": "edgedb", - "waitUntilAvailable": "PT30S" + "waitUntilAvailable": "PT9M" } }, { "name": "basic_opts_test_15", "opts": { - "dsn": "edgedb://", - "password": "" + "dsn": "edgedb://localhost:5555?wait_until_available=PT2M5S" }, "result": { "address": [ "localhost", - 5656 + 5555 ], "branch": "__default__", "database": "edgedb", - "password": "", + "password": null, "secretKey": null, "serverSettings": {}, "tlsCAData": null, "tlsSecurity": "strict", "tlsServerName": null, "user": "edgedb", - "waitUntilAvailable": "PT30S" + "waitUntilAvailable": "PT2M5S" } }, { "name": "basic_opts_test_16", "opts": { - "dsn": "edgedb://?password=" + "port": 1 }, "result": { "address": [ "localhost", - 5656 + 1 ], "branch": "__default__", "database": "edgedb", - "password": "", + "password": null, "secretKey": null, "serverSettings": {}, "tlsCAData": null, @@ -1276,144 +1274,30 @@ { "name": "basic_opts_test_17", "opts": { - "dsn": "edgedb://?password_env=DOESNT_EXIST", - "password": "secret" + "dsn": "edgedb://localhost:5555?wait_until_available=5s2minutes" }, "result": { "address": [ "localhost", - 5656 + 5555 ], "branch": "__default__", "database": "edgedb", - "password": "secret", + "password": null, "secretKey": null, "serverSettings": {}, "tlsCAData": null, "tlsSecurity": "strict", "tlsServerName": null, "user": "edgedb", - "waitUntilAvailable": "PT30S" + "waitUntilAvailable": "PT2M5S" } }, { "name": "basic_opts_test_18", "opts": { - "dsn": "edgedb://user3:123123@[::1]:5555/abcdef" - }, - "result": { - "address": [ - "::1", - 5555 - ], - "branch": "abcdef", - "database": "abcdef", - "password": "123123", - "secretKey": null, - "serverSettings": {}, - "tlsCAData": null, - "tlsSecurity": "strict", - "tlsServerName": null, - "user": "user3", - "waitUntilAvailable": "PT30S" - } - }, - { - "name": "basic_opts_test_19", - "opts": { - "dsn": "edgedb://user3@[fe80::1ff:fe23:4567:890a%25eth0]:3000/ab" - }, - "result": { - "address": [ - "fe80::1ff:fe23:4567:890a%eth0", - 3000 - ], - "branch": "ab", - "database": "ab", - "password": null, - "secretKey": null, - "serverSettings": {}, - "tlsCAData": null, - "tlsSecurity": "strict", - "tlsServerName": null, - "user": "user3", - "waitUntilAvailable": "PT30S" - } - }, - { - "name": "basic_opts_test_2", - "opts": { - "dsn": "edgedb://localhost?param=123&user=testuser&port=2222&database=testdb" - }, - "result": { - "address": [ - "localhost", - 2222 - ], - "branch": "testdb", - "database": "testdb", - "password": null, - "secretKey": null, - "serverSettings": { - "param": "123" - }, - "tlsCAData": null, - "tlsSecurity": "strict", - "tlsServerName": null, - "user": "testuser", - "waitUntilAvailable": "PT30S" - } - }, - { - "name": "basic_opts_test_20", - "opts": { - "host": "fe80::1ff:fe23:4567:890a%eth0", - "port": 12342 - }, - "result": { - "address": [ - "fe80::1ff:fe23:4567:890a%eth0", - 12342 - ], - "branch": "__default__", - "database": "edgedb", - "password": null, - "secretKey": null, - "serverSettings": {}, - "tlsCAData": null, - "tlsSecurity": "strict", - "tlsServerName": null, - "user": "edgedb", - "waitUntilAvailable": "PT30S" - } - }, - { - "name": "basic_opts_test_21", - "opts": { - "dsn": "edgedb://localhost:5555", - "waitUntilAvailable": "PT9M" - }, - "result": { - "address": [ - "localhost", - 5555 - ], - "branch": "__default__", - "database": "edgedb", - "password": null, - "secretKey": null, - "serverSettings": {}, - "tlsCAData": null, - "tlsSecurity": "strict", - "tlsServerName": null, - "user": "edgedb", - "waitUntilAvailable": "PT9M" - } - }, - { - "name": "basic_opts_test_22", - "opts": { - "dsn": "edgedb://localhost:5555?wait_until_available=PT2M5S" + "dsn": "edgedb://localhost:5555?wait_until_available=PT1H", + "waitUntilAvailable": "PT90M" }, "result": { "address": [ @@ -1429,63 +1313,41 @@ "tlsSecurity": "strict", "tlsServerName": null, "user": "edgedb", - "waitUntilAvailable": "PT2M5S" + "waitUntilAvailable": "PT90M" } }, { - "name": "basic_opts_test_23", + "name": "basic_opts_test_19", "opts": { - "port": 1 + "dsn": "edgedb://testuser@localhost/db?secret_key=not_secret_key" }, "result": { "address": [ "localhost", - 1 + 5656 ], - "branch": "__default__", - "database": "edgedb", + "branch": "db", + "database": "db", "password": null, - "secretKey": null, + "secretKey": "not_secret_key", "serverSettings": {}, "tlsCAData": null, "tlsSecurity": "strict", "tlsServerName": null, - "user": "edgedb", + "user": "testuser", "waitUntilAvailable": "PT30S" } }, { - "name": "basic_opts_test_24", - "opts": { - "dsn": "edgedb://localhost:5555?wait_until_available=5s2minutes" - }, - "result": { - "address": [ - "localhost", - 5555 - ], - "branch": "__default__", - "database": "edgedb", - "password": null, - "secretKey": null, - "serverSettings": {}, - "tlsCAData": null, - "tlsSecurity": "strict", - "tlsServerName": null, - "user": "edgedb", - "waitUntilAvailable": "PT2M5S" - } - }, - { - "name": "basic_opts_test_25", + "name": "basic_opts_test_2", "opts": { - "dsn": "edgedb://localhost:5555?wait_until_available=PT1H", - "waitUntilAvailable": "PT90M" + "dsn": "edgedb://", + "tlsSecurity": "no_host_verification" }, "result": { "address": [ "localhost", - 5555 + 5656 ], "branch": "__default__", "database": "edgedb", @@ -1493,38 +1355,16 @@ "secretKey": null, "serverSettings": {}, "tlsCAData": null, - "tlsSecurity": "strict", + "tlsSecurity": "no_host_verification", "tlsServerName": null, "user": "edgedb", - "waitUntilAvailable": "PT90M" - } - }, - { - "name": "basic_opts_test_26", - "opts": { - "dsn": "edgedb://testuser@localhost/db?secret_key=not_secret_key" - }, - "result": { - "address": [ - "localhost", - 5656 - ], - "branch": "db", - "database": "db", - "password": null, - "secretKey": "not_secret_key", - "serverSettings": {}, - "tlsCAData": null, - "tlsSecurity": "strict", - "tlsServerName": null, - "user": "testuser", "waitUntilAvailable": "PT30S" } }, { "env": {}, "fs": {}, - "name": "basic_opts_test_27", + "name": "basic_opts_test_20", "opts": { "dsn": "edgedb://testhost:1234/feature" }, @@ -1548,7 +1388,7 @@ { "env": {}, "fs": {}, - "name": "basic_opts_test_28", + "name": "basic_opts_test_21", "opts": { "dsn": "edgedb://testhost:1234/?branch=experimental11" }, @@ -1572,7 +1412,7 @@ { "env": {}, "fs": {}, - "name": "basic_opts_test_29", + "name": "basic_opts_test_22", "opts": { "branch": "experimental12", "dsn": "edgedb://testhost:1234/feature" @@ -1595,7 +1435,7 @@ } }, { - "name": "basic_opts_test_3", + "name": "basic_opts_test_23", "opts": { "dsn": "edgedb://?param=123&host=testhost&user=testuser&port=2222&database=testdb" }, @@ -1621,7 +1461,7 @@ { "env": {}, "fs": {}, - "name": "basic_opts_test_30", + "name": "basic_opts_test_24", "opts": { "branch": "experimental13", "dsn": "edgedb://testhost:1234/?branch=feature" @@ -1646,7 +1486,7 @@ { "env": {}, "fs": {}, - "name": "basic_opts_test_31", + "name": "basic_opts_test_25", "opts": { "database": "experimental15", "dsn": "edgedb://testhost:1234/?branch=feature" @@ -1671,7 +1511,7 @@ { "env": {}, "fs": {}, - "name": "basic_opts_test_32", + "name": "basic_opts_test_26", "opts": { "branch": "experimental16", "dsn": "edgedb://testhost:1234/?database=feature" @@ -1696,7 +1536,7 @@ { "env": {}, "fs": {}, - "name": "basic_opts_test_33", + "name": "basic_opts_test_27", "opts": { "branch": "feature", "host": "testhost", @@ -1720,7 +1560,7 @@ } }, { - "name": "basic_opts_test_34", + "name": "basic_opts_test_28", "opts": { "port": 65535 }, @@ -1742,7 +1582,7 @@ } }, { - "name": "basic_opts_test_35", + "name": "basic_opts_test_29", "opts": { "host": "test.local", "port": 12345 @@ -1765,7 +1605,30 @@ } }, { - "name": "basic_opts_test_36", + "name": "basic_opts_test_3", + "opts": { + "dsn": "edgedb://", + "tlsSecurity": "insecure" + }, + "result": { + "address": [ + "localhost", + 5656 + ], + "branch": "__default__", + "database": "edgedb", + "password": null, + "secretKey": null, + "serverSettings": {}, + "tlsCAData": null, + "tlsSecurity": "insecure", + "tlsServerName": null, + "user": "edgedb", + "waitUntilAvailable": "PT30S" + } + }, + { + "name": "basic_opts_test_30", "opts": { "dsn": "edgedb://user3:123123@localhost:5555/abcdef?param=123" }, @@ -1789,7 +1652,7 @@ } }, { - "name": "basic_opts_test_37", + "name": "basic_opts_test_31", "opts": { "dsn": "edgedb://localhost:5555/abcdef?param=123&user=testuser" }, @@ -1813,7 +1676,7 @@ } }, { - "name": "basic_opts_test_38", + "name": "basic_opts_test_32", "opts": { "dsn": "edgedb://localhost/abcdef?param=123&user=testuser&port=2222" }, @@ -1837,7 +1700,7 @@ } }, { - "name": "basic_opts_test_39", + "name": "basic_opts_test_33", "opts": { "dsn": "edgedb://localhost/?param=123&user=testuser&port=2222&database=testdb" }, @@ -1861,7 +1724,7 @@ } }, { - "name": "basic_opts_test_4", + "name": "basic_opts_test_34", "opts": { "dsn": "edgedb://?param=123&user=testuser&port=2222&database=testdb&host=test.local" }, @@ -1885,7 +1748,7 @@ } }, { - "name": "basic_opts_test_5", + "name": "basic_opts_test_35", "opts": { "dsn": "edgedb://localhost/database/with/slash?user=testuser&port=2222" }, @@ -1907,7 +1770,7 @@ } }, { - "name": "basic_opts_test_6", + "name": "basic_opts_test_36", "opts": { "dsn": "edgedb://localhost/?user=testuser&port=2222&database=/database/with/slash" }, @@ -1929,7 +1792,7 @@ } }, { - "name": "basic_opts_test_7", + "name": "basic_opts_test_37", "opts": { "dsn": "edgedb://testuser@localhost/db?password=not_secret_password" }, @@ -1951,7 +1814,7 @@ } }, { - "name": "basic_opts_test_8", + "name": "basic_opts_test_38", "opts": { "dsn": "edgedb://?a=abc&b=def", "serverSettings": { @@ -1980,7 +1843,7 @@ } }, { - "name": "basic_opts_test_9", + "name": "basic_opts_test_39", "opts": { "dsn": "edgedb://?a=abc&b=def", "serverSettings": { @@ -2010,11 +1873,148 @@ } }, { - "env": {}, - "error": { - "type": "credentials_file_not_found" - }, - "fs": { + "name": "basic_opts_test_4", + "opts": { + "port": "1234" + }, + "result": { + "address": [ + "localhost", + 1234 + ], + "branch": "__default__", + "database": "edgedb", + "password": null, + "secretKey": null, + "serverSettings": {}, + "tlsCAData": null, + "tlsSecurity": "strict", + "tlsServerName": null, + "user": "edgedb", + "waitUntilAvailable": "PT30S" + } + }, + { + "name": "basic_opts_test_5", + "opts": { + "dsn": "edgedb://", + "tlsServerName": "foo.example.com" + }, + "result": { + "address": [ + "localhost", + 5656 + ], + "branch": "__default__", + "database": "edgedb", + "password": null, + "secretKey": null, + "serverSettings": {}, + "tlsCAData": null, + "tlsSecurity": "strict", + "tlsServerName": "foo.example.com", + "user": "edgedb", + "waitUntilAvailable": "PT30S" + } + }, + { + "name": "basic_opts_test_6", + "opts": { + "dsn": "edgedb://", + "tlsCA": "-----BEGIN CERTIFICATE-----\nMIICEjCCAXsCAg36MA0GCSqGSIb3DQEBBQUAMIGbMQswCQYDVQQGEwJKUDEOMAwG\nA1UECBMFVG9reW8xEDAOBgNVBAcTB0NodW8ta3UxETAPBgNVBAoTCEZyYW5rNERE\nMRgwFgYDVQQLEw9XZWJDZXJ0IFN1cHBvcnQxGDAWBgNVBAMTD0ZyYW5rNEREIFdl\nYiBDQTEjMCEGCSqGSIb3DQEJARYUc3VwcG9ydEBmcmFuazRkZC5jb20wHhcNMTIw\nODIyMDUyNjU0WhcNMTcwODIxMDUyNjU0WjBKMQswCQYDVQQGEwJKUDEOMAwGA1UE\nCAwFVG9reW8xETAPBgNVBAoMCEZyYW5rNEREMRgwFgYDVQQDDA93d3cuZXhhbXBs\nZS5jb20wXDANBgkqhkiG9w0BAQEFAANLADBIAkEAm/xmkHmEQrurE/0re/jeFRLl\n8ZPjBop7uLHhnia7lQG/5zDtZIUC3RVpqDSwBuw/NTweGyuP+o8AG98HxqxTBwID\nAQABMA0GCSqGSIb3DQEBBQUAA4GBABS2TLuBeTPmcaTaUW/LCB2NYOy8GMdzR1mx\n8iBIu2H6/E2tiY3RIevV2OW61qY2/XRQg7YPxx3ffeUugX9F4J/iPnnu1zAxxyBy\n2VguKv4SWjRFoRkIfIlHX0qVviMhSlNy2ioFLy7JcPZb+v3ftDGywUqcBiVDoea0\nHn+GmxZA\n-----END CERTIFICATE-----\n", + "tlsSecurity": "strict" + }, + "result": { + "address": [ + "localhost", + 5656 + ], + "branch": "__default__", + "database": "edgedb", + "password": null, + "secretKey": null, + "serverSettings": {}, + "tlsCAData": "-----BEGIN CERTIFICATE-----\nMIICEjCCAXsCAg36MA0GCSqGSIb3DQEBBQUAMIGbMQswCQYDVQQGEwJKUDEOMAwG\nA1UECBMFVG9reW8xEDAOBgNVBAcTB0NodW8ta3UxETAPBgNVBAoTCEZyYW5rNERE\nMRgwFgYDVQQLEw9XZWJDZXJ0IFN1cHBvcnQxGDAWBgNVBAMTD0ZyYW5rNEREIFdl\nYiBDQTEjMCEGCSqGSIb3DQEJARYUc3VwcG9ydEBmcmFuazRkZC5jb20wHhcNMTIw\nODIyMDUyNjU0WhcNMTcwODIxMDUyNjU0WjBKMQswCQYDVQQGEwJKUDEOMAwGA1UE\nCAwFVG9reW8xETAPBgNVBAoMCEZyYW5rNEREMRgwFgYDVQQDDA93d3cuZXhhbXBs\nZS5jb20wXDANBgkqhkiG9w0BAQEFAANLADBIAkEAm/xmkHmEQrurE/0re/jeFRLl\n8ZPjBop7uLHhnia7lQG/5zDtZIUC3RVpqDSwBuw/NTweGyuP+o8AG98HxqxTBwID\nAQABMA0GCSqGSIb3DQEBBQUAA4GBABS2TLuBeTPmcaTaUW/LCB2NYOy8GMdzR1mx\n8iBIu2H6/E2tiY3RIevV2OW61qY2/XRQg7YPxx3ffeUugX9F4J/iPnnu1zAxxyBy\n2VguKv4SWjRFoRkIfIlHX0qVviMhSlNy2ioFLy7JcPZb+v3ftDGywUqcBiVDoea0\nHn+GmxZA\n-----END CERTIFICATE-----\n", + "tlsSecurity": "strict", + "tlsServerName": null, + "user": "edgedb", + "waitUntilAvailable": "PT30S" + } + }, + { + "name": "basic_opts_test_7", + "opts": { + "dsn": "edgedb://", + "password": "" + }, + "result": { + "address": [ + "localhost", + 5656 + ], + "branch": "__default__", + "database": "edgedb", + "password": "", + "secretKey": null, + "serverSettings": {}, + "tlsCAData": null, + "tlsSecurity": "strict", + "tlsServerName": null, + "user": "edgedb", + "waitUntilAvailable": "PT30S" + } + }, + { + "name": "basic_opts_test_8", + "opts": { + "dsn": "edgedb://?password=" + }, + "result": { + "address": [ + "localhost", + 5656 + ], + "branch": "__default__", + "database": "edgedb", + "password": "", + "secretKey": null, + "serverSettings": {}, + "tlsCAData": null, + "tlsSecurity": "strict", + "tlsServerName": null, + "user": "edgedb", + "waitUntilAvailable": "PT30S" + } + }, + { + "name": "basic_opts_test_9", + "opts": { + "dsn": "edgedb://?password_env=DOESNT_EXIST", + "password": "secret" + }, + "result": { + "address": [ + "localhost", + 5656 + ], + "branch": "__default__", + "database": "edgedb", + "password": "secret", + "secretKey": null, + "serverSettings": {}, + "tlsCAData": null, + "tlsSecurity": "strict", + "tlsServerName": null, + "user": "edgedb", + "waitUntilAvailable": "PT30S" + } + }, + { + "env": {}, + "error": { + "type": "credentials_file_not_found" + }, + "fs": { "cwd": "/home/edgedb/test", "files": { "/home/edgedb/.config/edgedb/projects/test-${HASH}": { @@ -2202,7 +2202,7 @@ }, "fs": { "files": { - "/home/edgedb/.config/edgedb/credentials/test_instance.json": "{\"port\": 10702, \"user\": \"edgedb\", \"tls_verify_hostname\": true, \"tls_security\": \"no_host_verification\"}" + "/home/edgedb/.config/edgedb/credentials/test_instance.json": "{\"port\": 10702, \"user\": \"edgedb\", \"tls_verify_hostname\": true, \"tls_security\": \"insecure\"}" }, "homedir": "/home/edgedb" }, @@ -2211,6 +2211,21 @@ "instance": "test_instance" } }, + { + "error": { + "type": "invalid_credentials_file" + }, + "fs": { + "files": { + "/home/edgedb/.config/edgedb/credentials/test_instance.json": "{\"port\": 10702, \"user\": \"edgedb\", \"tls_verify_hostname\": true, \"tls_security\": \"no_host_verification\"}" + }, + "homedir": "/home/edgedb" + }, + "name": "error_invalid_credentials_file_test_2", + "opts": { + "instance": "test_instance" + } + }, { "env": {}, "error": { @@ -2228,7 +2243,7 @@ }, "homedir": "/home/edgedb" }, - "name": "error_invalid_credentials_file_test_2", + "name": "error_invalid_credentials_file_test_3", "opts": {} }, { @@ -2241,7 +2256,7 @@ "/home/edgedb/test/credentials.json": "{\"port\": \"10702\", \"user\": \"test3n\", \"password\": \"lZTBy1RVCfOpBAOwSCwIyBIR\", \"database\": \"test3n\"}" } }, - "name": "error_invalid_credentials_file_test_3", + "name": "error_invalid_credentials_file_test_4", "opts": { "credentialsFile": "/home/edgedb/test/credentials.json" } @@ -2256,7 +2271,7 @@ "/home/edgedb/test/credentials.json": "\"port\": 10702, \"user\": \"test3n\", \"password\": \"lZTBy1RVCfOpBAOwSCwIyBIR\", \"database\": \"test3n\"}" } }, - "name": "error_invalid_credentials_file_test_4", + "name": "error_invalid_credentials_file_test_5", "opts": { "credentialsFile": "/home/edgedb/test/credentials.json" } @@ -2271,7 +2286,7 @@ "/home/edgedb/test/credentials.json": "{\"port\": 10702, \"user\": \"test3n\", \"tls_verify_hostname\": \"true\", \"tls_ca\": \"-----BEGIN CERTIFICATE-----\\nMIICEjCCAXsCAg36MA0GCSqGSIb3DQEBBQUAMIGbMQswCQYDVQQGEwJKUDEOMAwG\\nA1UECBMFVG9reW8xEDAOBgNVBAcTB0NodW8ta3UxETAPBgNVBAoTCEZyYW5rNERE\\nMRgwFgYDVQQLEw9XZWJDZXJ0IFN1cHBvcnQxGDAWBgNVBAMTD0ZyYW5rNEREIFdl\\nYiBDQTEjMCEGCSqGSIb3DQEJARYUc3VwcG9ydEBmcmFuazRkZC5jb20wHhcNMTIw\\nODIyMDUyNjU0WhcNMTcwODIxMDUyNjU0WjBKMQswCQYDVQQGEwJKUDEOMAwGA1UE\\nCAwFVG9reW8xETAPBgNVBAoMCEZyYW5rNEREMRgwFgYDVQQDDA93d3cuZXhhbXBs\\nZS5jb20wXDANBgkqhkiG9w0BAQEFAANLADBIAkEAm/xmkHmEQrurE/0re/jeFRLl\\n8ZPjBop7uLHhnia7lQG/5zDtZIUC3RVpqDSwBuw/NTweGyuP+o8AG98HxqxTBwID\\nAQABMA0GCSqGSIb3DQEBBQUAA4GBABS2TLuBeTPmcaTaUW/LCB2NYOy8GMdzR1mx\\n8iBIu2H6/E2tiY3RIevV2OW61qY2/XRQg7YPxx3ffeUugX9F4J/iPnnu1zAxxyBy\\n2VguKv4SWjRFoRkIfIlHX0qVviMhSlNy2ioFLy7JcPZb+v3ftDGywUqcBiVDoea0\\nHn+GmxZA\\n-----END CERTIFICATE-----\\n\"}" } }, - "name": "error_invalid_credentials_file_test_5", + "name": "error_invalid_credentials_file_test_6", "opts": { "credentialsFile": "/home/edgedb/test/credentials.json" } @@ -2286,7 +2301,7 @@ "/home/edgedb/test/credentials.json": "{\"port\": 10702, \"user\": \"test3n\", \"tls_security\": true, \"tls_ca\": \"-----BEGIN CERTIFICATE-----\\nMIICEjCCAXsCAg36MA0GCSqGSIb3DQEBBQUAMIGbMQswCQYDVQQGEwJKUDEOMAwG\\nA1UECBMFVG9reW8xEDAOBgNVBAcTB0NodW8ta3UxETAPBgNVBAoTCEZyYW5rNERE\\nMRgwFgYDVQQLEw9XZWJDZXJ0IFN1cHBvcnQxGDAWBgNVBAMTD0ZyYW5rNEREIFdl\\nYiBDQTEjMCEGCSqGSIb3DQEJARYUc3VwcG9ydEBmcmFuazRkZC5jb20wHhcNMTIw\\nODIyMDUyNjU0WhcNMTcwODIxMDUyNjU0WjBKMQswCQYDVQQGEwJKUDEOMAwGA1UE\\nCAwFVG9reW8xETAPBgNVBAoMCEZyYW5rNEREMRgwFgYDVQQDDA93d3cuZXhhbXBs\\nZS5jb20wXDANBgkqhkiG9w0BAQEFAANLADBIAkEAm/xmkHmEQrurE/0re/jeFRLl\\n8ZPjBop7uLHhnia7lQG/5zDtZIUC3RVpqDSwBuw/NTweGyuP+o8AG98HxqxTBwID\\nAQABMA0GCSqGSIb3DQEBBQUAA4GBABS2TLuBeTPmcaTaUW/LCB2NYOy8GMdzR1mx\\n8iBIu2H6/E2tiY3RIevV2OW61qY2/XRQg7YPxx3ffeUugX9F4J/iPnnu1zAxxyBy\\n2VguKv4SWjRFoRkIfIlHX0qVviMhSlNy2ioFLy7JcPZb+v3ftDGywUqcBiVDoea0\\nHn+GmxZA\\n-----END CERTIFICATE-----\\n\"}" } }, - "name": "error_invalid_credentials_file_test_6", + "name": "error_invalid_credentials_file_test_7", "opts": { "credentialsFile": "/home/edgedb/test/credentials.json" } @@ -2301,33 +2316,18 @@ "/home/edgedb/test/credentials.json": "{\"port\": 10702, \"user\": \"test3n\", \"tls_cert_data\": \"-----BEGIN CERTIFICATE-----\\nMIIC0zCCAbugAwIBAgIRAIiyXkJh/EUTq0GiQYnaTnUwDQYJKoZIhvcNAQELBQAw\\nGDEWMBQGA1UEAwwNRWRnZURCIFNlcnZlcjAeFw0yMTA4MTAyMDIzMjVaFw00MDEw\\nMTAyMDIzMjVaMBgxFjAUBgNVBAMMDUVkZ2VEQiBTZXJ2ZXIwggEiMA0GCSqGSIb3\\nDQEBAQUAA4IBDwAwggEKAoIBAQC0gePsxmtfwkiVXd+WjiXtSy1AMj/8zK1YWDDS\\n/GbVufBEFXDnGWgC4yEQl872tJOBrKUUHIqkWj65AXH50mrcs6ejc7tgZbK34i77\\nV/NQk7lsgwiHXNw0FAVH/pf+0Jfd6A+Re5pYcAmMiU6Gt2P+xTe6TgJk+h+L47QU\\nnDNNzfmxlVzQ9/MdaWxvH6AmAn5VzazaF8tZuvD5bt9opDCHtikjZFviML7mwnVa\\n9RoWc9oFLq7QwvqwZ10tCxNL/ApR7NQDuNf0v0Ib/ix8IhIkOQmovEY5Qcd1/Fo9\\nf+Ypf6c5Sc4J7Crajvz+nCZlAHrRi8L3lxDcQfUQO6Dh9ty3AgMBAAGjGDAWMBQG\\nA1UdEQQNMAuCCTEyNy4wLjAuMTANBgkqhkiG9w0BAQsFAAOCAQEAE4p0/QZk5aZY\\nsqhJTeEx6paWT1DUxQaFo3l259WVCSx4a+zEhikPgk9l23Tk3E56OScKg29mUpMq\\n/dJU8t4qp3JhiMk5pFVVuFfEqmr7RAktwt0tOF+9ZxKBCdT5EYxlhWlsJu9bVY0c\\nzlnZIc6SBUa1n19lWK9k4QF/1p8CpwindG6HrrbFmQmwhIcOuuOHOJ3dJwzM9Gtn\\nh3At6XIBPpNNrmsnRK6JncnMvITs20yHADU4k88U2vUtTFgVEAzpzgebSU7LdArC\\nIUAnwMCMIBPDFWU0DRa5ZNipuM1lJfHb6zDy2KK3wF/J6FI+A3GxbmRGMIzsAjD3\\nRQ/7CXD9Fw==\\n-----END CERTIFICATE-----\", \"tls_ca\": \"-----BEGIN CERTIFICATE-----\\nMIICEjCCAXsCAg36MA0GCSqGSIb3DQEBBQUAMIGbMQswCQYDVQQGEwJKUDEOMAwG\\nA1UECBMFVG9reW8xEDAOBgNVBAcTB0NodW8ta3UxETAPBgNVBAoTCEZyYW5rNERE\\nMRgwFgYDVQQLEw9XZWJDZXJ0IFN1cHBvcnQxGDAWBgNVBAMTD0ZyYW5rNEREIFdl\\nYiBDQTEjMCEGCSqGSIb3DQEJARYUc3VwcG9ydEBmcmFuazRkZC5jb20wHhcNMTIw\\nODIyMDUyNjU0WhcNMTcwODIxMDUyNjU0WjBKMQswCQYDVQQGEwJKUDEOMAwGA1UE\\nCAwFVG9reW8xETAPBgNVBAoMCEZyYW5rNEREMRgwFgYDVQQDDA93d3cuZXhhbXBs\\nZS5jb20wXDANBgkqhkiG9w0BAQEFAANLADBIAkEAm/xmkHmEQrurE/0re/jeFRLl\\n8ZPjBop7uLHhnia7lQG/5zDtZIUC3RVpqDSwBuw/NTweGyuP+o8AG98HxqxTBwID\\nAQABMA0GCSqGSIb3DQEBBQUAA4GBABS2TLuBeTPmcaTaUW/LCB2NYOy8GMdzR1mx\\n8iBIu2H6/E2tiY3RIevV2OW61qY2/XRQg7YPxx3ffeUugX9F4J/iPnnu1zAxxyBy\\n2VguKv4SWjRFoRkIfIlHX0qVviMhSlNy2ioFLy7JcPZb+v3ftDGywUqcBiVDoea0\\nHn+GmxZA\\n-----END CERTIFICATE-----\\n\"}" } }, - "name": "error_invalid_credentials_file_test_7", - "opts": { - "credentialsFile": "/home/edgedb/test/credentials.json" - } - }, - { - "error": { - "type": "invalid_credentials_file" - }, "name": "error_invalid_credentials_file_test_8", "opts": { - "credentialsFile": "" + "credentialsFile": "/home/edgedb/test/credentials.json" } }, { "error": { "type": "invalid_credentials_file" }, - "fs": { - "files": { - "/home/edgedb/.config/edgedb/credentials/test_instance.json": "{\"port\": 10702, \"user\": \"edgedb\", \"tls_verify_hostname\": true, \"tls_security\": \"insecure\"}" - }, - "homedir": "/home/edgedb" - }, "name": "error_invalid_credentials_file_test_9", "opts": { - "instance": "test_instance" + "credentialsFile": "" } }, { @@ -2493,65 +2493,68 @@ } }, { - "env": { - "EDGEDB_DSN": "edgedb://testhost:1234/foo/?branch=feature" - }, "error": { "type": "invalid_dsn" }, - "fs": {}, "name": "error_invalid_dsn_test_10", - "opts": {} + "opts": { + "dsn": "edgedb://?param=123&host=testhost&user=testuser&port=2222&database=testdb&host=localhost" + } }, { "env": { - "EDGEDB_DSN": "edgedb://testhost:1234/?branch=feature&database=foo" + "EDGEDB_PASSWORD": "password" }, "error": { "type": "invalid_dsn" }, - "fs": {}, "name": "error_invalid_dsn_test_11", - "opts": {} + "opts": { + "dsn": "edgedb://testuser:pass@localhost/db?password_env=EDGEDB_PASSWORD" + } }, { - "env": {}, + "env": { + "EDGEDB_DSN": "edgedb://testhost:1234/foo/?branch=feature" + }, "error": { "type": "invalid_dsn" }, "fs": {}, "name": "error_invalid_dsn_test_2", - "opts": { - "dsn": "edgedb://testhost:1234/feature/?branch=feature" - } + "opts": {} }, { - "env": {}, + "env": { + "EDGEDB_DSN": "edgedb://testhost:1234/?branch=feature&database=foo" + }, "error": { "type": "invalid_dsn" }, "fs": {}, "name": "error_invalid_dsn_test_3", - "opts": { - "dsn": "edgedb://testhost:1234/feature/?branch=feature&database=feature" - } + "opts": {} }, { + "env": {}, "error": { "type": "invalid_dsn" }, + "fs": {}, "name": "error_invalid_dsn_test_4", "opts": { - "dsn": "edgedb://user@host1:1111,host2:2222/db" + "dsn": "edgedb://testhost:1234/feature/?branch=feature" } }, { + "env": {}, "error": { "type": "invalid_dsn" }, + "fs": {}, "name": "error_invalid_dsn_test_5", "opts": { - "dsn": "edgedb://user3:123123@localhost:5555/abcdef?param=sss¶m=123" + "dsn": "edgedb://testhost:1234/feature/?branch=feature&database=feature" } }, { @@ -2560,7 +2563,7 @@ }, "name": "error_invalid_dsn_test_6", "opts": { - "dsn": "edgedb://localhost:5555/abcdef?param=123&user=testuser&port=2222&database=testdb" + "dsn": "edgedb://user@host1:1111,host2:2222/db" } }, { @@ -2569,7 +2572,7 @@ }, "name": "error_invalid_dsn_test_7", "opts": { - "dsn": "edgedb://localhost?param=123&host=testhost&user=testuser&port=2222&database=testdb" + "dsn": "edgedb://user3:123123@localhost:5555/abcdef?param=sss¶m=123" } }, { @@ -2578,19 +2581,16 @@ }, "name": "error_invalid_dsn_test_8", "opts": { - "dsn": "edgedb://?param=123&host=testhost&user=testuser&port=2222&database=testdb&host=localhost" + "dsn": "edgedb://localhost:5555/abcdef?param=123&user=testuser&port=2222&database=testdb" } }, { - "env": { - "EDGEDB_PASSWORD": "password" - }, "error": { "type": "invalid_dsn" }, "name": "error_invalid_dsn_test_9", "opts": { - "dsn": "edgedb://testuser:pass@localhost/db?password_env=EDGEDB_PASSWORD" + "dsn": "edgedb://localhost?param=123&host=testhost&user=testuser&port=2222&database=testdb" } }, { @@ -2703,7 +2703,7 @@ }, "name": "error_invalid_port_test_10", "opts": { - "port": "" + "port": "1111,2222" } }, { @@ -2712,7 +2712,7 @@ }, "name": "error_invalid_port_test_2", "opts": { - "dsn": "edgedb://?port=" + "port": "" } }, { @@ -2721,7 +2721,7 @@ }, "name": "error_invalid_port_test_3", "opts": { - "port": 123.456 + "dsn": "edgedb://?port=" } }, { @@ -2730,7 +2730,7 @@ }, "name": "error_invalid_port_test_4", "opts": { - "port": "123.456" + "port": 123.456 } }, { @@ -2739,7 +2739,7 @@ }, "name": "error_invalid_port_test_5", "opts": { - "port": "string" + "port": "123.456" } }, { @@ -2747,6 +2747,15 @@ "type": "invalid_port" }, "name": "error_invalid_port_test_6", + "opts": { + "port": "string" + } + }, + { + "error": { + "type": "invalid_port" + }, + "name": "error_invalid_port_test_7", "opts": { "port": "tcp://localhost:123" } @@ -2758,7 +2767,7 @@ "error": { "type": "invalid_port" }, - "name": "error_invalid_port_test_7" + "name": "error_invalid_port_test_8" }, { "env": { @@ -2767,16 +2776,7 @@ "error": { "type": "invalid_port" }, - "name": "error_invalid_port_test_8" - }, - { - "error": { - "type": "invalid_port" - }, - "name": "error_invalid_port_test_9", - "opts": { - "port": "1111,2222" - } + "name": "error_invalid_port_test_9" }, { "env": {}, @@ -2886,8 +2886,8 @@ }, { "env": { - "EDGEDB_HOST": "test.local", - "EDGEDB_INSTANCE": "test_instance" + "EDGEDB_CREDENTIALS_FILE": "/home/edgedb/test/credentials.json", + "EDGEDB_HOST": "test.local" }, "error": { "type": "multiple_compound_env" @@ -2896,8 +2896,8 @@ }, { "env": { - "EDGEDB_DSN": "edgedb://user3:123123@localhost:5555/abcdef", - "EDGEDB_INSTANCE": "test_instance" + "EDGEDB_CREDENTIALS_FILE": "/home/edgedb/test/credentials.json", + "EDGEDB_PORT": "1234" }, "error": { "type": "multiple_compound_env" @@ -2906,8 +2906,8 @@ }, { "env": { - "EDGEDB_CREDENTIALS_FILE": "/home/edgedb/test/credentials.json", - "EDGEDB_INSTANCE": "test_instance" + "EDGEDB_INSTANCE": "test_instance", + "EDGEDB_PORT": "1234" }, "error": { "type": "multiple_compound_env" @@ -2916,11 +2916,8 @@ }, { "env": { - "EDGEDB_CREDENTIALS_FILE": "/home/edgedb/test/credentials.json", - "EDGEDB_DSN": "edgedb://user3:123123@localhost:5555/abcdef", - "EDGEDB_HOST": "localhost", - "EDGEDB_INSTANCE": "test_instance", - "EDGEDB_PORT": "10701" + "EDGEDB_HOST": "test.local", + "EDGEDB_INSTANCE": "test_instance" }, "error": { "type": "multiple_compound_env" @@ -2929,21 +2926,18 @@ }, { "env": { - "EDGEDB_CREDENTIALS_FILE": "/home/edgedb/test/credentials.json", - "EDGEDB_DSN": "edgedb://user3:123123@localhost:5555/abcdef" + "EDGEDB_DSN": "edgedb://user3:123123@localhost:5555/abcdef", + "EDGEDB_INSTANCE": "test_instance" }, "error": { "type": "multiple_compound_env" }, - "name": "error_multiple_compound_env_test_3", - "opts": { - "database": "testdb" - } + "name": "error_multiple_compound_env_test_3" }, { "env": { - "EDGEDB_DSN": "edgedb://user3:123123@localhost:5555/abcdef", - "GEL_HOST": "test.local" + "EDGEDB_CREDENTIALS_FILE": "/home/edgedb/test/credentials.json", + "EDGEDB_INSTANCE": "test_instance" }, "error": { "type": "multiple_compound_env" @@ -2952,7 +2946,10 @@ }, { "env": { + "EDGEDB_CREDENTIALS_FILE": "/home/edgedb/test/credentials.json", "EDGEDB_DSN": "edgedb://user3:123123@localhost:5555/abcdef", + "EDGEDB_HOST": "localhost", + "EDGEDB_INSTANCE": "test_instance", "EDGEDB_PORT": "10701" }, "error": { @@ -2968,12 +2965,15 @@ "error": { "type": "multiple_compound_env" }, - "name": "error_multiple_compound_env_test_6" + "name": "error_multiple_compound_env_test_6", + "opts": { + "database": "testdb" + } }, { "env": { - "EDGEDB_CREDENTIALS_FILE": "/home/edgedb/test/credentials.json", - "EDGEDB_HOST": "test.local" + "EDGEDB_DSN": "edgedb://user3:123123@localhost:5555/abcdef", + "GEL_HOST": "test.local" }, "error": { "type": "multiple_compound_env" @@ -2982,8 +2982,8 @@ }, { "env": { - "EDGEDB_CREDENTIALS_FILE": "/home/edgedb/test/credentials.json", - "EDGEDB_PORT": "1234" + "EDGEDB_DSN": "edgedb://user3:123123@localhost:5555/abcdef", + "EDGEDB_PORT": "10701" }, "error": { "type": "multiple_compound_env" @@ -2992,8 +2992,8 @@ }, { "env": { - "EDGEDB_INSTANCE": "test_instance", - "EDGEDB_PORT": "1234" + "EDGEDB_CREDENTIALS_FILE": "/home/edgedb/test/credentials.json", + "EDGEDB_DSN": "edgedb://user3:123123@localhost:5555/abcdef" }, "error": { "type": "multiple_compound_env" @@ -3281,251 +3281,14 @@ { "fs": { "files": { - "/home/edgedb/test/cert.pem": "-----BEGIN CERTIFICATE-----\nMIICEjCCAXsCAg36MA0GCSqGSIb3DQEBBQUAMIGbMQswCQYDVQQGEwJKUDEOMAwG\nA1UECBMFVG9reW8xEDAOBgNVBAcTB0NodW8ta3UxETAPBgNVBAoTCEZyYW5rNERE\nMRgwFgYDVQQLEw9XZWJDZXJ0IFN1cHBvcnQxGDAWBgNVBAMTD0ZyYW5rNEREIFdl\nYiBDQTEjMCEGCSqGSIb3DQEJARYUc3VwcG9ydEBmcmFuazRkZC5jb20wHhcNMTIw\nODIyMDUyNjU0WhcNMTcwODIxMDUyNjU0WjBKMQswCQYDVQQGEwJKUDEOMAwGA1UE\nCAwFVG9reW8xETAPBgNVBAoMCEZyYW5rNEREMRgwFgYDVQQDDA93d3cuZXhhbXBs\nZS5jb20wXDANBgkqhkiG9w0BAQEFAANLADBIAkEAm/xmkHmEQrurE/0re/jeFRLl\n8ZPjBop7uLHhnia7lQG/5zDtZIUC3RVpqDSwBuw/NTweGyuP+o8AG98HxqxTBwID\nAQABMA0GCSqGSIb3DQEBBQUAA4GBABS2TLuBeTPmcaTaUW/LCB2NYOy8GMdzR1mx\n8iBIu2H6/E2tiY3RIevV2OW61qY2/XRQg7YPxx3ffeUugX9F4J/iPnnu1zAxxyBy\n2VguKv4SWjRFoRkIfIlHX0qVviMhSlNy2ioFLy7JcPZb+v3ftDGywUqcBiVDoea0\nHn+GmxZA\n-----END CERTIFICATE-----\n" - } - }, - "name": "override_certificate_test_4", - "opts": { - "dsn": "edgedb://", - "tlsCAFile": "/home/edgedb/test/cert.pem", - "tlsSecurity": "strict" - }, - "result": { - "address": [ - "localhost", - 5656 - ], - "branch": "__default__", - "database": "edgedb", - "password": null, - "secretKey": null, - "serverSettings": {}, - "tlsCAData": "-----BEGIN CERTIFICATE-----\nMIICEjCCAXsCAg36MA0GCSqGSIb3DQEBBQUAMIGbMQswCQYDVQQGEwJKUDEOMAwG\nA1UECBMFVG9reW8xEDAOBgNVBAcTB0NodW8ta3UxETAPBgNVBAoTCEZyYW5rNERE\nMRgwFgYDVQQLEw9XZWJDZXJ0IFN1cHBvcnQxGDAWBgNVBAMTD0ZyYW5rNEREIFdl\nYiBDQTEjMCEGCSqGSIb3DQEJARYUc3VwcG9ydEBmcmFuazRkZC5jb20wHhcNMTIw\nODIyMDUyNjU0WhcNMTcwODIxMDUyNjU0WjBKMQswCQYDVQQGEwJKUDEOMAwGA1UE\nCAwFVG9reW8xETAPBgNVBAoMCEZyYW5rNEREMRgwFgYDVQQDDA93d3cuZXhhbXBs\nZS5jb20wXDANBgkqhkiG9w0BAQEFAANLADBIAkEAm/xmkHmEQrurE/0re/jeFRLl\n8ZPjBop7uLHhnia7lQG/5zDtZIUC3RVpqDSwBuw/NTweGyuP+o8AG98HxqxTBwID\nAQABMA0GCSqGSIb3DQEBBQUAA4GBABS2TLuBeTPmcaTaUW/LCB2NYOy8GMdzR1mx\n8iBIu2H6/E2tiY3RIevV2OW61qY2/XRQg7YPxx3ffeUugX9F4J/iPnnu1zAxxyBy\n2VguKv4SWjRFoRkIfIlHX0qVviMhSlNy2ioFLy7JcPZb+v3ftDGywUqcBiVDoea0\nHn+GmxZA\n-----END CERTIFICATE-----\n", - "tlsSecurity": "strict", - "tlsServerName": null, - "user": "edgedb", - "waitUntilAvailable": "PT30S" - } - }, - { - "fs": { - "files": { - "/home/edgedb/test/cert.pem": "-----BEGIN CERTIFICATE-----\nMIICEjCCAXsCAg36MA0GCSqGSIb3DQEBBQUAMIGbMQswCQYDVQQGEwJKUDEOMAwG\nA1UECBMFVG9reW8xEDAOBgNVBAcTB0NodW8ta3UxETAPBgNVBAoTCEZyYW5rNERE\nMRgwFgYDVQQLEw9XZWJDZXJ0IFN1cHBvcnQxGDAWBgNVBAMTD0ZyYW5rNEREIFdl\nYiBDQTEjMCEGCSqGSIb3DQEJARYUc3VwcG9ydEBmcmFuazRkZC5jb20wHhcNMTIw\nODIyMDUyNjU0WhcNMTcwODIxMDUyNjU0WjBKMQswCQYDVQQGEwJKUDEOMAwGA1UE\nCAwFVG9reW8xETAPBgNVBAoMCEZyYW5rNEREMRgwFgYDVQQDDA93d3cuZXhhbXBs\nZS5jb20wXDANBgkqhkiG9w0BAQEFAANLADBIAkEAm/xmkHmEQrurE/0re/jeFRLl\n8ZPjBop7uLHhnia7lQG/5zDtZIUC3RVpqDSwBuw/NTweGyuP+o8AG98HxqxTBwID\nAQABMA0GCSqGSIb3DQEBBQUAA4GBABS2TLuBeTPmcaTaUW/LCB2NYOy8GMdzR1mx\n8iBIu2H6/E2tiY3RIevV2OW61qY2/XRQg7YPxx3ffeUugX9F4J/iPnnu1zAxxyBy\n2VguKv4SWjRFoRkIfIlHX0qVviMhSlNy2ioFLy7JcPZb+v3ftDGywUqcBiVDoea0\nHn+GmxZA\n-----END CERTIFICATE-----\n" - } - }, - "name": "override_certificate_test_5", - "opts": { - "dsn": "edgedb://?tls_ca_file=/home/edgedb/test/nonexist.pem", - "tlsCAFile": "/home/edgedb/test/cert.pem", - "tlsSecurity": "strict" - }, - "result": { - "address": [ - "localhost", - 5656 - ], - "branch": "__default__", - "database": "edgedb", - "password": null, - "secretKey": null, - "serverSettings": {}, - "tlsCAData": "-----BEGIN CERTIFICATE-----\nMIICEjCCAXsCAg36MA0GCSqGSIb3DQEBBQUAMIGbMQswCQYDVQQGEwJKUDEOMAwG\nA1UECBMFVG9reW8xEDAOBgNVBAcTB0NodW8ta3UxETAPBgNVBAoTCEZyYW5rNERE\nMRgwFgYDVQQLEw9XZWJDZXJ0IFN1cHBvcnQxGDAWBgNVBAMTD0ZyYW5rNEREIFdl\nYiBDQTEjMCEGCSqGSIb3DQEJARYUc3VwcG9ydEBmcmFuazRkZC5jb20wHhcNMTIw\nODIyMDUyNjU0WhcNMTcwODIxMDUyNjU0WjBKMQswCQYDVQQGEwJKUDEOMAwGA1UE\nCAwFVG9reW8xETAPBgNVBAoMCEZyYW5rNEREMRgwFgYDVQQDDA93d3cuZXhhbXBs\nZS5jb20wXDANBgkqhkiG9w0BAQEFAANLADBIAkEAm/xmkHmEQrurE/0re/jeFRLl\n8ZPjBop7uLHhnia7lQG/5zDtZIUC3RVpqDSwBuw/NTweGyuP+o8AG98HxqxTBwID\nAQABMA0GCSqGSIb3DQEBBQUAA4GBABS2TLuBeTPmcaTaUW/LCB2NYOy8GMdzR1mx\n8iBIu2H6/E2tiY3RIevV2OW61qY2/XRQg7YPxx3ffeUugX9F4J/iPnnu1zAxxyBy\n2VguKv4SWjRFoRkIfIlHX0qVviMhSlNy2ioFLy7JcPZb+v3ftDGywUqcBiVDoea0\nHn+GmxZA\n-----END CERTIFICATE-----\n", - "tlsSecurity": "strict", - "tlsServerName": null, - "user": "edgedb", - "waitUntilAvailable": "PT30S" - } - }, - { - "env": { - "MY_TLS_CERT": "/home/edgedb/test/cert.pem" - }, - "fs": { - "files": { - "/home/edgedb/test/cert.pem": "-----BEGIN CERTIFICATE-----\nMIICEjCCAXsCAg36MA0GCSqGSIb3DQEBBQUAMIGbMQswCQYDVQQGEwJKUDEOMAwG\nA1UECBMFVG9reW8xEDAOBgNVBAcTB0NodW8ta3UxETAPBgNVBAoTCEZyYW5rNERE\nMRgwFgYDVQQLEw9XZWJDZXJ0IFN1cHBvcnQxGDAWBgNVBAMTD0ZyYW5rNEREIFdl\nYiBDQTEjMCEGCSqGSIb3DQEJARYUc3VwcG9ydEBmcmFuazRkZC5jb20wHhcNMTIw\nODIyMDUyNjU0WhcNMTcwODIxMDUyNjU0WjBKMQswCQYDVQQGEwJKUDEOMAwGA1UE\nCAwFVG9reW8xETAPBgNVBAoMCEZyYW5rNEREMRgwFgYDVQQDDA93d3cuZXhhbXBs\nZS5jb20wXDANBgkqhkiG9w0BAQEFAANLADBIAkEAm/xmkHmEQrurE/0re/jeFRLl\n8ZPjBop7uLHhnia7lQG/5zDtZIUC3RVpqDSwBuw/NTweGyuP+o8AG98HxqxTBwID\nAQABMA0GCSqGSIb3DQEBBQUAA4GBABS2TLuBeTPmcaTaUW/LCB2NYOy8GMdzR1mx\n8iBIu2H6/E2tiY3RIevV2OW61qY2/XRQg7YPxx3ffeUugX9F4J/iPnnu1zAxxyBy\n2VguKv4SWjRFoRkIfIlHX0qVviMhSlNy2ioFLy7JcPZb+v3ftDGywUqcBiVDoea0\nHn+GmxZA\n-----END CERTIFICATE-----\n" - } - }, - "name": "override_certificate_test_6", - "opts": { - "dsn": "edgedb://?tls_ca_file_env=MY_TLS_CERT", - "tlsSecurity": "strict" - }, - "result": { - "address": [ - "localhost", - 5656 - ], - "branch": "__default__", - "database": "edgedb", - "password": null, - "secretKey": null, - "serverSettings": {}, - "tlsCAData": "-----BEGIN CERTIFICATE-----\nMIICEjCCAXsCAg36MA0GCSqGSIb3DQEBBQUAMIGbMQswCQYDVQQGEwJKUDEOMAwG\nA1UECBMFVG9reW8xEDAOBgNVBAcTB0NodW8ta3UxETAPBgNVBAoTCEZyYW5rNERE\nMRgwFgYDVQQLEw9XZWJDZXJ0IFN1cHBvcnQxGDAWBgNVBAMTD0ZyYW5rNEREIFdl\nYiBDQTEjMCEGCSqGSIb3DQEJARYUc3VwcG9ydEBmcmFuazRkZC5jb20wHhcNMTIw\nODIyMDUyNjU0WhcNMTcwODIxMDUyNjU0WjBKMQswCQYDVQQGEwJKUDEOMAwGA1UE\nCAwFVG9reW8xETAPBgNVBAoMCEZyYW5rNEREMRgwFgYDVQQDDA93d3cuZXhhbXBs\nZS5jb20wXDANBgkqhkiG9w0BAQEFAANLADBIAkEAm/xmkHmEQrurE/0re/jeFRLl\n8ZPjBop7uLHhnia7lQG/5zDtZIUC3RVpqDSwBuw/NTweGyuP+o8AG98HxqxTBwID\nAQABMA0GCSqGSIb3DQEBBQUAA4GBABS2TLuBeTPmcaTaUW/LCB2NYOy8GMdzR1mx\n8iBIu2H6/E2tiY3RIevV2OW61qY2/XRQg7YPxx3ffeUugX9F4J/iPnnu1zAxxyBy\n2VguKv4SWjRFoRkIfIlHX0qVviMhSlNy2ioFLy7JcPZb+v3ftDGywUqcBiVDoea0\nHn+GmxZA\n-----END CERTIFICATE-----\n", - "tlsSecurity": "strict", - "tlsServerName": null, - "user": "edgedb", - "waitUntilAvailable": "PT30S" - } - }, - { - "env": { - "EDGEDB_CLIENT_TLS_SECURITY": "strict", - "EDGEDB_DSN": "edgedb://" - }, - "fs": { - "files": { - "/home/edgedb/test/cert.pem": "-----BEGIN CERTIFICATE-----\nMIICEjCCAXsCAg36MA0GCSqGSIb3DQEBBQUAMIGbMQswCQYDVQQGEwJKUDEOMAwG\nA1UECBMFVG9reW8xEDAOBgNVBAcTB0NodW8ta3UxETAPBgNVBAoTCEZyYW5rNERE\nMRgwFgYDVQQLEw9XZWJDZXJ0IFN1cHBvcnQxGDAWBgNVBAMTD0ZyYW5rNEREIFdl\nYiBDQTEjMCEGCSqGSIb3DQEJARYUc3VwcG9ydEBmcmFuazRkZC5jb20wHhcNMTIw\nODIyMDUyNjU0WhcNMTcwODIxMDUyNjU0WjBKMQswCQYDVQQGEwJKUDEOMAwGA1UE\nCAwFVG9reW8xETAPBgNVBAoMCEZyYW5rNEREMRgwFgYDVQQDDA93d3cuZXhhbXBs\nZS5jb20wXDANBgkqhkiG9w0BAQEFAANLADBIAkEAm/xmkHmEQrurE/0re/jeFRLl\n8ZPjBop7uLHhnia7lQG/5zDtZIUC3RVpqDSwBuw/NTweGyuP+o8AG98HxqxTBwID\nAQABMA0GCSqGSIb3DQEBBQUAA4GBABS2TLuBeTPmcaTaUW/LCB2NYOy8GMdzR1mx\n8iBIu2H6/E2tiY3RIevV2OW61qY2/XRQg7YPxx3ffeUugX9F4J/iPnnu1zAxxyBy\n2VguKv4SWjRFoRkIfIlHX0qVviMhSlNy2ioFLy7JcPZb+v3ftDGywUqcBiVDoea0\nHn+GmxZA\n-----END CERTIFICATE-----\n" - } - }, - "name": "override_certificate_test_7", - "opts": { - "tlsCAFile": "/home/edgedb/test/cert.pem" - }, - "result": { - "address": [ - "localhost", - 5656 - ], - "branch": "__default__", - "database": "edgedb", - "password": null, - "secretKey": null, - "serverSettings": {}, - "tlsCAData": "-----BEGIN CERTIFICATE-----\nMIICEjCCAXsCAg36MA0GCSqGSIb3DQEBBQUAMIGbMQswCQYDVQQGEwJKUDEOMAwG\nA1UECBMFVG9reW8xEDAOBgNVBAcTB0NodW8ta3UxETAPBgNVBAoTCEZyYW5rNERE\nMRgwFgYDVQQLEw9XZWJDZXJ0IFN1cHBvcnQxGDAWBgNVBAMTD0ZyYW5rNEREIFdl\nYiBDQTEjMCEGCSqGSIb3DQEJARYUc3VwcG9ydEBmcmFuazRkZC5jb20wHhcNMTIw\nODIyMDUyNjU0WhcNMTcwODIxMDUyNjU0WjBKMQswCQYDVQQGEwJKUDEOMAwGA1UE\nCAwFVG9reW8xETAPBgNVBAoMCEZyYW5rNEREMRgwFgYDVQQDDA93d3cuZXhhbXBs\nZS5jb20wXDANBgkqhkiG9w0BAQEFAANLADBIAkEAm/xmkHmEQrurE/0re/jeFRLl\n8ZPjBop7uLHhnia7lQG/5zDtZIUC3RVpqDSwBuw/NTweGyuP+o8AG98HxqxTBwID\nAQABMA0GCSqGSIb3DQEBBQUAA4GBABS2TLuBeTPmcaTaUW/LCB2NYOy8GMdzR1mx\n8iBIu2H6/E2tiY3RIevV2OW61qY2/XRQg7YPxx3ffeUugX9F4J/iPnnu1zAxxyBy\n2VguKv4SWjRFoRkIfIlHX0qVviMhSlNy2ioFLy7JcPZb+v3ftDGywUqcBiVDoea0\nHn+GmxZA\n-----END CERTIFICATE-----\n", - "tlsSecurity": "strict", - "tlsServerName": null, - "user": "edgedb", - "waitUntilAvailable": "PT30S" - } - }, - { - "env": { - "EDGEDB_CLIENT_SECURITY": "default", - "EDGEDB_CLIENT_TLS_SECURITY": "default", - "EDGEDB_DSN": "edgedb://" - }, - "fs": { - "files": { - "/home/edgedb/test/cert.pem": "-----BEGIN CERTIFICATE-----\nMIICEjCCAXsCAg36MA0GCSqGSIb3DQEBBQUAMIGbMQswCQYDVQQGEwJKUDEOMAwG\nA1UECBMFVG9reW8xEDAOBgNVBAcTB0NodW8ta3UxETAPBgNVBAoTCEZyYW5rNERE\nMRgwFgYDVQQLEw9XZWJDZXJ0IFN1cHBvcnQxGDAWBgNVBAMTD0ZyYW5rNEREIFdl\nYiBDQTEjMCEGCSqGSIb3DQEJARYUc3VwcG9ydEBmcmFuazRkZC5jb20wHhcNMTIw\nODIyMDUyNjU0WhcNMTcwODIxMDUyNjU0WjBKMQswCQYDVQQGEwJKUDEOMAwGA1UE\nCAwFVG9reW8xETAPBgNVBAoMCEZyYW5rNEREMRgwFgYDVQQDDA93d3cuZXhhbXBs\nZS5jb20wXDANBgkqhkiG9w0BAQEFAANLADBIAkEAm/xmkHmEQrurE/0re/jeFRLl\n8ZPjBop7uLHhnia7lQG/5zDtZIUC3RVpqDSwBuw/NTweGyuP+o8AG98HxqxTBwID\nAQABMA0GCSqGSIb3DQEBBQUAA4GBABS2TLuBeTPmcaTaUW/LCB2NYOy8GMdzR1mx\n8iBIu2H6/E2tiY3RIevV2OW61qY2/XRQg7YPxx3ffeUugX9F4J/iPnnu1zAxxyBy\n2VguKv4SWjRFoRkIfIlHX0qVviMhSlNy2ioFLy7JcPZb+v3ftDGywUqcBiVDoea0\nHn+GmxZA\n-----END CERTIFICATE-----\n" - } - }, - "name": "override_certificate_test_8", - "opts": { - "tlsCAFile": "/home/edgedb/test/cert.pem" - }, - "result": { - "address": [ - "localhost", - 5656 - ], - "branch": "__default__", - "database": "edgedb", - "password": null, - "secretKey": null, - "serverSettings": {}, - "tlsCAData": "-----BEGIN CERTIFICATE-----\nMIICEjCCAXsCAg36MA0GCSqGSIb3DQEBBQUAMIGbMQswCQYDVQQGEwJKUDEOMAwG\nA1UECBMFVG9reW8xEDAOBgNVBAcTB0NodW8ta3UxETAPBgNVBAoTCEZyYW5rNERE\nMRgwFgYDVQQLEw9XZWJDZXJ0IFN1cHBvcnQxGDAWBgNVBAMTD0ZyYW5rNEREIFdl\nYiBDQTEjMCEGCSqGSIb3DQEJARYUc3VwcG9ydEBmcmFuazRkZC5jb20wHhcNMTIw\nODIyMDUyNjU0WhcNMTcwODIxMDUyNjU0WjBKMQswCQYDVQQGEwJKUDEOMAwGA1UE\nCAwFVG9reW8xETAPBgNVBAoMCEZyYW5rNEREMRgwFgYDVQQDDA93d3cuZXhhbXBs\nZS5jb20wXDANBgkqhkiG9w0BAQEFAANLADBIAkEAm/xmkHmEQrurE/0re/jeFRLl\n8ZPjBop7uLHhnia7lQG/5zDtZIUC3RVpqDSwBuw/NTweGyuP+o8AG98HxqxTBwID\nAQABMA0GCSqGSIb3DQEBBQUAA4GBABS2TLuBeTPmcaTaUW/LCB2NYOy8GMdzR1mx\n8iBIu2H6/E2tiY3RIevV2OW61qY2/XRQg7YPxx3ffeUugX9F4J/iPnnu1zAxxyBy\n2VguKv4SWjRFoRkIfIlHX0qVviMhSlNy2ioFLy7JcPZb+v3ftDGywUqcBiVDoea0\nHn+GmxZA\n-----END CERTIFICATE-----\n", - "tlsSecurity": "no_host_verification", - "tlsServerName": null, - "user": "edgedb", - "waitUntilAvailable": "PT30S" - } - }, - { - "env": {}, - "fs": { - "files": { - "/home/edgedb/test/credentials.json": "{\"port\": 10702, \"user\": \"test3n\"}" - } - }, - "name": "override_other_test_0", - "opts": { - "credentialsFile": "/home/edgedb/test/credentials.json" - }, - "result": { - "address": [ - "localhost", - 10702 - ], - "branch": "__default__", - "database": "edgedb", - "password": null, - "secretKey": null, - "serverSettings": {}, - "tlsCAData": null, - "tlsSecurity": "strict", - "tlsServerName": null, - "user": "test3n", - "waitUntilAvailable": "PT30S" - } - }, - { - "env": {}, - "fs": { - "files": { - "/home/edgedb/.config/edgedb/credentials/test_123.json": "{\"port\": 10702, \"user\": \"test3n\", \"password\": \"lZTBy1RVCfOpBAOwSCwIyBIR\", \"database\": \"test3n\"}" - }, - "homedir": "/home/edgedb" - }, - "name": "override_other_test_1", - "opts": { - "instance": "test_123" - }, - "result": { - "address": [ - "localhost", - 10702 - ], - "branch": "test3n", - "database": "test3n", - "password": "lZTBy1RVCfOpBAOwSCwIyBIR", - "secretKey": null, - "serverSettings": {}, - "tlsCAData": null, - "tlsSecurity": "strict", - "tlsServerName": null, - "user": "test3n", - "waitUntilAvailable": "PT30S" - } - }, - { - "env": { - "EDGEDB_PASSWORD": "password" - }, - "fs": { - "files": { - "/home/edgedb/password": "12345" - } - }, - "name": "override_other_test_10", - "opts": { - "dsn": "edgedb://testuser@localhost/db?password_file=/home/edgedb/password" - }, - "result": { - "address": [ - "localhost", - 5656 - ], - "branch": "db", - "database": "db", - "password": "12345", - "secretKey": null, - "serverSettings": {}, - "tlsCAData": null, - "tlsSecurity": "strict", - "tlsServerName": null, - "user": "testuser", - "waitUntilAvailable": "PT30S" - } - }, - { - "env": { - "EDGEDB_DSN": "edgedb://?a=abc&b=def" + "/home/edgedb/test/cert.pem": "-----BEGIN CERTIFICATE-----\nMIICEjCCAXsCAg36MA0GCSqGSIb3DQEBBQUAMIGbMQswCQYDVQQGEwJKUDEOMAwG\nA1UECBMFVG9reW8xEDAOBgNVBAcTB0NodW8ta3UxETAPBgNVBAoTCEZyYW5rNERE\nMRgwFgYDVQQLEw9XZWJDZXJ0IFN1cHBvcnQxGDAWBgNVBAMTD0ZyYW5rNEREIFdl\nYiBDQTEjMCEGCSqGSIb3DQEJARYUc3VwcG9ydEBmcmFuazRkZC5jb20wHhcNMTIw\nODIyMDUyNjU0WhcNMTcwODIxMDUyNjU0WjBKMQswCQYDVQQGEwJKUDEOMAwGA1UE\nCAwFVG9reW8xETAPBgNVBAoMCEZyYW5rNEREMRgwFgYDVQQDDA93d3cuZXhhbXBs\nZS5jb20wXDANBgkqhkiG9w0BAQEFAANLADBIAkEAm/xmkHmEQrurE/0re/jeFRLl\n8ZPjBop7uLHhnia7lQG/5zDtZIUC3RVpqDSwBuw/NTweGyuP+o8AG98HxqxTBwID\nAQABMA0GCSqGSIb3DQEBBQUAA4GBABS2TLuBeTPmcaTaUW/LCB2NYOy8GMdzR1mx\n8iBIu2H6/E2tiY3RIevV2OW61qY2/XRQg7YPxx3ffeUugX9F4J/iPnnu1zAxxyBy\n2VguKv4SWjRFoRkIfIlHX0qVviMhSlNy2ioFLy7JcPZb+v3ftDGywUqcBiVDoea0\nHn+GmxZA\n-----END CERTIFICATE-----\n" + } }, - "name": "override_other_test_11", + "name": "override_certificate_test_4", "opts": { - "serverSettings": { - "c": "ghi" - } + "dsn": "edgedb://", + "tlsCAFile": "/home/edgedb/test/cert.pem", + "tlsSecurity": "strict" }, "result": { "address": [ @@ -3536,12 +3299,8 @@ "database": "edgedb", "password": null, "secretKey": null, - "serverSettings": { - "a": "abc", - "b": "def", - "c": "ghi" - }, - "tlsCAData": null, + "serverSettings": {}, + "tlsCAData": "-----BEGIN CERTIFICATE-----\nMIICEjCCAXsCAg36MA0GCSqGSIb3DQEBBQUAMIGbMQswCQYDVQQGEwJKUDEOMAwG\nA1UECBMFVG9reW8xEDAOBgNVBAcTB0NodW8ta3UxETAPBgNVBAoTCEZyYW5rNERE\nMRgwFgYDVQQLEw9XZWJDZXJ0IFN1cHBvcnQxGDAWBgNVBAMTD0ZyYW5rNEREIFdl\nYiBDQTEjMCEGCSqGSIb3DQEJARYUc3VwcG9ydEBmcmFuazRkZC5jb20wHhcNMTIw\nODIyMDUyNjU0WhcNMTcwODIxMDUyNjU0WjBKMQswCQYDVQQGEwJKUDEOMAwGA1UE\nCAwFVG9reW8xETAPBgNVBAoMCEZyYW5rNEREMRgwFgYDVQQDDA93d3cuZXhhbXBs\nZS5jb20wXDANBgkqhkiG9w0BAQEFAANLADBIAkEAm/xmkHmEQrurE/0re/jeFRLl\n8ZPjBop7uLHhnia7lQG/5zDtZIUC3RVpqDSwBuw/NTweGyuP+o8AG98HxqxTBwID\nAQABMA0GCSqGSIb3DQEBBQUAA4GBABS2TLuBeTPmcaTaUW/LCB2NYOy8GMdzR1mx\n8iBIu2H6/E2tiY3RIevV2OW61qY2/XRQg7YPxx3ffeUugX9F4J/iPnnu1zAxxyBy\n2VguKv4SWjRFoRkIfIlHX0qVviMhSlNy2ioFLy7JcPZb+v3ftDGywUqcBiVDoea0\nHn+GmxZA\n-----END CERTIFICATE-----\n", "tlsSecurity": "strict", "tlsServerName": null, "user": "edgedb", @@ -3549,45 +3308,48 @@ } }, { - "env": {}, "fs": { "files": { - "/home/edgedb/.config/edgedb/credentials/test-123.json": "{\"port\": 10702, \"user\": \"test3n\", \"password\": \"lZTBy1RVCfOpBAOwSCwIyBIR\", \"database\": \"test3n\"}" - }, - "homedir": "/home/edgedb" + "/home/edgedb/test/cert.pem": "-----BEGIN CERTIFICATE-----\nMIICEjCCAXsCAg36MA0GCSqGSIb3DQEBBQUAMIGbMQswCQYDVQQGEwJKUDEOMAwG\nA1UECBMFVG9reW8xEDAOBgNVBAcTB0NodW8ta3UxETAPBgNVBAoTCEZyYW5rNERE\nMRgwFgYDVQQLEw9XZWJDZXJ0IFN1cHBvcnQxGDAWBgNVBAMTD0ZyYW5rNEREIFdl\nYiBDQTEjMCEGCSqGSIb3DQEJARYUc3VwcG9ydEBmcmFuazRkZC5jb20wHhcNMTIw\nODIyMDUyNjU0WhcNMTcwODIxMDUyNjU0WjBKMQswCQYDVQQGEwJKUDEOMAwGA1UE\nCAwFVG9reW8xETAPBgNVBAoMCEZyYW5rNEREMRgwFgYDVQQDDA93d3cuZXhhbXBs\nZS5jb20wXDANBgkqhkiG9w0BAQEFAANLADBIAkEAm/xmkHmEQrurE/0re/jeFRLl\n8ZPjBop7uLHhnia7lQG/5zDtZIUC3RVpqDSwBuw/NTweGyuP+o8AG98HxqxTBwID\nAQABMA0GCSqGSIb3DQEBBQUAA4GBABS2TLuBeTPmcaTaUW/LCB2NYOy8GMdzR1mx\n8iBIu2H6/E2tiY3RIevV2OW61qY2/XRQg7YPxx3ffeUugX9F4J/iPnnu1zAxxyBy\n2VguKv4SWjRFoRkIfIlHX0qVviMhSlNy2ioFLy7JcPZb+v3ftDGywUqcBiVDoea0\nHn+GmxZA\n-----END CERTIFICATE-----\n" + } }, - "name": "override_other_test_12", + "name": "override_certificate_test_5", "opts": { - "instance": "test-123" + "dsn": "edgedb://?tls_ca_file=/home/edgedb/test/nonexist.pem", + "tlsCAFile": "/home/edgedb/test/cert.pem", + "tlsSecurity": "strict" }, "result": { "address": [ "localhost", - 10702 + 5656 ], - "branch": "test3n", - "database": "test3n", - "password": "lZTBy1RVCfOpBAOwSCwIyBIR", + "branch": "__default__", + "database": "edgedb", + "password": null, "secretKey": null, "serverSettings": {}, - "tlsCAData": null, + "tlsCAData": "-----BEGIN CERTIFICATE-----\nMIICEjCCAXsCAg36MA0GCSqGSIb3DQEBBQUAMIGbMQswCQYDVQQGEwJKUDEOMAwG\nA1UECBMFVG9reW8xEDAOBgNVBAcTB0NodW8ta3UxETAPBgNVBAoTCEZyYW5rNERE\nMRgwFgYDVQQLEw9XZWJDZXJ0IFN1cHBvcnQxGDAWBgNVBAMTD0ZyYW5rNEREIFdl\nYiBDQTEjMCEGCSqGSIb3DQEJARYUc3VwcG9ydEBmcmFuazRkZC5jb20wHhcNMTIw\nODIyMDUyNjU0WhcNMTcwODIxMDUyNjU0WjBKMQswCQYDVQQGEwJKUDEOMAwGA1UE\nCAwFVG9reW8xETAPBgNVBAoMCEZyYW5rNEREMRgwFgYDVQQDDA93d3cuZXhhbXBs\nZS5jb20wXDANBgkqhkiG9w0BAQEFAANLADBIAkEAm/xmkHmEQrurE/0re/jeFRLl\n8ZPjBop7uLHhnia7lQG/5zDtZIUC3RVpqDSwBuw/NTweGyuP+o8AG98HxqxTBwID\nAQABMA0GCSqGSIb3DQEBBQUAA4GBABS2TLuBeTPmcaTaUW/LCB2NYOy8GMdzR1mx\n8iBIu2H6/E2tiY3RIevV2OW61qY2/XRQg7YPxx3ffeUugX9F4J/iPnnu1zAxxyBy\n2VguKv4SWjRFoRkIfIlHX0qVviMhSlNy2ioFLy7JcPZb+v3ftDGywUqcBiVDoea0\nHn+GmxZA\n-----END CERTIFICATE-----\n", "tlsSecurity": "strict", "tlsServerName": null, - "user": "test3n", + "user": "edgedb", "waitUntilAvailable": "PT30S" } }, { "env": { - "EDGEDB_DSN": "edgedb://?a=abc&b=def" + "MY_TLS_CERT": "/home/edgedb/test/cert.pem" }, - "name": "override_other_test_13", - "opts": { - "serverSettings": { - "a": "jkl", - "c": "ghi" + "fs": { + "files": { + "/home/edgedb/test/cert.pem": "-----BEGIN CERTIFICATE-----\nMIICEjCCAXsCAg36MA0GCSqGSIb3DQEBBQUAMIGbMQswCQYDVQQGEwJKUDEOMAwG\nA1UECBMFVG9reW8xEDAOBgNVBAcTB0NodW8ta3UxETAPBgNVBAoTCEZyYW5rNERE\nMRgwFgYDVQQLEw9XZWJDZXJ0IFN1cHBvcnQxGDAWBgNVBAMTD0ZyYW5rNEREIFdl\nYiBDQTEjMCEGCSqGSIb3DQEJARYUc3VwcG9ydEBmcmFuazRkZC5jb20wHhcNMTIw\nODIyMDUyNjU0WhcNMTcwODIxMDUyNjU0WjBKMQswCQYDVQQGEwJKUDEOMAwGA1UE\nCAwFVG9reW8xETAPBgNVBAoMCEZyYW5rNEREMRgwFgYDVQQDDA93d3cuZXhhbXBs\nZS5jb20wXDANBgkqhkiG9w0BAQEFAANLADBIAkEAm/xmkHmEQrurE/0re/jeFRLl\n8ZPjBop7uLHhnia7lQG/5zDtZIUC3RVpqDSwBuw/NTweGyuP+o8AG98HxqxTBwID\nAQABMA0GCSqGSIb3DQEBBQUAA4GBABS2TLuBeTPmcaTaUW/LCB2NYOy8GMdzR1mx\n8iBIu2H6/E2tiY3RIevV2OW61qY2/XRQg7YPxx3ffeUugX9F4J/iPnnu1zAxxyBy\n2VguKv4SWjRFoRkIfIlHX0qVviMhSlNy2ioFLy7JcPZb+v3ftDGywUqcBiVDoea0\nHn+GmxZA\n-----END CERTIFICATE-----\n" } }, + "name": "override_certificate_test_6", + "opts": { + "dsn": "edgedb://?tls_ca_file_env=MY_TLS_CERT", + "tlsSecurity": "strict" + }, "result": { "address": [ "localhost", @@ -3597,12 +3359,8 @@ "database": "edgedb", "password": null, "secretKey": null, - "serverSettings": { - "a": "jkl", - "b": "def", - "c": "ghi" - }, - "tlsCAData": null, + "serverSettings": {}, + "tlsCAData": "-----BEGIN CERTIFICATE-----\nMIICEjCCAXsCAg36MA0GCSqGSIb3DQEBBQUAMIGbMQswCQYDVQQGEwJKUDEOMAwG\nA1UECBMFVG9reW8xEDAOBgNVBAcTB0NodW8ta3UxETAPBgNVBAoTCEZyYW5rNERE\nMRgwFgYDVQQLEw9XZWJDZXJ0IFN1cHBvcnQxGDAWBgNVBAMTD0ZyYW5rNEREIFdl\nYiBDQTEjMCEGCSqGSIb3DQEJARYUc3VwcG9ydEBmcmFuazRkZC5jb20wHhcNMTIw\nODIyMDUyNjU0WhcNMTcwODIxMDUyNjU0WjBKMQswCQYDVQQGEwJKUDEOMAwGA1UE\nCAwFVG9reW8xETAPBgNVBAoMCEZyYW5rNEREMRgwFgYDVQQDDA93d3cuZXhhbXBs\nZS5jb20wXDANBgkqhkiG9w0BAQEFAANLADBIAkEAm/xmkHmEQrurE/0re/jeFRLl\n8ZPjBop7uLHhnia7lQG/5zDtZIUC3RVpqDSwBuw/NTweGyuP+o8AG98HxqxTBwID\nAQABMA0GCSqGSIb3DQEBBQUAA4GBABS2TLuBeTPmcaTaUW/LCB2NYOy8GMdzR1mx\n8iBIu2H6/E2tiY3RIevV2OW61qY2/XRQg7YPxx3ffeUugX9F4J/iPnnu1zAxxyBy\n2VguKv4SWjRFoRkIfIlHX0qVviMhSlNy2ioFLy7JcPZb+v3ftDGywUqcBiVDoea0\nHn+GmxZA\n-----END CERTIFICATE-----\n", "tlsSecurity": "strict", "tlsServerName": null, "user": "edgedb", @@ -3611,11 +3369,17 @@ }, { "env": { - "EDGEDB_CLIENT_TLS_SECURITY": "invalid value" + "EDGEDB_CLIENT_TLS_SECURITY": "strict", + "EDGEDB_DSN": "edgedb://" }, - "name": "override_other_test_14", + "fs": { + "files": { + "/home/edgedb/test/cert.pem": "-----BEGIN CERTIFICATE-----\nMIICEjCCAXsCAg36MA0GCSqGSIb3DQEBBQUAMIGbMQswCQYDVQQGEwJKUDEOMAwG\nA1UECBMFVG9reW8xEDAOBgNVBAcTB0NodW8ta3UxETAPBgNVBAoTCEZyYW5rNERE\nMRgwFgYDVQQLEw9XZWJDZXJ0IFN1cHBvcnQxGDAWBgNVBAMTD0ZyYW5rNEREIFdl\nYiBDQTEjMCEGCSqGSIb3DQEJARYUc3VwcG9ydEBmcmFuazRkZC5jb20wHhcNMTIw\nODIyMDUyNjU0WhcNMTcwODIxMDUyNjU0WjBKMQswCQYDVQQGEwJKUDEOMAwGA1UE\nCAwFVG9reW8xETAPBgNVBAoMCEZyYW5rNEREMRgwFgYDVQQDDA93d3cuZXhhbXBs\nZS5jb20wXDANBgkqhkiG9w0BAQEFAANLADBIAkEAm/xmkHmEQrurE/0re/jeFRLl\n8ZPjBop7uLHhnia7lQG/5zDtZIUC3RVpqDSwBuw/NTweGyuP+o8AG98HxqxTBwID\nAQABMA0GCSqGSIb3DQEBBQUAA4GBABS2TLuBeTPmcaTaUW/LCB2NYOy8GMdzR1mx\n8iBIu2H6/E2tiY3RIevV2OW61qY2/XRQg7YPxx3ffeUugX9F4J/iPnnu1zAxxyBy\n2VguKv4SWjRFoRkIfIlHX0qVviMhSlNy2ioFLy7JcPZb+v3ftDGywUqcBiVDoea0\nHn+GmxZA\n-----END CERTIFICATE-----\n" + } + }, + "name": "override_certificate_test_7", "opts": { - "dsn": "edgedb://" + "tlsCAFile": "/home/edgedb/test/cert.pem" }, "result": { "address": [ @@ -3627,7 +3391,7 @@ "password": null, "secretKey": null, "serverSettings": {}, - "tlsCAData": null, + "tlsCAData": "-----BEGIN CERTIFICATE-----\nMIICEjCCAXsCAg36MA0GCSqGSIb3DQEBBQUAMIGbMQswCQYDVQQGEwJKUDEOMAwG\nA1UECBMFVG9reW8xEDAOBgNVBAcTB0NodW8ta3UxETAPBgNVBAoTCEZyYW5rNERE\nMRgwFgYDVQQLEw9XZWJDZXJ0IFN1cHBvcnQxGDAWBgNVBAMTD0ZyYW5rNEREIFdl\nYiBDQTEjMCEGCSqGSIb3DQEJARYUc3VwcG9ydEBmcmFuazRkZC5jb20wHhcNMTIw\nODIyMDUyNjU0WhcNMTcwODIxMDUyNjU0WjBKMQswCQYDVQQGEwJKUDEOMAwGA1UE\nCAwFVG9reW8xETAPBgNVBAoMCEZyYW5rNEREMRgwFgYDVQQDDA93d3cuZXhhbXBs\nZS5jb20wXDANBgkqhkiG9w0BAQEFAANLADBIAkEAm/xmkHmEQrurE/0re/jeFRLl\n8ZPjBop7uLHhnia7lQG/5zDtZIUC3RVpqDSwBuw/NTweGyuP+o8AG98HxqxTBwID\nAQABMA0GCSqGSIb3DQEBBQUAA4GBABS2TLuBeTPmcaTaUW/LCB2NYOy8GMdzR1mx\n8iBIu2H6/E2tiY3RIevV2OW61qY2/XRQg7YPxx3ffeUugX9F4J/iPnnu1zAxxyBy\n2VguKv4SWjRFoRkIfIlHX0qVviMhSlNy2ioFLy7JcPZb+v3ftDGywUqcBiVDoea0\nHn+GmxZA\n-----END CERTIFICATE-----\n", "tlsSecurity": "strict", "tlsServerName": null, "user": "edgedb", @@ -3636,79 +3400,90 @@ }, { "env": { - "EDGEDB_DSN": "edgedb://testhost:1234/?database=db" + "EDGEDB_CLIENT_SECURITY": "default", + "EDGEDB_CLIENT_TLS_SECURITY": "default", + "EDGEDB_DSN": "edgedb://" }, - "name": "override_other_test_15", + "fs": { + "files": { + "/home/edgedb/test/cert.pem": "-----BEGIN CERTIFICATE-----\nMIICEjCCAXsCAg36MA0GCSqGSIb3DQEBBQUAMIGbMQswCQYDVQQGEwJKUDEOMAwG\nA1UECBMFVG9reW8xEDAOBgNVBAcTB0NodW8ta3UxETAPBgNVBAoTCEZyYW5rNERE\nMRgwFgYDVQQLEw9XZWJDZXJ0IFN1cHBvcnQxGDAWBgNVBAMTD0ZyYW5rNEREIFdl\nYiBDQTEjMCEGCSqGSIb3DQEJARYUc3VwcG9ydEBmcmFuazRkZC5jb20wHhcNMTIw\nODIyMDUyNjU0WhcNMTcwODIxMDUyNjU0WjBKMQswCQYDVQQGEwJKUDEOMAwGA1UE\nCAwFVG9reW8xETAPBgNVBAoMCEZyYW5rNEREMRgwFgYDVQQDDA93d3cuZXhhbXBs\nZS5jb20wXDANBgkqhkiG9w0BAQEFAANLADBIAkEAm/xmkHmEQrurE/0re/jeFRLl\n8ZPjBop7uLHhnia7lQG/5zDtZIUC3RVpqDSwBuw/NTweGyuP+o8AG98HxqxTBwID\nAQABMA0GCSqGSIb3DQEBBQUAA4GBABS2TLuBeTPmcaTaUW/LCB2NYOy8GMdzR1mx\n8iBIu2H6/E2tiY3RIevV2OW61qY2/XRQg7YPxx3ffeUugX9F4J/iPnnu1zAxxyBy\n2VguKv4SWjRFoRkIfIlHX0qVviMhSlNy2ioFLy7JcPZb+v3ftDGywUqcBiVDoea0\nHn+GmxZA\n-----END CERTIFICATE-----\n" + } + }, + "name": "override_certificate_test_8", "opts": { - "port": 65535 + "tlsCAFile": "/home/edgedb/test/cert.pem" }, "result": { "address": [ "localhost", - 65535 + 5656 ], "branch": "__default__", "database": "edgedb", "password": null, "secretKey": null, "serverSettings": {}, - "tlsCAData": null, - "tlsSecurity": "strict", + "tlsCAData": "-----BEGIN CERTIFICATE-----\nMIICEjCCAXsCAg36MA0GCSqGSIb3DQEBBQUAMIGbMQswCQYDVQQGEwJKUDEOMAwG\nA1UECBMFVG9reW8xEDAOBgNVBAcTB0NodW8ta3UxETAPBgNVBAoTCEZyYW5rNERE\nMRgwFgYDVQQLEw9XZWJDZXJ0IFN1cHBvcnQxGDAWBgNVBAMTD0ZyYW5rNEREIFdl\nYiBDQTEjMCEGCSqGSIb3DQEJARYUc3VwcG9ydEBmcmFuazRkZC5jb20wHhcNMTIw\nODIyMDUyNjU0WhcNMTcwODIxMDUyNjU0WjBKMQswCQYDVQQGEwJKUDEOMAwGA1UE\nCAwFVG9reW8xETAPBgNVBAoMCEZyYW5rNEREMRgwFgYDVQQDDA93d3cuZXhhbXBs\nZS5jb20wXDANBgkqhkiG9w0BAQEFAANLADBIAkEAm/xmkHmEQrurE/0re/jeFRLl\n8ZPjBop7uLHhnia7lQG/5zDtZIUC3RVpqDSwBuw/NTweGyuP+o8AG98HxqxTBwID\nAQABMA0GCSqGSIb3DQEBBQUAA4GBABS2TLuBeTPmcaTaUW/LCB2NYOy8GMdzR1mx\n8iBIu2H6/E2tiY3RIevV2OW61qY2/XRQg7YPxx3ffeUugX9F4J/iPnnu1zAxxyBy\n2VguKv4SWjRFoRkIfIlHX0qVviMhSlNy2ioFLy7JcPZb+v3ftDGywUqcBiVDoea0\nHn+GmxZA\n-----END CERTIFICATE-----\n", + "tlsSecurity": "no_host_verification", "tlsServerName": null, "user": "edgedb", "waitUntilAvailable": "PT30S" } }, { - "env": { - "EDGEDB_DATABASE": "test_db", - "EDGEDB_DSN": "edgedb://testhost:1234/?database=db" + "env": {}, + "fs": { + "files": { + "/home/edgedb/test/credentials.json": "{\"port\": 10702, \"user\": \"test3n\"}" + } }, - "name": "override_other_test_16", + "name": "override_other_test_0", "opts": { - "user": "user_123" + "credentialsFile": "/home/edgedb/test/credentials.json" }, "result": { "address": [ - "testhost", - 1234 + "localhost", + 10702 ], - "branch": "test_db", - "database": "test_db", + "branch": "__default__", + "database": "edgedb", "password": null, "secretKey": null, "serverSettings": {}, "tlsCAData": null, "tlsSecurity": "strict", "tlsServerName": null, - "user": "user_123", + "user": "test3n", "waitUntilAvailable": "PT30S" } }, { - "env": { - "EDGEDB_DATABASE": "test_db", - "EDGEDB_DSN": "edgedb://testhost:1234/?database=db" + "env": {}, + "fs": { + "files": { + "/home/edgedb/.config/edgedb/credentials/test_123.json": "{\"port\": 10702, \"user\": \"test3n\", \"password\": \"lZTBy1RVCfOpBAOwSCwIyBIR\", \"database\": \"test3n\"}" + }, + "homedir": "/home/edgedb" }, - "name": "override_other_test_17", + "name": "override_other_test_1", "opts": { - "database": "new_db", - "user": "user_123" + "instance": "test_123" }, "result": { "address": [ - "testhost", - 1234 + "localhost", + 10702 ], - "branch": "new_db", - "database": "new_db", - "password": null, + "branch": "test3n", + "database": "test3n", + "password": "lZTBy1RVCfOpBAOwSCwIyBIR", "secretKey": null, "serverSettings": {}, "tlsCAData": null, "tlsSecurity": "strict", "tlsServerName": null, - "user": "user_123", + "user": "test3n", "waitUntilAvailable": "PT30S" } }, @@ -3717,7 +3492,7 @@ "EDGEDB_DATABASE": "test_db", "EDGEDB_DSN": "edgedb://testhost:1234/?database=" }, - "name": "override_other_test_18", + "name": "override_other_test_10", "opts": { "database": "new_db", "user": "user_123" @@ -3743,7 +3518,7 @@ "env": { "EDGEDB_DATABASE": "test_db" }, - "name": "override_other_test_19", + "name": "override_other_test_11", "opts": { "dsn": "edgedb://testhost:1234/?database=db", "user": "user_123" @@ -3769,7 +3544,7 @@ "env": { "EDGEDB_CREDENTIALS_FILE": "/home/edgedb/test/credentials.json" }, - "name": "override_other_test_2", + "name": "override_other_test_12", "opts": { "dsn": "edgedb://user3:123123@localhost:5555/abcdef" }, @@ -3794,7 +3569,7 @@ "env": { "EDGEDB_PASSWORD": "qwerty" }, - "name": "override_other_test_20", + "name": "override_other_test_13", "opts": { "dsn": "edgedb://testhost:1234/?database=db", "user": "user_123" @@ -3826,7 +3601,7 @@ }, "homedir": "/home/edgedb" }, - "name": "override_other_test_21", + "name": "override_other_test_14", "opts": { "user": "super_user" }, @@ -3858,7 +3633,7 @@ }, "homedir": "/home/edgedb" }, - "name": "override_other_test_22", + "name": "override_other_test_15", "opts": { "user": "super_user" }, @@ -3887,7 +3662,7 @@ }, "homedir": "/home/edgedb" }, - "name": "override_other_test_23", + "name": "override_other_test_16", "opts": { "instance": "1234567890123456789012345678901234567890123456789012345678901234" }, @@ -3919,7 +3694,7 @@ }, "homedir": "/home/edgedb" }, - "name": "override_other_test_24", + "name": "override_other_test_17", "opts": { "user": "super_user" }, @@ -3947,7 +3722,7 @@ }, "homedir": "/home/edgedb" }, - "name": "override_other_test_25", + "name": "override_other_test_18", "opts": { "instance": "test_instance" }, @@ -3975,7 +3750,7 @@ }, "homedir": "/home/edgedb" }, - "name": "override_other_test_26", + "name": "override_other_test_19", "opts": { "instance": "test_instance" }, @@ -3996,6 +3771,36 @@ "waitUntilAvailable": "PT30S" } }, + { + "env": { + "EDGEDB_PASSWORD": "password" + }, + "fs": { + "files": { + "/home/edgedb/password": "12345" + } + }, + "name": "override_other_test_2", + "opts": { + "dsn": "edgedb://testuser@localhost/db?password_file=/home/edgedb/password" + }, + "result": { + "address": [ + "localhost", + 5656 + ], + "branch": "db", + "database": "db", + "password": "12345", + "secretKey": null, + "serverSettings": {}, + "tlsCAData": null, + "tlsSecurity": "strict", + "tlsServerName": null, + "user": "testuser", + "waitUntilAvailable": "PT30S" + } + }, { "fs": { "files": { @@ -4003,7 +3808,7 @@ }, "homedir": "/home/edgedb" }, - "name": "override_other_test_27", + "name": "override_other_test_20", "opts": { "instance": "test_instance" }, @@ -4028,7 +3833,7 @@ "env": { "EDGEDB_WAIT_UNTIL_AVAILABLE": "PT1H1M28S" }, - "name": "override_other_test_28", + "name": "override_other_test_21", "opts": { "dsn": "edgedb://localhost:5555?wait_until_available=1hour" }, @@ -4053,7 +3858,7 @@ "env": { "EDGEDB_WAIT_UNTIL_AVAILABLE": "PT1S" }, - "name": "override_other_test_29", + "name": "override_other_test_22", "opts": { "dsn": "edgedb://localhost:5555", "waitUntilAvailable": "9 minutes" @@ -4079,7 +3884,7 @@ "env": { "EDGEDB_CREDENTIALS_FILE": "/home/edgedb/test/credentials.json" }, - "name": "override_other_test_3", + "name": "override_other_test_23", "opts": { "host": "test.local" }, @@ -4108,7 +3913,7 @@ }, "homedir": "/home/edgedb" }, - "name": "override_other_test_30", + "name": "override_other_test_24", "opts": { "instance": "test_org/test123" }, @@ -4137,7 +3942,7 @@ }, "homedir": "/home/edgedb" }, - "name": "override_other_test_31", + "name": "override_other_test_25", "opts": { "instance": "-vicfg-hceTeOuz6iXr3vkXPf0Wsudd/test123" }, @@ -4166,7 +3971,7 @@ }, "homedir": "/home/edgedb" }, - "name": "override_other_test_32", + "name": "override_other_test_26", "opts": { "instance": "TestOrg/Test-123" }, @@ -4195,7 +4000,7 @@ }, "homedir": "/home/edgedb" }, - "name": "override_other_test_33", + "name": "override_other_test_27", "opts": { "instance": "test-org/test123" }, @@ -4224,7 +4029,7 @@ }, "homedir": "/home/edgedb" }, - "name": "override_other_test_34", + "name": "override_other_test_28", "opts": { "instance": "123-test" }, @@ -4256,7 +4061,7 @@ }, "homedir": "/home/edgedb" }, - "name": "override_other_test_35", + "name": "override_other_test_29", "opts": { "instance": "test-org/test-123" }, @@ -4277,6 +4082,37 @@ "waitUntilAvailable": "PT30S" } }, + { + "env": { + "EDGEDB_DSN": "edgedb://?a=abc&b=def" + }, + "name": "override_other_test_3", + "opts": { + "serverSettings": { + "c": "ghi" + } + }, + "result": { + "address": [ + "localhost", + 5656 + ], + "branch": "__default__", + "database": "edgedb", + "password": null, + "secretKey": null, + "serverSettings": { + "a": "abc", + "b": "def", + "c": "ghi" + }, + "tlsCAData": null, + "tlsSecurity": "strict", + "tlsServerName": null, + "user": "edgedb", + "waitUntilAvailable": "PT30S" + } + }, { "env": {}, "fs": { @@ -4285,7 +4121,7 @@ }, "homedir": "/home/edgedb" }, - "name": "override_other_test_36", + "name": "override_other_test_30", "opts": { "instance": "test-org/test-123" }, @@ -4314,7 +4150,7 @@ }, "homedir": "/home/edgedb" }, - "name": "override_other_test_37", + "name": "override_other_test_31", "opts": { "instance": "123/456" }, @@ -4341,7 +4177,7 @@ "files": {}, "homedir": "/home/edgedb" }, - "name": "override_other_test_38", + "name": "override_other_test_32", "opts": { "instance": "test-org/test-123", "secretKey": "nbwt_eyJhbGciOiJFUzI1NiIsInR5cCI6IkpXVCJ9.eyJlZGdlZGIuc2VydmVyLmFueV9yb2xlIjp0cnVlLCJpYXQiOjE2NjkzMTE3NjMsImlzcyI6ImxvY2FsLTEuaW50ZXJuYWwiLCJuZWJ1bGEuc2NvcGVzIjpbImFkbWluIl0sIm5lYnVsYS51c2VyX2lkIjoiM2U3ODU4YTgtNmJjNy0xMWVkLWFmNTAtMTdiMzkzMjlmZmEyIn0.9cS6-rR00fgmEmGu423IP3snJvmXe7ZGol7ZlYuHBNqmKGrWtTsMZPj-3C7dmureUmk3ZUttxioouPeAreKueg" @@ -4372,7 +4208,7 @@ "files": {}, "homedir": "/home/edgedb" }, - "name": "override_other_test_39", + "name": "override_other_test_33", "result": { "address": [ "test-123--testorg.c-31.i.local-1.internal", @@ -4399,7 +4235,7 @@ "/home/edgedb/test/credentials.json": "{\"port\": 10702, \"user\": \"test3n\", \"password\": \"lZTBy1RVCfOpBAOwSCwIyBIR\", \"database\": \"test3n\"}" } }, - "name": "override_other_test_4", + "name": "override_other_test_34", "opts": { "credentialsFile": "/home/edgedb/test/credentials.json" }, @@ -4431,7 +4267,7 @@ }, "homedir": "/home/edgedb" }, - "name": "override_other_test_40", + "name": "override_other_test_35", "opts": { "instance": "testorg/test-123", "secretKey": "nbwt_eyJhbGciOiJFUzI1NiIsInR5cCI6IkpXVCJ9.eyJlZGdlZGIuc2VydmVyLmFueV9yb2xlIjp0cnVlLCJpYXQiOjE2NjkzMTE3NjMsImlzcyI6ImxvY2FsLTEuaW50ZXJuYWwiLCJuZWJ1bGEuc2NvcGVzIjpbImFkbWluIl0sIm5lYnVsYS51c2VyX2lkIjoiM2U3ODU4YTgtNmJjNy0xMWVkLWFmNTAtMTdiMzkzMjlmZmEyIn0.9cS6-rR00fgmEmGu423IP3snJvmXe7ZGol7ZlYuHBNqmKGrWtTsMZPj-3C7dmureUmk3ZUttxioouPeAreKueg" @@ -4464,7 +4300,7 @@ }, "homedir": "/home/edgedb" }, - "name": "override_other_test_41", + "name": "override_other_test_36", "result": { "address": [ "test-123--testorg.c-31.i.local-1.internal", @@ -4492,7 +4328,7 @@ }, "homedir": "/home/edgedb" }, - "name": "override_other_test_42", + "name": "override_other_test_37", "result": { "address": [ "test-123--testorg.c-31.i.local-1.internal", @@ -4528,7 +4364,7 @@ }, "homedir": "/home/edgedb" }, - "name": "override_other_test_43", + "name": "override_other_test_38", "opts": {}, "result": { "address": [ @@ -4564,7 +4400,7 @@ }, "homedir": "/home/edgedb" }, - "name": "override_other_test_44", + "name": "override_other_test_39", "opts": {}, "result": { "address": [ @@ -4583,11 +4419,40 @@ "waitUntilAvailable": "PT30S" } }, + { + "env": {}, + "fs": { + "files": { + "/home/edgedb/.config/edgedb/credentials/test-123.json": "{\"port\": 10702, \"user\": \"test3n\", \"password\": \"lZTBy1RVCfOpBAOwSCwIyBIR\", \"database\": \"test3n\"}" + }, + "homedir": "/home/edgedb" + }, + "name": "override_other_test_4", + "opts": { + "instance": "test-123" + }, + "result": { + "address": [ + "localhost", + 10702 + ], + "branch": "test3n", + "database": "test3n", + "password": "lZTBy1RVCfOpBAOwSCwIyBIR", + "secretKey": null, + "serverSettings": {}, + "tlsCAData": null, + "tlsSecurity": "strict", + "tlsServerName": null, + "user": "test3n", + "waitUntilAvailable": "PT30S" + } + }, { "env": { "EDGEDB_PORT": "invalid" }, - "name": "override_other_test_45", + "name": "override_other_test_40", "opts": { "port": 1234 }, @@ -4625,7 +4490,7 @@ }, "homedir": "/home/edgedb" }, - "name": "override_other_test_46", + "name": "override_other_test_41", "opts": { "secretKey": "nbwt_eyJhbGciOiJFUzI1NiIsInR5cCI6IkpXVCJ9.eyJlZGdlZGIuc2VydmVyLmFueV9yb2xlIjp0cnVlLCJpYXQiOjE2NjkzMTE3NjMsImlzcyI6ImxvY2FsLTEuaW50ZXJuYWwiLCJuZWJ1bGEuc2NvcGVzIjpbImFkbWluIl0sIm5lYnVsYS51c2VyX2lkIjoiM2U3ODU4YTgtNmJjNy0xMWVkLWFmNTAtMTdiMzkzMjlmZmEyIn0.9cS6-rR00fgmEmGu423IP3snJvmXe7ZGol7ZlYuHBNqmKGrWtTsMZPj-3C7dmureUmk3ZUttxioouPeAreKueg" }, @@ -4650,7 +4515,7 @@ "env": { "SECRET_KEY": "super_secret_key" }, - "name": "override_other_test_47", + "name": "override_other_test_42", "opts": { "dsn": "edgedb://testuser@localhost/db?secret_key_env=SECRET_KEY" }, @@ -4675,7 +4540,7 @@ "env": { "EDGEDB_SECRET_KEY": "kkk" }, - "name": "override_other_test_48", + "name": "override_other_test_43", "opts": { "dsn": "edgedb://testuser@localhost/db?secret_key_env=EDGEDB_SECRET_KEY" }, @@ -4700,7 +4565,7 @@ "env": { "EDGEDB_SECRET_KEY": "kkk" }, - "name": "override_other_test_49", + "name": "override_other_test_44", "opts": { "dsn": "edgedb://testuser@localhost/db" }, @@ -4725,7 +4590,7 @@ "env": { "EDGEDB_PORT": "1234" }, - "name": "override_other_test_5", + "name": "override_other_test_45", "opts": { "credentials": "{\"port\": 10702, \"user\": \"test3n\", \"password\": \"lZTBy1RVCfOpBAOwSCwIyBIR\", \"database\": \"test3n\"}" }, @@ -4755,7 +4620,7 @@ "/home/edgedb/secret_key": "12345" } }, - "name": "override_other_test_50", + "name": "override_other_test_46", "opts": { "dsn": "edgedb://testuser@localhost/db?secret_key_file=/home/edgedb/secret_key" }, @@ -4792,7 +4657,7 @@ }, "homedir": "/home/edgedb" }, - "name": "override_other_test_51", + "name": "override_other_test_47", "opts": {}, "result": { "address": [ @@ -4827,7 +4692,7 @@ }, "homedir": "/home/edgedb" }, - "name": "override_other_test_52", + "name": "override_other_test_48", "opts": {}, "result": { "address": [ @@ -4862,7 +4727,7 @@ }, "homedir": "/home/edgedb" }, - "name": "override_other_test_53", + "name": "override_other_test_49", "opts": {}, "result": { "address": [ @@ -4881,6 +4746,38 @@ "waitUntilAvailable": "PT30S" } }, + { + "env": { + "EDGEDB_DSN": "edgedb://?a=abc&b=def" + }, + "name": "override_other_test_5", + "opts": { + "serverSettings": { + "a": "jkl", + "c": "ghi" + } + }, + "result": { + "address": [ + "localhost", + 5656 + ], + "branch": "__default__", + "database": "edgedb", + "password": null, + "secretKey": null, + "serverSettings": { + "a": "jkl", + "b": "def", + "c": "ghi" + }, + "tlsCAData": null, + "tlsSecurity": "strict", + "tlsServerName": null, + "user": "edgedb", + "waitUntilAvailable": "PT30S" + } + }, { "env": { "EDGEDB_DSN": "edgedb://testhost:1234/?branch=db" @@ -4897,7 +4794,7 @@ }, "homedir": "/home/edgedb" }, - "name": "override_other_test_54", + "name": "override_other_test_50", "opts": {}, "result": { "address": [ @@ -4932,7 +4829,7 @@ }, "homedir": "/home/edgedb" }, - "name": "override_other_test_55", + "name": "override_other_test_51", "opts": {}, "result": { "address": [ @@ -4955,7 +4852,7 @@ "env": { "EDGEDB_HOST": "test.local" }, - "name": "override_other_test_56", + "name": "override_other_test_52", "opts": { "dsn": "edgedb://user3:123123@localhost:5555/abcdef" }, @@ -4990,7 +4887,7 @@ }, "homedir": "/home/edgedb" }, - "name": "override_other_test_57", + "name": "override_other_test_53", "opts": { "dsn": "edgedb://testhost:1234/?branch=db" }, @@ -5025,7 +4922,7 @@ }, "homedir": "/home/edgedb" }, - "name": "override_other_test_58", + "name": "override_other_test_54", "opts": { "dsn": "edgedb://testhost:1234/?branch=db" }, @@ -5060,7 +4957,7 @@ }, "homedir": "/home/edgedb" }, - "name": "override_other_test_59", + "name": "override_other_test_55", "opts": { "branch": "test_db" }, @@ -5086,7 +4983,7 @@ "EDGEDB_CREDENTIALS_FILE": "/home/edgedb/test/credentials.json", "EDGEDB_DSN": "edgedb://user3:123123@localhost:5555/abcdef" }, - "name": "override_other_test_6", + "name": "override_other_test_56", "opts": { "host": "localhost", "port": 10701 @@ -5122,7 +5019,7 @@ }, "homedir": "/home/edgedb" }, - "name": "override_other_test_60", + "name": "override_other_test_57", "opts": { "branch": "test_db" }, @@ -5157,7 +5054,7 @@ }, "homedir": "/home/edgedb" }, - "name": "override_other_test_61", + "name": "override_other_test_58", "opts": { "database": "test_db" }, @@ -5183,7 +5080,7 @@ "EDGEDB_DSN": "edgedb://testhost:1234/feature" }, "fs": {}, - "name": "override_other_test_62", + "name": "override_other_test_59", "opts": { "branch": "experimental4" }, @@ -5204,12 +5101,37 @@ "waitUntilAvailable": "PT30S" } }, + { + "env": { + "EDGEDB_CLIENT_TLS_SECURITY": "invalid value" + }, + "name": "override_other_test_6", + "opts": { + "dsn": "edgedb://" + }, + "result": { + "address": [ + "localhost", + 5656 + ], + "branch": "__default__", + "database": "edgedb", + "password": null, + "secretKey": null, + "serverSettings": {}, + "tlsCAData": null, + "tlsSecurity": "strict", + "tlsServerName": null, + "user": "edgedb", + "waitUntilAvailable": "PT30S" + } + }, { "env": { "EDGEDB_DSN": "edgedb://testhost:1234/?branch=feature" }, "fs": {}, - "name": "override_other_test_63", + "name": "override_other_test_60", "opts": { "branch": "experimental5" }, @@ -5235,7 +5157,7 @@ "EDGEDB_DSN": "edgedb://testhost:1234/?database=feature" }, "fs": {}, - "name": "override_other_test_64", + "name": "override_other_test_61", "opts": { "branch": "experimental6" }, @@ -5261,7 +5183,7 @@ "EDGEDB_DSN": "edgedb://testhost:1234/?branch=feature" }, "fs": {}, - "name": "override_other_test_65", + "name": "override_other_test_62", "opts": { "database": "experimental7" }, @@ -5289,7 +5211,7 @@ "EDGEDB_PORT": "1312" }, "fs": {}, - "name": "override_other_test_66", + "name": "override_other_test_63", "opts": { "branch": "experimental8" }, @@ -5314,7 +5236,7 @@ "env": { "EDGEDB_DSN": "edgedb://user3:123123@localhost:5555/abcdef" }, - "name": "override_other_test_67", + "name": "override_other_test_64", "opts": { "port": 10701 }, @@ -5342,7 +5264,7 @@ "EDGEDB_PORT": "1312" }, "fs": {}, - "name": "override_other_test_68", + "name": "override_other_test_65", "opts": { "branch": "experimental9" }, @@ -5370,7 +5292,7 @@ "EDGEDB_PORT": "1312" }, "fs": {}, - "name": "override_other_test_69", + "name": "override_other_test_66", "opts": { "database": "experimental10" }, @@ -5395,7 +5317,7 @@ "env": { "SECRET_PASSWORD": "super_secret_password" }, - "name": "override_other_test_7", + "name": "override_other_test_67", "opts": { "dsn": "edgedb://testuser@localhost/db?password_env=SECRET_PASSWORD" }, @@ -5421,7 +5343,7 @@ "EDGEDB_BRANCH": "experimental14" }, "fs": {}, - "name": "override_other_test_70", + "name": "override_other_test_68", "opts": { "dsn": "edgedb://testhost:1234/?branch=feature" }, @@ -5447,7 +5369,7 @@ "EDGEDB_DATABASE": "experimental17" }, "fs": {}, - "name": "override_other_test_71", + "name": "override_other_test_69", "opts": { "dsn": "edgedb://testhost:1234/?branch=feature" }, @@ -5468,12 +5390,37 @@ "waitUntilAvailable": "PT30S" } }, + { + "env": { + "EDGEDB_DSN": "edgedb://testhost:1234/?database=db" + }, + "name": "override_other_test_7", + "opts": { + "port": 65535 + }, + "result": { + "address": [ + "localhost", + 65535 + ], + "branch": "__default__", + "database": "edgedb", + "password": null, + "secretKey": null, + "serverSettings": {}, + "tlsCAData": null, + "tlsSecurity": "strict", + "tlsServerName": null, + "user": "edgedb", + "waitUntilAvailable": "PT30S" + } + }, { "env": { "EDGEDB_BRANCH": "experimental18" }, "fs": {}, - "name": "override_other_test_72", + "name": "override_other_test_70", "opts": { "dsn": "edgedb://testhost:1234/?database=feature" }, @@ -5499,7 +5446,7 @@ "EDGEDB_BRANCH": "experimental19" }, "fs": {}, - "name": "override_other_test_73", + "name": "override_other_test_71", "opts": { "branch": "feature", "host": "testhost", @@ -5527,7 +5474,7 @@ "EDGEDB_DATABASE": "experimental20" }, "fs": {}, - "name": "override_other_test_74", + "name": "override_other_test_72", "opts": { "branch": "feature", "host": "testhost", @@ -5555,7 +5502,7 @@ "EDGEDB_BRANCH": "experimental21" }, "fs": {}, - "name": "override_other_test_75", + "name": "override_other_test_73", "opts": { "database": "feature", "host": "testhost", @@ -5594,7 +5541,7 @@ }, "homedir": "/home/edgedb" }, - "name": "override_other_test_76", + "name": "override_other_test_74", "opts": { "database": "feature", "host": "testhost", @@ -5633,7 +5580,7 @@ }, "homedir": "/home/edgedb" }, - "name": "override_other_test_77", + "name": "override_other_test_75", "opts": { "branch": "feature", "host": "testhost", @@ -5660,7 +5607,7 @@ "env": { "EDGEDB_INSTANCE": "test_instance" }, - "name": "override_other_test_78", + "name": "override_other_test_76", "opts": { "port": 10701 }, @@ -5691,7 +5638,7 @@ }, "homedir": "/home/edgedb" }, - "name": "override_other_test_79", + "name": "override_other_test_77", "opts": { "instance": "test_instance" }, @@ -5717,7 +5664,7 @@ "env": { "EDGEDB_PASSWORD": "password" }, - "name": "override_other_test_8", + "name": "override_other_test_78", "opts": { "dsn": "edgedb://testuser@localhost/db?password_env=EDGEDB_PASSWORD" }, @@ -5742,7 +5689,7 @@ "env": { "EDGEDB_PASSWORD": "password" }, - "name": "override_other_test_9", + "name": "override_other_test_79", "opts": { "dsn": "edgedb://testuser@localhost/db" }, @@ -5763,5 +5710,59 @@ "waitUntilAvailable": "PT30S" }, "~": "/*** WARNING: do not edit this file. This is automatically rebuilt using tools/rebuild.ts ***/" + }, + { + "env": { + "EDGEDB_DATABASE": "test_db", + "EDGEDB_DSN": "edgedb://testhost:1234/?database=db" + }, + "name": "override_other_test_8", + "opts": { + "user": "user_123" + }, + "result": { + "address": [ + "testhost", + 1234 + ], + "branch": "test_db", + "database": "test_db", + "password": null, + "secretKey": null, + "serverSettings": {}, + "tlsCAData": null, + "tlsSecurity": "strict", + "tlsServerName": null, + "user": "user_123", + "waitUntilAvailable": "PT30S" + } + }, + { + "env": { + "EDGEDB_DATABASE": "test_db", + "EDGEDB_DSN": "edgedb://testhost:1234/?database=db" + }, + "name": "override_other_test_9", + "opts": { + "database": "new_db", + "user": "user_123" + }, + "result": { + "address": [ + "testhost", + 1234 + ], + "branch": "new_db", + "database": "new_db", + "password": null, + "secretKey": null, + "serverSettings": {}, + "tlsCAData": null, + "tlsSecurity": "strict", + "tlsServerName": null, + "user": "user_123", + "waitUntilAvailable": "PT30S" + }, + "~": "/*** WARNING: do not edit this file. This is automatically rebuilt using tools/rebuild.ts ***/" } -] \ No newline at end of file +] diff --git a/tests/basic/env.jsonc b/tests/basic/env.jsonc index 40b2099..474a34b 100644 --- a/tests/basic/env.jsonc +++ b/tests/basic/env.jsonc @@ -765,4 +765,4 @@ "waitUntilAvailable": "PT30S" } } -] \ No newline at end of file +] diff --git a/tests/basic/fs.jsonc b/tests/basic/fs.jsonc index 0babb55..1001e81 100644 --- a/tests/basic/fs.jsonc +++ b/tests/basic/fs.jsonc @@ -303,4 +303,4 @@ "waitUntilAvailable": "PT30S" } } -] \ No newline at end of file +] diff --git a/tests/basic/opts.jsonc b/tests/basic/opts.jsonc index 79faf79..c20edca 100644 --- a/tests/basic/opts.jsonc +++ b/tests/basic/opts.jsonc @@ -939,4 +939,4 @@ "waitUntilAvailable": "PT30S" } } -] \ No newline at end of file +] diff --git a/tests/error/credentials_file_not_found.jsonc b/tests/error/credentials_file_not_found.jsonc index d9a0247..93ae5a7 100644 --- a/tests/error/credentials_file_not_found.jsonc +++ b/tests/error/credentials_file_not_found.jsonc @@ -33,4 +33,4 @@ "instance": "test_instance" } } -] \ No newline at end of file +] diff --git a/tests/error/env_not_found.jsonc b/tests/error/env_not_found.jsonc index 57628c2..188e944 100644 --- a/tests/error/env_not_found.jsonc +++ b/tests/error/env_not_found.jsonc @@ -35,4 +35,4 @@ "dsn": "edgedb://testuser@localhost/db?secret_key_env=EDGEDB_SECRET_KEY" } } -] \ No newline at end of file +] diff --git a/tests/error/exclusive_options.jsonc b/tests/error/exclusive_options.jsonc index 7e30e21..5355322 100644 --- a/tests/error/exclusive_options.jsonc +++ b/tests/error/exclusive_options.jsonc @@ -43,4 +43,4 @@ "port": 1312 } } -] \ No newline at end of file +] diff --git a/tests/error/file_not_found.jsonc b/tests/error/file_not_found.jsonc index 9809a92..1154f1e 100644 --- a/tests/error/file_not_found.jsonc +++ b/tests/error/file_not_found.jsonc @@ -42,4 +42,4 @@ "dsn": "edgedb://testuser@localhost/db?secret_key_file=/home/edgedb/secret_key" } } -] \ No newline at end of file +] diff --git a/tests/error/invalid_credentials_file.jsonc b/tests/error/invalid_credentials_file.jsonc index c810a5b..fc2dee7 100644 --- a/tests/error/invalid_credentials_file.jsonc +++ b/tests/error/invalid_credentials_file.jsonc @@ -163,4 +163,4 @@ "instance": "test_instance" } } -] \ No newline at end of file +] diff --git a/tests/error/invalid_database.jsonc b/tests/error/invalid_database.jsonc index 983808d..b1f19e2 100644 --- a/tests/error/invalid_database.jsonc +++ b/tests/error/invalid_database.jsonc @@ -18,4 +18,4 @@ "dsn": "edgedb://?database" } } -] \ No newline at end of file +] diff --git a/tests/error/invalid_dsn.jsonc b/tests/error/invalid_dsn.jsonc index 2d7b24c..0c646d2 100644 --- a/tests/error/invalid_dsn.jsonc +++ b/tests/error/invalid_dsn.jsonc @@ -118,4 +118,4 @@ "dsn": "edgedb://testuser:pass@localhost/db?password_env=EDGEDB_PASSWORD" } } -] \ No newline at end of file +] diff --git a/tests/error/invalid_dsn_or_instance_name.jsonc b/tests/error/invalid_dsn_or_instance_name.jsonc index 9c6a89d..77c0713 100644 --- a/tests/error/invalid_dsn_or_instance_name.jsonc +++ b/tests/error/invalid_dsn_or_instance_name.jsonc @@ -124,4 +124,4 @@ "instance": "test/te--st" } } -] \ No newline at end of file +] diff --git a/tests/error/invalid_host.jsonc b/tests/error/invalid_host.jsonc index a70146c..c6f91e1 100644 --- a/tests/error/invalid_host.jsonc +++ b/tests/error/invalid_host.jsonc @@ -53,4 +53,4 @@ "dsn": "edgedb://?host=" } } -] \ No newline at end of file +] diff --git a/tests/error/invalid_instance_name.jsonc b/tests/error/invalid_instance_name.jsonc index 4af340b..3a2a9f5 100644 --- a/tests/error/invalid_instance_name.jsonc +++ b/tests/error/invalid_instance_name.jsonc @@ -31,4 +31,4 @@ "instance": "12345678901234567890123456789012/34567890123456789012345678901234" } } -] \ No newline at end of file +] diff --git a/tests/error/invalid_port.jsonc b/tests/error/invalid_port.jsonc index 25df41b..c13cc4a 100644 --- a/tests/error/invalid_port.jsonc +++ b/tests/error/invalid_port.jsonc @@ -98,4 +98,4 @@ "port": "1111,2222" } } -] \ No newline at end of file +] diff --git a/tests/error/invalid_secret_key.jsonc b/tests/error/invalid_secret_key.jsonc index 5599e80..bdbbbd8 100644 --- a/tests/error/invalid_secret_key.jsonc +++ b/tests/error/invalid_secret_key.jsonc @@ -15,4 +15,4 @@ "instance": "test-org/test-123" } } -] \ No newline at end of file +] diff --git a/tests/error/invalid_tls_security.jsonc b/tests/error/invalid_tls_security.jsonc index 508873b..65d9794 100644 --- a/tests/error/invalid_tls_security.jsonc +++ b/tests/error/invalid_tls_security.jsonc @@ -50,4 +50,4 @@ "dsn": "edgedb://?tls_security" } } -] \ No newline at end of file +] diff --git a/tests/error/invalid_user.jsonc b/tests/error/invalid_user.jsonc index 56cd906..2287dd2 100644 --- a/tests/error/invalid_user.jsonc +++ b/tests/error/invalid_user.jsonc @@ -18,4 +18,4 @@ "dsn": "edgedb://?user=" } } -] \ No newline at end of file +] diff --git a/tests/error/multiple_compound_env.jsonc b/tests/error/multiple_compound_env.jsonc index 8c59af7..0969275 100644 --- a/tests/error/multiple_compound_env.jsonc +++ b/tests/error/multiple_compound_env.jsonc @@ -135,4 +135,4 @@ }, "name": "test_12" } -] \ No newline at end of file +] diff --git a/tests/error/multiple_compound_opts.jsonc b/tests/error/multiple_compound_opts.jsonc index 0adaf0f..890e90c 100644 --- a/tests/error/multiple_compound_opts.jsonc +++ b/tests/error/multiple_compound_opts.jsonc @@ -81,4 +81,4 @@ "credentialsFile": "/home/edgedb/test/credentials.json" } } -] \ No newline at end of file +] diff --git a/tests/error/no_options_or_toml.jsonc b/tests/error/no_options_or_toml.jsonc index ca13c96..43055c3 100644 --- a/tests/error/no_options_or_toml.jsonc +++ b/tests/error/no_options_or_toml.jsonc @@ -19,4 +19,4 @@ "docker_tcp_port" ] } -] \ No newline at end of file +] diff --git a/tests/error/project_not_initialised.jsonc b/tests/error/project_not_initialised.jsonc index 3c6f579..11e0090 100644 --- a/tests/error/project_not_initialised.jsonc +++ b/tests/error/project_not_initialised.jsonc @@ -14,4 +14,4 @@ "name": "test_0", "opts": {} } -] \ No newline at end of file +] diff --git a/tests/error/secret_key_not_found.jsonc b/tests/error/secret_key_not_found.jsonc index 9482a28..afbcee4 100644 --- a/tests/error/secret_key_not_found.jsonc +++ b/tests/error/secret_key_not_found.jsonc @@ -29,4 +29,4 @@ "instance": "testorg/test-123" } } -] \ No newline at end of file +] diff --git a/tests/error/unix_socket_unsupported.jsonc b/tests/error/unix_socket_unsupported.jsonc index 016cba4..db373f7 100644 --- a/tests/error/unix_socket_unsupported.jsonc +++ b/tests/error/unix_socket_unsupported.jsonc @@ -17,4 +17,4 @@ "dsn": "edgedb:///dbname?host=/unix_sock/test&user=spam" } } -] \ No newline at end of file +] diff --git a/tests/override/certificate.jsonc b/tests/override/certificate.jsonc index 211da1b..f19e745 100644 --- a/tests/override/certificate.jsonc +++ b/tests/override/certificate.jsonc @@ -264,4 +264,4 @@ "waitUntilAvailable": "PT30S" } } -] \ No newline at end of file +] diff --git a/tests/override/other.jsonc b/tests/override/other.jsonc index 790e943..271617d 100644 --- a/tests/override/other.jsonc +++ b/tests/override/other.jsonc @@ -2333,4 +2333,4 @@ }, "~": "/*** WARNING: do not edit this file. This is automatically rebuilt using tools/rebuild.ts ***/" } -] \ No newline at end of file +] diff --git a/tools/rebuild.ts b/tools/rebuild.ts index 35771f9..1e0ee47 100755 --- a/tools/rebuild.ts +++ b/tools/rebuild.ts @@ -64,7 +64,7 @@ writeFileSync( out, sortObjectKeys, 2, - ), + ) + "\n", ); console.log("Wrote", out.length, "testcases to", "connection_testcases.json");