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

refactor: update changes according to #708

Browse Source
This commit is contained in:
Pierre Mavro
2022-05-12 14:50:00 +02:00
parent 7937370f51
commit 7234583881
6 changed files with 23 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/dns_provider/cloudflare.rs
View File

@@ -2,7 +2,8 @@ use std::net::Ipv4Addr;
use tera::Context as TeraContext;
use crate::dns_provider::errors::DnsProviderError;
use crate::dns_provider::{DnsProvider, DnsProviderConfiguration, Kind};
use crate::dns_provider::io::Kind;
use crate::dns_provider::{DnsProvider, DnsProviderConfiguration};
use crate::io_models::{Context, Domain};
pub struct CloudflareDnsConfig {

8
src/dns_provider/io.rs Normal file
View File

@@ -0,0 +1,8 @@
use serde::{Deserialize, Serialize};
#[derive(Serialize, Deserialize, Clone, Debug)]
#[serde(rename_all = "SCREAMING_SNAKE_CASE")]
pub enum Kind {
Cloudflare,
QoveryDns,
}

10
src/dns_provider/mod.rs
View File

@@ -3,22 +3,16 @@ use std::net::Ipv4Addr;
use crate::dns_provider::cloudflare::CloudflareDnsConfig;
use crate::dns_provider::errors::DnsProviderError;
use crate::dns_provider::qoverydns::QoveryDnsConfig;
use serde::{Deserialize, Serialize};
use io::Kind;
use tera::Context as TeraContext;
use crate::io_models::{Context, Domain};
pub mod cloudflare;
pub mod errors;
mod io;
pub mod qoverydns;
#[derive(Serialize, Deserialize, Clone, Debug)]
#[serde(rename_all = "SCREAMING_SNAKE_CASE")]
pub enum Kind {
Cloudflare,
QoveryDns,
}
pub enum DnsProviderConfiguration {
Cloudflare(CloudflareDnsConfig),
QoveryDns(QoveryDnsConfig),

3
src/dns_provider/qoverydns.rs
View File

@@ -2,7 +2,8 @@ use std::net::Ipv4Addr;
use tera::Context as TeraContext;
use crate::dns_provider::errors::DnsProviderError;
use crate::dns_provider::{DnsProvider, DnsProviderConfiguration, Kind};
use crate::dns_provider::io::Kind;
use crate::dns_provider::{DnsProvider, DnsProviderConfiguration};
use crate::io_models::{Context, Domain};
pub struct QoveryDnsConfig {

6
test_utilities/src/utilities.rs
View File

@@ -111,6 +111,7 @@ pub struct FuncTestsSecrets {
pub AWS_SECRET_ACCESS_KEY: Option<String>,
pub AWS_TEST_CLUSTER_ID: Option<String>,
pub AWS_TEST_ORGANIZATION_ID: Option<String>,
pub AWS_EC2_DEFAULT_CLUSTER_ID: Option<String>,
pub BIN_VERSION_FILE: Option<String>,
pub CLOUDFLARE_DOMAIN: Option<String>,
pub CLOUDFLARE_ID: Option<String>,
@@ -206,6 +207,7 @@ impl FuncTestsSecrets {
AWS_SECRET_ACCESS_KEY: None,
AWS_TEST_CLUSTER_ID: None,
AWS_TEST_ORGANIZATION_ID: None,
AWS_EC2_DEFAULT_CLUSTER_ID: None,
BIN_VERSION_FILE: None,
CLOUDFLARE_DOMAIN: None,
CLOUDFLARE_ID: None,
@@ -292,6 +294,10 @@ impl FuncTestsSecrets {
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),
AWS_EC2_DEFAULT_CLUSTER_ID: Self::select_secret(
"AWS_EC2_DEAFULT_CLUSTER_ID",
secrets.AWS_EC2_DEFAULT_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),

4
tests/aws/aws_kubernetes_ec2.rs
View File

@@ -11,6 +11,7 @@ use qovery_engine::cloud_provider::Kind;
use std::str::FromStr;
use test_utilities::aws::{K3S_KUBERNETES_MAJOR_VERSION, K3S_KUBERNETES_MINOR_VERSION};
use test_utilities::common::{cluster_test, ClusterDomain, ClusterTestType};
use test_utilities::utilities::FuncTestsSecrets;
#[cfg(feature = "test-aws-infra-ec2")]
fn create_and_destroy_aws_ec2_k3s_cluster(
@@ -24,7 +25,8 @@ fn create_and_destroy_aws_ec2_k3s_cluster(
engine_run_test(|| {
let region = AwsRegion::from_str(region.as_str()).expect("Wasn't able to convert the desired region");
let zones = region.get_zones();
let cluster_id = "ztest-abe3e22b0".to_string(); // don't change it to test qovery dns provider properly
let secrets = FuncTestsSecrets::new();
let cluster_id = secrets.AWS_EC2_DEFAULT_CLUSTER_ID.unwrap(); // don't change it to test qovery dns provider properly
cluster_test(
test_name,
Kind::Aws,