Fix naming

This commit is contained in:
Romain GERARD
2021-02-18 21:18:31 +01:00
parent 56688fd0c6
commit bf6ceb6e57

View File

@@ -155,7 +155,7 @@ pub fn environment_3_apps_3_routers_3_databases(context: &Context) -> Environmen
let app_name_3 = format!("{}-{}", "simple-app-3".to_string(), generate_id());
// mongoDB management part
let database_host_mongo = "mongodb-".to_string() + generate_id().as_str() + ".CHANGE-ME/DEFAULT_TEST_DOMAIN"; // External access check
let database_host_mongo = "mongodb-".to_string() + generate_id().as_str() + ".oom.sh"; // External access check
let database_port_mongo = 27017;
let database_db_name_mongo = "my-mongodb".to_string();
let database_username_mongo = "superuser".to_string();
@@ -172,17 +172,17 @@ pub fn environment_3_apps_3_routers_3_databases(context: &Context) -> Environmen
// pSQL 1 management part
let fqdn_id = "my-postgresql-".to_string() + generate_id().as_str();
let fqdn = fqdn_id.clone() + ".CHANGE-ME/DEFAULT_TEST_DOMAIN";
let fqdn = fqdn_id.clone() + ".oom.sh";
let database_port = 5432;
let database_username = "superuser".to_string();
let database_password = generate_id();
let database_name = "my-psql".to_string();
let database_name = "postgresql".to_string();
// pSQL 2 management part
let fqdn_id_2 = "my-postgresql-2".to_string() + generate_id().as_str();
let fqdn_2 = fqdn_id_2.clone() + ".CHANGE-ME/DEFAULT_TEST_DOMAIN";
let fqdn_2 = fqdn_id_2.clone() + ".oom.sh";
let database_username_2 = "superuser2".to_string();
let database_name_2 = "my-psql-2".to_string();
let database_name_2 = "postgresql2".to_string();
Environment {
execution_id: context.execution_id().to_string(),
@@ -202,7 +202,7 @@ pub fn environment_3_apps_3_routers_3_databases(context: &Context) -> Environmen
action: Action::Create,
git_credentials: Some(GitCredentials {
login: "x-access-token".to_string(),
access_token: "CHANGE-ME/GITHUB_ACCESS_TOKEN".to_string(),
access_token: "xxx".to_string(),
expired_at: Utc::now(),
}),
storage: vec![Storage {
@@ -252,7 +252,7 @@ pub fn environment_3_apps_3_routers_3_databases(context: &Context) -> Environmen
action: Action::Create,
git_credentials: Some(GitCredentials {
login: "x-access-token".to_string(),
access_token: "CHANGE-ME/GITHUB_ACCESS_TOKEN".to_string(),
access_token: "xxx".to_string(),
expired_at: Utc::now(),
}),
storage: vec![Storage {
@@ -302,7 +302,7 @@ pub fn environment_3_apps_3_routers_3_databases(context: &Context) -> Environmen
action: Action::Create,
git_credentials: Some(GitCredentials {
login: "x-access-token".to_string(),
access_token: "CHANGE-ME/GITHUB_ACCESS_TOKEN".to_string(),
access_token: "xxx".to_string(),
expired_at: Utc::now(),
}),
storage: vec![Storage {
@@ -357,7 +357,7 @@ pub fn environment_3_apps_3_routers_3_databases(context: &Context) -> Environmen
id: generate_id(),
name: "main".to_string(),
action: Action::Create,
default_domain: generate_id() + ".CHANGE-ME/DEFAULT_TEST_DOMAIN",
default_domain: generate_id() + ".oom.sh",
public_port: 443,
custom_domains: vec![],
routes: vec![Route {
@@ -369,7 +369,7 @@ pub fn environment_3_apps_3_routers_3_databases(context: &Context) -> Environmen
id: generate_id(),
name: "second-router".to_string(),
action: Action::Create,
default_domain: generate_id() + ".CHANGE-ME/DEFAULT_TEST_DOMAIN",
default_domain: generate_id() + ".oom.sh",
public_port: 443,
custom_domains: vec![],
routes: vec![Route {
@@ -381,7 +381,7 @@ pub fn environment_3_apps_3_routers_3_databases(context: &Context) -> Environmen
id: generate_id(),
name: "third-router".to_string(),
action: Action::Create,
default_domain: generate_id() + ".CHANGE-ME/DEFAULT_TEST_DOMAIN",
default_domain: generate_id() + ".oom.sh",
public_port: 443,
custom_domains: vec![],
routes: vec![Route {
@@ -468,7 +468,7 @@ pub fn working_minimal_environment(context: &Context) -> Environment {
action: Action::Create,
git_credentials: Some(GitCredentials {
login: "x-access-token".to_string(),
access_token: "CHANGE-ME/GITHUB_ACCESS_TOKEN".to_string(),
access_token: "xxx".to_string(),
expired_at: Utc::now(),
}),
storage: vec![],
@@ -485,7 +485,7 @@ pub fn working_minimal_environment(context: &Context) -> Environment {
id: generate_id(),
name: "main".to_string(),
action: Action::Create,
default_domain: generate_id() + ".CHANGE-ME/DEFAULT_TEST_DOMAIN",
default_domain: generate_id() + ".oom.sh",
public_port: 443,
custom_domains: vec![],
routes: vec![Route {
@@ -501,12 +501,12 @@ pub fn working_minimal_environment(context: &Context) -> Environment {
pub fn environnement_2_app_2_routers_1_psql(context: &Context) -> Environment {
let fqdn_id = "my-postgresql-".to_string() + generate_id().as_str();
let fqdn = fqdn_id.clone() + ".CHANGE-ME/DEFAULT_TEST_DOMAIN";
let fqdn = fqdn_id.clone() + ".oom.sh";
let database_port = 5432;
let database_username = "superuser".to_string();
let database_password = generate_id();
let database_name = "my-psql".to_string();
let database_name = "postgresql".to_string();
let suffix = generate_id();
let application_name1 = sanitize_name("postgresql", &format!("{}-{}", "postgresql-app1", &suffix));
@@ -547,7 +547,7 @@ pub fn environnement_2_app_2_routers_1_psql(context: &Context) -> Environment {
action: Action::Create,
git_credentials: Some(GitCredentials {
login: "x-access-token".to_string(),
access_token: "CHANGE-ME/GITHUB_ACCESS_TOKEN".to_string(),
access_token: "xxx".to_string(),
expired_at: Utc::now(),
}),
storage: vec![Storage {
@@ -597,7 +597,7 @@ pub fn environnement_2_app_2_routers_1_psql(context: &Context) -> Environment {
action: Action::Create,
git_credentials: Some(GitCredentials {
login: "x-access-token".to_string(),
access_token: "CHANGE-ME/GITHUB_ACCESS_TOKEN".to_string(),
access_token: "xxx".to_string(),
expired_at: Utc::now(),
}),
storage: vec![Storage {
@@ -644,7 +644,7 @@ pub fn environnement_2_app_2_routers_1_psql(context: &Context) -> Environment {
id: generate_id(),
name: "main".to_string(),
action: Action::Create,
default_domain: generate_id() + ".CHANGE-ME/DEFAULT_TEST_DOMAIN",
default_domain: generate_id() + ".oom.sh",
public_port: 443,
custom_domains: vec![],
routes: vec![Route {
@@ -656,7 +656,7 @@ pub fn environnement_2_app_2_routers_1_psql(context: &Context) -> Environment {
id: generate_id(),
name: "second-router".to_string(),
action: Action::Create,
default_domain: generate_id() + ".CHANGE-ME/DEFAULT_TEST_DOMAIN",
default_domain: generate_id() + ".oom.sh",
public_port: 443,
custom_domains: vec![],
routes: vec![Route {
@@ -710,7 +710,7 @@ pub fn echo_app_environment(context: &Context) -> Environment {
action: Action::Create,
git_credentials: Some(GitCredentials {
login: "x-access-token".to_string(),
access_token: "CHANGE-ME/GITHUB_ACCESS_TOKEN".to_string(),
access_token: "xxx".to_string(),
expired_at: Utc::now(),
}),
storage: vec![],
@@ -730,7 +730,7 @@ pub fn echo_app_environment(context: &Context) -> Environment {
id: generate_id(),
name: "main".to_string(),
action: Action::Create,
default_domain: generate_id() + ".CHANGE-ME/DEFAULT_TEST_DOMAIN",
default_domain: generate_id() + ".oom.sh",
public_port: 443,
custom_domains: vec![],
routes: vec![Route {
@@ -821,7 +821,7 @@ pub fn environment_only_http_server_router(context: &Context) -> Environment {
id: generate_id(),
name: "main".to_string(),
action: Action::Create,
default_domain: generate_id() + ".CHANGE-ME/DEFAULT_TEST_DOMAIN",
default_domain: generate_id() + ".oom.sh",
public_port: 443,
custom_domains: vec![],
routes: vec![Route {