impr: reduce database tests duration (#620)

* impr: reduce database tests duration

* impr: reduce database resources consumption for test
This commit is contained in:
MacLikorne
2022-03-08 13:50:11 +01:00
committed by GitHub
parent 294686916d
commit fb7181f0de
5 changed files with 351 additions and 2382 deletions

View File

@@ -172,7 +172,7 @@ pub fn environment_3_apps_3_routers_3_databases(
let database_port_mongo = 27017;
let database_db_name_mongo = "my-mongodb".to_string();
let database_username_mongo = "superuser".to_string();
let database_password_mongo = generate_password(false);
let database_password_mongo = generate_password(provider_kind.clone(), DatabaseMode::CONTAINER);
let database_uri_mongo = format!(
"mongodb://{}:{}@{}:{}/{}",
database_username_mongo,
@@ -187,7 +187,7 @@ pub fn environment_3_apps_3_routers_3_databases(
let fqdn = get_svc_name(DatabaseKind::Postgresql, provider_kind.clone()).to_string();
let database_port = 5432;
let database_username = "superuser".to_string();
let database_password = generate_password(true);
let database_password = generate_password(provider_kind.clone(), DatabaseMode::CONTAINER);
let database_name = "postgres".to_string();
// pSQL 2 management part
@@ -527,6 +527,49 @@ pub fn working_minimal_environment(context: &Context, test_domain: &str) -> Envi
}
}
pub fn database_test_environment(context: &Context) -> Environment {
let suffix = generate_id();
let application_id = generate_id();
let application_name = format!("{}-{}", "simple-app".to_string(), &suffix);
Environment {
execution_id: context.execution_id().to_string(),
id: generate_id(),
owner_id: generate_id(),
project_id: generate_id(),
organization_id: context.organization_id().to_string(),
action: Action::Create,
applications: vec![Application {
id: application_id,
name: application_name,
git_url: "https://github.com/Qovery/engine-testing.git".to_string(),
commit_id: "fc575a2f3be0b9100492c8a463bf18134a8698a5".to_string(),
dockerfile_path: Some("Dockerfile".to_string()),
buildpack_language: None,
root_path: String::from("/"),
action: Action::Create,
git_credentials: Some(GitCredentials {
login: "x-access-token".to_string(),
access_token: "xxx".to_string(),
expired_at: Utc::now(),
}),
storage: vec![],
environment_vars: BTreeMap::default(),
branch: "basic-app-deploy".to_string(),
ports: vec![],
total_cpus: "100m".to_string(),
total_ram_in_mib: 256,
min_instances: 1,
max_instances: 1,
cpu_burst: "100m".to_string(),
start_timeout_in_seconds: 120,
}],
routers: vec![],
databases: vec![],
clone_from_environment_id: None,
}
}
pub fn environment_only_http_server_router_with_sticky_session(context: &Context, test_domain: &str) -> Environment {
let mut env = environment_only_http_server_router(context, test_domain.clone());
@@ -548,7 +591,7 @@ pub fn environnement_2_app_2_routers_1_psql(
let database_port = 5432;
let database_username = "superuser".to_string();
let database_password = generate_password(true);
let database_password = generate_password(provider_kind.clone(), DatabaseMode::CONTAINER);
let database_name = "postgres".to_string();
let suffix = generate_id();
@@ -954,9 +997,8 @@ pub fn test_db(
let context_for_delete = context.clone_not_same_execution_id();
let app_id = generate_id();
let database_username = "superuser".to_string();
let database_password = generate_id();
let database_password = generate_password(provider_kind.clone(), database_mode.clone());
let db_kind_str = db_kind.name().to_string();
let db_id = generate_id();
let database_host = format!("{}-{}", db_id, db_kind_str.clone());
@@ -997,8 +1039,8 @@ pub fn test_db(
port: database_port.clone(),
username: database_username.clone(),
password: database_password.clone(),
total_cpus: "100m".to_string(),
total_ram_in_mib: 512,
total_cpus: "50m".to_string(),
total_ram_in_mib: 256,
disk_size_in_gib: storage_size.clone(),
database_instance_type: db_instance_type.to_string(),
database_disk_type: db_disk_type.to_string(),
@@ -1034,7 +1076,6 @@ pub fn test_db(
app
})
.collect::<Vec<qovery_engine::models::Application>>();
environment.routers[0].routes[0].application_name = app_id.clone();
let mut environment_delete = environment.clone();
environment_delete.action = Action::Delete;

View File

@@ -417,12 +417,18 @@ pub fn generate_id() -> String {
uuid
}
pub fn generate_password(allow_using_symbols: bool) -> String {
pub fn generate_password(provider_kind: Kind, db_mode: DatabaseMode) -> String {
// core special chars set: !#$%&*+-=?_
// we will keep only those and exclude others
let forbidden_chars = vec![
'"', '\'', '(', ')', ',', '.', '/', ':', ';', '<', '>', '@', '[', '\\', ']', '^', '`', '{', '|', '}', '~',
];
let allow_using_symbols = provider_kind == Kind::Scw && db_mode == DatabaseMode::MANAGED;
if !allow_using_symbols {
return generate_id();
};
let pg = PasswordGenerator::new()
.length(32)
.numbers(true)

File diff suppressed because it is too large Load Diff

View File

@@ -11,7 +11,7 @@ use test_utilities::utilities::{
};
use qovery_engine::models::DatabaseMode::{CONTAINER, MANAGED};
use test_utilities::common::{test_db, working_minimal_environment, Infrastructure};
use test_utilities::common::{database_test_environment, test_db, working_minimal_environment, Infrastructure};
use test_utilities::digitalocean::{
clean_environments, DO_MANAGED_DATABASE_DISK_TYPE, DO_MANAGED_DATABASE_INSTANCE_TYPE,
DO_SELF_HOSTED_DATABASE_DISK_TYPE, DO_SELF_HOSTED_DATABASE_INSTANCE_TYPE, DO_TEST_REGION,
@@ -386,15 +386,21 @@ fn postgresql_deploy_a_working_environment_and_redeploy() {
**
**/
#[allow(dead_code)]
fn test_postgresql_configuration(
context: Context,
environment: Environment,
secrets: FuncTestsSecrets,
version: &str,
test_name: &str,
database_mode: DatabaseMode,
is_public: bool,
) {
fn test_postgresql_configuration(version: &str, test_name: &str, database_mode: DatabaseMode, is_public: bool) {
let secrets = FuncTestsSecrets::new();
let context = context(
secrets
.DIGITAL_OCEAN_TEST_ORGANIZATION_ID
.as_ref()
.expect("DIGITAL_OCEAN_TEST_ORGANIZATION_ID is not set"),
secrets
.DIGITAL_OCEAN_TEST_CLUSTER_ID
.as_ref()
.expect("DIGITAL_OCEAN_TEST_CLUSTER_ID is not set"),
);
let environment = database_test_environment(&context);
engine_run_test(|| {
test_db(
context,
@@ -416,27 +422,7 @@ fn test_postgresql_configuration(
#[named]
#[test]
fn private_postgresql_v10_deploy_a_working_dev_environment() {
let secrets = FuncTestsSecrets::new();
let context = context(
secrets
.DIGITAL_OCEAN_TEST_ORGANIZATION_ID
.as_ref()
.expect("DIGITAL_OCEAN_TEST_ORGANIZATION_ID is not set"),
secrets
.DIGITAL_OCEAN_TEST_CLUSTER_ID
.as_ref()
.expect("DIGITAL_OCEAN_TEST_CLUSTER_ID is not set"),
);
let environment = working_minimal_environment(
&context,
secrets
.DEFAULT_TEST_DOMAIN
.as_ref()
.expect("DEFAULT_TEST_DOMAIN is not set in secrets")
.as_str(),
);
test_postgresql_configuration(context, environment, secrets, "10", function_name!(), CONTAINER, false);
test_postgresql_configuration("10", function_name!(), CONTAINER, false);
}
#[cfg(feature = "test-do-self-hosted")]
@@ -444,27 +430,7 @@ fn private_postgresql_v10_deploy_a_working_dev_environment() {
#[named]
#[test]
fn public_postgresql_v10_deploy_a_working_dev_environment() {
let secrets = FuncTestsSecrets::new();
let context = context(
secrets
.DIGITAL_OCEAN_TEST_ORGANIZATION_ID
.as_ref()
.expect("DIGITAL_OCEAN_TEST_ORGANIZATION_ID is not set"),
secrets
.DIGITAL_OCEAN_TEST_CLUSTER_ID
.as_ref()
.expect("DIGITAL_OCEAN_TEST_CLUSTER_ID is not set"),
);
let environment = working_minimal_environment(
&context,
secrets
.DEFAULT_TEST_DOMAIN
.as_ref()
.expect("DEFAULT_TEST_DOMAIN is not set in secrets")
.as_str(),
);
test_postgresql_configuration(context, environment, secrets, "10", function_name!(), CONTAINER, true);
test_postgresql_configuration("10", function_name!(), CONTAINER, true);
}
#[cfg(feature = "test-do-self-hosted")]
@@ -472,27 +438,7 @@ fn public_postgresql_v10_deploy_a_working_dev_environment() {
#[named]
#[test]
fn private_postgresql_v11_deploy_a_working_dev_environment() {
let secrets = FuncTestsSecrets::new();
let context = context(
secrets
.DIGITAL_OCEAN_TEST_ORGANIZATION_ID
.as_ref()
.expect("DIGITAL_OCEAN_TEST_ORGANIZATION_ID is not set"),
secrets
.DIGITAL_OCEAN_TEST_CLUSTER_ID
.as_ref()
.expect("DIGITAL_OCEAN_TEST_CLUSTER_ID is not set"),
);
let environment = working_minimal_environment(
&context,
secrets
.DEFAULT_TEST_DOMAIN
.as_ref()
.expect("DEFAULT_TEST_DOMAIN is not set in secrets")
.as_str(),
);
test_postgresql_configuration(context, environment, secrets, "11", function_name!(), CONTAINER, false);
test_postgresql_configuration("11", function_name!(), CONTAINER, false);
}
#[cfg(feature = "test-do-self-hosted")]
@@ -500,135 +446,35 @@ fn private_postgresql_v11_deploy_a_working_dev_environment() {
#[named]
#[test]
fn public_postgresql_v11_deploy_a_working_dev_environment() {
let secrets = FuncTestsSecrets::new();
let context = context(
secrets
.DIGITAL_OCEAN_TEST_ORGANIZATION_ID
.as_ref()
.expect("DIGITAL_OCEAN_TEST_ORGANIZATION_ID is not set"),
secrets
.DIGITAL_OCEAN_TEST_CLUSTER_ID
.as_ref()
.expect("DIGITAL_OCEAN_TEST_CLUSTER_ID is not set"),
);
let environment = working_minimal_environment(
&context,
secrets
.DEFAULT_TEST_DOMAIN
.as_ref()
.expect("DEFAULT_TEST_DOMAIN is not set in secrets")
.as_str(),
);
test_postgresql_configuration(context, environment, secrets, "11", function_name!(), CONTAINER, true);
test_postgresql_configuration("11", function_name!(), CONTAINER, true);
}
#[cfg(feature = "test-do-self-hosted")]
#[named]
#[test]
fn private_postgresql_v12_deploy_a_working_dev_environment() {
let secrets = FuncTestsSecrets::new();
let context = context(
secrets
.DIGITAL_OCEAN_TEST_ORGANIZATION_ID
.as_ref()
.expect("DIGITAL_OCEAN_TEST_ORGANIZATION_ID is not set"),
secrets
.DIGITAL_OCEAN_TEST_CLUSTER_ID
.as_ref()
.expect("DIGITAL_OCEAN_TEST_CLUSTER_ID is not set"),
);
let environment = working_minimal_environment(
&context,
secrets
.DEFAULT_TEST_DOMAIN
.as_ref()
.expect("DEFAULT_TEST_DOMAIN is not set in secrets")
.as_str(),
);
test_postgresql_configuration(context, environment, secrets, "12", function_name!(), CONTAINER, false);
test_postgresql_configuration("12", function_name!(), CONTAINER, false);
}
#[cfg(feature = "test-do-self-hosted")]
#[named]
#[test]
fn public_postgresql_v12_deploy_a_working_dev_environment() {
let secrets = FuncTestsSecrets::new();
let context = context(
secrets
.DIGITAL_OCEAN_TEST_ORGANIZATION_ID
.as_ref()
.expect("DIGITAL_OCEAN_TEST_ORGANIZATION_ID is not set"),
secrets
.DIGITAL_OCEAN_TEST_CLUSTER_ID
.as_ref()
.expect("DIGITAL_OCEAN_TEST_CLUSTER_ID is not set"),
);
let environment = working_minimal_environment(
&context,
secrets
.DEFAULT_TEST_DOMAIN
.as_ref()
.expect("DEFAULT_TEST_DOMAIN is not set in secrets")
.as_str(),
);
test_postgresql_configuration(context, environment, secrets, "12", function_name!(), CONTAINER, true);
test_postgresql_configuration("12", function_name!(), CONTAINER, true);
}
#[cfg(feature = "test-do-self-hosted")]
#[named]
#[test]
fn private_postgresql_v13_deploy_a_working_dev_environment() {
let secrets = FuncTestsSecrets::new();
let context = context(
secrets
.DIGITAL_OCEAN_TEST_ORGANIZATION_ID
.as_ref()
.expect("DIGITAL_OCEAN_TEST_ORGANIZATION_ID is not set"),
secrets
.DIGITAL_OCEAN_TEST_CLUSTER_ID
.as_ref()
.expect("DIGITAL_OCEAN_TEST_CLUSTER_ID is not set"),
);
let environment = working_minimal_environment(
&context,
secrets
.DEFAULT_TEST_DOMAIN
.as_ref()
.expect("DEFAULT_TEST_DOMAIN is not set in secrets")
.as_str(),
);
test_postgresql_configuration(context, environment, secrets, "13", function_name!(), CONTAINER, false);
test_postgresql_configuration("13", function_name!(), CONTAINER, false);
}
#[cfg(feature = "test-do-self-hosted")]
#[named]
#[test]
fn public_postgresql_v13_deploy_a_working_dev_environment() {
let secrets = FuncTestsSecrets::new();
let context = context(
secrets
.DIGITAL_OCEAN_TEST_ORGANIZATION_ID
.as_ref()
.expect("DIGITAL_OCEAN_TEST_ORGANIZATION_ID is not set"),
secrets
.DIGITAL_OCEAN_TEST_CLUSTER_ID
.as_ref()
.expect("DIGITAL_OCEAN_TEST_CLUSTER_ID is not set"),
);
let environment = working_minimal_environment(
&context,
secrets
.DEFAULT_TEST_DOMAIN
.as_ref()
.expect("DEFAULT_TEST_DOMAIN is not set in secrets")
.as_str(),
);
test_postgresql_configuration(context, environment, secrets, "13", function_name!(), CONTAINER, true);
test_postgresql_configuration("13", function_name!(), CONTAINER, true);
}
/**
@@ -637,15 +483,21 @@ fn public_postgresql_v13_deploy_a_working_dev_environment() {
**
**/
#[allow(dead_code)]
fn test_mongodb_configuration(
context: Context,
environment: Environment,
secrets: FuncTestsSecrets,
version: &str,
test_name: &str,
database_mode: DatabaseMode,
is_public: bool,
) {
fn test_mongodb_configuration(version: &str, test_name: &str, database_mode: DatabaseMode, is_public: bool) {
let secrets = FuncTestsSecrets::new();
let context = context(
secrets
.DIGITAL_OCEAN_TEST_ORGANIZATION_ID
.as_ref()
.expect("DIGITAL_OCEAN_TEST_ORGANIZATION_ID is not set"),
secrets
.DIGITAL_OCEAN_TEST_CLUSTER_ID
.as_ref()
.expect("DIGITAL_OCEAN_TEST_CLUSTER_ID is not set"),
);
let environment = database_test_environment(&context);
engine_run_test(|| {
test_db(
context,
@@ -667,27 +519,7 @@ fn test_mongodb_configuration(
#[named]
#[test]
fn private_mongodb_v3_6_deploy_a_working_dev_environment() {
let secrets = FuncTestsSecrets::new();
let context = context(
secrets
.DIGITAL_OCEAN_TEST_ORGANIZATION_ID
.as_ref()
.expect("DIGITAL_OCEAN_TEST_ORGANIZATION_ID is not set"),
secrets
.DIGITAL_OCEAN_TEST_CLUSTER_ID
.as_ref()
.expect("DIGITAL_OCEAN_TEST_CLUSTER_ID is not set"),
);
let environment = working_minimal_environment(
&context,
secrets
.DEFAULT_TEST_DOMAIN
.as_ref()
.expect("DEFAULT_TEST_DOMAIN is not set in secrets")
.as_str(),
);
test_mongodb_configuration(context, environment, secrets, "3.6", function_name!(), CONTAINER, false);
test_mongodb_configuration("3.6", function_name!(), CONTAINER, false);
}
#[cfg(feature = "test-do-self-hosted")]
@@ -695,27 +527,7 @@ fn private_mongodb_v3_6_deploy_a_working_dev_environment() {
#[named]
#[test]
fn public_mongodb_v3_6_deploy_a_working_dev_environment() {
let secrets = FuncTestsSecrets::new();
let context = context(
secrets
.DIGITAL_OCEAN_TEST_ORGANIZATION_ID
.as_ref()
.expect("DIGITAL_OCEAN_TEST_ORGANIZATION_ID is not set"),
secrets
.DIGITAL_OCEAN_TEST_CLUSTER_ID
.as_ref()
.expect("DIGITAL_OCEAN_TEST_CLUSTER_ID is not set"),
);
let environment = working_minimal_environment(
&context,
secrets
.DEFAULT_TEST_DOMAIN
.as_ref()
.expect("DEFAULT_TEST_DOMAIN is not set in secrets")
.as_str(),
);
test_mongodb_configuration(context, environment, secrets, "3.6", function_name!(), CONTAINER, true);
test_mongodb_configuration("3.6", function_name!(), CONTAINER, true);
}
#[cfg(feature = "test-do-self-hosted")]
@@ -723,27 +535,7 @@ fn public_mongodb_v3_6_deploy_a_working_dev_environment() {
#[named]
#[test]
fn private_mongodb_v4_0_deploy_a_working_dev_environment() {
let secrets = FuncTestsSecrets::new();
let context = context(
secrets
.DIGITAL_OCEAN_TEST_ORGANIZATION_ID
.as_ref()
.expect("DIGITAL_OCEAN_TEST_ORGANIZATION_ID is not set"),
secrets
.DIGITAL_OCEAN_TEST_CLUSTER_ID
.as_ref()
.expect("DIGITAL_OCEAN_TEST_CLUSTER_ID is not set"),
);
let environment = working_minimal_environment(
&context,
secrets
.DEFAULT_TEST_DOMAIN
.as_ref()
.expect("DEFAULT_TEST_DOMAIN is not set in secrets")
.as_str(),
);
test_mongodb_configuration(context, environment, secrets, "4.0", function_name!(), CONTAINER, false);
test_mongodb_configuration("4.0", function_name!(), CONTAINER, false);
}
#[cfg(feature = "test-do-self-hosted")]
@@ -751,27 +543,7 @@ fn private_mongodb_v4_0_deploy_a_working_dev_environment() {
#[named]
#[test]
fn public_mongodb_v4_0_deploy_a_working_dev_environment() {
let secrets = FuncTestsSecrets::new();
let context = context(
secrets
.DIGITAL_OCEAN_TEST_ORGANIZATION_ID
.as_ref()
.expect("DIGITAL_OCEAN_TEST_ORGANIZATION_ID is not set"),
secrets
.DIGITAL_OCEAN_TEST_CLUSTER_ID
.as_ref()
.expect("DIGITAL_OCEAN_TEST_CLUSTER_ID is not set"),
);
let environment = working_minimal_environment(
&context,
secrets
.DEFAULT_TEST_DOMAIN
.as_ref()
.expect("DEFAULT_TEST_DOMAIN is not set in secrets")
.as_str(),
);
test_mongodb_configuration(context, environment, secrets, "4.0", function_name!(), CONTAINER, true);
test_mongodb_configuration("4.0", function_name!(), CONTAINER, true);
}
#[cfg(feature = "test-do-self-hosted")]
@@ -779,108 +551,28 @@ fn public_mongodb_v4_0_deploy_a_working_dev_environment() {
#[named]
#[test]
fn private_mongodb_v4_2_deploy_a_working_dev_environment() {
let secrets = FuncTestsSecrets::new();
let context = context(
secrets
.DIGITAL_OCEAN_TEST_ORGANIZATION_ID
.as_ref()
.expect("DIGITAL_OCEAN_TEST_ORGANIZATION_ID is not set"),
secrets
.DIGITAL_OCEAN_TEST_CLUSTER_ID
.as_ref()
.expect("DIGITAL_OCEAN_TEST_CLUSTER_ID is not set"),
);
let environment = working_minimal_environment(
&context,
secrets
.DEFAULT_TEST_DOMAIN
.as_ref()
.expect("DEFAULT_TEST_DOMAIN is not set in secrets")
.as_str(),
);
test_mongodb_configuration(context, environment, secrets, "4.2", function_name!(), CONTAINER, false);
test_mongodb_configuration("4.2", function_name!(), CONTAINER, false);
}
#[cfg(feature = "test-do-self-hosted")]
#[named]
#[test]
fn public_mongodb_v4_2_deploy_a_working_dev_environment() {
let secrets = FuncTestsSecrets::new();
let context = context(
secrets
.DIGITAL_OCEAN_TEST_ORGANIZATION_ID
.as_ref()
.expect("DIGITAL_OCEAN_TEST_ORGANIZATION_ID is not set"),
secrets
.DIGITAL_OCEAN_TEST_CLUSTER_ID
.as_ref()
.expect("DIGITAL_OCEAN_TEST_CLUSTER_ID is not set"),
);
let environment = working_minimal_environment(
&context,
secrets
.DEFAULT_TEST_DOMAIN
.as_ref()
.expect("DEFAULT_TEST_DOMAIN is not set in secrets")
.as_str(),
);
test_mongodb_configuration(context, environment, secrets, "4.2", function_name!(), CONTAINER, true);
test_mongodb_configuration("4.2", function_name!(), CONTAINER, true);
}
#[cfg(feature = "test-do-self-hosted")]
#[named]
#[test]
fn private_mongodb_v4_4_deploy_a_working_dev_environment() {
let secrets = FuncTestsSecrets::new();
let context = context(
secrets
.DIGITAL_OCEAN_TEST_ORGANIZATION_ID
.as_ref()
.expect("DIGITAL_OCEAN_TEST_ORGANIZATION_ID is not set"),
secrets
.DIGITAL_OCEAN_TEST_CLUSTER_ID
.as_ref()
.expect("DIGITAL_OCEAN_TEST_CLUSTER_ID is not set"),
);
let environment = working_minimal_environment(
&context,
secrets
.DEFAULT_TEST_DOMAIN
.as_ref()
.expect("DEFAULT_TEST_DOMAIN is not set in secrets")
.as_str(),
);
test_mongodb_configuration(context, environment, secrets, "4.4", function_name!(), CONTAINER, false);
test_mongodb_configuration("4.4", function_name!(), CONTAINER, false);
}
#[cfg(feature = "test-do-self-hosted")]
#[named]
#[test]
fn public_mongodb_v4_4_deploy_a_working_dev_environment() {
let secrets = FuncTestsSecrets::new();
let context = context(
secrets
.DIGITAL_OCEAN_TEST_ORGANIZATION_ID
.as_ref()
.expect("DIGITAL_OCEAN_TEST_ORGANIZATION_ID is not set"),
secrets
.DIGITAL_OCEAN_TEST_CLUSTER_ID
.as_ref()
.expect("DIGITAL_OCEAN_TEST_CLUSTER_ID is not set"),
);
let environment = working_minimal_environment(
&context,
secrets
.DEFAULT_TEST_DOMAIN
.as_ref()
.expect("DEFAULT_TEST_DOMAIN is not set in secrets")
.as_str(),
);
test_mongodb_configuration(context, environment, secrets, "4.4", function_name!(), CONTAINER, true);
test_mongodb_configuration("4.4", function_name!(), CONTAINER, true);
}
/**
@@ -889,15 +581,21 @@ fn public_mongodb_v4_4_deploy_a_working_dev_environment() {
**
**/
#[allow(dead_code)]
fn test_mysql_configuration(
context: Context,
environment: Environment,
secrets: FuncTestsSecrets,
version: &str,
test_name: &str,
database_mode: DatabaseMode,
is_public: bool,
) {
fn test_mysql_configuration(version: &str, test_name: &str, database_mode: DatabaseMode, is_public: bool) {
let secrets = FuncTestsSecrets::new();
let context = context(
secrets
.DIGITAL_OCEAN_TEST_ORGANIZATION_ID
.as_ref()
.expect("DIGITAL_OCEAN_TEST_ORGANIZATION_ID is not set"),
secrets
.DIGITAL_OCEAN_TEST_CLUSTER_ID
.as_ref()
.expect("DIGITAL_OCEAN_TEST_CLUSTER_ID is not set"),
);
let environment = database_test_environment(&context);
engine_run_test(|| {
test_db(
context,
@@ -919,27 +617,7 @@ fn test_mysql_configuration(
#[named]
#[test]
fn private_mysql_v5_7_deploy_a_working_dev_environment() {
let secrets = FuncTestsSecrets::new();
let context = context(
secrets
.DIGITAL_OCEAN_TEST_ORGANIZATION_ID
.as_ref()
.expect("DIGITAL_OCEAN_TEST_ORGANIZATION_ID is not set"),
secrets
.DIGITAL_OCEAN_TEST_CLUSTER_ID
.as_ref()
.expect("DIGITAL_OCEAN_TEST_CLUSTER_ID is not set"),
);
let environment = working_minimal_environment(
&context,
secrets
.DEFAULT_TEST_DOMAIN
.as_ref()
.expect("DEFAULT_TEST_DOMAIN is not set in secrets")
.as_str(),
);
test_mysql_configuration(context, environment, secrets, "5.7", function_name!(), CONTAINER, false);
test_mysql_configuration("5.7", function_name!(), CONTAINER, false);
}
#[cfg(feature = "test-do-self-hosted")]
@@ -947,27 +625,7 @@ fn private_mysql_v5_7_deploy_a_working_dev_environment() {
#[named]
#[test]
fn public_mysql_v5_7_deploy_a_working_dev_environment() {
let secrets = FuncTestsSecrets::new();
let context = context(
secrets
.DIGITAL_OCEAN_TEST_ORGANIZATION_ID
.as_ref()
.expect("DIGITAL_OCEAN_TEST_ORGANIZATION_ID is not set"),
secrets
.DIGITAL_OCEAN_TEST_CLUSTER_ID
.as_ref()
.expect("DIGITAL_OCEAN_TEST_CLUSTER_ID is not set"),
);
let environment = working_minimal_environment(
&context,
secrets
.DEFAULT_TEST_DOMAIN
.as_ref()
.expect("DEFAULT_TEST_DOMAIN is not set in secrets")
.as_str(),
);
test_mysql_configuration(context, environment, secrets, "5.7", function_name!(), CONTAINER, true);
test_mysql_configuration("5.7", function_name!(), CONTAINER, true);
}
#[cfg(feature = "test-do-self-hosted")]
@@ -975,54 +633,14 @@ fn public_mysql_v5_7_deploy_a_working_dev_environment() {
#[named]
#[test]
fn private_mysql_v8_deploy_a_working_dev_environment() {
let secrets = FuncTestsSecrets::new();
let context = context(
secrets
.DIGITAL_OCEAN_TEST_ORGANIZATION_ID
.as_ref()
.expect("DIGITAL_OCEAN_TEST_ORGANIZATION_ID is not set"),
secrets
.DIGITAL_OCEAN_TEST_CLUSTER_ID
.as_ref()
.expect("DIGITAL_OCEAN_TEST_CLUSTER_ID is not set"),
);
let environment = working_minimal_environment(
&context,
secrets
.DEFAULT_TEST_DOMAIN
.as_ref()
.expect("DEFAULT_TEST_DOMAIN is not set in secrets")
.as_str(),
);
test_mysql_configuration(context, environment, secrets, "8.0", function_name!(), CONTAINER, false);
test_mysql_configuration("8.0", function_name!(), CONTAINER, false);
}
#[cfg(feature = "test-do-self-hosted")]
#[named]
#[test]
fn public_mysql_v8_deploy_a_working_dev_environment() {
let secrets = FuncTestsSecrets::new();
let context = context(
secrets
.DIGITAL_OCEAN_TEST_ORGANIZATION_ID
.as_ref()
.expect("DIGITAL_OCEAN_TEST_ORGANIZATION_ID is not set"),
secrets
.DIGITAL_OCEAN_TEST_CLUSTER_ID
.as_ref()
.expect("DIGITAL_OCEAN_TEST_CLUSTER_ID is not set"),
);
let environment = working_minimal_environment(
&context,
secrets
.DEFAULT_TEST_DOMAIN
.as_ref()
.expect("DEFAULT_TEST_DOMAIN is not set in secrets")
.as_str(),
);
test_mysql_configuration(context, environment, secrets, "8.0", function_name!(), CONTAINER, true);
test_mysql_configuration("8.0", function_name!(), CONTAINER, true);
}
// MySQL production environment
@@ -1033,15 +651,21 @@ fn public_mysql_v8_deploy_a_working_dev_environment() {
**
**/
#[allow(dead_code)]
fn test_redis_configuration(
context: Context,
environment: Environment,
secrets: FuncTestsSecrets,
version: &str,
test_name: &str,
database_mode: DatabaseMode,
is_public: bool,
) {
fn test_redis_configuration(version: &str, test_name: &str, database_mode: DatabaseMode, is_public: bool) {
let secrets = FuncTestsSecrets::new();
let context = context(
secrets
.DIGITAL_OCEAN_TEST_ORGANIZATION_ID
.as_ref()
.expect("DIGITAL_OCEAN_TEST_ORGANIZATION_ID is not set"),
secrets
.DIGITAL_OCEAN_TEST_CLUSTER_ID
.as_ref()
.expect("DIGITAL_OCEAN_TEST_CLUSTER_ID is not set"),
);
let environment = database_test_environment(&context);
engine_run_test(|| {
test_db(
context,
@@ -1063,27 +687,7 @@ fn test_redis_configuration(
#[named]
#[test]
fn private_redis_v5_deploy_a_working_dev_environment() {
let secrets = FuncTestsSecrets::new();
let context = context(
secrets
.DIGITAL_OCEAN_TEST_ORGANIZATION_ID
.as_ref()
.expect("DIGITAL_OCEAN_TEST_ORGANIZATION_ID is not set"),
secrets
.DIGITAL_OCEAN_TEST_CLUSTER_ID
.as_ref()
.expect("DIGITAL_OCEAN_TEST_CLUSTER_ID is not set"),
);
let environment = working_minimal_environment(
&context,
secrets
.DEFAULT_TEST_DOMAIN
.as_ref()
.expect("DEFAULT_TEST_DOMAIN is not set in secrets")
.as_str(),
);
test_redis_configuration(context, environment, secrets, "5", function_name!(), CONTAINER, false);
test_redis_configuration("5", function_name!(), CONTAINER, false);
}
#[cfg(feature = "test-do-self-hosted")]
@@ -1091,27 +695,7 @@ fn private_redis_v5_deploy_a_working_dev_environment() {
#[named]
#[test]
fn public_redis_v5_deploy_a_working_dev_environment() {
let secrets = FuncTestsSecrets::new();
let context = context(
secrets
.DIGITAL_OCEAN_TEST_ORGANIZATION_ID
.as_ref()
.expect("DIGITAL_OCEAN_TEST_ORGANIZATION_ID is not set"),
secrets
.DIGITAL_OCEAN_TEST_CLUSTER_ID
.as_ref()
.expect("DIGITAL_OCEAN_TEST_CLUSTER_ID is not set"),
);
let environment = working_minimal_environment(
&context,
secrets
.DEFAULT_TEST_DOMAIN
.as_ref()
.expect("DEFAULT_TEST_DOMAIN is not set in secrets")
.as_str(),
);
test_redis_configuration(context, environment, secrets, "5", function_name!(), CONTAINER, true);
test_redis_configuration("5", function_name!(), CONTAINER, true);
}
#[cfg(feature = "test-do-self-hosted")]
@@ -1119,52 +703,12 @@ fn public_redis_v5_deploy_a_working_dev_environment() {
#[named]
#[test]
fn private_redis_v6_deploy_a_working_dev_environment() {
let secrets = FuncTestsSecrets::new();
let context = context(
secrets
.DIGITAL_OCEAN_TEST_ORGANIZATION_ID
.as_ref()
.expect("DIGITAL_OCEAN_TEST_ORGANIZATION_ID is not set"),
secrets
.DIGITAL_OCEAN_TEST_CLUSTER_ID
.as_ref()
.expect("DIGITAL_OCEAN_TEST_CLUSTER_ID is not set"),
);
let environment = working_minimal_environment(
&context,
secrets
.DEFAULT_TEST_DOMAIN
.as_ref()
.expect("DEFAULT_TEST_DOMAIN is not set in secrets")
.as_str(),
);
test_redis_configuration(context, environment, secrets, "6", function_name!(), CONTAINER, false);
test_redis_configuration("6", function_name!(), CONTAINER, false);
}
#[cfg(feature = "test-do-self-hosted")]
#[named]
#[test]
fn public_redis_v6_deploy_a_working_dev_environment() {
let secrets = FuncTestsSecrets::new();
let context = context(
secrets
.DIGITAL_OCEAN_TEST_ORGANIZATION_ID
.as_ref()
.expect("DIGITAL_OCEAN_TEST_ORGANIZATION_ID is not set"),
secrets
.DIGITAL_OCEAN_TEST_CLUSTER_ID
.as_ref()
.expect("DIGITAL_OCEAN_TEST_CLUSTER_ID is not set"),
);
let environment = working_minimal_environment(
&context,
secrets
.DEFAULT_TEST_DOMAIN
.as_ref()
.expect("DEFAULT_TEST_DOMAIN is not set in secrets")
.as_str(),
);
test_redis_configuration(context, environment, secrets, "6", function_name!(), CONTAINER, true);
test_redis_configuration("6", function_name!(), CONTAINER, true);
}

File diff suppressed because it is too large Load Diff