scott/crabfit
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

More helpful error messages when creating adaptors

Browse source
This commit is contained in:
Ben Grant 2023-05-15 20:11:41 +10:00
parent 2ba96cc9cb
commit b586b4c88d
5 changed files with 22 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

17
backend/adaptors/datastore/src/lib.rs
View file

@ -203,19 +203,22 @@ impl Adaptor for DatastoreAdaptor {
impl DatastoreAdaptor {
pub async fn new() -> Self {
let project_name = env::var("GCP_PROJECT_NAME").unwrap();
// Load credentials
let credentials: ApplicationCredentials =
serde_json::from_str(&env::var("GCP_CREDENTIALS").unwrap()).unwrap();
let credentials: ApplicationCredentials = serde_json::from_str(
&env::var("GCP_CREDENTIALS").expect("Expected GCP_CREDENTIALS environment variable"),
)
.expect("GCP_CREDENTIALS environment variable is not valid JSON");
// Connect to datastore
let client = Client::from_credentials(project_name.clone(), credentials)
let client = Client::from_credentials(credentials.project_id.clone(), credentials.clone())
.await
.unwrap();
.expect("Failed to setup datastore client");
let client = Mutex::new(client);
println!("🎛️ Connected to datastore in project {}", project_name);
println!(
"🎛️ Connected to datastore in project {}",
credentials.project_id
);
Self { client }
}

13
backend/adaptors/sql/src/lib.rs
View file

@ -158,23 +158,28 @@ async fn get_stats_row(db: &DatabaseConnection) -> Result<stats::ActiveModel, Db
impl SqlAdaptor {
pub async fn new() -> Self {
let connection_string = env::var("DATABASE_URL").unwrap();
let connection_string =
env::var("DATABASE_URL").expect("Expected DATABASE_URL environment variable");
// Connect to the database
let db = Database::connect(&connection_string).await.unwrap();
let db = Database::connect(&connection_string)
.await
.expect("Failed to connect to SQL database");
println!(
"{} Connected to database at {}",
match db {
DatabaseConnection::SqlxMySqlPoolConnection(_) => "🐬",
DatabaseConnection::SqlxPostgresPoolConnection(_) => "🐘",
DatabaseConnection::SqlxSqlitePoolConnection(_) => "🪶",
DatabaseConnection::Disconnected => panic!("Failed to connect"),
DatabaseConnection::Disconnected => panic!("Failed to connect to SQL database"),
},
connection_string
);
// Setup tables
Migrator::up(&db, None).await.unwrap();
Migrator::up(&db, None)
.await
.expect("Failed to set up tables in the database");
Self { db }
}