From 3ce3ee318b974c92728bad89a6b905b470cef645 Mon Sep 17 00:00:00 2001 From: James Clarke Date: Tue, 7 Nov 2023 10:30:46 +0000 Subject: [PATCH] Update shared testcases + fix `EDGEDB_CLOUD_PROFILE` handling --- packages/driver/src/conUtils.ts | 4 ++-- packages/driver/test/shared-client-testcases | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/packages/driver/src/conUtils.ts b/packages/driver/src/conUtils.ts index 5761aef6e..d261bf8a1 100644 --- a/packages/driver/src/conUtils.ts +++ b/packages/driver/src/conUtils.ts @@ -501,6 +501,7 @@ async function parseConnectDsnAndArgs( user: config.user, password: config.password, secretKey: config.secretKey, + cloudProfile: getEnv("EDGEDB_CLOUD_PROFILE"), tlsCA: config.tlsCA, tlsCAFile: config.tlsCAFile, tlsSecurity: config.tlsSecurity, @@ -521,6 +522,7 @@ async function parseConnectDsnAndArgs( user: `'user' option`, password: `'password' option`, secretKey: `'secretKey' option`, + cloudProfile: `'EDGEDB_CLOUD_PROFILE' environment variable`, tlsCA: `'tlsCA' option`, tlsCAFile: `'tlsCAFile' option`, tlsSecurity: `'tlsSecurity' option`, @@ -559,7 +561,6 @@ async function parseConnectDsnAndArgs( user: getEnv("EDGEDB_USER"), password: getEnv("EDGEDB_PASSWORD"), secretKey: getEnv("EDGEDB_SECRET_KEY"), - cloudProfile: getEnv("EDGEDB_CLOUD_PROFILE"), tlsCA: getEnv("EDGEDB_TLS_CA"), tlsCAFile: getEnv("EDGEDB_TLS_CA_FILE"), tlsSecurity: getEnv("EDGEDB_CLIENT_TLS_SECURITY"), @@ -576,7 +577,6 @@ async function parseConnectDsnAndArgs( user: `'EDGEDB_USER' environment variable`, password: `'EDGEDB_PASSWORD' environment variable`, secretKey: `'EDGEDB_SECRET_KEY' environment variable`, - cloudProfile: `'EDGEDB_CLOUD_PROFILE' environment variable`, tlsCA: `'EDGEDB_TLS_CA' environment variable`, tlsCAFile: `'EDGEDB_TLS_CA_FILE' environment variable`, tlsSecurity: `'EDGEDB_CLIENT_TLS_SECURITY' environment variable`, diff --git a/packages/driver/test/shared-client-testcases b/packages/driver/test/shared-client-testcases index b8959be89..b260ad9b3 160000 --- a/packages/driver/test/shared-client-testcases +++ b/packages/driver/test/shared-client-testcases @@ -1 +1 @@ -Subproject commit b8959be8968aceeeac2af3da7639de02b19d7030 +Subproject commit b260ad9b3fd0ddb6d4bc9174477fe8ad14220af3