mirror of
https://github.com/jlengrand/engine.git
synced 2026-03-10 08:11:21 +00:00
Add logs
This commit is contained in:
@@ -977,6 +977,21 @@ pub trait ProgressListener: Send + Sync {
|
||||
fn delete_error(&self, info: ProgressInfo);
|
||||
}
|
||||
|
||||
pub struct NoOpProgressListener {}
|
||||
|
||||
impl ProgressListener for NoOpProgressListener {
|
||||
fn deployment_in_progress(&self, _info: ProgressInfo) {}
|
||||
fn pause_in_progress(&self, _info: ProgressInfo) {}
|
||||
fn delete_in_progress(&self, _info: ProgressInfo) {}
|
||||
fn error(&self, _info: ProgressInfo) {}
|
||||
fn deployed(&self, _info: ProgressInfo) {}
|
||||
fn paused(&self, _info: ProgressInfo) {}
|
||||
fn deleted(&self, _info: ProgressInfo) {}
|
||||
fn deployment_error(&self, _info: ProgressInfo) {}
|
||||
fn pause_error(&self, _info: ProgressInfo) {}
|
||||
fn delete_error(&self, _info: ProgressInfo) {}
|
||||
}
|
||||
|
||||
pub trait Listen {
|
||||
fn listeners(&self) -> &Listeners;
|
||||
fn add_listener(&mut self, listener: Listener);
|
||||
|
||||
@@ -13,7 +13,7 @@ use qovery_engine::container_registry::ecr::ECR;
|
||||
use qovery_engine::dns_provider::DnsProvider;
|
||||
use qovery_engine::engine::EngineConfig;
|
||||
use qovery_engine::logger::Logger;
|
||||
use qovery_engine::models::Context;
|
||||
use qovery_engine::models::{Context, NoOpProgressListener};
|
||||
use std::str::FromStr;
|
||||
use std::sync::Arc;
|
||||
use tracing::error;
|
||||
@@ -49,6 +49,7 @@ pub fn container_registry_ecr(context: &Context, logger: Box<dyn Logger>) -> ECR
|
||||
secrets.AWS_ACCESS_KEY_ID.unwrap().as_str(),
|
||||
secrets.AWS_SECRET_ACCESS_KEY.unwrap().as_str(),
|
||||
secrets.AWS_DEFAULT_REGION.unwrap().as_str(),
|
||||
Arc::new(Box::new(NoOpProgressListener {})),
|
||||
logger,
|
||||
)
|
||||
.unwrap()
|
||||
|
||||
@@ -7,7 +7,7 @@ use qovery_engine::cloud_provider::models::NodeGroups;
|
||||
use qovery_engine::cloud_provider::{CloudProvider, TerraformStateCredentials};
|
||||
use qovery_engine::container_registry::docr::DOCR;
|
||||
use qovery_engine::engine::EngineConfig;
|
||||
use qovery_engine::models::{Context, EnvironmentRequest};
|
||||
use qovery_engine::models::{Context, EnvironmentRequest, NoOpProgressListener};
|
||||
use std::sync::Arc;
|
||||
|
||||
use crate::cloudflare::dns_provider_cloudflare;
|
||||
@@ -33,7 +33,14 @@ pub const DO_SELF_HOSTED_DATABASE_DISK_TYPE: &str = "do-block-storage";
|
||||
|
||||
pub fn container_registry_digital_ocean(context: &Context) -> DOCR {
|
||||
let secrets = FuncTestsSecrets::new();
|
||||
DOCR::new(context.clone(), DOCR_ID, DOCR_ID, secrets.DIGITAL_OCEAN_TOKEN.unwrap().as_str()).unwrap()
|
||||
DOCR::new(
|
||||
context.clone(),
|
||||
DOCR_ID,
|
||||
DOCR_ID,
|
||||
secrets.DIGITAL_OCEAN_TOKEN.unwrap().as_str(),
|
||||
Arc::new(Box::new(NoOpProgressListener {})),
|
||||
)
|
||||
.unwrap()
|
||||
}
|
||||
|
||||
pub fn do_default_engine_config(context: &Context, logger: Box<dyn Logger>) -> EngineConfig {
|
||||
@@ -168,6 +175,7 @@ pub fn clean_environments(
|
||||
.DIGITAL_OCEAN_TOKEN
|
||||
.as_ref()
|
||||
.expect("DIGITAL_OCEAN_TOKEN is not set in secrets"),
|
||||
Arc::new(Box::new(NoOpProgressListener {})),
|
||||
);
|
||||
|
||||
// FIXME: re-enable it, or let pleco do its job ?
|
||||
|
||||
@@ -6,7 +6,7 @@ use qovery_engine::cloud_provider::scaleway::Scaleway;
|
||||
use qovery_engine::cloud_provider::{CloudProvider, TerraformStateCredentials};
|
||||
use qovery_engine::container_registry::scaleway_container_registry::ScalewayCR;
|
||||
use qovery_engine::engine::EngineConfig;
|
||||
use qovery_engine::models::{Context, EnvironmentRequest};
|
||||
use qovery_engine::models::{Context, EnvironmentRequest, Listener, NoOpProgressListener};
|
||||
use qovery_engine::object_storage::scaleway_object_storage::{BucketDeleteStrategy, ScalewayOS};
|
||||
use std::sync::Arc;
|
||||
|
||||
@@ -59,6 +59,7 @@ pub fn container_registry_scw(context: &Context) -> ScalewayCR {
|
||||
scw_secret_key.as_str(),
|
||||
scw_default_project_id.as_str(),
|
||||
SCW_TEST_ZONE,
|
||||
Arc::new(Box::new(NoOpProgressListener {})),
|
||||
)
|
||||
.unwrap()
|
||||
}
|
||||
@@ -236,6 +237,7 @@ pub fn clean_environments(
|
||||
secret_token.as_str(),
|
||||
project_id.as_str(),
|
||||
zone,
|
||||
Arc::new(Box::new(NoOpProgressListener {})),
|
||||
)?;
|
||||
|
||||
// delete images created in registry
|
||||
|
||||
Reference in New Issue
Block a user