fix: test compil issue and linter

This commit is contained in:
Pierre Mavro
2022-05-04 11:12:51 +02:00
parent 838f83a831
commit 57c131bb54
4 changed files with 30 additions and 36 deletions

View File

@@ -85,12 +85,12 @@ pub fn ec2_aws_helm_charts(
qovery_terraform_config_file: &str,
chart_config_prerequisites: &Ec2ChartsConfigPrerequisites,
chart_prefix_path: Option<&str>,
kubernetes_config: &Path,
envs: &[(String, String)],
_kubernetes_config: &Path,
_envs: &[(String, String)],
) -> Result<Vec<Vec<Box<dyn HelmChart>>>, CommandError> {
let chart_prefix = chart_prefix_path.unwrap_or("./");
let chart_path = |x: &str| -> String { format!("{}/{}", &chart_prefix, x) };
let qovery_terraform_config = get_aws_ec2_qovery_terraform_config(qovery_terraform_config_file)?;
let _qovery_terraform_config = get_aws_ec2_qovery_terraform_config(qovery_terraform_config_file)?;
// Qovery storage class
let q_storage_class = CommonChart {

View File

@@ -622,37 +622,32 @@ fn create(
}
// wait for AWS EC2 K3S port is open to avoid later deployment issues (and kubeconfig not available on S3)
match kubernetes.kind() {
Kind::Ec2 => {
let qovery_teraform_config =
get_aws_ec2_qovery_terraform_config(format!("{}/qovery-tf-config.json", &temp_dir).as_str())
.map_err(|e| EngineError::new_terraform_qovery_config_mismatch(event_details.clone(), e))?;
if let Kind::Ec2 = kubernetes.kind() {
let qovery_teraform_config =
get_aws_ec2_qovery_terraform_config(format!("{}/qovery-tf-config.json", &temp_dir).as_str())
.map_err(|e| EngineError::new_terraform_qovery_config_mismatch(event_details.clone(), e))?;
let port = qovery_teraform_config.kubernetes_port_to_u16().map_err(|e| {
EngineError::new_terraform_qovery_config_mismatch(
event_details.clone(),
CommandError::new_from_safe_message(e),
)
})?;
wait_until_port_is_open(
&TcpCheckSource::DnsName(qovery_teraform_config.aws_ec2_public_hostname.as_str()),
port,
300,
kubernetes.logger(),
let port = qovery_teraform_config.kubernetes_port_to_u16().map_err(|e| {
EngineError::new_terraform_qovery_config_mismatch(
event_details.clone(),
CommandError::new_from_safe_message(e),
)
.map_err(|e| {
EngineError::new_terraform_qovery_config_mismatch(
event_details.clone(),
CommandError::new(format!(
"Wasn't able to connect to Kubernetes API, can't continue. Did you manually performed changes AWS side?"
), Some(format!("{:?}", e)), None),
)
})?;
}
_ => {}
}
})?;
wait_until_port_is_open(
&TcpCheckSource::DnsName(qovery_teraform_config.aws_ec2_public_hostname.as_str()),
port,
300,
kubernetes.logger(),
event_details.clone(),
)
.map_err(|e| {
EngineError::new_terraform_qovery_config_mismatch(
event_details.clone(),
CommandError::new("Wasn't able to connect to Kubernetes API, can't continue. Did you manually performed changes AWS side?".to_string(), Some(format!("{:?}", e)), None),
)
})?;
};
// kubernetes helm deployments on the cluster
let kubeconfig_path = kubernetes.get_kubeconfig_file_path()?;

View File

@@ -272,7 +272,7 @@ pub fn check_tcp_port_is_open(address: &TcpCheckSource, port: u16) -> Result<(),
let timeout = core::time::Duration::from_secs(1);
let ip = match address {
TcpCheckSource::SocketAddr(x) => x.clone(),
TcpCheckSource::SocketAddr(x) => *x,
TcpCheckSource::DnsName(x) => {
let address = format!("{}:{}", x, port);
match address.to_socket_addrs() {

View File

@@ -3,6 +3,7 @@ extern crate test_utilities;
use std::str::FromStr;
use ::function_name::named;
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, logger};
@@ -23,15 +24,13 @@ fn create_and_destroy_eks_cluster(
) {
engine_run_test(|| {
let region = AwsRegion::from_str(region.as_str()).expect("Wasn't able to convert the desired region");
let cluster_id = generate_cluster_id(region.to_string().as_str());
let zones = region.get_zones();
cluster_test(
test_name,
Kind::Aws,
KKind::Eks,
context(
generate_id().as_str(),
generate_cluster_id(region.to_string().as_str()).as_str(),
),
context(generate_id().as_str(), cluster_id.as_str()),
logger(),
region.to_aws_format().as_str(),
Some(zones),