tests: move cluster and orga IDs to vault (#512)

test_utilities/src/aws.rs

@@ -16,14 +16,12 @@ use crate::cloudflare::dns_provider_cloudflare;
 use crate::common::{Cluster, ClusterDomain};
 use crate::utilities::{build_platform_local_docker, FuncTestsSecrets};
 
-pub const AWS_QOVERY_ORGANIZATION_ID: &str = "u8nb94c7fwxzr2jt";
 pub const AWS_REGION_FOR_S3: &str = "eu-west-3";
 pub const AWS_TEST_REGION: &str = "eu-west-3";
 pub const AWS_KUBERNETES_MAJOR_VERSION: u8 = 1;
 pub const AWS_KUBERNETES_MINOR_VERSION: u8 = 18;
 pub const AWS_KUBERNETES_VERSION: &'static str =
     formatcp!("{}.{}", AWS_KUBERNETES_MAJOR_VERSION, AWS_KUBERNETES_MINOR_VERSION);
-pub const AWS_KUBE_TEST_CLUSTER_ID: &str = "zbe9e22b0";
 pub const AWS_DATABASE_INSTANCE_TYPE: &str = "db.t2.micro";
 pub const AWS_DATABASE_DISK_TYPE: &str = "gp2";
 
@@ -84,14 +82,28 @@ impl Cluster<AWS, Options> for AWS {
         Box::new(AWS::new(
             context.clone(),
             "u8nb94c7fwxzr2jt",
-            AWS_QOVERY_ORGANIZATION_ID,
+            secrets
+                .AWS_TEST_ORGANIZATION_ID
+                .as_ref()
+                .expect("AWS_TEST_ORGANIZATION_ID is not set")
+                .as_str(),
             uuid::Uuid::new_v4(),
             "QoveryTest",
-            secrets.AWS_ACCESS_KEY_ID.unwrap().as_str(),
-            secrets.AWS_SECRET_ACCESS_KEY.unwrap().as_str(),
+            secrets
+                .AWS_ACCESS_KEY_ID
+                .expect("AWS_ACCESS_KEY_ID is not set")
+                .as_str(),
+            secrets
+                .AWS_SECRET_ACCESS_KEY
+                .expect("AWS_SECRET_ACCESS_KEY is not set")
+                .as_str(),
             TerraformStateCredentials {
-                access_key_id: secrets.TERRAFORM_AWS_ACCESS_KEY_ID.unwrap(),
-                secret_access_key: secrets.TERRAFORM_AWS_SECRET_ACCESS_KEY.unwrap(),
+                access_key_id: secrets
+                    .TERRAFORM_AWS_ACCESS_KEY_ID
+                    .expect("TERRAFORM_AWS_ACCESS_KEY_ID is n ot set"),
+                secret_access_key: secrets
+                    .TERRAFORM_AWS_SECRET_ACCESS_KEY
+                    .expect("TERRAFORM_AWS_SECRET_ACCESS_KEY is not set"),
                 region: "eu-west-3".to_string(),
             },
         ))

test_utilities/src/common.rs

@@ -11,10 +11,10 @@ use qovery_engine::models::{
 };
 use qovery_engine::transaction::TransactionResult;
 
-use crate::aws::{AWS_KUBERNETES_VERSION, AWS_KUBE_TEST_CLUSTER_ID};
+use crate::aws::AWS_KUBERNETES_VERSION;
 use crate::cloudflare::dns_provider_cloudflare;
-use crate::digitalocean::{DO_KUBERNETES_VERSION, DO_KUBE_TEST_CLUSTER_ID, DO_KUBE_TEST_CLUSTER_NAME};
-use crate::scaleway::{SCW_KUBERNETES_VERSION, SCW_KUBE_TEST_CLUSTER_ID, SCW_KUBE_TEST_CLUSTER_NAME};
+use crate::digitalocean::DO_KUBERNETES_VERSION;
+use crate::scaleway::SCW_KUBERNETES_VERSION;
 use crate::utilities::{
     db_disk_type, db_infos, db_instance_type, generate_cluster_id, generate_id, generate_password, get_pvc, get_svc,
     get_svc_name, init, FuncTestsSecrets,
@@ -917,16 +917,25 @@ pub fn test_db(
     }
 
     let kube_cluster_id = match provider_kind {
-        Kind::Aws => AWS_KUBE_TEST_CLUSTER_ID,
-        Kind::Do => DO_KUBE_TEST_CLUSTER_ID,
-        Kind::Scw => SCW_KUBE_TEST_CLUSTER_ID,
+        Kind::Aws => secrets
+            .AWS_TEST_CLUSTER_ID
+            .as_ref()
+            .expect("AWS_TEST_CLUSTER_ID is not set"),
+        Kind::Do => secrets
+            .DIGITAL_OCEAN_TEST_CLUSTER_ID
+            .as_ref()
+            .expect("DIGITAL_OCEAN_TEST_CLUSTER_ID is not set"),
+        Kind::Scw => secrets
+            .SCALEWAY_TEST_CLUSTER_ID
+            .as_ref()
+            .expect("SCALEWAY_TEST_CLUSTER_ID is not set"),
     };
 
     match database_mode.clone() {
         DatabaseMode::CONTAINER => {
             match get_pvc(
                 provider_kind.clone(),
-                kube_cluster_id.clone(),
+                kube_cluster_id.as_str(),
                 environment.clone(),
                 secrets.clone(),
             ) {
@@ -939,7 +948,7 @@ pub fn test_db(
 
             match get_svc(
                 provider_kind.clone(),
-                kube_cluster_id.clone(),
+                kube_cluster_id.as_str(),
                 environment.clone(),
                 secrets.clone(),
             ) {
@@ -965,7 +974,7 @@ pub fn test_db(
         DatabaseMode::MANAGED => {
             match get_svc(
                 provider_kind.clone(),
-                kube_cluster_id.clone(),
+                kube_cluster_id.as_str(),
                 environment.clone(),
                 secrets.clone(),
             ) {
@@ -1014,48 +1023,78 @@ pub fn get_environment_test_kubernetes<'a>(
 
     match provider_kind {
         Kind::Aws => {
+            let cluster_id = secrets
+                .AWS_TEST_CLUSTER_ID
+                .as_ref()
+                .expect("AWS_KUBE_TEST_CLUSTER_ID is not set");
             k = Box::new(
                 EKS::new(
                     context.clone(),
-                    AWS_KUBE_TEST_CLUSTER_ID,
+                    cluster_id.as_str(),
                     uuid::Uuid::new_v4(),
-                    AWS_KUBE_TEST_CLUSTER_ID,
+                    format!("qovery-{}", cluster_id.as_str()).as_str(),
                     AWS_KUBERNETES_VERSION,
-                    secrets.clone().AWS_DEFAULT_REGION.unwrap().as_str(),
+                    secrets
+                        .AWS_DEFAULT_REGION
+                        .as_ref()
+                        .expect("AWS_DEFAULT_REGION is not set")
+                        .as_str(),
                     cloud_provider,
                     dns_provider,
-                    AWS::kubernetes_cluster_options(secrets, None),
+                    AWS::kubernetes_cluster_options(secrets.clone(), None),
                     AWS::kubernetes_nodes(),
                 )
                 .unwrap(),
             );
         }
         Kind::Do => {
+            let cluster_id = secrets
+                .DIGITAL_OCEAN_TEST_CLUSTER_ID
+                .as_ref()
+                .expect("DIGITAL_OCEAN_TEST_CLUSTER_ID is not set");
             k = Box::new(
                 DOKS::new(
                     context.clone(),
-                    DO_KUBE_TEST_CLUSTER_ID.to_string(),
+                    cluster_id.to_string(),
                     uuid::Uuid::new_v4(),
-                    DO_KUBE_TEST_CLUSTER_NAME.to_string(),
+                    format!("qovery-{}", cluster_id),
                     DO_KUBERNETES_VERSION.to_string(),
-                    Region::from_str(secrets.clone().DIGITAL_OCEAN_DEFAULT_REGION.unwrap().as_str()).unwrap(),
+                    Region::from_str(
+                        secrets
+                            .clone()
+                            .DIGITAL_OCEAN_DEFAULT_REGION
+                            .expect("DIGITAL_OCEAN_DEFAULT_REGION is not set")
+                            .as_str(),
+                    )
+                    .unwrap(),
                     cloud_provider,
                     dns_provider,
                     DO::kubernetes_nodes(),
-                    DO::kubernetes_cluster_options(secrets, Option::from(DO_KUBE_TEST_CLUSTER_ID.to_string())),
+                    DO::kubernetes_cluster_options(secrets.clone(), Option::from(cluster_id.to_string())),
                 )
                 .unwrap(),
             );
         }
         Kind::Scw => {
+            let cluster_id = secrets
+                .SCALEWAY_TEST_CLUSTER_ID
+                .as_ref()
+                .expect("SCALEWAY_TEST_CLUSTER_ID is not set");
             k = Box::new(
                 Kapsule::new(
                     context.clone(),
-                    SCW_KUBE_TEST_CLUSTER_ID.to_string(),
+                    cluster_id.to_string(),
                     uuid::Uuid::new_v4(),
-                    SCW_KUBE_TEST_CLUSTER_NAME.to_string(),
+                    format!("qovery-{}", cluster_id),
                     SCW_KUBERNETES_VERSION.to_string(),
-                    Zone::from_str(secrets.clone().SCALEWAY_DEFAULT_REGION.unwrap().as_str()).unwrap(),
+                    Zone::from_str(
+                        secrets
+                            .clone()
+                            .SCALEWAY_DEFAULT_REGION
+                            .expect("SCALEWAY_DEFAULT_REGION is not set")
+                            .as_str(),
+                    )
+                    .unwrap(),
                     cloud_provider,
                     dns_provider,
                     Scaleway::kubernetes_nodes(),

test_utilities/src/digitalocean.rs

@@ -16,14 +16,11 @@ use crate::utilities::{build_platform_local_docker, FuncTestsSecrets};
 use qovery_engine::cloud_provider::digitalocean::application::Region;
 use qovery_engine::cloud_provider::qovery::EngineLocation;
 
-pub const DO_QOVERY_ORGANIZATION_ID: &str = "z3bc003d2";
 pub const DO_KUBERNETES_MAJOR_VERSION: u8 = 1;
 pub const DO_KUBERNETES_MINOR_VERSION: u8 = 19;
 pub const DO_KUBERNETES_VERSION: &'static str =
     formatcp!("{}.{}", DO_KUBERNETES_MAJOR_VERSION, DO_KUBERNETES_MINOR_VERSION);
 pub const DOCR_ID: &str = "registry-the-one-and-unique";
-pub const DO_KUBE_TEST_CLUSTER_ID: &str = "za80c56a0";
-pub const DO_KUBE_TEST_CLUSTER_NAME: &str = "qovery-za80c56a0";
 pub const DO_TEST_REGION: Region = Region::Amsterdam3;
 pub const DO_MANAGED_DATABASE_INSTANCE_TYPE: &str = "";
 pub const DO_MANAGED_DATABASE_DISK_TYPE: &str = "";
@@ -62,19 +59,38 @@ impl Cluster<DO, DoksOptions> for DO {
 
     fn cloud_provider(context: &Context) -> Box<DO> {
         let secrets = FuncTestsSecrets::new();
+        let cluster_id = secrets
+            .DIGITAL_OCEAN_TEST_CLUSTER_ID
+            .expect("DIGITAL_OCEAN_TEST_CLUSTER_ID is not set");
         Box::new(DO::new(
             context.clone(),
-            DO_KUBE_TEST_CLUSTER_ID,
-            DO_QOVERY_ORGANIZATION_ID,
+            cluster_id.clone().as_str(),
+            secrets
+                .DIGITAL_OCEAN_TEST_ORGANIZATION_ID
+                .expect("DIGITAL_OCEAN_KUBE_TEST_ORGANIZATION_ID is not set")
+                .as_str(),
             uuid::Uuid::new_v4(),
-            secrets.DIGITAL_OCEAN_TOKEN.unwrap().as_str(),
-            secrets.DIGITAL_OCEAN_SPACES_ACCESS_ID.unwrap().as_str(),
-            secrets.DIGITAL_OCEAN_SPACES_SECRET_ID.unwrap().as_str(),
-            DO_KUBE_TEST_CLUSTER_NAME,
+            secrets
+                .DIGITAL_OCEAN_TOKEN
+                .expect("DIGITAL_OCEAN_TOKEN is not set")
+                .as_str(),
+            secrets
+                .DIGITAL_OCEAN_SPACES_ACCESS_ID
+                .expect("DIGITAL_OCEAN_SPACES_ACCESS_ID is not set")
+                .as_str(),
+            secrets
+                .DIGITAL_OCEAN_SPACES_SECRET_ID
+                .expect("DIGITAL_OCEAN_SPACES_SECRET_ID is not set")
+                .as_str(),
+            format!("qovery-{}", cluster_id).as_str(),
             TerraformStateCredentials {
-                access_key_id: secrets.TERRAFORM_AWS_ACCESS_KEY_ID.unwrap(),
-                secret_access_key: secrets.TERRAFORM_AWS_SECRET_ACCESS_KEY.unwrap(),
-                region: secrets.TERRAFORM_AWS_REGION.unwrap(),
+                access_key_id: secrets
+                    .TERRAFORM_AWS_ACCESS_KEY_ID
+                    .expect("TERRAFORM_AWS_ACCESS_KEY_ID is not set"),
+                secret_access_key: secrets
+                    .TERRAFORM_AWS_SECRET_ACCESS_KEY
+                    .expect("TERRAFORM_AWS_SECRET_ACCESS_KEY is not set"),
+                region: secrets.TERRAFORM_AWS_REGION.expect("TERRAFORM_AWS_REGION is not set"),
             },
         ))
     }

test_utilities/src/scaleway.rs

@@ -18,9 +18,6 @@ use qovery_engine::cloud_provider::models::NodeGroups;
 use qovery_engine::cloud_provider::qovery::EngineLocation;
 use tracing::error;
 
-pub const SCW_QOVERY_ORGANIZATION_ID: &str = "zcf8e78e6";
-pub const SCW_KUBE_TEST_CLUSTER_NAME: &str = "qovery-z093e29e2";
-pub const SCW_KUBE_TEST_CLUSTER_ID: &str = "z093e29e2";
 pub const SCW_TEST_ZONE: Zone = Zone::Paris2;
 pub const SCW_KUBERNETES_MAJOR_VERSION: u8 = 1;
 pub const SCW_KUBERNETES_MINOR_VERSION: u8 = 18;
@@ -83,12 +80,19 @@ impl Cluster<Scaleway, KapsuleOptions> for Scaleway {
 
     fn cloud_provider(context: &Context) -> Box<Scaleway> {
         let secrets = FuncTestsSecrets::new();
+        let cluster_id = secrets
+            .SCALEWAY_TEST_CLUSTER_ID
+            .expect("SCALEWAY_TEST_CLUSTER_ID is not set");
         Box::new(Scaleway::new(
             context.clone(),
-            SCW_KUBE_TEST_CLUSTER_ID,
-            SCW_QOVERY_ORGANIZATION_ID,
+            cluster_id.as_str(),
+            secrets
+                .DIGITAL_OCEAN_TEST_ORGANIZATION_ID
+                .as_ref()
+                .expect("DIGITAL_OCEAN_TEST_ORGANIZATION_ID is not set")
+                .as_str(),
             uuid::Uuid::new_v4(),
-            SCW_KUBE_TEST_CLUSTER_NAME,
+            format!("qovery-{}", cluster_id).as_str(),
             secrets
                 .SCALEWAY_ACCESS_KEY
                 .expect("SCALEWAY_ACCESS_KEY is not set in secrets")

test_utilities/src/utilities.rs

@@ -24,8 +24,8 @@ use tracing::{error, info, warn};
 use tracing_subscriber;
 
 use crate::scaleway::{
-    SCW_KUBE_TEST_CLUSTER_ID, SCW_MANAGED_DATABASE_DISK_TYPE, SCW_MANAGED_DATABASE_INSTANCE_TYPE,
-    SCW_SELF_HOSTED_DATABASE_DISK_TYPE, SCW_SELF_HOSTED_DATABASE_INSTANCE_TYPE,
+    SCW_MANAGED_DATABASE_DISK_TYPE, SCW_MANAGED_DATABASE_INSTANCE_TYPE, SCW_SELF_HOSTED_DATABASE_DISK_TYPE,
+    SCW_SELF_HOSTED_DATABASE_INSTANCE_TYPE,
 };
 use hashicorp_vault;
 use qovery_engine::build_platform::local_docker::LocalDocker;
@@ -105,6 +105,8 @@ pub struct FuncTestsSecrets {
     pub AWS_ACCESS_KEY_ID: Option<String>,
     pub AWS_DEFAULT_REGION: Option<String>,
     pub AWS_SECRET_ACCESS_KEY: Option<String>,
+    pub AWS_TEST_CLUSTER_ID: Option<String>,
+    pub AWS_TEST_ORGANIZATION_ID: Option<String>,
     pub BIN_VERSION_FILE: Option<String>,
     pub CLOUDFLARE_DOMAIN: Option<String>,
     pub CLOUDFLARE_ID: Option<String>,
@@ -115,6 +117,8 @@ pub struct FuncTestsSecrets {
     pub DIGITAL_OCEAN_SPACES_SECRET_ID: Option<String>,
     pub DIGITAL_OCEAN_DEFAULT_REGION: Option<String>,
     pub DIGITAL_OCEAN_TOKEN: Option<String>,
+    pub DIGITAL_OCEAN_TEST_CLUSTER_ID: Option<String>,
+    pub DIGITAL_OCEAN_TEST_ORGANIZATION_ID: Option<String>,
     pub DISCORD_API_URL: Option<String>,
     pub EKS_ACCESS_CIDR_BLOCKS: Option<String>,
     pub GITHUB_ACCESS_TOKEN: Option<String>,
@@ -133,6 +137,8 @@ pub struct FuncTestsSecrets {
     pub SCALEWAY_ACCESS_KEY: Option<String>,
     pub SCALEWAY_SECRET_KEY: Option<String>,
     pub SCALEWAY_DEFAULT_REGION: Option<String>,
+    pub SCALEWAY_TEST_CLUSTER_ID: Option<String>,
+    pub SCALEWAY_TEST_ORGANIZATION_ID: Option<String>,
     pub TERRAFORM_AWS_ACCESS_KEY_ID: Option<String>,
     pub TERRAFORM_AWS_SECRET_ACCESS_KEY: Option<String>,
     pub TERRAFORM_AWS_REGION: Option<String>,
@@ -183,6 +189,8 @@ impl FuncTestsSecrets {
             AWS_ACCESS_KEY_ID: None,
             AWS_DEFAULT_REGION: None,
             AWS_SECRET_ACCESS_KEY: None,
+            AWS_TEST_CLUSTER_ID: None,
+            AWS_TEST_ORGANIZATION_ID: None,
             BIN_VERSION_FILE: None,
             CLOUDFLARE_DOMAIN: None,
             CLOUDFLARE_ID: None,
@@ -193,6 +201,8 @@ impl FuncTestsSecrets {
             DIGITAL_OCEAN_SPACES_SECRET_ID: None,
             DIGITAL_OCEAN_DEFAULT_REGION: None,
             DIGITAL_OCEAN_TOKEN: None,
+            DIGITAL_OCEAN_TEST_CLUSTER_ID: None,
+            DIGITAL_OCEAN_TEST_ORGANIZATION_ID: None,
             DISCORD_API_URL: None,
             EKS_ACCESS_CIDR_BLOCKS: None,
             GITHUB_ACCESS_TOKEN: None,
@@ -211,6 +221,8 @@ impl FuncTestsSecrets {
             SCALEWAY_DEFAULT_PROJECT_ID: None,
             SCALEWAY_SECRET_KEY: None,
             SCALEWAY_DEFAULT_REGION: None,
+            SCALEWAY_TEST_CLUSTER_ID: None,
+            SCALEWAY_TEST_ORGANIZATION_ID: None,
             TERRAFORM_AWS_ACCESS_KEY_ID: None,
             TERRAFORM_AWS_SECRET_ACCESS_KEY: None,
             TERRAFORM_AWS_REGION: None,
@@ -258,6 +270,8 @@ impl FuncTestsSecrets {
             AWS_ACCESS_KEY_ID: Self::select_secret("AWS_ACCESS_KEY_ID", secrets.AWS_ACCESS_KEY_ID),
             AWS_DEFAULT_REGION: Self::select_secret("AWS_DEFAULT_REGION", secrets.AWS_DEFAULT_REGION),
             AWS_SECRET_ACCESS_KEY: Self::select_secret("AWS_SECRET_ACCESS_KEY", secrets.AWS_SECRET_ACCESS_KEY),
+            AWS_TEST_ORGANIZATION_ID: Self::select_secret("AWS_TEST_ORGANIZATION_ID", secrets.AWS_TEST_ORGANIZATION_ID),
+            AWS_TEST_CLUSTER_ID: Self::select_secret("AWS_TEST_CLUSTER_ID", secrets.AWS_TEST_CLUSTER_ID),
             BIN_VERSION_FILE: Self::select_secret("BIN_VERSION_FILE", secrets.BIN_VERSION_FILE),
             CLOUDFLARE_DOMAIN: Self::select_secret("CLOUDFLARE_DOMAIN", secrets.CLOUDFLARE_DOMAIN),
             CLOUDFLARE_ID: Self::select_secret("CLOUDFLARE_ID", secrets.CLOUDFLARE_ID),
@@ -277,6 +291,14 @@ impl FuncTestsSecrets {
                 secrets.DIGITAL_OCEAN_DEFAULT_REGION,
             ),
             DIGITAL_OCEAN_TOKEN: Self::select_secret("DIGITAL_OCEAN_TOKEN", secrets.DIGITAL_OCEAN_TOKEN),
+            DIGITAL_OCEAN_TEST_ORGANIZATION_ID: Self::select_secret(
+                "DIGITAL_OCEAN_TEST_ORGANIZATION_ID",
+                secrets.DIGITAL_OCEAN_TEST_ORGANIZATION_ID,
+            ),
+            DIGITAL_OCEAN_TEST_CLUSTER_ID: Self::select_secret(
+                "DIGITAL_OCEAN_TEST_CLUSTER_ID",
+                secrets.DIGITAL_OCEAN_TEST_CLUSTER_ID,
+            ),
             DISCORD_API_URL: Self::select_secret("DISCORD_API_URL", secrets.DISCORD_API_URL),
             EKS_ACCESS_CIDR_BLOCKS: Self::select_secret("EKS_ACCESS_CIDR_BLOCKS", secrets.EKS_ACCESS_CIDR_BLOCKS),
             GITHUB_ACCESS_TOKEN: Self::select_secret("GITHUB_ACCESS_TOKEN", secrets.GITHUB_ACCESS_TOKEN),
@@ -307,6 +329,11 @@ impl FuncTestsSecrets {
             ),
             SCALEWAY_SECRET_KEY: Self::select_secret("SCALEWAY_SECRET_KEY", secrets.SCALEWAY_SECRET_KEY),
             SCALEWAY_DEFAULT_REGION: Self::select_secret("SCALEWAY_DEFAULT_REGION", secrets.SCALEWAY_DEFAULT_REGION),
+            SCALEWAY_TEST_ORGANIZATION_ID: Self::select_secret(
+                "SCALEWAY_TEST_ORGANIZATION_ID",
+                secrets.SCALEWAY_TEST_ORGANIZATION_ID,
+            ),
+            SCALEWAY_TEST_CLUSTER_ID: Self::select_secret("SCALEWAY_TEST_CLUSTER_ID", secrets.SCALEWAY_TEST_CLUSTER_ID),
             TERRAFORM_AWS_ACCESS_KEY_ID: Self::select_secret(
                 "TERRAFORM_AWS_ACCESS_KEY_ID",
                 secrets.TERRAFORM_AWS_ACCESS_KEY_ID,
@@ -596,7 +623,13 @@ where
                 }
 
                 let clusters = clusters.clusters.unwrap();
-                let expected_test_server_tag = format!("ClusterId={}", SCW_KUBE_TEST_CLUSTER_ID);
+                let expected_test_server_tag = format!(
+                    "ClusterId={}",
+                    secrets
+                        .SCALEWAY_TEST_CLUSTER_ID
+                        .as_ref()
+                        .expect("SCALEWAY_TEST_CLUSTER_ID is not set")
+                );
 
                 for cluster in clusters.iter() {
                     if cluster.tags.is_some() {

tests/aws/aws_databases.rs

@@ -8,9 +8,7 @@ use qovery_engine::models::{
 use qovery_engine::transaction::TransactionResult;
 use tracing::{span, Level};
 
-use self::test_utilities::aws::{
-    AWS_DATABASE_DISK_TYPE, AWS_DATABASE_INSTANCE_TYPE, AWS_KUBE_TEST_CLUSTER_ID, AWS_QOVERY_ORGANIZATION_ID,
-};
+use self::test_utilities::aws::{AWS_DATABASE_DISK_TYPE, AWS_DATABASE_INSTANCE_TYPE};
 use self::test_utilities::utilities::{
     context, engine_run_test, generate_id, get_pods, get_svc_name, init, is_pod_restarted_env, FuncTestsSecrets,
 };
@@ -40,7 +38,11 @@ fn deploy_an_environment_with_3_databases_and_3_apps() {
         let secrets = FuncTestsSecrets::new();
         let environment = test_utilities::common::environment_3_apps_3_routers_3_databases(
             &context,
-            AWS_QOVERY_ORGANIZATION_ID,
+            secrets
+                .AWS_TEST_ORGANIZATION_ID
+                .as_ref()
+                .expect("AWS_TEST_ORGANIZATION_ID is not set")
+                .as_str(),
             secrets
                 .DEFAULT_TEST_DOMAIN
                 .expect("DEFAULT_TEST_DOMAIN is not set in secrets")
@@ -87,7 +89,11 @@ fn deploy_an_environment_with_db_and_pause_it() {
         let secrets = FuncTestsSecrets::new();
         let environment = test_utilities::common::environnement_2_app_2_routers_1_psql(
             &context,
-            AWS_QOVERY_ORGANIZATION_ID,
+            secrets
+                .AWS_TEST_ORGANIZATION_ID
+                .as_ref()
+                .expect("AWS_TEST_ORGANIZATION_ID is not set")
+                .as_str(),
             secrets
                 .clone()
                 .DEFAULT_TEST_DOMAIN
@@ -121,7 +127,11 @@ fn deploy_an_environment_with_db_and_pause_it() {
             Kind::Aws,
             environment.clone(),
             app_name.clone().as_str(),
-            AWS_KUBE_TEST_CLUSTER_ID,
+            secrets
+                .AWS_TEST_CLUSTER_ID
+                .as_ref()
+                .expect("AWS_TEST_CLUSTER_ID is not set")
+                .as_str(),
             secrets.clone(),
         );
         assert_eq!(ret.is_ok(), true);
@@ -159,7 +169,11 @@ fn postgresql_failover_dev_environment_with_all_options() {
 
         let environment = test_utilities::common::environnement_2_app_2_routers_1_psql(
             &context,
-            AWS_QOVERY_ORGANIZATION_ID,
+            secrets
+                .AWS_TEST_ORGANIZATION_ID
+                .as_ref()
+                .expect("AWS_TEST_ORGANIZATION_ID is not set")
+                .as_str(),
             test_domain.as_str(),
             AWS_DATABASE_INSTANCE_TYPE,
             AWS_DATABASE_DISK_TYPE,
@@ -178,7 +192,11 @@ fn postgresql_failover_dev_environment_with_all_options() {
             .collect::<Vec<qovery_engine::models::Application>>();
         let mut environment_delete = test_utilities::common::environnement_2_app_2_routers_1_psql(
             &context_for_deletion,
-            AWS_QOVERY_ORGANIZATION_ID,
+            secrets
+                .AWS_TEST_ORGANIZATION_ID
+                .as_ref()
+                .expect("AWS_TEST_ORGANIZATION_ID is not set")
+                .as_str(),
             test_domain.as_str(),
             AWS_DATABASE_INSTANCE_TYPE,
             AWS_DATABASE_DISK_TYPE,
@@ -200,7 +218,11 @@ fn postgresql_failover_dev_environment_with_all_options() {
         let database_name = format!("postgresql{}-0", &environment_check.databases[0].name);
         match is_pod_restarted_env(
             Kind::Aws,
-            AWS_KUBE_TEST_CLUSTER_ID,
+            secrets
+                .AWS_TEST_CLUSTER_ID
+                .as_ref()
+                .expect("AWS_TEST_CLUSTER_ID is not set")
+                .as_str(),
             environment_check.clone(),
             database_name.as_str(),
             secrets.clone(),
@@ -216,10 +238,14 @@ fn postgresql_failover_dev_environment_with_all_options() {
         // TO CHECK: DATABASE SHOULDN'T BE RESTARTED AFTER A REDEPLOY EVEN IF FAIL
         match is_pod_restarted_env(
             Kind::Aws,
-            AWS_KUBE_TEST_CLUSTER_ID,
+            secrets
+                .AWS_TEST_CLUSTER_ID
+                .as_ref()
+                .expect("AWS_TEST_CLUSTER_ID is not set")
+                .as_str(),
             environment_check.clone(),
             database_name.as_str(),
-            secrets,
+            secrets.clone(),
         ) {
             (true, _) => assert!(true),
             (false, _) => assert!(false),
@@ -257,7 +283,11 @@ fn postgresql_deploy_a_working_development_environment_with_all_options() {
 
         let environment = test_utilities::common::environnement_2_app_2_routers_1_psql(
             &context,
-            AWS_QOVERY_ORGANIZATION_ID,
+            secrets
+                .AWS_TEST_ORGANIZATION_ID
+                .as_ref()
+                .expect("AWS_TEST_ORGANIZATION_ID is not set")
+                .as_str(),
             test_domain.as_str(),
             AWS_DATABASE_INSTANCE_TYPE,
             AWS_DATABASE_DISK_TYPE,
@@ -266,7 +296,11 @@ fn postgresql_deploy_a_working_development_environment_with_all_options() {
         //let env_to_check = environment.clone();
         let mut environment_delete = test_utilities::common::environnement_2_app_2_routers_1_psql(
             &context_for_deletion,
-            AWS_QOVERY_ORGANIZATION_ID,
+            secrets
+                .AWS_TEST_ORGANIZATION_ID
+                .as_ref()
+                .expect("AWS_TEST_ORGANIZATION_ID is not set")
+                .as_str(),
             test_domain.as_str(),
             AWS_DATABASE_INSTANCE_TYPE,
             AWS_DATABASE_DISK_TYPE,
@@ -319,7 +353,11 @@ fn postgresql_deploy_a_working_environment_and_redeploy() {
 
         let mut environment = test_utilities::common::working_minimal_environment(
             &context,
-            AWS_QOVERY_ORGANIZATION_ID,
+            secrets
+                .AWS_TEST_ORGANIZATION_ID
+                .as_ref()
+                .expect("AWS_TEST_ORGANIZATION_ID is not set")
+                .as_str(),
             secrets
                 .clone()
                 .DEFAULT_TEST_DOMAIN
@@ -396,10 +434,14 @@ fn postgresql_deploy_a_working_environment_and_redeploy() {
         let database_name = format!("postgresql{}-0", &environment_check.databases[0].name);
         match is_pod_restarted_env(
             Kind::Aws,
-            AWS_KUBE_TEST_CLUSTER_ID,
+            secrets
+                .AWS_TEST_CLUSTER_ID
+                .as_ref()
+                .expect("AWS_TEST_CLUSTER_ID is not set")
+                .as_str(),
             environment_check,
             database_name.as_str(),
-            secrets,
+            secrets.clone(),
         ) {
             (true, _) => assert!(true),
             (false, _) => assert!(false),
@@ -454,7 +496,11 @@ fn private_postgresql_v10_deploy_a_working_dev_environment() {
     let secrets = FuncTestsSecrets::new();
     let environment = test_utilities::common::working_minimal_environment(
         &context,
-        AWS_QOVERY_ORGANIZATION_ID,
+        secrets
+            .AWS_TEST_ORGANIZATION_ID
+            .as_ref()
+            .expect("AWS_TEST_ORGANIZATION_ID is not set")
+            .as_str(),
         secrets
             .DEFAULT_TEST_DOMAIN
             .as_ref()
@@ -472,7 +518,11 @@ fn public_postgresql_v10_deploy_a_working_dev_environment() {
     let secrets = FuncTestsSecrets::new();
     let environment = test_utilities::common::working_minimal_environment(
         &context,
-        AWS_QOVERY_ORGANIZATION_ID,
+        secrets
+            .AWS_TEST_ORGANIZATION_ID
+            .as_ref()
+            .expect("AWS_TEST_ORGANIZATION_ID is not set")
+            .as_str(),
         secrets
             .DEFAULT_TEST_DOMAIN
             .as_ref()
@@ -490,7 +540,11 @@ fn private_postgresql_v11_deploy_a_working_dev_environment() {
     let secrets = FuncTestsSecrets::new();
     let environment = test_utilities::common::working_minimal_environment(
         &context,
-        AWS_QOVERY_ORGANIZATION_ID,
+        secrets
+            .AWS_TEST_ORGANIZATION_ID
+            .as_ref()
+            .expect("AWS_TEST_ORGANIZATION_ID is not set")
+            .as_str(),
         secrets
             .clone()
             .DEFAULT_TEST_DOMAIN
@@ -509,7 +563,11 @@ fn public_postgresql_v11_deploy_a_working_dev_environment() {
     let secrets = FuncTestsSecrets::new();
     let environment = test_utilities::common::working_minimal_environment(
         &context,
-        AWS_QOVERY_ORGANIZATION_ID,
+        secrets
+            .AWS_TEST_ORGANIZATION_ID
+            .as_ref()
+            .expect("AWS_TEST_ORGANIZATION_ID is not set")
+            .as_str(),
         secrets
             .clone()
             .DEFAULT_TEST_DOMAIN
@@ -528,7 +586,11 @@ fn private_postgresql_v12_deploy_a_working_dev_environment() {
     let secrets = FuncTestsSecrets::new();
     let environment = test_utilities::common::working_minimal_environment(
         &context,
-        AWS_QOVERY_ORGANIZATION_ID,
+        secrets
+            .AWS_TEST_ORGANIZATION_ID
+            .as_ref()
+            .expect("AWS_TEST_ORGANIZATION_ID is not set")
+            .as_str(),
         secrets
             .DEFAULT_TEST_DOMAIN
             .as_ref()
@@ -546,7 +608,11 @@ fn public_postgresql_v12_deploy_a_working_dev_environment() {
     let secrets = FuncTestsSecrets::new();
     let environment = test_utilities::common::working_minimal_environment(
         &context,
-        AWS_QOVERY_ORGANIZATION_ID,
+        secrets
+            .AWS_TEST_ORGANIZATION_ID
+            .as_ref()
+            .expect("AWS_TEST_ORGANIZATION_ID is not set")
+            .as_str(),
         secrets
             .DEFAULT_TEST_DOMAIN
             .as_ref()
@@ -565,7 +631,11 @@ fn private_postgresql_v10_deploy_a_working_prod_environment() {
     let secrets = FuncTestsSecrets::new();
     let environment = test_utilities::common::working_minimal_environment(
         &context,
-        AWS_QOVERY_ORGANIZATION_ID,
+        secrets
+            .AWS_TEST_ORGANIZATION_ID
+            .as_ref()
+            .expect("AWS_TEST_ORGANIZATION_ID is not set")
+            .as_str(),
         secrets
             .DEFAULT_TEST_DOMAIN
             .as_ref()
@@ -583,7 +653,11 @@ fn public_postgresql_v10_deploy_a_working_prod_environment() {
     let secrets = FuncTestsSecrets::new();
     let environment = test_utilities::common::working_minimal_environment(
         &context,
-        AWS_QOVERY_ORGANIZATION_ID,
+        secrets
+            .AWS_TEST_ORGANIZATION_ID
+            .as_ref()
+            .expect("AWS_TEST_ORGANIZATION_ID is not set")
+            .as_str(),
         secrets
             .DEFAULT_TEST_DOMAIN
             .as_ref()
@@ -601,7 +675,11 @@ fn private_postgresql_v11_deploy_a_working_prod_environment() {
     let secrets = FuncTestsSecrets::new();
     let environment = test_utilities::common::working_minimal_environment(
         &context,
-        AWS_QOVERY_ORGANIZATION_ID,
+        secrets
+            .AWS_TEST_ORGANIZATION_ID
+            .as_ref()
+            .expect("AWS_TEST_ORGANIZATION_ID is not set")
+            .as_str(),
         secrets
             .DEFAULT_TEST_DOMAIN
             .as_ref()
@@ -619,7 +697,11 @@ fn public_postgresql_v11_deploy_a_working_prod_environment() {
     let secrets = FuncTestsSecrets::new();
     let environment = test_utilities::common::working_minimal_environment(
         &context,
-        AWS_QOVERY_ORGANIZATION_ID,
+        secrets
+            .AWS_TEST_ORGANIZATION_ID
+            .as_ref()
+            .expect("AWS_TEST_ORGANIZATION_ID is not set")
+            .as_str(),
         secrets
             .DEFAULT_TEST_DOMAIN
             .as_ref()
@@ -637,7 +719,11 @@ fn private_postgresql_v12_deploy_a_working_prod_environment() {
     let secrets = FuncTestsSecrets::new();
     let environment = test_utilities::common::working_minimal_environment(
         &context,
-        AWS_QOVERY_ORGANIZATION_ID,
+        secrets
+            .AWS_TEST_ORGANIZATION_ID
+            .as_ref()
+            .expect("AWS_TEST_ORGANIZATION_ID is not set")
+            .as_str(),
         secrets
             .DEFAULT_TEST_DOMAIN
             .as_ref()
@@ -655,7 +741,11 @@ fn public_postgresql_v12_deploy_a_working_prod_environment() {
     let secrets = FuncTestsSecrets::new();
     let environment = test_utilities::common::working_minimal_environment(
         &context,
-        AWS_QOVERY_ORGANIZATION_ID,
+        secrets
+            .AWS_TEST_ORGANIZATION_ID
+            .as_ref()
+            .expect("AWS_TEST_ORGANIZATION_ID is not set")
+            .as_str(),
         secrets
             .DEFAULT_TEST_DOMAIN
             .as_ref()
@@ -704,7 +794,11 @@ fn private_mongodb_v3_6_deploy_a_working_dev_environment() {
     let secrets = FuncTestsSecrets::new();
     let environment = test_utilities::common::working_minimal_environment(
         &context,
-        AWS_QOVERY_ORGANIZATION_ID,
+        secrets
+            .AWS_TEST_ORGANIZATION_ID
+            .as_ref()
+            .expect("AWS_TEST_ORGANIZATION_ID is not set")
+            .as_str(),
         secrets
             .DEFAULT_TEST_DOMAIN
             .as_ref()
@@ -722,7 +816,11 @@ fn public_mongodb_v3_6_deploy_a_working_dev_environment() {
     let secrets = FuncTestsSecrets::new();
     let environment = test_utilities::common::working_minimal_environment(
         &context,
-        AWS_QOVERY_ORGANIZATION_ID,
+        secrets
+            .AWS_TEST_ORGANIZATION_ID
+            .as_ref()
+            .expect("AWS_TEST_ORGANIZATION_ID is not set")
+            .as_str(),
         secrets
             .DEFAULT_TEST_DOMAIN
             .as_ref()
@@ -740,7 +838,11 @@ fn private_mongodb_v4_0_deploy_a_working_dev_environment() {
     let secrets = FuncTestsSecrets::new();
     let environment = test_utilities::common::working_minimal_environment(
         &context,
-        AWS_QOVERY_ORGANIZATION_ID,
+        secrets
+            .AWS_TEST_ORGANIZATION_ID
+            .as_ref()
+            .expect("AWS_TEST_ORGANIZATION_ID is not set")
+            .as_str(),
         secrets
             .DEFAULT_TEST_DOMAIN
             .as_ref()
@@ -758,7 +860,11 @@ fn public_mongodb_v4_0_deploy_a_working_dev_environment() {
     let secrets = FuncTestsSecrets::new();
     let environment = test_utilities::common::working_minimal_environment(
         &context,
-        AWS_QOVERY_ORGANIZATION_ID,
+        secrets
+            .AWS_TEST_ORGANIZATION_ID
+            .as_ref()
+            .expect("AWS_TEST_ORGANIZATION_ID is not set")
+            .as_str(),
         secrets
             .DEFAULT_TEST_DOMAIN
             .as_ref()
@@ -776,7 +882,11 @@ fn private_mongodb_v4_2_deploy_a_working_dev_environment() {
     let secrets = FuncTestsSecrets::new();
     let environment = test_utilities::common::working_minimal_environment(
         &context,
-        AWS_QOVERY_ORGANIZATION_ID,
+        secrets
+            .AWS_TEST_ORGANIZATION_ID
+            .as_ref()
+            .expect("AWS_TEST_ORGANIZATION_ID is not set")
+            .as_str(),
         secrets
             .DEFAULT_TEST_DOMAIN
             .as_ref()
@@ -794,7 +904,11 @@ fn public_mongodb_v4_2_deploy_a_working_dev_environment() {
     let secrets = FuncTestsSecrets::new();
     let environment = test_utilities::common::working_minimal_environment(
         &context,
-        AWS_QOVERY_ORGANIZATION_ID,
+        secrets
+            .AWS_TEST_ORGANIZATION_ID
+            .as_ref()
+            .expect("AWS_TEST_ORGANIZATION_ID is not set")
+            .as_str(),
         secrets
             .DEFAULT_TEST_DOMAIN
             .as_ref()
@@ -812,7 +926,11 @@ fn private_mongodb_v4_4_deploy_a_working_dev_environment() {
     let secrets = FuncTestsSecrets::new();
     let environment = test_utilities::common::working_minimal_environment(
         &context,
-        AWS_QOVERY_ORGANIZATION_ID,
+        secrets
+            .AWS_TEST_ORGANIZATION_ID
+            .as_ref()
+            .expect("AWS_TEST_ORGANIZATION_ID is not set")
+            .as_str(),
         secrets
             .DEFAULT_TEST_DOMAIN
             .as_ref()
@@ -830,7 +948,11 @@ fn public_mongodb_v4_4_deploy_a_working_dev_environment() {
     let secrets = FuncTestsSecrets::new();
     let environment = test_utilities::common::working_minimal_environment(
         &context,
-        AWS_QOVERY_ORGANIZATION_ID,
+        secrets
+            .AWS_TEST_ORGANIZATION_ID
+            .as_ref()
+            .expect("AWS_TEST_ORGANIZATION_ID is not set")
+            .as_str(),
         secrets
             .DEFAULT_TEST_DOMAIN
             .as_ref()
@@ -849,7 +971,11 @@ fn private_mongodb_v3_6_deploy_a_working_prod_environment() {
     let secrets = FuncTestsSecrets::new();
     let environment = test_utilities::common::working_minimal_environment(
         &context,
-        AWS_QOVERY_ORGANIZATION_ID,
+        secrets
+            .AWS_TEST_ORGANIZATION_ID
+            .as_ref()
+            .expect("AWS_TEST_ORGANIZATION_ID is not set")
+            .as_str(),
         secrets
             .DEFAULT_TEST_DOMAIN
             .as_ref()
@@ -867,7 +993,11 @@ fn public_mongodb_v3_6_deploy_a_working_prod_environment() {
     let secrets = FuncTestsSecrets::new();
     let environment = test_utilities::common::working_minimal_environment(
         &context,
-        AWS_QOVERY_ORGANIZATION_ID,
+        secrets
+            .AWS_TEST_ORGANIZATION_ID
+            .as_ref()
+            .expect("AWS_TEST_ORGANIZATION_ID is not set")
+            .as_str(),
         secrets
             .DEFAULT_TEST_DOMAIN
             .as_ref()
@@ -885,7 +1015,11 @@ fn private_mongodb_v4_0_deploy_a_working_prod_environment() {
     let secrets = FuncTestsSecrets::new();
     let environment = test_utilities::common::working_minimal_environment(
         &context,
-        AWS_QOVERY_ORGANIZATION_ID,
+        secrets
+            .AWS_TEST_ORGANIZATION_ID
+            .as_ref()
+            .expect("AWS_TEST_ORGANIZATION_ID is not set")
+            .as_str(),
         secrets
             .DEFAULT_TEST_DOMAIN
             .as_ref()
@@ -903,7 +1037,11 @@ fn public_mongodb_v4_0_deploy_a_working_prod_environment() {
     let secrets = FuncTestsSecrets::new();
     let environment = test_utilities::common::working_minimal_environment(
         &context,
-        AWS_QOVERY_ORGANIZATION_ID,
+        secrets
+            .AWS_TEST_ORGANIZATION_ID
+            .as_ref()
+            .expect("AWS_TEST_ORGANIZATION_ID is not set")
+            .as_str(),
         secrets
             .DEFAULT_TEST_DOMAIN
             .as_ref()
@@ -952,7 +1090,11 @@ fn private_mysql_v5_7_deploy_a_working_dev_environment() {
     let secrets = FuncTestsSecrets::new();
     let environment = test_utilities::common::working_minimal_environment(
         &context,
-        AWS_QOVERY_ORGANIZATION_ID,
+        secrets
+            .AWS_TEST_ORGANIZATION_ID
+            .as_ref()
+            .expect("AWS_TEST_ORGANIZATION_ID is not set")
+            .as_str(),
         secrets
             .DEFAULT_TEST_DOMAIN
             .as_ref()
@@ -970,7 +1112,11 @@ fn public_mysql_v5_7_deploy_a_working_dev_environment() {
     let secrets = FuncTestsSecrets::new();
     let environment = test_utilities::common::working_minimal_environment(
         &context,
-        AWS_QOVERY_ORGANIZATION_ID,
+        secrets
+            .AWS_TEST_ORGANIZATION_ID
+            .as_ref()
+            .expect("AWS_TEST_ORGANIZATION_ID is not set")
+            .as_str(),
         secrets
             .DEFAULT_TEST_DOMAIN
             .as_ref()
@@ -988,7 +1134,11 @@ fn private_mysql_v8_deploy_a_working_dev_environment() {
     let secrets = FuncTestsSecrets::new();
     let environment = test_utilities::common::working_minimal_environment(
         &context,
-        AWS_QOVERY_ORGANIZATION_ID,
+        secrets
+            .AWS_TEST_ORGANIZATION_ID
+            .as_ref()
+            .expect("AWS_TEST_ORGANIZATION_ID is not set")
+            .as_str(),
         secrets
             .DEFAULT_TEST_DOMAIN
             .as_ref()
@@ -1006,7 +1156,11 @@ fn public_mysql_v8_deploy_a_working_dev_environment() {
     let secrets = FuncTestsSecrets::new();
     let environment = test_utilities::common::working_minimal_environment(
         &context,
-        AWS_QOVERY_ORGANIZATION_ID,
+        secrets
+            .AWS_TEST_ORGANIZATION_ID
+            .as_ref()
+            .expect("AWS_TEST_ORGANIZATION_ID is not set")
+            .as_str(),
         secrets
             .DEFAULT_TEST_DOMAIN
             .as_ref()
@@ -1025,7 +1179,11 @@ fn private_mysql_v5_7_deploy_a_working_prod_environment() {
     let secrets = FuncTestsSecrets::new();
     let environment = test_utilities::common::working_minimal_environment(
         &context,
-        AWS_QOVERY_ORGANIZATION_ID,
+        secrets
+            .AWS_TEST_ORGANIZATION_ID
+            .as_ref()
+            .expect("AWS_TEST_ORGANIZATION_ID is not set")
+            .as_str(),
         secrets
             .DEFAULT_TEST_DOMAIN
             .as_ref()
@@ -1043,7 +1201,11 @@ fn public_mysql_v5_7_deploy_a_working_prod_environment() {
     let secrets = FuncTestsSecrets::new();
     let environment = test_utilities::common::working_minimal_environment(
         &context,
-        AWS_QOVERY_ORGANIZATION_ID,
+        secrets
+            .AWS_TEST_ORGANIZATION_ID
+            .as_ref()
+            .expect("AWS_TEST_ORGANIZATION_ID is not set")
+            .as_str(),
         secrets
             .DEFAULT_TEST_DOMAIN
             .as_ref()
@@ -1061,7 +1223,11 @@ fn private_mysql_v8_0_deploy_a_working_prod_environment() {
     let secrets = FuncTestsSecrets::new();
     let environment = test_utilities::common::working_minimal_environment(
         &context,
-        AWS_QOVERY_ORGANIZATION_ID,
+        secrets
+            .AWS_TEST_ORGANIZATION_ID
+            .as_ref()
+            .expect("AWS_TEST_ORGANIZATION_ID is not set")
+            .as_str(),
         secrets
             .DEFAULT_TEST_DOMAIN
             .as_ref()
@@ -1079,7 +1245,11 @@ fn public_mysql_v8_0_deploy_a_working_prod_environment() {
     let secrets = FuncTestsSecrets::new();
     let environment = test_utilities::common::working_minimal_environment(
         &context,
-        AWS_QOVERY_ORGANIZATION_ID,
+        secrets
+            .AWS_TEST_ORGANIZATION_ID
+            .as_ref()
+            .expect("AWS_TEST_ORGANIZATION_ID is not set")
+            .as_str(),
         secrets
             .DEFAULT_TEST_DOMAIN
             .as_ref()
@@ -1128,7 +1298,11 @@ fn private_redis_v5_deploy_a_working_dev_environment() {
     let secrets = FuncTestsSecrets::new();
     let environment = test_utilities::common::working_minimal_environment(
         &context,
-        AWS_QOVERY_ORGANIZATION_ID,
+        secrets
+            .AWS_TEST_ORGANIZATION_ID
+            .as_ref()
+            .expect("AWS_TEST_ORGANIZATION_ID is not set")
+            .as_str(),
         secrets
             .DEFAULT_TEST_DOMAIN
             .as_ref()
@@ -1146,7 +1320,11 @@ fn public_redis_v5_deploy_a_working_dev_environment() {
     let secrets = FuncTestsSecrets::new();
     let environment = test_utilities::common::working_minimal_environment(
         &context,
-        AWS_QOVERY_ORGANIZATION_ID,
+        secrets
+            .AWS_TEST_ORGANIZATION_ID
+            .as_ref()
+            .expect("AWS_TEST_ORGANIZATION_ID is not set")
+            .as_str(),
         secrets
             .DEFAULT_TEST_DOMAIN
             .as_ref()
@@ -1164,7 +1342,11 @@ fn private_redis_v6_deploy_a_working_dev_environment() {
     let secrets = FuncTestsSecrets::new();
     let environment = test_utilities::common::working_minimal_environment(
         &context,
-        AWS_QOVERY_ORGANIZATION_ID,
+        secrets
+            .AWS_TEST_ORGANIZATION_ID
+            .as_ref()
+            .expect("AWS_TEST_ORGANIZATION_ID is not set")
+            .as_str(),
         secrets
             .DEFAULT_TEST_DOMAIN
             .as_ref()
@@ -1182,7 +1364,11 @@ fn public_redis_v6_deploy_a_working_dev_environment() {
     let secrets = FuncTestsSecrets::new();
     let environment = test_utilities::common::working_minimal_environment(
         &context,
-        AWS_QOVERY_ORGANIZATION_ID,
+        secrets
+            .AWS_TEST_ORGANIZATION_ID
+            .as_ref()
+            .expect("AWS_TEST_ORGANIZATION_ID is not set")
+            .as_str(),
         secrets
             .DEFAULT_TEST_DOMAIN
             .as_ref()
@@ -1201,7 +1387,11 @@ fn private_redis_v5_deploy_a_working_prod_environment() {
     let secrets = FuncTestsSecrets::new();
     let environment = test_utilities::common::working_minimal_environment(
         &context,
-        AWS_QOVERY_ORGANIZATION_ID,
+        secrets
+            .AWS_TEST_ORGANIZATION_ID
+            .as_ref()
+            .expect("AWS_TEST_ORGANIZATION_ID is not set")
+            .as_str(),
         secrets
             .DEFAULT_TEST_DOMAIN
             .as_ref()
@@ -1219,7 +1409,11 @@ fn public_redis_v5_deploy_a_working_prod_environment() {
     let secrets = FuncTestsSecrets::new();
     let environment = test_utilities::common::working_minimal_environment(
         &context,
-        AWS_QOVERY_ORGANIZATION_ID,
+        secrets
+            .AWS_TEST_ORGANIZATION_ID
+            .as_ref()
+            .expect("AWS_TEST_ORGANIZATION_ID is not set")
+            .as_str(),
         secrets
             .DEFAULT_TEST_DOMAIN
             .as_ref()
@@ -1237,7 +1431,11 @@ fn private_redis_v6_deploy_a_working_prod_environment() {
     let secrets = FuncTestsSecrets::new();
     let environment = test_utilities::common::working_minimal_environment(
         &context,
-        AWS_QOVERY_ORGANIZATION_ID,
+        secrets
+            .AWS_TEST_ORGANIZATION_ID
+            .as_ref()
+            .expect("AWS_TEST_ORGANIZATION_ID is not set")
+            .as_str(),
         secrets
             .DEFAULT_TEST_DOMAIN
             .as_ref()
@@ -1255,7 +1453,11 @@ fn public_redis_v6_deploy_a_working_prod_environment() {
     let secrets = FuncTestsSecrets::new();
     let environment = test_utilities::common::working_minimal_environment(
         &context,
-        AWS_QOVERY_ORGANIZATION_ID,
+        secrets
+            .AWS_TEST_ORGANIZATION_ID
+            .as_ref()
+            .expect("AWS_TEST_ORGANIZATION_ID is not set")
+            .as_str(),
         secrets
             .DEFAULT_TEST_DOMAIN
             .as_ref()

tests/aws/aws_environment.rs

@@ -1,6 +1,5 @@
 extern crate test_utilities;
 
-use self::test_utilities::aws::{AWS_KUBE_TEST_CLUSTER_ID, AWS_QOVERY_ORGANIZATION_ID};
 use self::test_utilities::common::Infrastructure;
 use self::test_utilities::utilities::{
     engine_run_test, generate_id, get_pods, get_pvc, is_pod_restarted_env, FuncTestsSecrets,
@@ -32,7 +31,11 @@ fn deploy_a_working_environment_with_no_router_on_aws_eks() {
         let secrets = FuncTestsSecrets::new();
         let mut environment = test_utilities::common::working_minimal_environment(
             &context,
-            AWS_QOVERY_ORGANIZATION_ID,
+            secrets
+                .AWS_TEST_ORGANIZATION_ID
+                .as_ref()
+                .expect("AWS_TEST_ORGANIZATION_ID is not set")
+                .as_str(),
             secrets
                 .DEFAULT_TEST_DOMAIN
                 .expect("DEFAULT_TEST_DOMAIN is not set in secrets")
@@ -78,7 +81,11 @@ fn deploy_a_working_environment_and_pause_it_eks() {
         let secrets = FuncTestsSecrets::new();
         let environment = test_utilities::common::working_minimal_environment(
             &context,
-            AWS_QOVERY_ORGANIZATION_ID,
+            secrets
+                .AWS_TEST_ORGANIZATION_ID
+                .as_ref()
+                .expect("AWS_TEST_ORGANIZATION_ID is not set")
+                .as_str(),
             secrets
                 .DEFAULT_TEST_DOMAIN
                 .as_ref()
@@ -99,7 +106,11 @@ fn deploy_a_working_environment_and_pause_it_eks() {
             Kind::Aws,
             environment.clone(),
             selector.as_str(),
-            AWS_KUBE_TEST_CLUSTER_ID,
+            secrets
+                .AWS_TEST_CLUSTER_ID
+                .as_ref()
+                .expect("AWS_TEST_CLUSTER_ID is not set")
+                .as_str(),
             secrets.clone(),
         );
         assert_eq!(ret.is_ok(), true);
@@ -116,7 +127,11 @@ fn deploy_a_working_environment_and_pause_it_eks() {
             Kind::Aws,
             environment.clone(),
             selector.as_str(),
-            AWS_KUBE_TEST_CLUSTER_ID,
+            secrets
+                .AWS_TEST_CLUSTER_ID
+                .as_ref()
+                .expect("AWS_TEST_CLUSTER_ID is not set")
+                .as_str(),
             secrets.clone(),
         );
         assert_eq!(ret.is_ok(), true);
@@ -134,7 +149,11 @@ fn deploy_a_working_environment_and_pause_it_eks() {
             Kind::Aws,
             environment.clone(),
             selector.as_str(),
-            AWS_KUBE_TEST_CLUSTER_ID,
+            secrets
+                .AWS_TEST_CLUSTER_ID
+                .as_ref()
+                .expect("AWS_TEST_CLUSTER_ID is not set")
+                .as_str(),
             secrets.clone(),
         );
         assert_eq!(ret.is_ok(), true);
@@ -166,7 +185,11 @@ fn deploy_a_not_working_environment_with_no_router_on_aws_eks() {
 
         let mut environment = test_utilities::common::non_working_environment(
             &context,
-            AWS_QOVERY_ORGANIZATION_ID,
+            secrets
+                .AWS_TEST_ORGANIZATION_ID
+                .as_ref()
+                .expect("AWS_TEST_ORGANIZATION_ID is not set")
+                .as_str(),
             secrets
                 .DEFAULT_TEST_DOMAIN
                 .expect("DEFAULT_TEST_DOMAIN is not set in secrets")
@@ -212,7 +235,11 @@ fn build_with_buildpacks_and_deploy_a_working_environment() {
         let secrets = FuncTestsSecrets::new();
         let mut environment = test_utilities::common::working_minimal_environment(
             &context,
-            AWS_QOVERY_ORGANIZATION_ID,
+            secrets
+                .AWS_TEST_ORGANIZATION_ID
+                .as_ref()
+                .expect("AWS_TEST_ORGANIZATION_ID is not set")
+                .as_str(),
             secrets
                 .DEFAULT_TEST_DOMAIN
                 .expect("DEFAULT_TEST_DOMAIN is not set in secrets")
@@ -268,7 +295,11 @@ fn build_worker_with_buildpacks_and_deploy_a_working_environment() {
         let secrets = FuncTestsSecrets::new();
         let mut environment = test_utilities::common::working_minimal_environment(
             &context,
-            AWS_QOVERY_ORGANIZATION_ID,
+            secrets
+                .AWS_TEST_ORGANIZATION_ID
+                .as_ref()
+                .expect("AWS_TEST_ORGANIZATION_ID is not set")
+                .as_str(),
             secrets
                 .DEFAULT_TEST_DOMAIN
                 .expect("DEFAULT_TEST_DOMAIN is not set in secrets")
@@ -324,7 +355,11 @@ fn deploy_a_working_environment_with_domain() {
         let secrets = FuncTestsSecrets::new();
         let environment = test_utilities::common::working_minimal_environment(
             &context,
-            AWS_QOVERY_ORGANIZATION_ID,
+            secrets
+                .AWS_TEST_ORGANIZATION_ID
+                .as_ref()
+                .expect("AWS_TEST_ORGANIZATION_ID is not set")
+                .as_str(),
             secrets
                 .DEFAULT_TEST_DOMAIN
                 .expect("DEFAULT_TEST_DOMAIN is not set in secrets")
@@ -370,7 +405,11 @@ fn deploy_a_working_environment_with_storage_on_aws_eks() {
 
         let mut environment = test_utilities::common::working_minimal_environment(
             &context,
-            AWS_QOVERY_ORGANIZATION_ID,
+            secrets
+                .AWS_TEST_ORGANIZATION_ID
+                .as_ref()
+                .expect("AWS_TEST_ORGANIZATION_ID is not set")
+                .as_str(),
             secrets
                 .DEFAULT_TEST_DOMAIN
                 .as_ref()
@@ -409,7 +448,11 @@ fn deploy_a_working_environment_with_storage_on_aws_eks() {
 
         match get_pvc(
             Kind::Aws,
-            AWS_KUBE_TEST_CLUSTER_ID,
+            secrets
+                .AWS_TEST_CLUSTER_ID
+                .as_ref()
+                .expect("AWS_TEST_CLUSTER_ID is not set")
+                .as_str(),
             environment.clone(),
             secrets.clone(),
         ) {
@@ -449,7 +492,11 @@ fn redeploy_same_app_with_ebs() {
 
         let mut environment = test_utilities::common::working_minimal_environment(
             &context,
-            AWS_QOVERY_ORGANIZATION_ID,
+            secrets
+                .AWS_TEST_ORGANIZATION_ID
+                .as_ref()
+                .expect("AWS_TEST_ORGANIZATION_ID is not set")
+                .as_str(),
             secrets
                 .DEFAULT_TEST_DOMAIN
                 .as_ref()
@@ -491,7 +538,11 @@ fn redeploy_same_app_with_ebs() {
 
         match get_pvc(
             Kind::Aws,
-            AWS_KUBE_TEST_CLUSTER_ID,
+            secrets
+                .AWS_TEST_CLUSTER_ID
+                .as_ref()
+                .expect("AWS_TEST_CLUSTER_ID is not set")
+                .as_str(),
             environment.clone(),
             secrets.clone(),
         ) {
@@ -505,7 +556,11 @@ fn redeploy_same_app_with_ebs() {
         let app_name = format!("{}-0", &environment_check1.applications[0].name);
         let (_, number) = is_pod_restarted_env(
             Kind::Aws,
-            AWS_KUBE_TEST_CLUSTER_ID,
+            secrets
+                .AWS_TEST_CLUSTER_ID
+                .as_ref()
+                .expect("AWS_TEST_CLUSTER_ID is not set")
+                .as_str(),
             environment_check1,
             app_name.clone().as_str(),
             secrets.clone(),
@@ -519,10 +574,14 @@ fn redeploy_same_app_with_ebs() {
 
         let (_, number2) = is_pod_restarted_env(
             Kind::Aws,
-            AWS_KUBE_TEST_CLUSTER_ID,
+            secrets
+                .AWS_TEST_CLUSTER_ID
+                .as_ref()
+                .expect("AWS_TEST_CLUSTER_ID is not set")
+                .as_str(),
             environment_check2,
             app_name.as_str(),
-            secrets,
+            secrets.clone(),
         );
         //nothing change in the app, so, it shouldn't be restarted
         assert!(number.eq(&number2));
@@ -555,7 +614,11 @@ fn deploy_a_not_working_environment_and_after_working_environment() {
         // env part generation
         let environment = test_utilities::common::working_minimal_environment(
             &context,
-            AWS_QOVERY_ORGANIZATION_ID,
+            secrets
+                .AWS_TEST_ORGANIZATION_ID
+                .as_ref()
+                .expect("AWS_TEST_ORGANIZATION_ID is not set")
+                .as_str(),
             secrets
                 .DEFAULT_TEST_DOMAIN
                 .expect("DEFAULT_TEST_DOMAIN is not set in secrets")
@@ -621,7 +684,11 @@ fn deploy_ok_fail_fail_ok_environment() {
         let secrets = FuncTestsSecrets::new();
         let environment = test_utilities::common::working_minimal_environment(
             &context,
-            AWS_QOVERY_ORGANIZATION_ID,
+            secrets
+                .AWS_TEST_ORGANIZATION_ID
+                .as_ref()
+                .expect("AWS_TEST_ORGANIZATION_ID is not set")
+                .as_str(),
             secrets
                 .DEFAULT_TEST_DOMAIN
                 .expect("DEFAULT_TEST_DOMAIN is not set in secrets")
@@ -710,7 +777,11 @@ fn deploy_a_non_working_environment_with_no_failover_on_aws_eks() {
         let secrets = FuncTestsSecrets::new();
         let environment = test_utilities::common::non_working_environment(
             &context,
-            AWS_QOVERY_ORGANIZATION_ID,
+            secrets
+                .AWS_TEST_ORGANIZATION_ID
+                .as_ref()
+                .expect("AWS_TEST_ORGANIZATION_ID is not set")
+                .as_str(),
             secrets
                 .DEFAULT_TEST_DOMAIN
                 .expect("DEFAULT_TEST_DOMAIN is not set in secrets")
@@ -758,18 +829,33 @@ fn deploy_a_non_working_environment_with_a_working_failover_on_aws_eks() {
             .as_ref()
             .expect("DEFAULT_TEST_DOMAIN is not set in secrets");
 
-        let environment =
-            test_utilities::common::non_working_environment(&context, AWS_QOVERY_ORGANIZATION_ID, test_domain.as_str());
+        let environment = test_utilities::common::non_working_environment(
+            &context,
+            secrets
+                .AWS_TEST_ORGANIZATION_ID
+                .as_ref()
+                .expect("AWS_TEST_ORGANIZATION_ID is not set")
+                .as_str(),
+            test_domain.as_str(),
+        );
         let failover_environment = test_utilities::common::working_minimal_environment(
             &context,
-            AWS_QOVERY_ORGANIZATION_ID,
+            secrets
+                .AWS_TEST_ORGANIZATION_ID
+                .as_ref()
+                .expect("AWS_TEST_ORGANIZATION_ID is not set")
+                .as_str(),
             test_domain.as_str(),
         );
         // context for deletion
         let context_deletion = context.clone_not_same_execution_id();
         let mut delete_env = test_utilities::common::working_minimal_environment(
             &context_deletion,
-            AWS_QOVERY_ORGANIZATION_ID,
+            secrets
+                .AWS_TEST_ORGANIZATION_ID
+                .as_ref()
+                .expect("AWS_TEST_ORGANIZATION_ID is not set")
+                .as_str(),
             test_domain.as_str(),
         );
         delete_env.action = Action::Delete;
@@ -812,22 +898,38 @@ fn deploy_2_non_working_environments_with_2_working_failovers_on_aws_eks() {
 
     let failover_environment_1 = test_utilities::common::echo_app_environment(
         &context_failover_1,
-        AWS_QOVERY_ORGANIZATION_ID,
+        secrets
+            .AWS_TEST_ORGANIZATION_ID
+            .as_ref()
+            .expect("AWS_TEST_ORGANIZATION_ID is not set")
+            .as_str(),
         test_domain.as_str(),
     );
     let fail_app_1 = test_utilities::common::non_working_environment(
         &context_first_fail_deployement_1,
-        AWS_QOVERY_ORGANIZATION_ID,
+        secrets
+            .AWS_TEST_ORGANIZATION_ID
+            .as_ref()
+            .expect("AWS_TEST_ORGANIZATION_ID is not set")
+            .as_str(),
         test_domain.as_str(),
     );
     let mut failover_environment_2 = test_utilities::common::echo_app_environment(
         &context_failover_2,
-        AWS_QOVERY_ORGANIZATION_ID,
+        secrets
+            .AWS_TEST_ORGANIZATION_ID
+            .as_ref()
+            .expect("AWS_TEST_ORGANIZATION_ID is not set")
+            .as_str(),
         test_domain.as_str(),
     );
     let fail_app_2 = test_utilities::common::non_working_environment(
         &context_second_fail_deployement_2,
-        AWS_QOVERY_ORGANIZATION_ID,
+        secrets
+            .AWS_TEST_ORGANIZATION_ID
+            .as_ref()
+            .expect("AWS_TEST_ORGANIZATION_ID is not set")
+            .as_str(),
         test_domain.as_str(),
     );
 
@@ -846,7 +948,11 @@ fn deploy_2_non_working_environments_with_2_working_failovers_on_aws_eks() {
     let context_deletion = context_failover_1.clone_not_same_execution_id();
     let mut delete_env = test_utilities::common::echo_app_environment(
         &context_deletion,
-        AWS_QOVERY_ORGANIZATION_ID,
+        secrets
+            .AWS_TEST_ORGANIZATION_ID
+            .as_ref()
+            .expect("AWS_TEST_ORGANIZATION_ID is not set")
+            .as_str(),
         test_domain.as_str(),
     );
     delete_env.action = Action::Delete;
@@ -893,15 +999,33 @@ fn deploy_a_non_working_environment_with_a_non_working_failover_on_aws_eks() {
             .as_ref()
             .expect("DEFAULT_TEST_DOMAIN is not set in secrets");
 
-        let environment =
-            test_utilities::common::non_working_environment(&context, AWS_QOVERY_ORGANIZATION_ID, test_domain.as_str());
-        let failover_environment =
-            test_utilities::common::non_working_environment(&context, AWS_QOVERY_ORGANIZATION_ID, test_domain.as_str());
+        let environment = test_utilities::common::non_working_environment(
+            &context,
+            secrets
+                .AWS_TEST_ORGANIZATION_ID
+                .as_ref()
+                .expect("AWS_TEST_ORGANIZATION_ID is not set")
+                .as_str(),
+            test_domain.as_str(),
+        );
+        let failover_environment = test_utilities::common::non_working_environment(
+            &context,
+            secrets
+                .AWS_TEST_ORGANIZATION_ID
+                .as_ref()
+                .expect("AWS_TEST_ORGANIZATION_ID is not set")
+                .as_str(),
+            test_domain.as_str(),
+        );
 
         let context_for_deletion = context.clone_not_same_execution_id();
         let mut delete_env = test_utilities::common::non_working_environment(
             &context_for_deletion,
-            AWS_QOVERY_ORGANIZATION_ID,
+            secrets
+                .AWS_TEST_ORGANIZATION_ID
+                .as_ref()
+                .expect("AWS_TEST_ORGANIZATION_ID is not set")
+                .as_str(),
             test_domain.as_str(),
         );
         delete_env.action = Action::Delete;

tests/digitalocean/do_databases.rs

@@ -13,9 +13,8 @@ use test_utilities::utilities::{
 use qovery_engine::models::DatabaseMode::{CONTAINER, MANAGED};
 use test_utilities::common::{test_db, working_minimal_environment, Infrastructure};
 use test_utilities::digitalocean::{
-    clean_environments, DO_KUBE_TEST_CLUSTER_ID, DO_MANAGED_DATABASE_DISK_TYPE, DO_MANAGED_DATABASE_INSTANCE_TYPE,
-    DO_QOVERY_ORGANIZATION_ID, DO_SELF_HOSTED_DATABASE_DISK_TYPE, DO_SELF_HOSTED_DATABASE_INSTANCE_TYPE,
-    DO_TEST_REGION,
+    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,
 };
 
 /**
@@ -41,10 +40,13 @@ fn deploy_an_environment_with_3_databases_and_3_apps() {
         let secrets = FuncTestsSecrets::new();
         let environment = test_utilities::common::environment_3_apps_3_routers_3_databases(
             &context,
-            DO_QOVERY_ORGANIZATION_ID,
             secrets
-                .clone()
+                .DIGITAL_OCEAN_TEST_ORGANIZATION_ID
+                .as_ref()
+                .expect("DIGITAL_OCEAN_TEST_ORGANIZATION_ID is not set"),
+            secrets
                 .DEFAULT_TEST_DOMAIN
+                .as_ref()
                 .expect("DEFAULT_TEST_DOMAIN is not set in secrets")
                 .as_str(),
             DO_SELF_HOSTED_DATABASE_INSTANCE_TYPE,
@@ -94,7 +96,10 @@ fn deploy_an_environment_with_db_and_pause_it() {
         let secrets = FuncTestsSecrets::new();
         let environment = test_utilities::common::environnement_2_app_2_routers_1_psql(
             &context,
-            DO_QOVERY_ORGANIZATION_ID,
+            secrets
+                .DIGITAL_OCEAN_TEST_ORGANIZATION_ID
+                .as_ref()
+                .expect("DIGITAL_OCEAN_TEST_ORGANIZATION_ID is not set"),
             secrets
                 .clone()
                 .DEFAULT_TEST_DOMAIN
@@ -128,7 +133,10 @@ fn deploy_an_environment_with_db_and_pause_it() {
             ProviderKind::Do,
             environment.clone(),
             app_name.clone().as_str(),
-            DO_KUBE_TEST_CLUSTER_ID,
+            secrets
+                .DIGITAL_OCEAN_TEST_CLUSTER_ID
+                .as_ref()
+                .expect("DIGITAL_OCEAN_TEST_CLUSTER_ID is not set"),
             secrets.clone(),
         );
         assert_eq!(ret.is_ok(), true);
@@ -171,7 +179,10 @@ fn postgresql_failover_dev_environment_with_all_options() {
 
         let environment = test_utilities::common::environnement_2_app_2_routers_1_psql(
             &context,
-            DO_QOVERY_ORGANIZATION_ID,
+            secrets
+                .DIGITAL_OCEAN_TEST_ORGANIZATION_ID
+                .as_ref()
+                .expect("DIGITAL_OCEAN_TEST_ORGANIZATION_ID is not set"),
             test_domain.as_str(),
             DO_SELF_HOSTED_DATABASE_INSTANCE_TYPE,
             DO_SELF_HOSTED_DATABASE_DISK_TYPE,
@@ -190,7 +201,10 @@ fn postgresql_failover_dev_environment_with_all_options() {
             .collect::<Vec<qovery_engine::models::Application>>();
         let mut environment_delete = test_utilities::common::environnement_2_app_2_routers_1_psql(
             &context_for_deletion,
-            DO_QOVERY_ORGANIZATION_ID,
+            secrets
+                .DIGITAL_OCEAN_TEST_ORGANIZATION_ID
+                .as_ref()
+                .expect("DIGITAL_OCEAN_TEST_ORGANIZATION_ID is not set"),
             test_domain.as_str(),
             DO_SELF_HOSTED_DATABASE_INSTANCE_TYPE,
             DO_SELF_HOSTED_DATABASE_DISK_TYPE,
@@ -213,7 +227,10 @@ fn postgresql_failover_dev_environment_with_all_options() {
         let database_name = format!("postgresql-{}-0", &environment_check.databases[0].name);
         match is_pod_restarted_env(
             ProviderKind::Do,
-            DO_KUBE_TEST_CLUSTER_ID,
+            secrets
+                .DIGITAL_OCEAN_TEST_CLUSTER_ID
+                .as_ref()
+                .expect("DIGITAL_OCEAN_TEST_CLUSTER_ID is not set"),
             environment_check.clone(),
             database_name.as_str(),
             secrets.clone(),
@@ -229,7 +246,10 @@ fn postgresql_failover_dev_environment_with_all_options() {
         // TO CHECK: DATABASE SHOULDN'T BE RESTARTED AFTER A REDEPLOY EVEN IF FAIL
         match is_pod_restarted_env(
             ProviderKind::Do,
-            DO_KUBE_TEST_CLUSTER_ID,
+            secrets
+                .DIGITAL_OCEAN_TEST_CLUSTER_ID
+                .as_ref()
+                .expect("DIGITAL_OCEAN_TEST_CLUSTER_ID is not set"),
             environment_check.clone(),
             database_name.as_str(),
             secrets.clone(),
@@ -275,7 +295,10 @@ fn postgresql_deploy_a_working_development_environment_with_all_options() {
 
         let environment = test_utilities::common::environnement_2_app_2_routers_1_psql(
             &context,
-            DO_QOVERY_ORGANIZATION_ID,
+            secrets
+                .DIGITAL_OCEAN_TEST_ORGANIZATION_ID
+                .as_ref()
+                .expect("DIGITAL_OCEAN_TEST_ORGANIZATION_ID is not set"),
             test_domain.as_str(),
             DO_SELF_HOSTED_DATABASE_INSTANCE_TYPE,
             DO_SELF_HOSTED_DATABASE_DISK_TYPE,
@@ -284,7 +307,10 @@ fn postgresql_deploy_a_working_development_environment_with_all_options() {
         //let env_to_check = environment.clone();
         let mut environment_delete = test_utilities::common::environnement_2_app_2_routers_1_psql(
             &context_for_deletion,
-            DO_QOVERY_ORGANIZATION_ID,
+            secrets
+                .DIGITAL_OCEAN_TEST_ORGANIZATION_ID
+                .as_ref()
+                .expect("DIGITAL_OCEAN_TEST_ORGANIZATION_ID is not set"),
             test_domain.as_str(),
             DO_SELF_HOSTED_DATABASE_INSTANCE_TYPE,
             DO_SELF_HOSTED_DATABASE_DISK_TYPE,
@@ -347,7 +373,10 @@ fn postgresql_deploy_a_working_environment_and_redeploy() {
 
         let mut environment = test_utilities::common::working_minimal_environment(
             &context,
-            DO_QOVERY_ORGANIZATION_ID,
+            secrets
+                .DIGITAL_OCEAN_TEST_ORGANIZATION_ID
+                .as_ref()
+                .expect("DIGITAL_OCEAN_TEST_ORGANIZATION_ID is not set"),
             secrets
                 .clone()
                 .DEFAULT_TEST_DOMAIN
@@ -435,7 +464,10 @@ fn postgresql_deploy_a_working_environment_and_redeploy() {
         let database_name = format!("postgresql-{}-0", &environment_check.databases[0].name);
         match is_pod_restarted_env(
             ProviderKind::Do,
-            DO_KUBE_TEST_CLUSTER_ID,
+            secrets
+                .DIGITAL_OCEAN_TEST_CLUSTER_ID
+                .as_ref()
+                .expect("DIGITAL_OCEAN_TEST_CLUSTER_ID is not set"),
             environment_check,
             database_name.as_str(),
             secrets.clone(),
@@ -498,7 +530,10 @@ fn private_postgresql_v10_deploy_a_working_dev_environment() {
     let secrets = FuncTestsSecrets::new();
     let environment = working_minimal_environment(
         &context,
-        DO_QOVERY_ORGANIZATION_ID,
+        secrets
+            .DIGITAL_OCEAN_TEST_ORGANIZATION_ID
+            .as_ref()
+            .expect("DIGITAL_OCEAN_TEST_ORGANIZATION_ID is not set"),
         secrets
             .DEFAULT_TEST_DOMAIN
             .as_ref()
@@ -517,7 +552,10 @@ fn public_postgresql_v10_deploy_a_working_dev_environment() {
     let secrets = FuncTestsSecrets::new();
     let environment = working_minimal_environment(
         &context,
-        DO_QOVERY_ORGANIZATION_ID,
+        secrets
+            .DIGITAL_OCEAN_TEST_ORGANIZATION_ID
+            .as_ref()
+            .expect("DIGITAL_OCEAN_TEST_ORGANIZATION_ID is not set"),
         secrets
             .DEFAULT_TEST_DOMAIN
             .as_ref()
@@ -536,7 +574,10 @@ fn private_postgresql_v11_deploy_a_working_dev_environment() {
     let secrets = FuncTestsSecrets::new();
     let environment = working_minimal_environment(
         &context,
-        DO_QOVERY_ORGANIZATION_ID,
+        secrets
+            .DIGITAL_OCEAN_TEST_ORGANIZATION_ID
+            .as_ref()
+            .expect("DIGITAL_OCEAN_TEST_ORGANIZATION_ID is not set"),
         secrets
             .DEFAULT_TEST_DOMAIN
             .as_ref()
@@ -555,7 +596,10 @@ fn public_postgresql_v11_deploy_a_working_dev_environment() {
     let secrets = FuncTestsSecrets::new();
     let environment = working_minimal_environment(
         &context,
-        DO_QOVERY_ORGANIZATION_ID,
+        secrets
+            .DIGITAL_OCEAN_TEST_ORGANIZATION_ID
+            .as_ref()
+            .expect("DIGITAL_OCEAN_TEST_ORGANIZATION_ID is not set"),
         secrets
             .DEFAULT_TEST_DOMAIN
             .as_ref()
@@ -573,7 +617,10 @@ fn private_postgresql_v12_deploy_a_working_dev_environment() {
     let secrets = FuncTestsSecrets::new();
     let environment = working_minimal_environment(
         &context,
-        DO_QOVERY_ORGANIZATION_ID,
+        secrets
+            .DIGITAL_OCEAN_TEST_ORGANIZATION_ID
+            .as_ref()
+            .expect("DIGITAL_OCEAN_TEST_ORGANIZATION_ID is not set"),
         secrets
             .DEFAULT_TEST_DOMAIN
             .as_ref()
@@ -591,7 +638,10 @@ fn public_postgresql_v12_deploy_a_working_dev_environment() {
     let secrets = FuncTestsSecrets::new();
     let environment = working_minimal_environment(
         &context,
-        DO_QOVERY_ORGANIZATION_ID,
+        secrets
+            .DIGITAL_OCEAN_TEST_ORGANIZATION_ID
+            .as_ref()
+            .expect("DIGITAL_OCEAN_TEST_ORGANIZATION_ID is not set"),
         secrets
             .DEFAULT_TEST_DOMAIN
             .as_ref()
@@ -640,7 +690,10 @@ fn private_mongodb_v3_6_deploy_a_working_dev_environment() {
     let secrets = FuncTestsSecrets::new();
     let environment = working_minimal_environment(
         &context,
-        DO_QOVERY_ORGANIZATION_ID,
+        secrets
+            .DIGITAL_OCEAN_TEST_ORGANIZATION_ID
+            .as_ref()
+            .expect("DIGITAL_OCEAN_TEST_ORGANIZATION_ID is not set"),
         secrets
             .DEFAULT_TEST_DOMAIN
             .as_ref()
@@ -659,7 +712,10 @@ fn public_mongodb_v3_6_deploy_a_working_dev_environment() {
     let secrets = FuncTestsSecrets::new();
     let environment = working_minimal_environment(
         &context,
-        DO_QOVERY_ORGANIZATION_ID,
+        secrets
+            .DIGITAL_OCEAN_TEST_ORGANIZATION_ID
+            .as_ref()
+            .expect("DIGITAL_OCEAN_TEST_ORGANIZATION_ID is not set"),
         secrets
             .DEFAULT_TEST_DOMAIN
             .as_ref()
@@ -678,7 +734,10 @@ fn private_mongodb_v4_0_deploy_a_working_dev_environment() {
     let secrets = FuncTestsSecrets::new();
     let environment = working_minimal_environment(
         &context,
-        DO_QOVERY_ORGANIZATION_ID,
+        secrets
+            .DIGITAL_OCEAN_TEST_ORGANIZATION_ID
+            .as_ref()
+            .expect("DIGITAL_OCEAN_TEST_ORGANIZATION_ID is not set"),
         secrets
             .DEFAULT_TEST_DOMAIN
             .as_ref()
@@ -697,7 +756,10 @@ fn public_mongodb_v4_0_deploy_a_working_dev_environment() {
     let secrets = FuncTestsSecrets::new();
     let environment = working_minimal_environment(
         &context,
-        DO_QOVERY_ORGANIZATION_ID,
+        secrets
+            .DIGITAL_OCEAN_TEST_ORGANIZATION_ID
+            .as_ref()
+            .expect("DIGITAL_OCEAN_TEST_ORGANIZATION_ID is not set"),
         secrets
             .DEFAULT_TEST_DOMAIN
             .as_ref()
@@ -716,7 +778,10 @@ fn private_mongodb_v4_2_deploy_a_working_dev_environment() {
     let secrets = FuncTestsSecrets::new();
     let environment = working_minimal_environment(
         &context,
-        DO_QOVERY_ORGANIZATION_ID,
+        secrets
+            .DIGITAL_OCEAN_TEST_ORGANIZATION_ID
+            .as_ref()
+            .expect("DIGITAL_OCEAN_TEST_ORGANIZATION_ID is not set"),
         secrets
             .DEFAULT_TEST_DOMAIN
             .as_ref()
@@ -734,7 +799,10 @@ fn public_mongodb_v4_2_deploy_a_working_dev_environment() {
     let secrets = FuncTestsSecrets::new();
     let environment = working_minimal_environment(
         &context,
-        DO_QOVERY_ORGANIZATION_ID,
+        secrets
+            .DIGITAL_OCEAN_TEST_ORGANIZATION_ID
+            .as_ref()
+            .expect("DIGITAL_OCEAN_TEST_ORGANIZATION_ID is not set"),
         secrets
             .DEFAULT_TEST_DOMAIN
             .as_ref()
@@ -752,7 +820,10 @@ fn private_mongodb_v4_4_deploy_a_working_dev_environment() {
     let secrets = FuncTestsSecrets::new();
     let environment = working_minimal_environment(
         &context,
-        DO_QOVERY_ORGANIZATION_ID,
+        secrets
+            .DIGITAL_OCEAN_TEST_ORGANIZATION_ID
+            .as_ref()
+            .expect("DIGITAL_OCEAN_TEST_ORGANIZATION_ID is not set"),
         secrets
             .DEFAULT_TEST_DOMAIN
             .as_ref()
@@ -770,7 +841,10 @@ fn public_mongodb_v4_4_deploy_a_working_dev_environment() {
     let secrets = FuncTestsSecrets::new();
     let environment = working_minimal_environment(
         &context,
-        DO_QOVERY_ORGANIZATION_ID,
+        secrets
+            .DIGITAL_OCEAN_TEST_ORGANIZATION_ID
+            .as_ref()
+            .expect("DIGITAL_OCEAN_TEST_ORGANIZATION_ID is not set"),
         secrets
             .DEFAULT_TEST_DOMAIN
             .as_ref()
@@ -819,7 +893,10 @@ fn private_mysql_v5_7_deploy_a_working_dev_environment() {
     let secrets = FuncTestsSecrets::new();
     let environment = working_minimal_environment(
         &context,
-        DO_QOVERY_ORGANIZATION_ID,
+        secrets
+            .DIGITAL_OCEAN_TEST_ORGANIZATION_ID
+            .as_ref()
+            .expect("DIGITAL_OCEAN_TEST_ORGANIZATION_ID is not set"),
         secrets
             .DEFAULT_TEST_DOMAIN
             .as_ref()
@@ -838,7 +915,10 @@ fn public_mysql_v5_7_deploy_a_working_dev_environment() {
     let secrets = FuncTestsSecrets::new();
     let environment = working_minimal_environment(
         &context,
-        DO_QOVERY_ORGANIZATION_ID,
+        secrets
+            .DIGITAL_OCEAN_TEST_ORGANIZATION_ID
+            .as_ref()
+            .expect("DIGITAL_OCEAN_TEST_ORGANIZATION_ID is not set"),
         secrets
             .DEFAULT_TEST_DOMAIN
             .as_ref()
@@ -857,7 +937,10 @@ fn private_mysql_v8_deploy_a_working_dev_environment() {
     let secrets = FuncTestsSecrets::new();
     let environment = working_minimal_environment(
         &context,
-        DO_QOVERY_ORGANIZATION_ID,
+        secrets
+            .DIGITAL_OCEAN_TEST_ORGANIZATION_ID
+            .as_ref()
+            .expect("DIGITAL_OCEAN_TEST_ORGANIZATION_ID is not set"),
         secrets
             .DEFAULT_TEST_DOMAIN
             .as_ref()
@@ -875,7 +958,10 @@ fn public_mysql_v8_deploy_a_working_dev_environment() {
     let secrets = FuncTestsSecrets::new();
     let environment = working_minimal_environment(
         &context,
-        DO_QOVERY_ORGANIZATION_ID,
+        secrets
+            .DIGITAL_OCEAN_TEST_ORGANIZATION_ID
+            .as_ref()
+            .expect("DIGITAL_OCEAN_TEST_ORGANIZATION_ID is not set"),
         secrets
             .DEFAULT_TEST_DOMAIN
             .as_ref()
@@ -926,7 +1012,10 @@ fn private_redis_v5_deploy_a_working_dev_environment() {
     let secrets = FuncTestsSecrets::new();
     let environment = working_minimal_environment(
         &context,
-        DO_QOVERY_ORGANIZATION_ID,
+        secrets
+            .DIGITAL_OCEAN_TEST_ORGANIZATION_ID
+            .as_ref()
+            .expect("DIGITAL_OCEAN_TEST_ORGANIZATION_ID is not set"),
         secrets
             .DEFAULT_TEST_DOMAIN
             .as_ref()
@@ -945,7 +1034,10 @@ fn public_redis_v5_deploy_a_working_dev_environment() {
     let secrets = FuncTestsSecrets::new();
     let environment = working_minimal_environment(
         &context,
-        DO_QOVERY_ORGANIZATION_ID,
+        secrets
+            .DIGITAL_OCEAN_TEST_ORGANIZATION_ID
+            .as_ref()
+            .expect("DIGITAL_OCEAN_TEST_ORGANIZATION_ID is not set"),
         secrets
             .DEFAULT_TEST_DOMAIN
             .as_ref()
@@ -964,7 +1056,10 @@ fn private_redis_v6_deploy_a_working_dev_environment() {
     let secrets = FuncTestsSecrets::new();
     let environment = working_minimal_environment(
         &context,
-        DO_QOVERY_ORGANIZATION_ID,
+        secrets
+            .DIGITAL_OCEAN_TEST_ORGANIZATION_ID
+            .as_ref()
+            .expect("DIGITAL_OCEAN_TEST_ORGANIZATION_ID is not set"),
         secrets
             .DEFAULT_TEST_DOMAIN
             .as_ref()
@@ -982,7 +1077,10 @@ fn public_redis_v6_deploy_a_working_dev_environment() {
     let secrets = FuncTestsSecrets::new();
     let environment = working_minimal_environment(
         &context,
-        DO_QOVERY_ORGANIZATION_ID,
+        secrets
+            .DIGITAL_OCEAN_TEST_ORGANIZATION_ID
+            .as_ref()
+            .expect("DIGITAL_OCEAN_TEST_ORGANIZATION_ID is not set"),
         secrets
             .DEFAULT_TEST_DOMAIN
             .as_ref()

tests/digitalocean/do_environment.rs

@@ -1,8 +1,6 @@
 extern crate test_utilities;
 
-use self::test_utilities::digitalocean::{
-    clean_environments, DO_KUBE_TEST_CLUSTER_ID, DO_QOVERY_ORGANIZATION_ID, DO_TEST_REGION,
-};
+use self::test_utilities::digitalocean::{clean_environments, DO_TEST_REGION};
 use self::test_utilities::utilities::{
     engine_run_test, generate_id, get_pods, get_pvc, init, is_pod_restarted_env, FuncTestsSecrets,
 };
@@ -34,7 +32,10 @@ fn digitalocean_doks_deploy_a_working_environment_with_no_router() {
         let secrets = FuncTestsSecrets::new();
         let mut environment = test_utilities::common::working_minimal_environment(
             &context,
-            DO_QOVERY_ORGANIZATION_ID,
+            secrets
+                .DIGITAL_OCEAN_TEST_ORGANIZATION_ID
+                .as_ref()
+                .expect("DIGITAL_OCEAN_TEST_ORGANIZATION_ID is not set"),
             secrets
                 .DEFAULT_TEST_DOMAIN
                 .as_ref()
@@ -87,7 +88,10 @@ fn digitalocean_doks_deploy_a_not_working_environment_with_no_router() {
 
         let mut environment = test_utilities::common::non_working_environment(
             &context,
-            DO_QOVERY_ORGANIZATION_ID,
+            secrets
+                .DIGITAL_OCEAN_TEST_ORGANIZATION_ID
+                .as_ref()
+                .expect("DIGITAL_OCEAN_TEST_ORGANIZATION_ID is not set"),
             secrets
                 .DEFAULT_TEST_DOMAIN
                 .as_ref()
@@ -138,7 +142,10 @@ fn digitalocean_doks_deploy_a_working_environment_and_pause() {
         let secrets = FuncTestsSecrets::new();
         let environment = test_utilities::common::working_minimal_environment(
             &context,
-            DO_QOVERY_ORGANIZATION_ID,
+            secrets
+                .DIGITAL_OCEAN_TEST_ORGANIZATION_ID
+                .as_ref()
+                .expect("DIGITAL_OCEAN_TEST_ORGANIZATION_ID is not set"),
             secrets
                 .DEFAULT_TEST_DOMAIN
                 .as_ref()
@@ -159,7 +166,10 @@ fn digitalocean_doks_deploy_a_working_environment_and_pause() {
             Kind::Do,
             environment.clone(),
             selector.as_str(),
-            DO_KUBE_TEST_CLUSTER_ID,
+            secrets
+                .DIGITAL_OCEAN_TEST_CLUSTER_ID
+                .as_ref()
+                .expect("DIGITAL_OCEAN_TEST_CLUSTER_ID is not set"),
             secrets.clone(),
         );
         assert_eq!(ret.is_ok(), true);
@@ -176,7 +186,10 @@ fn digitalocean_doks_deploy_a_working_environment_and_pause() {
             Kind::Do,
             environment.clone(),
             selector.clone().as_str(),
-            DO_KUBE_TEST_CLUSTER_ID,
+            secrets
+                .DIGITAL_OCEAN_TEST_CLUSTER_ID
+                .as_ref()
+                .expect("DIGITAL_OCEAN_TEST_CLUSTER_ID is not set"),
             secrets.clone(),
         );
         assert_eq!(ret.is_ok(), true);
@@ -194,7 +207,10 @@ fn digitalocean_doks_deploy_a_working_environment_and_pause() {
             Kind::Do,
             environment.clone(),
             selector.as_str(),
-            DO_KUBE_TEST_CLUSTER_ID,
+            secrets
+                .DIGITAL_OCEAN_TEST_CLUSTER_ID
+                .as_ref()
+                .expect("DIGITAL_OCEAN_TEST_CLUSTER_ID is not set"),
             secrets.clone(),
         );
         assert_eq!(ret.is_ok(), true);
@@ -231,7 +247,10 @@ fn digitalocean_doks_build_with_buildpacks_and_deploy_a_working_environment() {
         let secrets = FuncTestsSecrets::new();
         let mut environment = test_utilities::common::working_minimal_environment(
             &context,
-            DO_QOVERY_ORGANIZATION_ID,
+            secrets
+                .DIGITAL_OCEAN_TEST_ORGANIZATION_ID
+                .as_ref()
+                .expect("DIGITAL_OCEAN_TEST_ORGANIZATION_ID is not set"),
             secrets
                 .DEFAULT_TEST_DOMAIN
                 .as_ref()
@@ -292,7 +311,10 @@ fn digitalocean_doks_deploy_a_working_environment_with_domain() {
         let secrets = FuncTestsSecrets::new();
         let environment = test_utilities::common::working_minimal_environment(
             &context,
-            DO_QOVERY_ORGANIZATION_ID,
+            secrets
+                .DIGITAL_OCEAN_TEST_ORGANIZATION_ID
+                .as_ref()
+                .expect("DIGITAL_OCEAN_TEST_ORGANIZATION_ID is not set"),
             secrets
                 .DEFAULT_TEST_DOMAIN
                 .as_ref()
@@ -343,7 +365,10 @@ fn digitalocean_doks_deploy_a_working_environment_with_storage() {
 
         let mut environment = test_utilities::common::working_minimal_environment(
             &context,
-            DO_QOVERY_ORGANIZATION_ID,
+            secrets
+                .DIGITAL_OCEAN_TEST_ORGANIZATION_ID
+                .as_ref()
+                .expect("DIGITAL_OCEAN_TEST_ORGANIZATION_ID is not set"),
             secrets
                 .DEFAULT_TEST_DOMAIN
                 .as_ref()
@@ -380,7 +405,15 @@ fn digitalocean_doks_deploy_a_working_environment_with_storage() {
             TransactionResult::UnrecoverableError(_, _) => assert!(false),
         };
 
-        match get_pvc(Kind::Do, DO_KUBE_TEST_CLUSTER_ID, environment.clone(), secrets.clone()) {
+        match get_pvc(
+            Kind::Do,
+            secrets
+                .DIGITAL_OCEAN_TEST_CLUSTER_ID
+                .as_ref()
+                .expect("DIGITAL_OCEAN_TEST_CLUSTER_ID is not set"),
+            environment.clone(),
+            secrets.clone(),
+        ) {
             Ok(pvc) => assert_eq!(
                 pvc.items.expect("No items in pvc")[0].spec.resources.requests.storage,
                 format!("{}Gi", storage_size)
@@ -420,7 +453,10 @@ fn digitalocean_doks_redeploy_same_app() {
 
         let mut environment = test_utilities::common::working_minimal_environment(
             &context,
-            DO_QOVERY_ORGANIZATION_ID,
+            secrets
+                .DIGITAL_OCEAN_TEST_ORGANIZATION_ID
+                .as_ref()
+                .expect("DIGITAL_OCEAN_TEST_ORGANIZATION_ID is not set"),
             secrets
                 .DEFAULT_TEST_DOMAIN
                 .as_ref()
@@ -461,7 +497,15 @@ fn digitalocean_doks_redeploy_same_app() {
             TransactionResult::UnrecoverableError(_, _) => assert!(false),
         };
 
-        match get_pvc(Kind::Do, DO_KUBE_TEST_CLUSTER_ID, environment.clone(), secrets.clone()) {
+        match get_pvc(
+            Kind::Do,
+            secrets
+                .DIGITAL_OCEAN_TEST_CLUSTER_ID
+                .as_ref()
+                .expect("DIGITAL_OCEAN_TEST_CLUSTER_ID is not set"),
+            environment.clone(),
+            secrets.clone(),
+        ) {
             Ok(pvc) => assert_eq!(
                 pvc.items.expect("No items in pvc")[0].spec.resources.requests.storage,
                 format!("{}Gi", storage_size)
@@ -472,7 +516,10 @@ fn digitalocean_doks_redeploy_same_app() {
         let app_name = format!("{}-0", &environment_check1.applications[0].name);
         let (_, number) = is_pod_restarted_env(
             Kind::Do,
-            DO_KUBE_TEST_CLUSTER_ID,
+            secrets
+                .DIGITAL_OCEAN_TEST_CLUSTER_ID
+                .as_ref()
+                .expect("DIGITAL_OCEAN_TEST_CLUSTER_ID is not set"),
             environment_check1,
             app_name.clone().as_str(),
             secrets.clone(),
@@ -486,7 +533,10 @@ fn digitalocean_doks_redeploy_same_app() {
 
         let (_, number2) = is_pod_restarted_env(
             Kind::Do,
-            DO_KUBE_TEST_CLUSTER_ID,
+            secrets
+                .DIGITAL_OCEAN_TEST_CLUSTER_ID
+                .as_ref()
+                .expect("DIGITAL_OCEAN_TEST_CLUSTER_ID is not set"),
             environment_check2,
             app_name.as_str(),
             secrets.clone(),
@@ -528,7 +578,10 @@ fn digitalocean_doks_deploy_a_not_working_environment_and_then_working_environme
         // env part generation
         let environment = test_utilities::common::working_minimal_environment(
             &context,
-            DO_QOVERY_ORGANIZATION_ID,
+            secrets
+                .DIGITAL_OCEAN_TEST_ORGANIZATION_ID
+                .as_ref()
+                .expect("DIGITAL_OCEAN_TEST_ORGANIZATION_ID is not set"),
             secrets
                 .DEFAULT_TEST_DOMAIN
                 .as_ref()
@@ -602,7 +655,10 @@ fn digitalocean_doks_deploy_ok_fail_fail_ok_environment() {
         let secrets = FuncTestsSecrets::new();
         let environment = test_utilities::common::working_minimal_environment(
             &context,
-            DO_QOVERY_ORGANIZATION_ID,
+            secrets
+                .DIGITAL_OCEAN_TEST_ORGANIZATION_ID
+                .as_ref()
+                .expect("DIGITAL_OCEAN_TEST_ORGANIZATION_ID is not set"),
             secrets
                 .DEFAULT_TEST_DOMAIN
                 .as_ref()
@@ -696,7 +752,10 @@ fn digitalocean_doks_deploy_a_non_working_environment_with_no_failover() {
         let secrets = FuncTestsSecrets::new();
         let environment = test_utilities::common::non_working_environment(
             &context,
-            DO_QOVERY_ORGANIZATION_ID,
+            secrets
+                .DIGITAL_OCEAN_TEST_ORGANIZATION_ID
+                .as_ref()
+                .expect("DIGITAL_OCEAN_TEST_ORGANIZATION_ID is not set"),
             secrets
                 .DEFAULT_TEST_DOMAIN
                 .as_ref()
@@ -750,11 +809,20 @@ fn digitalocean_doks_deploy_a_non_working_environment_with_a_working_failover()
             .as_ref()
             .expect("DEFAULT_TEST_DOMAIN is not set in secrets");
 
-        let environment =
-            test_utilities::common::non_working_environment(&context, DO_QOVERY_ORGANIZATION_ID, test_domain.as_str());
+        let environment = test_utilities::common::non_working_environment(
+            &context,
+            secrets
+                .DIGITAL_OCEAN_TEST_ORGANIZATION_ID
+                .as_ref()
+                .expect("DIGITAL_OCEAN_TEST_ORGANIZATION_ID is not set"),
+            test_domain.as_str(),
+        );
         let failover_environment = test_utilities::common::working_minimal_environment(
             &context,
-            DO_QOVERY_ORGANIZATION_ID,
+            secrets
+                .DIGITAL_OCEAN_TEST_ORGANIZATION_ID
+                .as_ref()
+                .expect("DIGITAL_OCEAN_TEST_ORGANIZATION_ID is not set"),
             test_domain.as_str(),
         );
 
@@ -762,7 +830,10 @@ fn digitalocean_doks_deploy_a_non_working_environment_with_a_working_failover()
         let context_deletion = context.clone_not_same_execution_id();
         let mut delete_env = test_utilities::common::working_minimal_environment(
             &context_deletion,
-            DO_QOVERY_ORGANIZATION_ID,
+            secrets
+                .DIGITAL_OCEAN_TEST_ORGANIZATION_ID
+                .as_ref()
+                .expect("DIGITAL_OCEAN_TEST_ORGANIZATION_ID is not set"),
             test_domain.as_str(),
         );
         delete_env.action = Action::Delete;
@@ -813,15 +884,30 @@ fn digitalocean_doks_deploy_a_non_working_environment_with_a_non_working_failove
             .as_ref()
             .expect("DEFAULT_TEST_DOMAIN is not set in secrets");
 
-        let environment =
-            test_utilities::common::non_working_environment(&context, DO_QOVERY_ORGANIZATION_ID, test_domain.as_str());
-        let failover_environment =
-            test_utilities::common::non_working_environment(&context, DO_QOVERY_ORGANIZATION_ID, test_domain.as_str());
+        let environment = test_utilities::common::non_working_environment(
+            &context,
+            secrets
+                .DIGITAL_OCEAN_TEST_ORGANIZATION_ID
+                .as_ref()
+                .expect("DIGITAL_OCEAN_TEST_ORGANIZATION_ID is not set"),
+            test_domain.as_str(),
+        );
+        let failover_environment = test_utilities::common::non_working_environment(
+            &context,
+            secrets
+                .DIGITAL_OCEAN_TEST_ORGANIZATION_ID
+                .as_ref()
+                .expect("DIGITAL_OCEAN_TEST_ORGANIZATION_ID is not set"),
+            test_domain.as_str(),
+        );
 
         let context_for_deletion = context.clone_not_same_execution_id();
         let mut delete_env = test_utilities::common::non_working_environment(
             &context_for_deletion,
-            DO_QOVERY_ORGANIZATION_ID,
+            secrets
+                .DIGITAL_OCEAN_TEST_ORGANIZATION_ID
+                .as_ref()
+                .expect("DIGITAL_OCEAN_TEST_ORGANIZATION_ID is not set"),
             test_domain.as_str(),
         );
         delete_env.action = Action::Delete;

tests/digitalocean/do_utility_kubernetes_doks_test_cluster.rs

@@ -36,20 +36,23 @@ fn create_digitalocean_kubernetes_doks_test_cluster() {
         let nodes = DO::kubernetes_nodes();
         let cloudflare = dns_provider_cloudflare(&context, ClusterDomain::Default);
 
+        let cluster_id = secrets
+            .DIGITAL_OCEAN_TEST_CLUSTER_ID
+            .as_ref()
+            .expect("DIGITAL_OCEAN_TEST_CLUSTER_ID is not set");
+        let cluster_name = format!("qovery-{}", cluster_id.clone());
+
         let kubernetes = DOKS::new(
             context.clone(),
-            test_utilities::digitalocean::DO_KUBE_TEST_CLUSTER_ID.to_string(),
+            cluster_id.to_string(),
             uuid::Uuid::new_v4(),
-            test_utilities::digitalocean::DO_KUBE_TEST_CLUSTER_NAME.to_string(),
+            cluster_name.to_string(),
             test_utilities::digitalocean::DO_KUBERNETES_VERSION.to_string(),
             test_utilities::digitalocean::DO_TEST_REGION,
             do_cluster.as_ref(),
             &cloudflare,
             nodes,
-            DO::kubernetes_cluster_options(
-                secrets,
-                Option::from(test_utilities::digitalocean::DO_KUBE_TEST_CLUSTER_NAME.to_string()),
-            ),
+            DO::kubernetes_cluster_options(secrets, Option::from(cluster_name.to_string())),
         )
         .unwrap();
 
@@ -93,20 +96,23 @@ fn destroy_digitalocean_kubernetes_doks_test_cluster() {
         let nodes = DO::kubernetes_nodes();
         let cloudflare = dns_provider_cloudflare(&context, ClusterDomain::Default);
 
+        let cluster_id = secrets
+            .DIGITAL_OCEAN_TEST_CLUSTER_ID
+            .as_ref()
+            .expect("DIGITAL_OCEAN_TEST_CLUSTER_ID is not set");
+        let cluster_name = format!("qovery-{}", cluster_id);
+
         let kubernetes = DOKS::new(
             context.clone(),
-            test_utilities::digitalocean::DO_KUBE_TEST_CLUSTER_ID.to_string(),
+            cluster_id.to_string(),
             uuid::Uuid::new_v4(),
-            test_utilities::digitalocean::DO_KUBE_TEST_CLUSTER_NAME.to_string(),
+            cluster_name.to_string(),
             test_utilities::digitalocean::DO_KUBERNETES_VERSION.to_string(),
             test_utilities::digitalocean::DO_TEST_REGION,
             do_cluster.as_ref(),
             &cloudflare,
             nodes,
-            DO::kubernetes_cluster_options(
-                secrets,
-                Option::from(test_utilities::digitalocean::DO_KUBE_TEST_CLUSTER_NAME.to_string()),
-            ),
+            DO::kubernetes_cluster_options(secrets, Option::from(cluster_name.to_string())),
         )
         .unwrap();
 

tests/scaleway/scw_databases.rs

@@ -15,9 +15,8 @@ use qovery_engine::models::DatabaseMode::{CONTAINER, MANAGED};
 use test_utilities::common::Infrastructure;
 use test_utilities::common::{test_db, working_minimal_environment};
 use test_utilities::scaleway::{
-    clean_environments, SCW_KUBE_TEST_CLUSTER_ID, SCW_MANAGED_DATABASE_DISK_TYPE, SCW_MANAGED_DATABASE_INSTANCE_TYPE,
-    SCW_QOVERY_ORGANIZATION_ID, SCW_SELF_HOSTED_DATABASE_DISK_TYPE, SCW_SELF_HOSTED_DATABASE_INSTANCE_TYPE,
-    SCW_TEST_ZONE,
+    clean_environments, SCW_MANAGED_DATABASE_DISK_TYPE, SCW_MANAGED_DATABASE_INSTANCE_TYPE,
+    SCW_SELF_HOSTED_DATABASE_DISK_TYPE, SCW_SELF_HOSTED_DATABASE_INSTANCE_TYPE, SCW_TEST_ZONE,
 };
 
 /**
@@ -43,7 +42,10 @@ fn deploy_an_environment_with_3_databases_and_3_apps() {
         let secrets = FuncTestsSecrets::new();
         let environment = test_utilities::common::environment_3_apps_3_routers_3_databases(
             &context,
-            SCW_QOVERY_ORGANIZATION_ID,
+            secrets
+                .SCALEWAY_TEST_ORGANIZATION_ID
+                .as_ref()
+                .expect("SCALEWAY_TEST_ORGANIZATION_ID"),
             secrets
                 .clone()
                 .DEFAULT_TEST_DOMAIN
@@ -96,7 +98,11 @@ fn deploy_an_environment_with_db_and_pause_it() {
         let secrets = FuncTestsSecrets::new();
         let environment = test_utilities::common::environnement_2_app_2_routers_1_psql(
             &context,
-            SCW_QOVERY_ORGANIZATION_ID,
+            secrets
+                .SCALEWAY_TEST_ORGANIZATION_ID
+                .as_ref()
+                .expect("SCALEWAY_TEST_ORGANIZATION_ID")
+                .as_str(),
             secrets
                 .clone()
                 .DEFAULT_TEST_DOMAIN
@@ -130,7 +136,11 @@ fn deploy_an_environment_with_db_and_pause_it() {
             ProviderKind::Scw,
             environment.clone(),
             app_name.clone().as_str(),
-            SCW_KUBE_TEST_CLUSTER_ID,
+            secrets
+                .SCALEWAY_TEST_CLUSTER_ID
+                .as_ref()
+                .expect("SCALEWAY_TEST_CLUSTER_ID is not set")
+                .as_str(),
             secrets.clone(),
         );
         assert_eq!(ret.is_ok(), true);
@@ -173,7 +183,11 @@ fn postgresql_failover_dev_environment_with_all_options() {
 
         let environment = test_utilities::common::environnement_2_app_2_routers_1_psql(
             &context,
-            SCW_QOVERY_ORGANIZATION_ID,
+            secrets
+                .SCALEWAY_TEST_ORGANIZATION_ID
+                .as_ref()
+                .expect("SCALEWAY_TEST_ORGANIZATION_ID")
+                .as_str(),
             test_domain.as_str(),
             SCW_SELF_HOSTED_DATABASE_INSTANCE_TYPE,
             SCW_SELF_HOSTED_DATABASE_DISK_TYPE,
@@ -192,7 +206,11 @@ fn postgresql_failover_dev_environment_with_all_options() {
             .collect::<Vec<qovery_engine::models::Application>>();
         let mut environment_delete = test_utilities::common::environnement_2_app_2_routers_1_psql(
             &context_for_deletion,
-            SCW_QOVERY_ORGANIZATION_ID,
+            secrets
+                .SCALEWAY_TEST_ORGANIZATION_ID
+                .as_ref()
+                .expect("SCALEWAY_TEST_ORGANIZATION_ID")
+                .as_str(),
             test_domain.as_str(),
             SCW_SELF_HOSTED_DATABASE_INSTANCE_TYPE,
             SCW_SELF_HOSTED_DATABASE_DISK_TYPE,
@@ -214,7 +232,11 @@ fn postgresql_failover_dev_environment_with_all_options() {
         let database_name = format!("postgresql-{}-0", &environment_check.databases[0].name);
         match is_pod_restarted_env(
             ProviderKind::Scw,
-            SCW_KUBE_TEST_CLUSTER_ID,
+            secrets
+                .SCALEWAY_TEST_CLUSTER_ID
+                .as_ref()
+                .expect("SCALEWAY_TEST_CLUSTER_ID is not set")
+                .as_str(),
             environment_check.clone(),
             database_name.as_str(),
             secrets.clone(),
@@ -230,7 +252,11 @@ fn postgresql_failover_dev_environment_with_all_options() {
         // TO CHECK: DATABASE SHOULDN'T BE RESTARTED AFTER A REDEPLOY EVEN IF FAIL
         match is_pod_restarted_env(
             ProviderKind::Scw,
-            SCW_KUBE_TEST_CLUSTER_ID,
+            secrets
+                .SCALEWAY_TEST_CLUSTER_ID
+                .as_ref()
+                .expect("SCALEWAY_TEST_CLUSTER_ID is not set")
+                .as_str(),
             environment_check.clone(),
             database_name.as_str(),
             secrets.clone(),
@@ -276,7 +302,11 @@ fn postgresql_deploy_a_working_development_environment_with_all_options() {
 
         let environment = test_utilities::common::environnement_2_app_2_routers_1_psql(
             &context,
-            SCW_QOVERY_ORGANIZATION_ID,
+            secrets
+                .SCALEWAY_TEST_ORGANIZATION_ID
+                .as_ref()
+                .expect("SCALEWAY_TEST_ORGANIZATION_ID")
+                .as_str(),
             test_domain.as_str(),
             SCW_SELF_HOSTED_DATABASE_INSTANCE_TYPE,
             SCW_SELF_HOSTED_DATABASE_DISK_TYPE,
@@ -284,7 +314,11 @@ fn postgresql_deploy_a_working_development_environment_with_all_options() {
         );
         let mut environment_delete = test_utilities::common::environnement_2_app_2_routers_1_psql(
             &context_for_deletion,
-            SCW_QOVERY_ORGANIZATION_ID,
+            secrets
+                .SCALEWAY_TEST_ORGANIZATION_ID
+                .as_ref()
+                .expect("SCALEWAY_TEST_ORGANIZATION_ID")
+                .as_str(),
             test_domain.as_str(),
             SCW_SELF_HOSTED_DATABASE_INSTANCE_TYPE,
             SCW_SELF_HOSTED_DATABASE_DISK_TYPE,
@@ -341,7 +375,11 @@ fn postgresql_deploy_a_working_environment_and_redeploy() {
 
         let mut environment = test_utilities::common::working_minimal_environment(
             &context,
-            SCW_QOVERY_ORGANIZATION_ID,
+            secrets
+                .SCALEWAY_TEST_ORGANIZATION_ID
+                .as_ref()
+                .expect("SCALEWAY_TEST_ORGANIZATION_ID")
+                .as_str(),
             secrets
                 .clone()
                 .DEFAULT_TEST_DOMAIN
@@ -431,7 +469,11 @@ fn postgresql_deploy_a_working_environment_and_redeploy() {
         let database_name = format!("postgresql-{}-0", &environment_check.databases[0].name);
         match is_pod_restarted_env(
             ProviderKind::Scw,
-            SCW_KUBE_TEST_CLUSTER_ID,
+            secrets
+                .SCALEWAY_TEST_CLUSTER_ID
+                .as_ref()
+                .expect("SCALEWAY_TEST_CLUSTER_ID is not set")
+                .as_str(),
             environment_check,
             database_name.as_str(),
             secrets.clone(),
@@ -494,7 +536,11 @@ fn private_postgresql_v10_deploy_a_working_dev_environment() {
     let secrets = FuncTestsSecrets::new();
     let environment = working_minimal_environment(
         &context,
-        SCW_QOVERY_ORGANIZATION_ID,
+        secrets
+            .SCALEWAY_TEST_ORGANIZATION_ID
+            .as_ref()
+            .expect("SCALEWAY_TEST_ORGANIZATION_ID")
+            .as_str(),
         secrets
             .DEFAULT_TEST_DOMAIN
             .as_ref()
@@ -512,7 +558,11 @@ fn public_postgresql_v10_deploy_a_working_dev_environment() {
     let secrets = FuncTestsSecrets::new();
     let environment = working_minimal_environment(
         &context,
-        SCW_QOVERY_ORGANIZATION_ID,
+        secrets
+            .SCALEWAY_TEST_ORGANIZATION_ID
+            .as_ref()
+            .expect("SCALEWAY_TEST_ORGANIZATION_ID")
+            .as_str(),
         secrets
             .DEFAULT_TEST_DOMAIN
             .as_ref()
@@ -530,7 +580,11 @@ fn private_postgresql_v11_deploy_a_working_dev_environment() {
     let secrets = FuncTestsSecrets::new();
     let environment = working_minimal_environment(
         &context,
-        SCW_QOVERY_ORGANIZATION_ID,
+        secrets
+            .SCALEWAY_TEST_ORGANIZATION_ID
+            .as_ref()
+            .expect("SCALEWAY_TEST_ORGANIZATION_ID")
+            .as_str(),
         secrets
             .DEFAULT_TEST_DOMAIN
             .as_ref()
@@ -548,7 +602,11 @@ fn public_postgresql_v11_deploy_a_working_dev_environment() {
     let secrets = FuncTestsSecrets::new();
     let environment = working_minimal_environment(
         &context,
-        SCW_QOVERY_ORGANIZATION_ID,
+        secrets
+            .SCALEWAY_TEST_ORGANIZATION_ID
+            .as_ref()
+            .expect("SCALEWAY_TEST_ORGANIZATION_ID")
+            .as_str(),
         secrets
             .DEFAULT_TEST_DOMAIN
             .as_ref()
@@ -566,7 +624,11 @@ fn private_postgresql_v12_deploy_a_working_dev_environment() {
     let secrets = FuncTestsSecrets::new();
     let environment = working_minimal_environment(
         &context,
-        SCW_QOVERY_ORGANIZATION_ID,
+        secrets
+            .SCALEWAY_TEST_ORGANIZATION_ID
+            .as_ref()
+            .expect("SCALEWAY_TEST_ORGANIZATION_ID")
+            .as_str(),
         secrets
             .DEFAULT_TEST_DOMAIN
             .as_ref()
@@ -584,7 +646,11 @@ fn public_postgresql_v12_deploy_a_working_dev_environment() {
     let secrets = FuncTestsSecrets::new();
     let environment = working_minimal_environment(
         &context,
-        SCW_QOVERY_ORGANIZATION_ID,
+        secrets
+            .SCALEWAY_TEST_ORGANIZATION_ID
+            .as_ref()
+            .expect("SCALEWAY_TEST_ORGANIZATION_ID")
+            .as_str(),
         secrets
             .DEFAULT_TEST_DOMAIN
             .as_ref()
@@ -604,7 +670,11 @@ fn private_postgresql_v10_deploy_a_working_prod_environment() {
     let secrets = FuncTestsSecrets::new();
     let environment = working_minimal_environment(
         &context,
-        SCW_QOVERY_ORGANIZATION_ID,
+        secrets
+            .SCALEWAY_TEST_ORGANIZATION_ID
+            .as_ref()
+            .expect("SCALEWAY_TEST_ORGANIZATION_ID")
+            .as_str(),
         secrets
             .DEFAULT_TEST_DOMAIN
             .as_ref()
@@ -623,7 +693,11 @@ fn public_postgresql_v10_deploy_a_working_prod_environment() {
     let secrets = FuncTestsSecrets::new();
     let environment = working_minimal_environment(
         &context,
-        SCW_QOVERY_ORGANIZATION_ID,
+        secrets
+            .SCALEWAY_TEST_ORGANIZATION_ID
+            .as_ref()
+            .expect("SCALEWAY_TEST_ORGANIZATION_ID")
+            .as_str(),
         secrets
             .DEFAULT_TEST_DOMAIN
             .as_ref()
@@ -642,7 +716,11 @@ fn private_postgresql_v11_deploy_a_working_prod_environment() {
     let secrets = FuncTestsSecrets::new();
     let environment = working_minimal_environment(
         &context,
-        SCW_QOVERY_ORGANIZATION_ID,
+        secrets
+            .SCALEWAY_TEST_ORGANIZATION_ID
+            .as_ref()
+            .expect("SCALEWAY_TEST_ORGANIZATION_ID")
+            .as_str(),
         secrets
             .DEFAULT_TEST_DOMAIN
             .as_ref()
@@ -661,7 +739,11 @@ fn public_postgresql_v11_deploy_a_working_prod_environment() {
     let secrets = FuncTestsSecrets::new();
     let environment = working_minimal_environment(
         &context,
-        SCW_QOVERY_ORGANIZATION_ID,
+        secrets
+            .SCALEWAY_TEST_ORGANIZATION_ID
+            .as_ref()
+            .expect("SCALEWAY_TEST_ORGANIZATION_ID")
+            .as_str(),
         secrets
             .DEFAULT_TEST_DOMAIN
             .as_ref()
@@ -680,7 +762,11 @@ fn private_postgresql_v12_deploy_a_working_prod_environment() {
     let secrets = FuncTestsSecrets::new();
     let environment = working_minimal_environment(
         &context,
-        SCW_QOVERY_ORGANIZATION_ID,
+        secrets
+            .SCALEWAY_TEST_ORGANIZATION_ID
+            .as_ref()
+            .expect("SCALEWAY_TEST_ORGANIZATION_ID")
+            .as_str(),
         secrets
             .DEFAULT_TEST_DOMAIN
             .as_ref()
@@ -699,7 +785,11 @@ fn public_postgresql_v12_deploy_a_working_prod_environment() {
     let secrets = FuncTestsSecrets::new();
     let environment = working_minimal_environment(
         &context,
-        SCW_QOVERY_ORGANIZATION_ID,
+        secrets
+            .SCALEWAY_TEST_ORGANIZATION_ID
+            .as_ref()
+            .expect("SCALEWAY_TEST_ORGANIZATION_ID")
+            .as_str(),
         secrets
             .DEFAULT_TEST_DOMAIN
             .as_ref()
@@ -748,7 +838,11 @@ fn private_mongodb_v3_6_deploy_a_working_dev_environment() {
     let secrets = FuncTestsSecrets::new();
     let environment = working_minimal_environment(
         &context,
-        SCW_QOVERY_ORGANIZATION_ID,
+        secrets
+            .SCALEWAY_TEST_ORGANIZATION_ID
+            .as_ref()
+            .expect("SCALEWAY_TEST_ORGANIZATION_ID")
+            .as_str(),
         secrets
             .DEFAULT_TEST_DOMAIN
             .as_ref()
@@ -766,7 +860,11 @@ fn public_mongodb_v3_6_deploy_a_working_dev_environment() {
     let secrets = FuncTestsSecrets::new();
     let environment = working_minimal_environment(
         &context,
-        SCW_QOVERY_ORGANIZATION_ID,
+        secrets
+            .SCALEWAY_TEST_ORGANIZATION_ID
+            .as_ref()
+            .expect("SCALEWAY_TEST_ORGANIZATION_ID")
+            .as_str(),
         secrets
             .DEFAULT_TEST_DOMAIN
             .as_ref()
@@ -784,7 +882,11 @@ fn private_mongodb_v4_0_deploy_a_working_dev_environment() {
     let secrets = FuncTestsSecrets::new();
     let environment = working_minimal_environment(
         &context,
-        SCW_QOVERY_ORGANIZATION_ID,
+        secrets
+            .SCALEWAY_TEST_ORGANIZATION_ID
+            .as_ref()
+            .expect("SCALEWAY_TEST_ORGANIZATION_ID")
+            .as_str(),
         secrets
             .DEFAULT_TEST_DOMAIN
             .as_ref()
@@ -802,7 +904,11 @@ fn public_mongodb_v4_0_deploy_a_working_dev_environment() {
     let secrets = FuncTestsSecrets::new();
     let environment = working_minimal_environment(
         &context,
-        SCW_QOVERY_ORGANIZATION_ID,
+        secrets
+            .SCALEWAY_TEST_ORGANIZATION_ID
+            .as_ref()
+            .expect("SCALEWAY_TEST_ORGANIZATION_ID")
+            .as_str(),
         secrets
             .DEFAULT_TEST_DOMAIN
             .as_ref()
@@ -820,7 +926,11 @@ fn private_mongodb_v4_2_deploy_a_working_dev_environment() {
     let secrets = FuncTestsSecrets::new();
     let environment = working_minimal_environment(
         &context,
-        SCW_QOVERY_ORGANIZATION_ID,
+        secrets
+            .SCALEWAY_TEST_ORGANIZATION_ID
+            .as_ref()
+            .expect("SCALEWAY_TEST_ORGANIZATION_ID")
+            .as_str(),
         secrets
             .DEFAULT_TEST_DOMAIN
             .as_ref()
@@ -838,7 +948,11 @@ fn public_mongodb_v4_2_deploy_a_working_dev_environment() {
     let secrets = FuncTestsSecrets::new();
     let environment = working_minimal_environment(
         &context,
-        SCW_QOVERY_ORGANIZATION_ID,
+        secrets
+            .SCALEWAY_TEST_ORGANIZATION_ID
+            .as_ref()
+            .expect("SCALEWAY_TEST_ORGANIZATION_ID")
+            .as_str(),
         secrets
             .DEFAULT_TEST_DOMAIN
             .as_ref()
@@ -856,7 +970,11 @@ fn private_mongodb_v4_4_deploy_a_working_dev_environment() {
     let secrets = FuncTestsSecrets::new();
     let environment = working_minimal_environment(
         &context,
-        SCW_QOVERY_ORGANIZATION_ID,
+        secrets
+            .SCALEWAY_TEST_ORGANIZATION_ID
+            .as_ref()
+            .expect("SCALEWAY_TEST_ORGANIZATION_ID")
+            .as_str(),
         secrets
             .DEFAULT_TEST_DOMAIN
             .as_ref()
@@ -874,7 +992,11 @@ fn public_mongodb_v4_4_deploy_a_working_dev_environment() {
     let secrets = FuncTestsSecrets::new();
     let environment = working_minimal_environment(
         &context,
-        SCW_QOVERY_ORGANIZATION_ID,
+        secrets
+            .SCALEWAY_TEST_ORGANIZATION_ID
+            .as_ref()
+            .expect("SCALEWAY_TEST_ORGANIZATION_ID")
+            .as_str(),
         secrets
             .DEFAULT_TEST_DOMAIN
             .as_ref()
@@ -923,7 +1045,11 @@ fn private_mysql_v5_7_deploy_a_working_dev_environment() {
     let secrets = FuncTestsSecrets::new();
     let environment = working_minimal_environment(
         &context,
-        SCW_QOVERY_ORGANIZATION_ID,
+        secrets
+            .SCALEWAY_TEST_ORGANIZATION_ID
+            .as_ref()
+            .expect("SCALEWAY_TEST_ORGANIZATION_ID")
+            .as_str(),
         secrets
             .DEFAULT_TEST_DOMAIN
             .as_ref()
@@ -941,7 +1067,11 @@ fn public_mysql_v5_7_deploy_a_working_dev_environment() {
     let secrets = FuncTestsSecrets::new();
     let environment = working_minimal_environment(
         &context,
-        SCW_QOVERY_ORGANIZATION_ID,
+        secrets
+            .SCALEWAY_TEST_ORGANIZATION_ID
+            .as_ref()
+            .expect("SCALEWAY_TEST_ORGANIZATION_ID")
+            .as_str(),
         secrets
             .DEFAULT_TEST_DOMAIN
             .as_ref()
@@ -959,7 +1089,11 @@ fn private_mysql_v8_deploy_a_working_dev_environment() {
     let secrets = FuncTestsSecrets::new();
     let environment = working_minimal_environment(
         &context,
-        SCW_QOVERY_ORGANIZATION_ID,
+        secrets
+            .SCALEWAY_TEST_ORGANIZATION_ID
+            .as_ref()
+            .expect("SCALEWAY_TEST_ORGANIZATION_ID")
+            .as_str(),
         secrets
             .DEFAULT_TEST_DOMAIN
             .as_ref()
@@ -977,7 +1111,11 @@ fn public_mysql_v8_deploy_a_working_dev_environment() {
     let secrets = FuncTestsSecrets::new();
     let environment = working_minimal_environment(
         &context,
-        SCW_QOVERY_ORGANIZATION_ID,
+        secrets
+            .SCALEWAY_TEST_ORGANIZATION_ID
+            .as_ref()
+            .expect("SCALEWAY_TEST_ORGANIZATION_ID")
+            .as_str(),
         secrets
             .DEFAULT_TEST_DOMAIN
             .as_ref()
@@ -997,7 +1135,11 @@ fn private_mysql_v8_deploy_a_working_prod_environment() {
     let secrets = FuncTestsSecrets::new();
     let environment = test_utilities::common::working_minimal_environment(
         &context,
-        SCW_QOVERY_ORGANIZATION_ID,
+        secrets
+            .SCALEWAY_TEST_ORGANIZATION_ID
+            .as_ref()
+            .expect("SCALEWAY_TEST_ORGANIZATION_ID")
+            .as_str(),
         secrets
             .DEFAULT_TEST_DOMAIN
             .as_ref()
@@ -1016,7 +1158,11 @@ fn public_mysql_v8_deploy_a_working_prod_environment() {
     let secrets = FuncTestsSecrets::new();
     let environment = test_utilities::common::working_minimal_environment(
         &context,
-        SCW_QOVERY_ORGANIZATION_ID,
+        secrets
+            .SCALEWAY_TEST_ORGANIZATION_ID
+            .as_ref()
+            .expect("SCALEWAY_TEST_ORGANIZATION_ID")
+            .as_str(),
         secrets
             .DEFAULT_TEST_DOMAIN
             .as_ref()
@@ -1065,7 +1211,11 @@ fn private_redis_v5_deploy_a_working_dev_environment() {
     let secrets = FuncTestsSecrets::new();
     let environment = working_minimal_environment(
         &context,
-        SCW_QOVERY_ORGANIZATION_ID,
+        secrets
+            .SCALEWAY_TEST_ORGANIZATION_ID
+            .as_ref()
+            .expect("SCALEWAY_TEST_ORGANIZATION_ID")
+            .as_str(),
         secrets
             .DEFAULT_TEST_DOMAIN
             .as_ref()
@@ -1083,7 +1233,11 @@ fn public_redis_v5_deploy_a_working_dev_environment() {
     let secrets = FuncTestsSecrets::new();
     let environment = working_minimal_environment(
         &context,
-        SCW_QOVERY_ORGANIZATION_ID,
+        secrets
+            .SCALEWAY_TEST_ORGANIZATION_ID
+            .as_ref()
+            .expect("SCALEWAY_TEST_ORGANIZATION_ID")
+            .as_str(),
         secrets
             .DEFAULT_TEST_DOMAIN
             .as_ref()
@@ -1101,7 +1255,11 @@ fn private_redis_v6_deploy_a_working_dev_environment() {
     let secrets = FuncTestsSecrets::new();
     let environment = working_minimal_environment(
         &context,
-        SCW_QOVERY_ORGANIZATION_ID,
+        secrets
+            .SCALEWAY_TEST_ORGANIZATION_ID
+            .as_ref()
+            .expect("SCALEWAY_TEST_ORGANIZATION_ID")
+            .as_str(),
         secrets
             .DEFAULT_TEST_DOMAIN
             .as_ref()
@@ -1119,7 +1277,11 @@ fn public_redis_v6_deploy_a_working_dev_environment() {
     let secrets = FuncTestsSecrets::new();
     let environment = working_minimal_environment(
         &context,
-        SCW_QOVERY_ORGANIZATION_ID,
+        secrets
+            .SCALEWAY_TEST_ORGANIZATION_ID
+            .as_ref()
+            .expect("SCALEWAY_TEST_ORGANIZATION_ID")
+            .as_str(),
         secrets
             .DEFAULT_TEST_DOMAIN
             .as_ref()

tests/scaleway/scw_environment.rs

@@ -1,8 +1,6 @@
 extern crate test_utilities;
 
-use self::test_utilities::scaleway::{
-    clean_environments, SCW_KUBE_TEST_CLUSTER_ID, SCW_QOVERY_ORGANIZATION_ID, SCW_TEST_ZONE,
-};
+use self::test_utilities::scaleway::{clean_environments, SCW_TEST_ZONE};
 use self::test_utilities::utilities::{
     context, engine_run_test, generate_id, get_pods, get_pvc, init, is_pod_restarted_env, FuncTestsSecrets,
 };
@@ -33,7 +31,11 @@ fn scaleway_kapsule_deploy_a_working_environment_with_no_router() {
         let secrets = FuncTestsSecrets::new();
         let mut environment = test_utilities::common::working_minimal_environment(
             &context,
-            SCW_QOVERY_ORGANIZATION_ID,
+            secrets
+                .SCALEWAY_TEST_ORGANIZATION_ID
+                .as_ref()
+                .expect("SCALEWAY_TEST_ORGANIZATION_ID")
+                .as_str(),
             secrets
                 .DEFAULT_TEST_DOMAIN
                 .as_ref()
@@ -86,7 +88,11 @@ fn scaleway_kapsule_deploy_a_not_working_environment_with_no_router() {
 
         let mut environment = test_utilities::common::non_working_environment(
             &context,
-            SCW_QOVERY_ORGANIZATION_ID,
+            secrets
+                .SCALEWAY_TEST_ORGANIZATION_ID
+                .as_ref()
+                .expect("SCALEWAY_TEST_ORGANIZATION_ID")
+                .as_str(),
             secrets
                 .DEFAULT_TEST_DOMAIN
                 .as_ref()
@@ -137,7 +143,11 @@ fn scaleway_kapsule_deploy_a_working_environment_and_pause() {
         let secrets = FuncTestsSecrets::new();
         let environment = test_utilities::common::working_minimal_environment(
             &context,
-            SCW_QOVERY_ORGANIZATION_ID,
+            secrets
+                .SCALEWAY_TEST_ORGANIZATION_ID
+                .as_ref()
+                .expect("SCALEWAY_TEST_ORGANIZATION_ID")
+                .as_str(),
             secrets
                 .DEFAULT_TEST_DOMAIN
                 .as_ref()
@@ -158,7 +168,11 @@ fn scaleway_kapsule_deploy_a_working_environment_and_pause() {
             Kind::Scw,
             environment.clone(),
             selector.as_str(),
-            SCW_KUBE_TEST_CLUSTER_ID,
+            secrets
+                .SCALEWAY_TEST_CLUSTER_ID
+                .as_ref()
+                .expect("SCALEWAY_TEST_CLUSTER_ID is not set")
+                .as_str(),
             secrets.clone(),
         );
         assert_eq!(ret.is_ok(), true);
@@ -175,7 +189,11 @@ fn scaleway_kapsule_deploy_a_working_environment_and_pause() {
             Kind::Scw,
             environment.clone(),
             selector.as_str(),
-            SCW_KUBE_TEST_CLUSTER_ID,
+            secrets
+                .SCALEWAY_TEST_CLUSTER_ID
+                .as_ref()
+                .expect("SCALEWAY_TEST_CLUSTER_ID is not set")
+                .as_str(),
             secrets.clone(),
         );
         assert_eq!(ret.is_ok(), true);
@@ -193,7 +211,11 @@ fn scaleway_kapsule_deploy_a_working_environment_and_pause() {
             Kind::Scw,
             environment.clone(),
             selector.as_str(),
-            SCW_KUBE_TEST_CLUSTER_ID,
+            secrets
+                .SCALEWAY_TEST_CLUSTER_ID
+                .as_ref()
+                .expect("SCALEWAY_TEST_CLUSTER_ID is not set")
+                .as_str(),
             secrets.clone(),
         );
         assert_eq!(ret.is_ok(), true);
@@ -230,7 +252,11 @@ fn scaleway_kapsule_build_with_buildpacks_and_deploy_a_working_environment() {
         let secrets = FuncTestsSecrets::new();
         let mut environment = test_utilities::common::working_minimal_environment(
             &context,
-            SCW_QOVERY_ORGANIZATION_ID,
+            secrets
+                .SCALEWAY_TEST_ORGANIZATION_ID
+                .as_ref()
+                .expect("SCALEWAY_TEST_ORGANIZATION_ID")
+                .as_str(),
             secrets
                 .DEFAULT_TEST_DOMAIN
                 .as_ref()
@@ -291,7 +317,11 @@ fn scaleway_kapsule_deploy_a_working_environment_with_domain() {
         let secrets = FuncTestsSecrets::new();
         let environment = test_utilities::common::working_minimal_environment(
             &context,
-            SCW_QOVERY_ORGANIZATION_ID,
+            secrets
+                .SCALEWAY_TEST_ORGANIZATION_ID
+                .as_ref()
+                .expect("SCALEWAY_TEST_ORGANIZATION_ID")
+                .as_str(),
             secrets
                 .DEFAULT_TEST_DOMAIN
                 .as_ref()
@@ -342,7 +372,11 @@ fn scaleway_kapsule_deploy_a_working_environment_with_storage() {
 
         let mut environment = test_utilities::common::working_minimal_environment(
             &context,
-            SCW_QOVERY_ORGANIZATION_ID,
+            secrets
+                .SCALEWAY_TEST_ORGANIZATION_ID
+                .as_ref()
+                .expect("SCALEWAY_TEST_ORGANIZATION_ID")
+                .as_str(),
             secrets
                 .DEFAULT_TEST_DOMAIN
                 .as_ref()
@@ -381,7 +415,11 @@ fn scaleway_kapsule_deploy_a_working_environment_with_storage() {
 
         match get_pvc(
             Kind::Scw,
-            SCW_KUBE_TEST_CLUSTER_ID,
+            secrets
+                .SCALEWAY_TEST_CLUSTER_ID
+                .as_ref()
+                .expect("SCALEWAY_TEST_CLUSTER_ID is not set")
+                .as_str(),
             environment.clone(),
             secrets.clone(),
         ) {
@@ -424,7 +462,11 @@ fn scaleway_kapsule_redeploy_same_app() {
 
         let mut environment = test_utilities::common::working_minimal_environment(
             &context,
-            SCW_QOVERY_ORGANIZATION_ID,
+            secrets
+                .SCALEWAY_TEST_ORGANIZATION_ID
+                .as_ref()
+                .expect("SCALEWAY_TEST_ORGANIZATION_ID")
+                .as_str(),
             secrets
                 .clone()
                 .DEFAULT_TEST_DOMAIN
@@ -468,7 +510,11 @@ fn scaleway_kapsule_redeploy_same_app() {
 
         match get_pvc(
             Kind::Scw,
-            SCW_KUBE_TEST_CLUSTER_ID,
+            secrets
+                .SCALEWAY_TEST_CLUSTER_ID
+                .as_ref()
+                .expect("SCALEWAY_TEST_CLUSTER_ID is not set")
+                .as_str(),
             environment.clone(),
             secrets.clone(),
         ) {
@@ -482,7 +528,11 @@ fn scaleway_kapsule_redeploy_same_app() {
         let app_name = format!("{}-0", &environment_check1.applications[0].name);
         let (_, number) = is_pod_restarted_env(
             Kind::Scw,
-            SCW_KUBE_TEST_CLUSTER_ID,
+            secrets
+                .SCALEWAY_TEST_CLUSTER_ID
+                .as_ref()
+                .expect("SCALEWAY_TEST_CLUSTER_ID is not set")
+                .as_str(),
             environment_check1,
             app_name.clone().as_str(),
             secrets.clone(),
@@ -496,7 +546,11 @@ fn scaleway_kapsule_redeploy_same_app() {
 
         let (_, number2) = is_pod_restarted_env(
             Kind::Scw,
-            SCW_KUBE_TEST_CLUSTER_ID,
+            secrets
+                .SCALEWAY_TEST_CLUSTER_ID
+                .as_ref()
+                .expect("SCALEWAY_TEST_CLUSTER_ID is not set")
+                .as_str(),
             environment_check2,
             app_name.as_str(),
             secrets.clone(),
@@ -538,7 +592,11 @@ fn scaleway_kapsule_deploy_a_not_working_environment_and_then_working_environmen
         // env part generation
         let environment = test_utilities::common::working_minimal_environment(
             &context,
-            SCW_QOVERY_ORGANIZATION_ID,
+            secrets
+                .SCALEWAY_TEST_ORGANIZATION_ID
+                .as_ref()
+                .expect("SCALEWAY_TEST_ORGANIZATION_ID")
+                .as_str(),
             secrets
                 .DEFAULT_TEST_DOMAIN
                 .as_ref()
@@ -612,7 +670,11 @@ fn scaleway_kapsule_deploy_ok_fail_fail_ok_environment() {
         let secrets = FuncTestsSecrets::new();
         let environment = test_utilities::common::working_minimal_environment(
             &context,
-            SCW_QOVERY_ORGANIZATION_ID,
+            secrets
+                .SCALEWAY_TEST_ORGANIZATION_ID
+                .as_ref()
+                .expect("SCALEWAY_TEST_ORGANIZATION_ID")
+                .as_str(),
             secrets
                 .DEFAULT_TEST_DOMAIN
                 .as_ref()
@@ -706,7 +768,11 @@ fn scaleway_kapsule_deploy_a_non_working_environment_with_no_failover() {
         let secrets = FuncTestsSecrets::new();
         let environment = test_utilities::common::non_working_environment(
             &context,
-            SCW_QOVERY_ORGANIZATION_ID,
+            secrets
+                .SCALEWAY_TEST_ORGANIZATION_ID
+                .as_ref()
+                .expect("SCALEWAY_TEST_ORGANIZATION_ID")
+                .as_str(),
             secrets
                 .DEFAULT_TEST_DOMAIN
                 .as_ref()
@@ -760,11 +826,22 @@ fn scaleway_kapsule_deploy_a_non_working_environment_with_a_working_failover() {
             .as_ref()
             .expect("DEFAULT_TEST_DOMAIN is not set in secrets");
 
-        let environment =
-            test_utilities::common::non_working_environment(&context, SCW_QOVERY_ORGANIZATION_ID, test_domain.as_str());
+        let environment = test_utilities::common::non_working_environment(
+            &context,
+            secrets
+                .SCALEWAY_TEST_ORGANIZATION_ID
+                .as_ref()
+                .expect("SCALEWAY_TEST_ORGANIZATION_ID")
+                .as_str(),
+            test_domain.as_str(),
+        );
         let failover_environment = test_utilities::common::working_minimal_environment(
             &context,
-            SCW_QOVERY_ORGANIZATION_ID,
+            secrets
+                .SCALEWAY_TEST_ORGANIZATION_ID
+                .as_ref()
+                .expect("SCALEWAY_TEST_ORGANIZATION_ID")
+                .as_str(),
             test_domain.as_str(),
         );
 
@@ -772,7 +849,11 @@ fn scaleway_kapsule_deploy_a_non_working_environment_with_a_working_failover() {
         let context_deletion = context.clone_not_same_execution_id();
         let mut delete_env = test_utilities::common::working_minimal_environment(
             &context_deletion,
-            SCW_QOVERY_ORGANIZATION_ID,
+            secrets
+                .SCALEWAY_TEST_ORGANIZATION_ID
+                .as_ref()
+                .expect("SCALEWAY_TEST_ORGANIZATION_ID")
+                .as_str(),
             test_domain.as_str(),
         );
         delete_env.action = Action::Delete;
@@ -823,15 +904,33 @@ fn scaleway_kapsule_deploy_a_non_working_environment_with_a_non_working_failover
             .as_ref()
             .expect("DEFAULT_TEST_DOMAIN is not set in secrets");
 
-        let environment =
-            test_utilities::common::non_working_environment(&context, SCW_QOVERY_ORGANIZATION_ID, test_domain.as_str());
-        let failover_environment =
-            test_utilities::common::non_working_environment(&context, SCW_QOVERY_ORGANIZATION_ID, test_domain.as_str());
+        let environment = test_utilities::common::non_working_environment(
+            &context,
+            secrets
+                .SCALEWAY_TEST_ORGANIZATION_ID
+                .as_ref()
+                .expect("SCALEWAY_TEST_ORGANIZATION_ID")
+                .as_str(),
+            test_domain.as_str(),
+        );
+        let failover_environment = test_utilities::common::non_working_environment(
+            &context,
+            secrets
+                .SCALEWAY_TEST_ORGANIZATION_ID
+                .as_ref()
+                .expect("SCALEWAY_TEST_ORGANIZATION_ID")
+                .as_str(),
+            test_domain.as_str(),
+        );
 
         let context_for_deletion = context.clone_not_same_execution_id();
         let mut delete_env = test_utilities::common::non_working_environment(
             &context_for_deletion,
-            SCW_QOVERY_ORGANIZATION_ID,
+            secrets
+                .SCALEWAY_TEST_ORGANIZATION_ID
+                .as_ref()
+                .expect("SCALEWAY_TEST_ORGANIZATION_ID")
+                .as_str(),
             test_domain.as_str(),
         );
         delete_env.action = Action::Delete;

tests/scaleway/scw_utility_kubernetes_kapsule_test_cluster.rs

@@ -36,11 +36,16 @@ fn create_scaleway_kubernetes_kapsule_test_cluster() {
         let nodes = Scaleway::kubernetes_nodes();
         let cloudflare = dns_provider_cloudflare(&context, ClusterDomain::Default);
 
+        let cluster_id = secrets
+            .SCALEWAY_TEST_CLUSTER_ID
+            .as_ref()
+            .expect("SCALEWAY_TEST_CLUSTER_ID");
+
         let kubernetes = Kapsule::new(
             context.clone(),
-            test_utilities::scaleway::SCW_KUBE_TEST_CLUSTER_ID.to_string(),
+            cluster_id.to_string(),
             uuid::Uuid::new_v4(),
-            test_utilities::scaleway::SCW_KUBE_TEST_CLUSTER_NAME.to_string(),
+            format!("qovery-{}", cluster_id.to_string()),
             test_utilities::scaleway::SCW_KUBERNETES_VERSION.to_string(),
             test_utilities::scaleway::SCW_TEST_ZONE,
             scw_cluster.as_ref(),
@@ -90,11 +95,16 @@ fn destroy_scaleway_kubernetes_kapsule_test_cluster() {
         let nodes = Scaleway::kubernetes_nodes();
         let cloudflare = dns_provider_cloudflare(&context, ClusterDomain::Default);
 
+        let cluster_id = secrets
+            .SCALEWAY_TEST_CLUSTER_ID
+            .as_ref()
+            .expect("SCALEWAY_TEST_CLUSTER_ID is not set");
+
         let kubernetes = Kapsule::new(
             context.clone(),
-            test_utilities::scaleway::SCW_KUBE_TEST_CLUSTER_ID.to_string(),
+            cluster_id.to_string(),
             uuid::Uuid::new_v4(),
-            test_utilities::scaleway::SCW_KUBE_TEST_CLUSTER_NAME.to_string(),
+            format!("qovery-{}", cluster_id.to_string()),
             test_utilities::scaleway::SCW_KUBERNETES_VERSION.to_string(),
             test_utilities::scaleway::SCW_TEST_ZONE,
             scw_cluster.as_ref(),