server app builder implemented

This commit is contained in:
Andre Heber
2024-02-26 14:43:57 +01:00
parent 518acf03b1
commit 2f4895928f
4 changed files with 61 additions and 57 deletions

View File

@ -1,10 +1,7 @@
use once_cell::sync::Lazy;
use secrecy::ExposeSecret;
use sqlx::{postgres::PgPoolOptions, Connection, Executor, PgConnection, Pool, Postgres};
use testcontainers::{clients::Cli, RunnableImage};
use uuid::Uuid;
use std:: net::TcpListener;
use zero2prod::{configuration::{get_configuration, DatabaseSettings}, email_client, telemetry::{get_subscriber, init_subscriber}};
use zero2prod::{configuration::{get_configuration, DatabaseSettings}, startup::{get_connection_pool, Application}, telemetry::{get_subscriber, init_subscriber}};
pub struct TestApp {
pub address: String,
@ -24,44 +21,26 @@ static TRACING: Lazy<()> = Lazy::new(|| {
}
});
fn create_db(config: &DatabaseSettings) -> RunnableImage<testcontainers_modules::postgres::Postgres> {
RunnableImage::from(testcontainers_modules::postgres::Postgres::default())
.with_env_var(("POSTGRES_PASSWORD", config.password.expose_secret()))
.with_env_var(("POSTGRES_USER", &config.username))
.with_env_var(("POSTGRES_DB", &config.database_name))
}
pub async fn spawn_app() -> TestApp {
Lazy::force(&TRACING);
let listener = TcpListener::bind("127.0.0.1:0").expect("Failed to bind random port");
let port = listener.local_addr().unwrap().port();
let address = format!("http://127.0.0.1:{}", port);
let config = {
let mut c = get_configuration().expect("Failed to read configuration");
c.database.database_name = Uuid::new_v4().to_string();
c.application.port = 0;
c
};
let mut config = get_configuration().expect("Failed to read configuration");
let image = create_db(&config.database);
let docker = Cli::default();
docker.run(image);
config.database.database_name = Uuid::new_v4().to_string();
let connection_pool = configure_database(&config.database).await;
configure_database(&config.database).await;
let sender_email = config.email_client.sender().unwrap();
let timeout = config.email_client.timeout();
let email_client = email_client::EmailClient::new(
config.email_client.base_url,
sender_email,
config.email_client.authorization_token,
timeout,
);
let server = zero2prod::startup::run(listener, connection_pool.clone(), email_client).expect("Failed to bind address");
let _fut = tokio::spawn(server);
let app = Application::build(config.clone()).await.expect("Failed to build app.");
let address = format!("http://127.0.0.1:{}", app.port());
let _fut = tokio::spawn(app.run_until_stopped());
TestApp {
address,
connection_pool,
connection_pool: get_connection_pool(config.database),
}
}
pub async fn configure_database(config: &DatabaseSettings) -> Pool<Postgres> {