diff --git a/avalanche-kms/Cargo.toml b/avalanche-kms/Cargo.toml index 558a7c5f..adf1f135 100644 --- a/avalanche-kms/Cargo.toml +++ b/avalanche-kms/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "avalanche-kms" -version = "0.5.5-beta.0" # https://github.com/ava-labs/avalanche-ops/releases +version = "0.6.0-beta.0" # https://github.com/ava-labs/avalanche-ops/releases edition = "2021" rust-version = "1.69" diff --git a/avalanche-ops/Cargo.toml b/avalanche-ops/Cargo.toml index 3787b75a..a1f7c4f9 100644 --- a/avalanche-ops/Cargo.toml +++ b/avalanche-ops/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "avalanche-ops" -version = "0.5.5-beta.0" # https://crates.io/crates/avalanche-ops +version = "0.6.0-beta.0" # https://crates.io/crates/avalanche-ops edition = "2021" rust-version = "1.69" publish = true diff --git a/avalanched-aws/Cargo.toml b/avalanched-aws/Cargo.toml index 90c8e323..3999e973 100644 --- a/avalanched-aws/Cargo.toml +++ b/avalanched-aws/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "avalanched-aws" -version = "0.5.5-beta.0" # https://github.com/ava-labs/avalanche-ops/releases +version = "0.6.0-beta.0" # https://github.com/ava-labs/avalanche-ops/releases edition = "2021" rust-version = "1.69" diff --git a/avalancheup-aws/Cargo.toml b/avalancheup-aws/Cargo.toml index 7ec72987..ada01c29 100644 --- a/avalancheup-aws/Cargo.toml +++ b/avalancheup-aws/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "avalancheup-aws" -version = "0.5.5-beta.0" # https://github.com/ava-labs/avalanche-ops/releases +version = "0.6.0-beta.0" # https://github.com/ava-labs/avalanche-ops/releases edition = "2021" rust-version = "1.69" diff --git a/avalancheup-aws/src/apply/mod.rs b/avalancheup-aws/src/apply/mod.rs index e821d982..3d7444cc 100644 --- a/avalancheup-aws/src/apply/mod.rs +++ b/avalancheup-aws/src/apply/mod.rs @@ -377,21 +377,21 @@ pub async fn execute(log_level: &str, spec_file_path: &str, skip_prompt: bool) - let regional_shared_config = aws_manager::load_config(Some(region.clone()), Some(Duration::from_secs(30))).await; - let regional_kms_manager = kms::Manager::new(®ional_shared_config); + + sleep(Duration::from_secs(1)).await; + execute!( + stdout(), + SetForegroundColor(Color::Green), + Print(format!( + "\n\n\nSTEP: create KMS encrypt key in '{region}'\n" + )), + ResetColor + )?; if regional_resource .kms_symmetric_default_encrypt_key .is_none() { - sleep(Duration::from_secs(1)).await; - execute!( - stdout(), - SetForegroundColor(Color::Green), - Print(format!( - "\n\n\nSTEP: create encryption KMS key in '{region}'\n" - )), - ResetColor - )?; let key = regional_kms_manager .create_symmetric_default_key(format!("{}-kms-key", spec.id).as_str(), false) .await @@ -413,7 +413,7 @@ pub async fn execute(log_level: &str, spec_file_path: &str, skip_prompt: bool) - .await .unwrap(); } else { - log::info!("skipping creating kms default encrypt key"); + log::info!("skipping creating KMS default encrypt key"); } let regional_envelope_manager = envelope::Manager::new( @@ -492,19 +492,18 @@ pub async fn execute(log_level: &str, spec_file_path: &str, skip_prompt: bool) - aws_manager::load_config(Some(region.clone()), Some(Duration::from_secs(30))).await; let regional_cloudformation_manager = cloudformation::Manager::new(®ional_shared_config); + execute!( + stdout(), + SetForegroundColor(Color::Green), + Print(format!( + "\n\n\nSTEP: creating EC2 instance role in the region '{region}'\n" + )), + ResetColor + )?; if regional_resource .cloudformation_ec2_instance_profile_arn .is_none() { - execute!( - stdout(), - SetForegroundColor(Color::Green), - Print(format!( - "\n\n\nSTEP: creating EC2 instance role in the region '{region}'\n" - )), - ResetColor - )?; - let ec2_instance_role_tmpl = avalanche_ops::aws::artifacts::ec2_instance_role_yaml().unwrap(); let ec2_instance_role_stack_name = regional_resource @@ -618,6 +617,14 @@ pub async fn execute(log_level: &str, spec_file_path: &str, skip_prompt: bool) - aws_manager::load_config(Some(region.clone()), Some(Duration::from_secs(30))).await; let regional_cloudformation_manager = cloudformation::Manager::new(®ional_shared_config); + execute!( + stdout(), + SetForegroundColor(Color::Green), + Print(format!( + "\n\n\nSTEP: creating a VPC in the region '{region}'\n" + )), + ResetColor + )?; if regional_resource.cloudformation_vpc_id.is_none() && regional_resource .cloudformation_vpc_security_group_id @@ -626,15 +633,6 @@ pub async fn execute(log_level: &str, spec_file_path: &str, skip_prompt: bool) - .cloudformation_vpc_public_subnet_ids .is_none() { - execute!( - stdout(), - SetForegroundColor(Color::Green), - Print(format!( - "\n\n\nSTEP: creating a VPC in the region '{region}'\n" - )), - ResetColor - )?; - let vpc_tmpl = avalanche_ops::aws::artifacts::vpc_yaml().unwrap(); let vpc_stack_name = regional_resource.cloudformation_vpc.clone().unwrap(); let vpc_params = Vec::from([ diff --git a/blizzard-aws/Cargo.toml b/blizzard-aws/Cargo.toml index c2d74ba9..8c74888d 100644 --- a/blizzard-aws/Cargo.toml +++ b/blizzard-aws/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "blizzard-aws" -version = "0.5.5-beta.0" # https://github.com/ava-labs/avalanche-ops/releases +version = "0.6.0-beta.0" # https://github.com/ava-labs/avalanche-ops/releases edition = "2021" rust-version = "1.69" diff --git a/blizzardup-aws/Cargo.toml b/blizzardup-aws/Cargo.toml index 8a440d9d..ec0e874c 100644 --- a/blizzardup-aws/Cargo.toml +++ b/blizzardup-aws/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "blizzardup-aws" -version = "0.5.5-beta.0" # https://github.com/ava-labs/avalanche-ops/releases +version = "0.6.0-beta.0" # https://github.com/ava-labs/avalanche-ops/releases edition = "2021" rust-version = "1.69" diff --git a/devnet-faucet/Cargo.toml b/devnet-faucet/Cargo.toml index e1328c71..b146829a 100644 --- a/devnet-faucet/Cargo.toml +++ b/devnet-faucet/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "devnet-faucet" -version = "0.5.5-beta.0" # https://github.com/ava-labs/avalanche-ops/releases +version = "0.6.0-beta.0" # https://github.com/ava-labs/avalanche-ops/releases edition = "2021" license = "MIT OR Apache-2.0" diff --git a/staking-key-cert-s3-downloader/Cargo.toml b/staking-key-cert-s3-downloader/Cargo.toml index 93a5bb47..549ff298 100644 --- a/staking-key-cert-s3-downloader/Cargo.toml +++ b/staking-key-cert-s3-downloader/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "staking-key-cert-s3-downloader" -version = "0.5.5-beta.0" # https://github.com/ava-labs/avalanche-ops/releases +version = "0.6.0-beta.0" # https://github.com/ava-labs/avalanche-ops/releases edition = "2021" rust-version = "1.69" diff --git a/staking-signer-key-s3-downloader/Cargo.toml b/staking-signer-key-s3-downloader/Cargo.toml index f4142e36..40b1d9d6 100644 --- a/staking-signer-key-s3-downloader/Cargo.toml +++ b/staking-signer-key-s3-downloader/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "staking-signer-key-s3-downloader" -version = "0.5.5-beta.0" # https://github.com/ava-labs/avalanche-ops/releases +version = "0.6.0-beta.0" # https://github.com/ava-labs/avalanche-ops/releases edition = "2021" rust-version = "1.69"