jlengrand/engine
1
0
Fork 0
mirror of https://github.com/jlengrand/engine.git synced 2026-03-10 08:11:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

feat: use subdomains for dns and tls (#500)

Browse Source 
Ticket: DEV-996
This commit is contained in:
Benjamin
2021-11-29 10:33:51 +01:00
committed by GitHub
parent cddf044680
commit 6167abe032
30 changed files with 485 additions and 73 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
Cargo.toml
View File

@@ -76,7 +76,7 @@ maplit = "1.0.2"
[features]
default = []
test-all = ["test-all-self-hosted", "test-all-infra", "test-all-managed-services"]
test-all = ["test-all-self-hosted", "test-all-infra", "test-all-managed-services", "test-all-whole-enchilada"]
# functionnal tests by type
test-aws-self-hosted = []
@@ -94,7 +94,12 @@ test-do-infra = []
test-scw-infra = []
test-all-infra = ["test-aws-infra", "test-do-infra", "test-scw-infra"]
test-aws-whole-enchilada = []
test-do-whole-enchilada = []
test-scw-whole-enchilada = []
test-all-whole-enchilada = ["test-aws-whole-enchilada", "test-do-whole-enchilada", "test-scw-whole-enchilada"]
# functionnal tests by provider
test-aws-all = ["test-aws-infra", "test-aws-managed-services", "test-aws-self-hosted"]
test-do-all = ["test-do-infra", "test-do-managed-services", "test-do-self-hosted"]
test-scw-all = ["test-scw-infra", "test-scw-managed-services", "test-scw-self-hosted"]
test-aws-all = ["test-aws-infra", "test-aws-managed-services", "test-aws-self-hosted", "test-aws-whole-enchilada"]
test-do-all = ["test-do-infra", "test-do-managed-services", "test-do-self-hosted", "test-do-whole-enchilada"]
test-scw-all = ["test-scw-infra", "test-scw-managed-services", "test-scw-self-hosted", "test-scw-whole-enchilada"]

2
lib/aws/bootstrap/chart_values/external-dns.j2.yaml
View File

@@ -7,7 +7,7 @@ cloudflare:
proxied: {{ cloudflare_proxied|default(value="false") }}
{% endif %}
domainFilters: {{ managed_dns_domains_helm_format }}
domainFilters: {{ managed_dns_domains_root_helm_format }}
triggerLoopOnEvent: true
policy: sync
txtOwnerId: "{{ kubernetes_cluster_id }}"

2
lib/digitalocean/bootstrap/chart_values/external-dns.j2.yaml
View File

@@ -7,7 +7,7 @@ cloudflare:
proxied: {{ cloudflare_proxied|default(value="false") }}
{% endif %}
domainFilters: {{ managed_dns_domains_helm_format }}
domainFilters: {{ managed_dns_domains_root_helm_format }}
triggerLoopOnEvent: true
policy: sync
txtOwnerId: "{{ doks_cluster_id }}"

2
lib/scaleway/bootstrap/chart_values/external-dns.j2.yaml
View File

@@ -7,7 +7,7 @@ cloudflare:
proxied: {{ cloudflare_proxied|default(value="false") }}
{% endif %}
domainFilters: {{ managed_dns_domains_helm_format }}
domainFilters: {{ managed_dns_domains_root_helm_format }}
triggerLoopOnEvent: true
policy: sync
txtOwnerId: "{{ kubernetes_cluster_id }}"

27
src/cloud_provider/aws/kubernetes/mod.rs
View File

@@ -37,7 +37,7 @@ use crate::error::EngineErrorCause::Internal;
use crate::error::{
cast_simple_error_to_engine_error, EngineError, EngineErrorCause, EngineErrorScope, SimpleError, SimpleErrorKind,
};
use crate::models::{Action, Context, Features, Listen, Listener, Listeners, ListenersHelper};
use crate::models::{Action, Context, Features, Listen, Listener, Listeners, ListenersHelper, ToHelmString};
use crate::object_storage::s3::S3;
use crate::object_storage::ObjectStorage;
use crate::string::terraform_list_format;
@@ -287,11 +287,6 @@ impl<'a> EKS<'a> {
let elasticache_cidr_subnet = self.options.elasticache_cidr_subnet.clone();
let elasticsearch_cidr_subnet = self.options.elasticsearch_cidr_subnet.clone();
let managed_dns_list = vec![self.dns_provider.name()];
let managed_dns_domains_helm_format = vec![format!("{}", self.dns_provider.domain())];
let managed_dns_domains_terraform_format = terraform_list_format(vec![self.dns_provider.domain().to_string()]);
let managed_dns_resolvers_terraform_format = self.managed_dns_resolvers_terraform_format();
// Qovery
context.insert("organization_id", self.cloud_provider.organization_id());
context.insert("qovery_api_url", &qovery_api_url);
@@ -325,14 +320,28 @@ impl<'a> EKS<'a> {
);
// DNS configuration
let managed_dns_list = vec![self.dns_provider.name()];
let managed_dns_domains_helm_format = vec![self.dns_provider.domain().to_string()];
let managed_dns_domains_root_helm_format = vec![self.dns_provider.domain().root_domain().to_string()];
let managed_dns_domains_terraform_format = terraform_list_format(vec![self.dns_provider.domain().to_string()]);
let managed_dns_domains_root_terraform_format =
terraform_list_format(vec![self.dns_provider.domain().root_domain().to_string()]);
let managed_dns_resolvers_terraform_format = self.managed_dns_resolvers_terraform_format();
context.insert("managed_dns", &managed_dns_list);
context.insert("managed_dns_domains_helm_format", &managed_dns_domains_helm_format);
context.insert(
"managed_dns_domains_root_helm_format",
&managed_dns_domains_root_helm_format,
);
context.insert(
"managed_dns_domains_terraform_format",
&managed_dns_domains_terraform_format,
);
context.insert(
"managed_dns_domains_root_terraform_format",
&managed_dns_domains_root_terraform_format,
);
context.insert(
"managed_dns_resolvers_terraform_format",
&managed_dns_resolvers_terraform_format,
@@ -630,7 +639,7 @@ impl<'a> EKS<'a> {
ff_log_history_enabled: self.context.is_feature_enabled(&Features::LogsHistory),
ff_metrics_history_enabled: self.context.is_feature_enabled(&Features::MetricsHistory),
managed_dns_name: self.dns_provider.domain().to_string(),
managed_dns_helm_format: self.dns_provider.domain_helm_format(),
managed_dns_helm_format: self.dns_provider.domain().to_helm_format_string(),
managed_dns_resolvers_terraform_format: self.managed_dns_resolvers_terraform_format(),
external_dns_provider: self.dns_provider.provider_name().to_string(),
dns_email_report: self.options.tls_email_report.clone(),

20
src/cloud_provider/digitalocean/kubernetes/mod.rs
View File

@@ -35,7 +35,8 @@ use crate::dns_provider::DnsProvider;
use crate::error::EngineErrorCause::Internal;
use crate::error::{cast_simple_error_to_engine_error, EngineError, EngineErrorCause, EngineErrorScope, SimpleError};
use crate::models::{
Action, Context, Features, Listen, Listener, Listeners, ListenersHelper, ProgressInfo, ProgressLevel, ProgressScope,
Action, Context, Features, Listen, Listener, Listeners, ListenersHelper, ProgressInfo, ProgressLevel,
ProgressScope, ToHelmString,
};
use crate::object_storage::spaces::{BucketDeleteStrategy, Spaces};
use crate::object_storage::ObjectStorage;
@@ -221,18 +222,29 @@ impl<'a> DOKS<'a> {
// DNS
let managed_dns_list = vec![self.dns_provider.name()];
let managed_dns_domains_helm_format = vec![format!("\"{}\"", self.dns_provider.domain())];
let managed_dns_domains_helm_format = vec![self.dns_provider.domain().to_string()];
let managed_dns_domains_root_helm_format = vec![self.dns_provider.domain().root_domain().to_string()];
let managed_dns_domains_terraform_format = terraform_list_format(vec![self.dns_provider.domain().to_string()]);
let managed_dns_domains_root_terraform_format =
terraform_list_format(vec![self.dns_provider.domain().root_domain().to_string()]);
let managed_dns_resolvers_terraform_format = self.managed_dns_resolvers_terraform_format();
context.insert("managed_dns", &managed_dns_list);
context.insert("do_loadbalancer_hostname", &self.do_loadbalancer_hostname());
context.insert("managed_dns_domain", self.dns_provider.domain());
context.insert("managed_dns_domain", self.dns_provider.domain().to_string().as_str());
context.insert("managed_dns_domains_helm_format", &managed_dns_domains_helm_format);
context.insert(
"managed_dns_domains_root_helm_format",
&managed_dns_domains_root_helm_format,
);
context.insert(
"managed_dns_domains_terraform_format",
&managed_dns_domains_terraform_format,
);
context.insert(
"managed_dns_domains_root_terraform_format",
&managed_dns_domains_root_terraform_format,
);
context.insert(
"managed_dns_resolvers_terraform_format",
&managed_dns_resolvers_terraform_format,
@@ -630,7 +642,7 @@ impl<'a> DOKS<'a> {
ff_log_history_enabled: self.context.is_feature_enabled(&Features::LogsHistory),
ff_metrics_history_enabled: self.context.is_feature_enabled(&Features::MetricsHistory),
managed_dns_name: self.dns_provider.domain().to_string(),
managed_dns_helm_format: self.dns_provider.domain_helm_format(),
managed_dns_helm_format: self.dns_provider.domain().to_helm_format_string(),
managed_dns_resolvers_terraform_format: self.managed_dns_resolvers_terraform_format(),
external_dns_provider: self.dns_provider.provider_name().to_string(),
dns_email_report: self.options.tls_email_report.clone(),

17
src/cloud_provider/scaleway/kubernetes/mod.rs
View File

@@ -23,7 +23,7 @@ use crate::error::EngineErrorCause::Internal;
use crate::error::{
cast_simple_error_to_engine_error, EngineError, EngineErrorCause, EngineErrorScope, SimpleError, SimpleErrorKind,
};
use crate::models::{Action, Context, Features, Listen, Listener, Listeners, ListenersHelper};
use crate::models::{Action, Context, Features, Listen, Listener, Listeners, ListenersHelper, ToHelmString};
use crate::object_storage::scaleway_object_storage::{BucketDeleteStrategy, ScalewayOS};
use crate::object_storage::ObjectStorage;
use crate::string::terraform_list_format;
@@ -201,15 +201,26 @@ impl<'a> Kapsule<'a> {
// DNS
let managed_dns_list = vec![self.dns_provider.name()];
let managed_dns_domains_helm_format = vec![self.dns_provider.domain().to_string()];
let managed_dns_domains_root_helm_format = vec![self.dns_provider.domain().root_domain().to_string()];
let managed_dns_domains_terraform_format = terraform_list_format(vec![self.dns_provider.domain().to_string()]);
let managed_dns_domains_root_terraform_format =
terraform_list_format(vec![self.dns_provider.domain().root_domain().to_string()]);
let managed_dns_resolvers_terraform_format = self.managed_dns_resolvers_terraform_format();
context.insert("managed_dns", &managed_dns_list);
context.insert("managed_dns_domains_helm_format", &managed_dns_domains_helm_format);
context.insert(
"managed_dns_domains_root_helm_format",
&managed_dns_domains_root_helm_format,
);
context.insert(
"managed_dns_domains_terraform_format",
&managed_dns_domains_terraform_format,
);
context.insert(
"managed_dns_domains_root_terraform_format",
&managed_dns_domains_root_terraform_format,
);
context.insert(
"managed_dns_resolvers_terraform_format",
&managed_dns_resolvers_terraform_format,
@@ -498,8 +509,8 @@ impl<'a> Kapsule<'a> {
self.options.qovery_engine_location.clone(),
self.context.is_feature_enabled(&Features::LogsHistory),
self.context.is_feature_enabled(&Features::MetricsHistory),
self.dns_provider.domain().to_string(),
self.dns_provider.domain_helm_format(),
self.dns_provider.domain().root_domain().to_string(),
self.dns_provider.domain().to_helm_format_string(),
self.managed_dns_resolvers_terraform_format(),
self.dns_provider.provider_name().to_string(),
self.options.tls_email_report.clone(),

4
src/cloud_provider/scaleway/router.rs
View File

@@ -158,9 +158,9 @@ impl Service for Router {
.collect::<Vec<_>>();
let router_default_domain_hash = crate::crypto::to_sha1_truncate_16(self.default_domain.as_str());
let tls_domain = kubernetes.dns_provider().domain().wildcarded();
let tls_domain = format!("*.{}", kubernetes.dns_provider().domain());
context.insert("router_tls_domain", tls_domain.as_str());
context.insert("router_tls_domain", tls_domain.to_string().as_str());
context.insert("router_default_domain", self.default_domain.as_str());
context.insert("router_default_domain_hash", router_default_domain_hash.as_str());
context.insert("custom_domains", &custom_domain_data_templates);

2
src/container_registry/scaleway_container_registry.rs
View File

@@ -303,7 +303,7 @@ impl ContainerRegistry for ScalewayCR {
}
fn kind(&self) -> Kind {
Kind::Docr
Kind::ScalewayCr
}
fn id(&self) -> &str {

12
src/dns_provider/cloudflare.rs
View File

@@ -2,13 +2,13 @@ use std::net::Ipv4Addr;
use crate::dns_provider::{DnsProvider, Kind};
use crate::error::{EngineError, EngineErrorCause};
use crate::models::Context;
use crate::models::{Context, Domain};
pub struct Cloudflare {
context: Context,
id: String,
name: String,
domain: String,
domain: Domain,
cloudflare_api_token: String,
cloudflare_email: String,
}
@@ -18,7 +18,7 @@ impl Cloudflare {
context: Context,
id: &str,
name: &str,
domain: &str,
domain: Domain,
cloudflare_api_token: &str,
cloudflare_email: &str,
) -> Self {
@@ -26,7 +26,7 @@ impl Cloudflare {
context,
id: id.to_string(),
name: name.to_string(),
domain: domain.to_string(),
domain,
cloudflare_api_token: cloudflare_api_token.to_string(),
cloudflare_email: cloudflare_email.to_string(),
}
@@ -62,8 +62,8 @@ impl DnsProvider for Cloudflare {
&self.cloudflare_api_token
}
fn domain(&self) -> &str {
self.domain.as_str()
fn domain(&self) -> &Domain {
&self.domain
}
fn resolvers(&self) -> Vec<Ipv4Addr> {

7
src/dns_provider/mod.rs
View File

@@ -3,7 +3,7 @@ use std::net::Ipv4Addr;
use serde::{Deserialize, Serialize};
use crate::error::{EngineError, EngineErrorCause, EngineErrorScope};
use crate::models::Context;
use crate::models::{Context, Domain};
pub mod cloudflare;
@@ -18,10 +18,7 @@ pub trait DnsProvider {
}
fn account(&self) -> &str;
fn token(&self) -> &str;
fn domain(&self) -> &str;
fn domain_helm_format(&self) -> String {
format!("{{{}}}", self.domain())
}
fn domain(&self) -> &Domain;
fn resolvers(&self) -> Vec<Ipv4Addr>;
fn is_valid(&self) -> Result<(), EngineError>;
fn engine_error_scope(&self) -> EngineErrorScope {

169
src/models.rs
View File

@@ -16,8 +16,10 @@ use crate::cloud_provider::utilities::VersionsNumber;
use crate::cloud_provider::CloudProvider;
use crate::cloud_provider::Kind as CPKind;
use crate::git::Credentials;
use itertools::Itertools;
use std::collections::BTreeMap;
use std::fmt::{Display, Formatter};
use std::net::Ipv4Addr;
use std::str::FromStr;
use std::sync::Arc;
@@ -1165,3 +1167,170 @@ impl Metadata {
/// Represent a String path instead of passing a PathBuf struct
pub type StringPath = String;
pub trait ToTerraformString {
fn to_terraform_format_string(&self) -> String;
}
pub trait ToHelmString {
fn to_helm_format_string(&self) -> String;
}
/// Represents a domain, just plain domain, no protocol.
/// eq. `test.com`, `sub.test.com`
#[derive(Clone)]
pub struct Domain {
raw: String,
root_domain: String,
}
impl Domain {
pub fn new(raw: String) -> Self {
// TODO(benjaminch): This is very basic solution which doesn't take into account
// some edge cases such as: "test.co.uk" domains
let sep: &str = ".";
let items: Vec<String> = raw.split(sep).map(|e| e.to_string()).collect();
let items_count = raw.matches(sep).count() + 1;
let top_domain: String = match items_count > 2 {
true => items.iter().skip(items_count - 2).join("."),
false => items.iter().join("."),
};
Domain {
root_domain: top_domain,
raw,
}
}
pub fn new_with_subdomain(raw: String, sub_domain: String) -> Self {
Domain::new(format!("{}.{}", sub_domain, raw))
}
pub fn with_sub_domain(&self, sub_domain: String) -> Domain {
Domain::new(format!("{}.{}", sub_domain, self.raw))
}
pub fn root_domain(&self) -> Domain {
Domain::new(self.root_domain.to_string())
}
pub fn wildcarded(&self) -> Domain {
if self.is_wildcarded() {
return self.clone();
}
match self.raw.is_empty() {
false => Domain::new_with_subdomain(self.raw.to_string(), "*".to_string()),
true => Domain::new("*".to_string()),
}
}
fn is_wildcarded(&self) -> bool {
self.raw.starts_with("*")
}
}
impl Display for Domain {
fn fmt(&self, f: &mut Formatter<'_>) -> std::fmt::Result {
f.write_str(&self.raw.as_str())
}
}
impl ToTerraformString for Domain {
fn to_terraform_format_string(&self) -> String {
format!("{{{}}}", self.raw)
}
}
impl ToHelmString for Domain {
fn to_helm_format_string(&self) -> String {
format!("{{{}}}", self.raw)
}
}
impl ToTerraformString for Ipv4Addr {
fn to_terraform_format_string(&self) -> String {
format!("{{{}}}", self.to_string())
}
}
#[cfg(test)]
mod tests {
use crate::models::Domain;
#[test]
fn test_domain_new() {
struct TestCase<'a> {
input: String,
expected_root_domain_output: String,
expected_wildcarded_output: String,
description: &'a str,
}
// setup:
let test_cases: Vec<TestCase> = vec![
TestCase {
input: "".to_string(),
expected_root_domain_output: "".to_string(),
expected_wildcarded_output: "*".to_string(),
description: "empty raw domain input",
},
TestCase {
input: "*".to_string(),
expected_root_domain_output: "*".to_string(),
expected_wildcarded_output: "*".to_string(),
description: "wildcard domain input",
},
TestCase {
input: "*.test.com".to_string(),
expected_root_domain_output: "test.com".to_string(),
expected_wildcarded_output: "*.test.com".to_string(),
description: "wildcarded domain input",
},
TestCase {
input: "test.co.uk".to_string(),
expected_root_domain_output: "co.uk".to_string(), // TODO(benjamin) => Should be test.co.uk in the future
expected_wildcarded_output: "*.co.uk".to_string(),
description: "broken edge case domain with special tld input",
},
TestCase {
input: "test".to_string(),
expected_root_domain_output: "test".to_string(),
expected_wildcarded_output: "*.test".to_string(),
description: "domain without tld input",
},
TestCase {
input: "test.com".to_string(),
expected_root_domain_output: "test.com".to_string(),
expected_wildcarded_output: "*.test.com".to_string(),
description: "simple top domain input",
},
TestCase {
input: "sub.test.com".to_string(),
expected_root_domain_output: "test.com".to_string(),
expected_wildcarded_output: "*.sub.test.com".to_string(),
description: "simple sub domain input",
},
TestCase {
input: "yetanother.sub.test.com".to_string(),
expected_root_domain_output: "test.com".to_string(),
expected_wildcarded_output: "*.yetanother.sub.test.com".to_string(),
description: "simple sub domain input",
},
];
for tc in test_cases {
// execute:
let result = Domain::new(tc.input.clone());
// verify:
assert_eq!(
tc.expected_root_domain_output,
result.root_domain().to_string(),
"case {} : '{}'",
tc.description,
tc.input
);
}
}
}

4
test_utilities/src/aws.rs
View File

@@ -13,7 +13,7 @@ use qovery_engine::models::Context;
use tracing::error;
use crate::cloudflare::dns_provider_cloudflare;
use crate::common::Cluster;
use crate::common::{Cluster, ClusterDomain};
use crate::utilities::{build_platform_local_docker, FuncTestsSecrets};
pub const AWS_QOVERY_ORGANIZATION_ID: &str = "u8nb94c7fwxzr2jt";
@@ -68,7 +68,7 @@ impl Cluster<AWS, Options> for AWS {
// use AWS
let cloud_provider = AWS::cloud_provider(context);
let dns_provider = Box::new(dns_provider_cloudflare(context));
let dns_provider = Box::new(dns_provider_cloudflare(context, ClusterDomain::Default));
Engine::new(
context.clone(),

15
test_utilities/src/cloudflare.rs
View File

@@ -1,15 +1,20 @@
use crate::common::ClusterDomain;
use crate::utilities::FuncTestsSecrets;
use qovery_engine::dns_provider::cloudflare::Cloudflare;
use qovery_engine::models::Context;
use qovery_engine::models::{Context, Domain};
pub fn dns_provider_cloudflare(context: &Context) -> Cloudflare {
pub fn dns_provider_cloudflare(context: &Context, domain: ClusterDomain) -> Cloudflare {
let secrets = FuncTestsSecrets::new();
let domain = Domain::new(match domain {
ClusterDomain::Custom(domain) => domain,
ClusterDomain::Default => secrets.CLOUDFLARE_DOMAIN.expect("CLOUDFLARE_DOMAIN is not set"),
});
Cloudflare::new(
context.clone(),
"qoverytestdnsclo",
"Qovery Test Cloudflare",
secrets.CLOUDFLARE_DOMAIN.unwrap().as_str(),
secrets.CLOUDFLARE_TOKEN.unwrap().as_str(), // Cloudflare name: Qovery test
secrets.CLOUDFLARE_ID.unwrap().as_str(),
domain,
secrets.CLOUDFLARE_TOKEN.expect("CLOUDFLARE_TOKEN is not set").as_str(), // Cloudflare name: Qovery test
secrets.CLOUDFLARE_ID.expect("CLOUDFLARE_ID is not set").as_str(),
)
}

66
test_utilities/src/common.rs
View File

@@ -16,8 +16,8 @@ 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::utilities::{
context, db_disk_type, db_infos, db_instance_type, generate_cluster_id, generate_id, generate_password, get_pvc,
get_svc, get_svc_name, init, FuncTestsSecrets,
db_disk_type, db_infos, db_instance_type, generate_cluster_id, generate_id, generate_password, get_pvc, get_svc,
get_svc_name, init, FuncTestsSecrets,
};
use base64;
use qovery_engine::cloud_provider::aws::kubernetes::{VpcQoveryNetworkMode, EKS};
@@ -39,6 +39,11 @@ use std::collections::BTreeMap;
use std::str::FromStr;
use tracing::{span, Level};
pub enum ClusterDomain {
Default,
Custom(String),
}
pub trait Cluster<T, U> {
fn docker_cr_engine(context: &Context) -> Engine;
fn cloud_provider(context: &Context) -> Box<T>;
@@ -82,7 +87,7 @@ impl Infrastructure for Environment {
let session = engine.session().unwrap();
let mut tx = session.transaction();
let dns_provider = dns_provider_cloudflare(context);
let dns_provider = dns_provider_cloudflare(context, ClusterDomain::Default);
let cp: Box<dyn CloudProvider>;
cp = match provider_kind {
Kind::Aws => AWS::cloud_provider(context),
@@ -119,7 +124,7 @@ impl Infrastructure for Environment {
let session = engine.session().unwrap();
let mut tx = session.transaction();
let dns_provider = dns_provider_cloudflare(context);
let dns_provider = dns_provider_cloudflare(context, ClusterDomain::Default);
let cp: Box<dyn CloudProvider>;
cp = match provider_kind {
Kind::Aws => AWS::cloud_provider(context),
@@ -149,7 +154,7 @@ impl Infrastructure for Environment {
let session = engine.session().unwrap();
let mut tx = session.transaction();
let dns_provider = dns_provider_cloudflare(context);
let dns_provider = dns_provider_cloudflare(context, ClusterDomain::Default);
let cp: Box<dyn CloudProvider>;
cp = match provider_kind {
Kind::Aws => AWS::cloud_provider(context),
@@ -444,6 +449,11 @@ pub fn environment_3_apps_3_routers_3_databases(
pub fn working_minimal_environment(context: &Context, organization_id: &str, test_domain: &str) -> Environment {
let suffix = generate_id();
let application_id = generate_id();
let application_name = format!("{}-{}", "simple-app".to_string(), &suffix);
let router_id = generate_id();
let router_name = "main".to_string();
let application_domain = format!("{}.{}", application_id, test_domain);
Environment {
execution_id: context.execution_id().to_string(),
id: generate_id(),
@@ -452,8 +462,8 @@ pub fn working_minimal_environment(context: &Context, organization_id: &str, tes
organization_id: organization_id.to_string(),
action: Action::Create,
applications: vec![Application {
id: generate_id(),
name: format!("{}-{}", "simple-app".to_string(), &suffix),
id: application_id,
name: application_name,
git_url: "https://github.com/Qovery/engine-testing.git".to_string(),
commit_id: "fc575a2f3be0b9100492c8a463bf18134a8698a5".to_string(),
dockerfile_path: Some("Dockerfile".to_string()),
@@ -476,10 +486,10 @@ pub fn working_minimal_environment(context: &Context, organization_id: &str, tes
start_timeout_in_seconds: 60,
}],
routers: vec![Router {
id: generate_id(),
name: "main".to_string(),
id: router_id,
name: router_name,
action: Action::Create,
default_domain: format!("{}.{}", generate_id(), test_domain),
default_domain: application_domain,
public_port: 443,
custom_domains: vec![],
routes: vec![Route {
@@ -1135,19 +1145,21 @@ pub fn get_cluster_test_kubernetes<'a>(
pub fn cluster_test(
test_name: &str,
provider_kind: Kind,
context: Context,
localisation: &str,
secrets: FuncTestsSecrets,
test_type: ClusterTestType,
major_boot_version: u8,
minor_boot_version: u8,
cluster_domain: ClusterDomain,
vpc_network_mode: Option<VpcQoveryNetworkMode>,
environment_to_deploy: Option<&EnvironmentAction>,
) -> String {
init();
let span = span!(Level::INFO, "test", name = test_name);
let _enter = span.enter();
let context = context();
let cluster_id = generate_cluster_id(localisation.clone());
let cluster_name = generate_cluster_id(localisation.clone());
let boot_version = format!("{}.{}", major_boot_version, minor_boot_version.clone());
@@ -1158,7 +1170,7 @@ pub fn cluster_test(
Kind::Do => engine = DO::docker_cr_engine(&context),
Kind::Scw => engine = Scaleway::docker_cr_engine(&context),
};
let dns_provider = dns_provider_cloudflare(&context);
let dns_provider = dns_provider_cloudflare(&context, cluster_domain);
let mut deploy_tx = engine.session().unwrap().transaction();
let mut delete_tx = engine.session().unwrap().transaction();
@@ -1191,6 +1203,21 @@ pub fn cluster_test(
TransactionResult::UnrecoverableError(_, _) => assert!(false),
};
// Deploy env if any
if let Some(env) = environment_to_deploy {
let mut deploy_env_tx = engine.session().unwrap().transaction();
// Deploy env
if let Err(err) = deploy_env_tx.deploy_environment(kubernetes.as_ref(), env) {
panic!("{:?}", err)
}
match deploy_env_tx.commit() {
TransactionResult::Ok => assert!(true),
TransactionResult::Rollback(_) => assert!(false),
TransactionResult::UnrecoverableError(_, _) => assert!(false),
};
}
match test_type {
ClusterTestType::Classic => {}
ClusterTestType::WithPause => {
@@ -1259,6 +1286,21 @@ pub fn cluster_test(
}
}
// Destroy env if any
if let Some(env) = environment_to_deploy {
let mut destroy_env_tx = engine.session().unwrap().transaction();
// Deploy env
if let Err(err) = destroy_env_tx.delete_environment(kubernetes.as_ref(), env) {
panic!("{:?}", err)
}
match destroy_env_tx.commit() {
TransactionResult::Ok => assert!(true),
TransactionResult::Rollback(_) => assert!(false),
TransactionResult::UnrecoverableError(_, _) => assert!(false),
};
}
// Delete
if let Err(err) = delete_tx.delete_kubernetes(kubernetes.as_ref()) {
panic!("{:?}", err)

4
test_utilities/src/digitalocean.rs
View File

@@ -11,7 +11,7 @@ use qovery_engine::error::EngineError;
use qovery_engine::models::{Context, Environment};
use crate::cloudflare::dns_provider_cloudflare;
use crate::common::Cluster;
use crate::common::{Cluster, ClusterDomain};
use crate::utilities::{build_platform_local_docker, FuncTestsSecrets};
use qovery_engine::cloud_provider::digitalocean::application::Region;
use qovery_engine::cloud_provider::qovery::EngineLocation;
@@ -49,7 +49,7 @@ impl Cluster<DO, DoksOptions> for DO {
// use Digital Ocean
let cloud_provider = DO::cloud_provider(context);
let dns_provider = Box::new(dns_provider_cloudflare(&context));
let dns_provider = Box::new(dns_provider_cloudflare(&context, ClusterDomain::Default));
Engine::new(
context.clone(),

4
test_utilities/src/scaleway.rs
View File

@@ -13,7 +13,7 @@ use qovery_engine::object_storage::scaleway_object_storage::{BucketDeleteStrateg
use crate::cloudflare::dns_provider_cloudflare;
use crate::utilities::{build_platform_local_docker, generate_id, FuncTestsSecrets};
use crate::common::Cluster;
use crate::common::{Cluster, ClusterDomain};
use qovery_engine::cloud_provider::models::NodeGroups;
use qovery_engine::cloud_provider::qovery::EngineLocation;
use tracing::error;
@@ -70,7 +70,7 @@ impl Cluster<Scaleway, KapsuleOptions> for Scaleway {
// use Scaleway
let cloud_provider = Scaleway::cloud_provider(context);
let dns_provider = Box::new(dns_provider_cloudflare(context));
let dns_provider = Box::new(dns_provider_cloudflare(context, ClusterDomain::Default));
Engine::new(
context.clone(),

2
tests/aws/aws_environment.rs
View File

@@ -372,8 +372,8 @@ fn deploy_a_working_environment_with_storage_on_aws_eks() {
&context,
AWS_QOVERY_ORGANIZATION_ID,
secrets
.clone()
.DEFAULT_TEST_DOMAIN
.as_ref()
.expect("DEFAULT_TEST_DOMAIN is not set in secrets")
.as_str(),
);

7
tests/aws/aws_kubernetes.rs
View File

@@ -1,12 +1,12 @@
extern crate test_utilities;
use self::test_utilities::aws::{AWS_KUBERNETES_MAJOR_VERSION, AWS_KUBERNETES_MINOR_VERSION};
use self::test_utilities::utilities::{engine_run_test, FuncTestsSecrets};
use self::test_utilities::utilities::{context, engine_run_test, FuncTestsSecrets};
use ::function_name::named;
use qovery_engine::cloud_provider::aws::kubernetes::VpcQoveryNetworkMode;
use qovery_engine::cloud_provider::aws::kubernetes::VpcQoveryNetworkMode::{WithNatGateways, WithoutNatGateways};
use qovery_engine::cloud_provider::Kind;
use test_utilities::common::{cluster_test, ClusterTestType};
use test_utilities::common::{cluster_test, ClusterDomain, ClusterTestType};
#[cfg(feature = "test-aws-infra")]
fn create_and_destroy_eks_cluster(
@@ -22,12 +22,15 @@ fn create_and_destroy_eks_cluster(
cluster_test(
test_name,
Kind::Aws,
context(),
region,
secrets,
test_type,
major_boot_version,
minor_boot_version,
ClusterDomain::Default,
Option::from(vpc_network_mode),
None,
)
})
}

50
tests/aws/aws_whole_enchilada.rs Normal file
View File

@@ -0,0 +1,50 @@
use ::function_name::named;
use qovery_engine::cloud_provider::aws::kubernetes::VpcQoveryNetworkMode::WithNatGateways;
use qovery_engine::cloud_provider::Kind;
use qovery_engine::models::EnvironmentAction;
use test_utilities::aws::{AWS_KUBERNETES_MAJOR_VERSION, AWS_KUBERNETES_MINOR_VERSION};
use test_utilities::common::{cluster_test, ClusterDomain, ClusterTestType};
use test_utilities::utilities::{context, engine_run_test, generate_cluster_id, generate_id, FuncTestsSecrets};
#[cfg(feature = "test-aws-whole-enchilada")]
#[named]
#[test]
fn create_upgrade_and_destroy_eks_cluster_with_env_in_eu_west_3() {
let context = context();
let secrets = FuncTestsSecrets::new();
let region = "eu-west-3";
let organization_id = generate_id();
let cluster_id = generate_cluster_id(region);
let cluster_domain = format!(
"{}.{}",
cluster_id.as_str(),
secrets
.DEFAULT_TEST_DOMAIN
.as_ref()
.expect("DEFAULT_TEST_DOMAIN is not set in secrets")
.as_str()
);
let environment = test_utilities::common::working_minimal_environment(
&context,
organization_id.as_str(),
cluster_domain.as_str(),
);
let env_action = EnvironmentAction::Environment(environment.clone());
engine_run_test(|| {
cluster_test(
function_name!(),
Kind::Aws,
context.clone(),
region,
secrets.clone(),
ClusterTestType::Classic,
AWS_KUBERNETES_MAJOR_VERSION,
AWS_KUBERNETES_MINOR_VERSION,
ClusterDomain::Custom(cluster_domain),
Some(WithNatGateways),
Some(&env_action),
)
})
}

1
tests/aws/mod.rs
View File

@@ -1,3 +1,4 @@
mod aws_databases;
mod aws_environment;
mod aws_kubernetes;
mod aws_whole_enchilada;

6
tests/digitalocean/do_kubernetes.rs
View File

@@ -1,7 +1,8 @@
extern crate test_utilities;
use self::test_utilities::common::ClusterDomain;
use self::test_utilities::digitalocean::{DO_KUBERNETES_MAJOR_VERSION, DO_KUBERNETES_MINOR_VERSION};
use self::test_utilities::utilities::{engine_run_test, FuncTestsSecrets};
use self::test_utilities::utilities::{context, engine_run_test, FuncTestsSecrets};
use ::function_name::named;
use qovery_engine::cloud_provider::digitalocean::application::Region;
use qovery_engine::cloud_provider::Kind;
@@ -20,11 +21,14 @@ fn create_and_destroy_doks_cluster(
cluster_test(
test_name,
Kind::Do,
context(),
region.as_str(),
secrets,
test_type,
major_boot_version,
minor_boot_version,
ClusterDomain::Default,
None,
None,
)
})

6
tests/digitalocean/do_utility_kubernetes_doks_test_cluster.rs
View File

@@ -6,7 +6,7 @@ use ::function_name::named;
use qovery_engine::cloud_provider::digitalocean::DO;
use tracing::{span, Level};
use self::test_utilities::common::Cluster;
use self::test_utilities::common::{Cluster, ClusterDomain};
use qovery_engine::cloud_provider::digitalocean::kubernetes::DOKS;
use qovery_engine::transaction::TransactionResult;
@@ -34,7 +34,7 @@ fn create_digitalocean_kubernetes_doks_test_cluster() {
let do_cluster = DO::cloud_provider(&context);
let nodes = DO::kubernetes_nodes();
let cloudflare = dns_provider_cloudflare(&context);
let cloudflare = dns_provider_cloudflare(&context, ClusterDomain::Default);
let kubernetes = DOKS::new(
context.clone(),
@@ -91,7 +91,7 @@ fn destroy_digitalocean_kubernetes_doks_test_cluster() {
let do_cluster = DO::cloud_provider(&context);
let nodes = DO::kubernetes_nodes();
let cloudflare = dns_provider_cloudflare(&context);
let cloudflare = dns_provider_cloudflare(&context, ClusterDomain::Default);
let kubernetes = DOKS::new(
context.clone(),

50
tests/digitalocean/do_whole_enchilada.rs Normal file
View File

@@ -0,0 +1,50 @@
use ::function_name::named;
use qovery_engine::cloud_provider::digitalocean::application::Region;
use qovery_engine::cloud_provider::Kind;
use qovery_engine::models::EnvironmentAction;
use test_utilities::common::{cluster_test, ClusterDomain, ClusterTestType};
use test_utilities::digitalocean::{DO_KUBERNETES_MAJOR_VERSION, DO_KUBERNETES_MINOR_VERSION};
use test_utilities::utilities::{context, engine_run_test, generate_cluster_id, generate_id, FuncTestsSecrets};
#[cfg(feature = "test-do-whole-enchilada")]
#[named]
#[test]
fn create_upgrade_and_destroy_doks_cluster_with_env_in_ams_3() {
let context = context();
let region = Region::Amsterdam3;
let secrets = FuncTestsSecrets::new();
let organization_id = generate_id();
let cluster_id = generate_cluster_id(region.as_str());
let cluster_domain = format!(
"{}.{}",
cluster_id.as_str(),
secrets
.DEFAULT_TEST_DOMAIN
.as_ref()
.expect("DEFAULT_TEST_DOMAIN is not set in secrets")
.as_str()
);
let environment = test_utilities::common::working_minimal_environment(
&context,
organization_id.as_str(),
cluster_domain.as_str(),
);
let env_action = EnvironmentAction::Environment(environment.clone());
engine_run_test(|| {
cluster_test(
function_name!(),
Kind::Do,
context.clone(),
region.as_str(),
secrets.clone(),
ClusterTestType::Classic,
DO_KUBERNETES_MAJOR_VERSION,
DO_KUBERNETES_MINOR_VERSION,
ClusterDomain::Custom(cluster_domain),
None,
Some(&env_action),
)
})
}

1
tests/digitalocean/mod.rs
View File

@@ -3,3 +3,4 @@ mod do_environment;
mod do_kubernetes;
mod do_spaces;
mod do_utility_kubernetes_doks_test_cluster;
mod do_whole_enchilada;

1
tests/scaleway/mod.rs
View File

@@ -4,3 +4,4 @@ mod scw_environment;
mod scw_kubernetes;
mod scw_object_storage;
mod scw_utility_kubernetes_kapsule_test_cluster;
mod scw_whole_enchilada;

7
tests/scaleway/scw_kubernetes.rs
View File

@@ -1,12 +1,12 @@
extern crate test_utilities;
use self::test_utilities::scaleway::{SCW_KUBERNETES_MAJOR_VERSION, SCW_KUBERNETES_MINOR_VERSION};
use self::test_utilities::utilities::{engine_run_test, FuncTestsSecrets};
use self::test_utilities::utilities::{context, engine_run_test, FuncTestsSecrets};
use ::function_name::named;
use qovery_engine::cloud_provider::aws::kubernetes::VpcQoveryNetworkMode;
use qovery_engine::cloud_provider::scaleway::application::Zone;
use qovery_engine::cloud_provider::Kind;
use test_utilities::common::{cluster_test, ClusterTestType};
use test_utilities::common::{cluster_test, ClusterDomain, ClusterTestType};
#[cfg(feature = "test-scw-infra")]
fn create_and_destroy_kapsule_cluster(
@@ -22,12 +22,15 @@ fn create_and_destroy_kapsule_cluster(
cluster_test(
test_name,
Kind::Scw,
context(),
zone.as_str(),
secrets,
test_type,
major_boot_version,
minor_boot_version,
ClusterDomain::Default,
vpc_network_mode,
None,
)
})
}

1
tests/scaleway/scw_object_storage.rs
View File

@@ -3,7 +3,6 @@ extern crate test_utilities;
use self::test_utilities::utilities::{context, generate_id, FuncTestsSecrets};
use self::test_utilities::scaleway::{SCW_RESOURCE_TTL_IN_SECONDS, SCW_TEST_ZONE};
use qovery_engine::cloud_provider::scaleway::application::Zone;
use qovery_engine::object_storage::scaleway_object_storage::{BucketDeleteStrategy, ScalewayOS};
use qovery_engine::object_storage::ObjectStorage;
use tempfile::NamedTempFile;

6
tests/scaleway/scw_utility_kubernetes_kapsule_test_cluster.rs
View File

@@ -5,7 +5,7 @@ use self::test_utilities::utilities::{context, engine_run_test, init, FuncTestsS
use ::function_name::named;
use tracing::{span, Level};
use self::test_utilities::common::Cluster;
use self::test_utilities::common::{Cluster, ClusterDomain};
use qovery_engine::cloud_provider::scaleway::kubernetes::Kapsule;
use qovery_engine::cloud_provider::scaleway::Scaleway;
use qovery_engine::transaction::TransactionResult;
@@ -34,7 +34,7 @@ fn create_scaleway_kubernetes_kapsule_test_cluster() {
let scw_cluster = Scaleway::cloud_provider(&context);
let nodes = Scaleway::kubernetes_nodes();
let cloudflare = dns_provider_cloudflare(&context);
let cloudflare = dns_provider_cloudflare(&context, ClusterDomain::Default);
let kubernetes = Kapsule::new(
context.clone(),
@@ -88,7 +88,7 @@ fn destroy_scaleway_kubernetes_kapsule_test_cluster() {
let scw_cluster = Scaleway::cloud_provider(&context);
let nodes = Scaleway::kubernetes_nodes();
let cloudflare = dns_provider_cloudflare(&context);
let cloudflare = dns_provider_cloudflare(&context, ClusterDomain::Default);
let kubernetes = Kapsule::new(
context.clone(),

50
tests/scaleway/scw_whole_enchilada.rs Normal file
View File

@@ -0,0 +1,50 @@
use ::function_name::named;
use qovery_engine::cloud_provider::scaleway::application::Zone;
use qovery_engine::cloud_provider::Kind;
use qovery_engine::models::EnvironmentAction;
use test_utilities::common::{cluster_test, ClusterDomain, ClusterTestType};
use test_utilities::scaleway::{SCW_KUBERNETES_MAJOR_VERSION, SCW_KUBERNETES_MINOR_VERSION};
use test_utilities::utilities::{context, engine_run_test, generate_cluster_id, generate_id, FuncTestsSecrets};
#[cfg(feature = "test-scw-whole-enchilada")]
#[named]
#[test]
fn create_upgrade_and_destroy_kapsule_cluster_with_env_in_par_2() {
let context = context();
let zone = Zone::Paris2;
let secrets = FuncTestsSecrets::new();
let organization_id = generate_id();
let cluster_id = generate_cluster_id(zone.as_str());
let cluster_domain = format!(
"{}.{}",
cluster_id.as_str(),
secrets
.DEFAULT_TEST_DOMAIN
.as_ref()
.expect("DEFAULT_TEST_DOMAIN is not set in secrets")
.as_str()
);
let environment = test_utilities::common::working_minimal_environment(
&context,
organization_id.as_str(),
cluster_domain.as_str(),
);
let env_action = EnvironmentAction::Environment(environment.clone());
engine_run_test(|| {
cluster_test(
function_name!(),
Kind::Scw,
context.clone(),
zone.as_str(),
secrets.clone(),
ClusterTestType::Classic,
SCW_KUBERNETES_MAJOR_VERSION,
SCW_KUBERNETES_MINOR_VERSION,
ClusterDomain::Custom(cluster_domain),
None,
Some(&env_action),
)
})
}