chore: address comments

Author: jacek-prisma

libs/user-facing-errors/src/schema_engine.rs

@@ -314,6 +314,10 @@ pub struct DatabaseSchemaInconsistent {
     pub explanation: String,
 }
 
+#[derive(Debug, SimpleUserFacingError)]
+#[user_facing(code = "P4003", message = "No URL defined in the configured datasource")]
+pub struct MissingConfigDatasourceUrl;
+
 #[cfg(test)]
 mod tests {
     use super::*;

schema-engine/cli/src/commands.rs

@@ -8,6 +8,7 @@ use schema_core::{
 };
 use structopt::StructOpt;
 use tokio_util::sync::CancellationToken;
+use user_facing_errors::schema_engine::MissingConfigDatasourceUrl;
 
 #[derive(Debug, StructOpt)]
 pub(crate) struct Cli {
@@ -40,7 +41,7 @@ impl Cli {
 
         let url = datasource_urls
             .url
-            .ok_or_else(|| ConnectorError::from_msg("No URL defined in the configured datasource".to_owned()))?;
+            .ok_or_else(|| ConnectorError::user_facing(MissingConfigDatasourceUrl))?;
 
         let work = async {
             match self.command {

schema-engine/core/src/lib.rs

@@ -10,6 +10,7 @@ pub mod commands;
 
 pub use ::commands::{CoreError, CoreResult, GenericApi};
 pub use json_rpc;
+use user_facing_errors::schema_engine::MissingConfigDatasourceUrl;
 
 mod core_error;
 mod extensions;
@@ -126,8 +127,7 @@ fn schema_to_connector(
         )
     };
 
-    let connection_string = connection_string
-        .ok_or_else(|| CoreError::from_msg("No URL defined in the configured datasource".to_owned()))?;
+    let connection_string = connection_string.ok_or_else(|| CoreError::user_facing(MissingConfigDatasourceUrl))?;
 
     let params = ConnectorParams {
         connection_string,
@@ -148,7 +148,7 @@ fn initial_datamodel_to_connector(
     let params = ConnectorParams {
         connection_string: datasource_urls
             .url()
-            .ok_or_else(|| CoreError::from_msg("No URL defined in the configured datasource".to_owned()))?
+            .ok_or_else(|| CoreError::user_facing(MissingConfigDatasourceUrl))?
             .to_owned(),
         preview_features,
         shadow_database_connection_string: datasource_urls.shadow_database_url().map(<_>::to_owned),

schema-engine/core/src/state.rs

@@ -24,6 +24,7 @@ use std::{
 };
 use tokio::sync::{Mutex, mpsc, oneshot};
 use tracing_futures::{Instrument, WithSubscriber};
+use user_facing_errors::schema_engine::MissingConfigDatasourceUrl;
 
 /// The container for the state of the schema engine. It can contain one or more connectors
 /// corresponding to a database to be reached or that we are already connected to.
@@ -218,7 +219,7 @@ impl EngineState {
         Ok(self
             .validate_datasource_urls(&datasource)?
             .url_with_config_dir(datasource.active_connector.flavour(), Path::new(&container.config_dir))
-            .ok_or_else(|| CoreError::from_msg("No URL defined in the configured datasource".to_owned()))?
+            .ok_or_else(|| CoreError::user_facing(MissingConfigDatasourceUrl))?
             .into_owned())
     }
 

schema-engine/core/src/url.rs

@@ -48,14 +48,6 @@ impl DatasourceUrls {
         }
     }
 
-    /// Creates a `DatasourceUrls` instance with both primary and shadow database URLs.
-    pub fn from_url_and_shadow_database_url(url: impl Into<String>, shadow_database_url: impl Into<String>) -> Self {
-        Self {
-            url: Some(url.into()),
-            shadow_database_url: Some(shadow_database_url.into()),
-        }
-    }
-
     /// Validates the URLs.
     pub fn validate(
         &self,

schema-engine/sql-migration-tests/tests/migrations/diff.rs

@@ -376,7 +376,10 @@ fn from_empty_to_migrations_directory(mut api: TestApi) {
     let host = Arc::new(TestConnectorHost::default());
     tok(diff_cli(
         params,
-        &DatasourceUrls::from_url_and_shadow_database_url("postgres://not-used", api.connection_string()),
+        &DatasourceUrls {
+            url: Some("postgres://not-used".to_string()),
+            shadow_database_url: Some(api.connection_string().to_owned()),
+        },
         host.clone(),
         &NoExtensionTypes,
     ))