Skip to content

Commit 72ddaaf

Browse files
committed
don't use get_connection_uri method which doesn't use test environment
1 parent 0be4ba5 commit 72ddaaf

File tree

1 file changed

+9
-2
lines changed
  • crates/configuration/src/version5

1 file changed

+9
-2
lines changed

crates/configuration/src/version5/mod.rs

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ mod to_runtime_configuration;
99
mod upgrade_from_v4;
1010

1111
use ndc_models::{CollectionName, TypeName};
12+
use std::borrow::Cow;
1213
use std::collections::{BTreeMap, HashSet};
1314
use std::path::Path;
1415
pub use to_runtime_configuration::make_runtime_configuration;
@@ -26,6 +27,7 @@ use metadata::database;
2627
use crate::connect::read_ssl_info;
2728
use crate::environment::Environment;
2829
use crate::error::{ParseConfigurationError, WriteParsedConfigurationError};
30+
use crate::{ConnectionUri, Secret};
2931

3032
const CONFIGURATION_FILENAME: &str = "configuration.json";
3133
const CONFIGURATION_JSONSCHEMA_FILENAME: &str = "schema.json";
@@ -136,8 +138,13 @@ pub async fn introspect(
136138
args: ParsedConfiguration,
137139
environment: impl Environment,
138140
) -> anyhow::Result<ParsedConfiguration> {
139-
let connect_options =
140-
crate::get_connect_options(&args.get_connection_uri()?, &read_ssl_info(environment))?;
141+
let connection_uri = match &args.connection_settings.connection_uri {
142+
ConnectionUri(Secret::Plain(value)) => Cow::Borrowed(value),
143+
ConnectionUri(Secret::FromEnvironment { variable }) => {
144+
Cow::Owned(environment.read(variable)?)
145+
}
146+
};
147+
let connect_options = crate::get_connect_options(&connection_uri, &read_ssl_info(environment))?;
141148

142149
let mut connection = PgConnection::connect_with(&connect_options)
143150
.instrument(info_span!("Connect to database"))

0 commit comments

Comments
 (0)