diff --git a/utils/scripts/ssi_wizards/aws_onboarding_wizard.sh b/utils/scripts/ssi_wizards/aws_onboarding_wizard.sh index 28bc27ac6ef..a29fb04f662 100755 --- a/utils/scripts/ssi_wizards/aws_onboarding_wizard.sh +++ b/utils/scripts/ssi_wizards/aws_onboarding_wizard.sh @@ -147,7 +147,7 @@ verify_aws_environment() { echo "šŸ” Checking AWS environment..." # Run AWS environment check - if ! aws-vault exec sso-sandbox-account-admin -- aws s3 ls &>/dev/null; then + if ! aws-vault exec sso-dev-apm-dcs-system-tests-account-admin -- aws s3 ls &>/dev/null; then echo "āŒ AWS environment check failed!" echo "šŸ”— Please follow the AWS SSO setup guide:" echo " šŸ‘‰ https://datadoghq.atlassian.net/wiki/spaces/ENG/pages/2498068557/AWS+SSO+Getting+Started" @@ -168,8 +168,8 @@ verify_aws_environment check_and_set_env_var "PULUMI_CONFIG_PASSPHRASE" "Passphrase to store secure data in Pulumi." check_and_set_env_var "DD_API_KEY_ONBOARDING" "šŸ”‘ API Key required for system-tests.\nšŸ¢ You can retrieve this key from the Datadog system-tests organization.\nšŸ”— Access the organization page here: https://system-tests.datadoghq.com/dashboard/zqg-kqn-2mc?fromUser=false&refresh_mode=sliding&from_ts=1736776640739&to_ts=1739368640739&live=true" check_and_set_env_var "DD_APP_KEY_ONBOARDING" "šŸ”‘ Application Key required for system-tests.\nšŸ¢ You can retrieve this key from the Datadog system-tests organization.\nšŸ”— Access the organization page here: https://system-tests.datadoghq.com/dashboard/zqg-kqn-2mc?fromUser=false&refresh_mode=sliding&from_ts=1736776640739&to_ts=1739368640739&live=true" -check_and_set_env_var "ONBOARDING_AWS_INFRA_SUBNET_ID" "🌐 Networking configuration for AWS.\nšŸ“– You can find this value in the internal documentation:\nšŸ”— https://datadoghq.atlassian.net/wiki/spaces/APMINT/pages/3487138295/Using+virtual+machines+to+test+your+software+components+against+different+operating+systems#Run-command" "subnet-b89e00e2" -check_and_set_env_var "ONBOARDING_AWS_INFRA_SECURITY_GROUPS_ID" "🌐 Networking configuration for AWS.\nšŸ“– You can find this value in the internal documentation:\nšŸ”— https://datadoghq.atlassian.net/wiki/spaces/APMINT/pages/3487138295/Using+virtual+machines+to+test+your+software+components+against+different+operating+systems#Run-command" "sg-46506837,sg-7fedd80a" +check_and_set_env_var "ONBOARDING_AWS_INFRA_SUBNET_ID" "🌐 Networking configuration for AWS.\nšŸ“– You can find this value in the internal documentation:\nšŸ”— https://datadoghq.atlassian.net/wiki/spaces/APMINT/pages/3487138295/Using+virtual+machines+to+test+your+software+components+against+different+operating+systems#Run-command" "subnet-00e689fa9557b1834" +check_and_set_env_var "ONBOARDING_AWS_INFRA_SECURITY_GROUPS_ID" "🌐 Networking configuration for AWS.\nšŸ“– You can find this value in the internal documentation:\nšŸ”— https://datadoghq.atlassian.net/wiki/spaces/APMINT/pages/3487138295/Using+virtual+machines+to+test+your+software+components+against+different+operating+systems#Run-command" "sg-0d402c7ec259b2a66" # Automatically set and offer to save some variables if ! is_var_in_env_file "ONBOARDING_LOCAL_TEST"; then @@ -199,7 +199,7 @@ create_key_pair() { # Create key pair echo "šŸš€ Creating AWS Key Pair: $key_name ..." - aws-vault exec sso-sandbox-account-admin -- aws ec2 create-key-pair --key-name "$key_name" --output text > "$pem_path" + aws-vault exec sso-dev-apm-dcs-system-tests-account-admin -- aws ec2 create-key-pair --key-name "$key_name" --output text > "$pem_path" if [[ $? -ne 0 ]]; then echo "āŒ Failed to create AWS Key Pair. Please check AWS permissions and try again." @@ -438,7 +438,7 @@ run_test_command() { echo "" # Construct the command - TEST_COMMAND="aws-vault exec sso-sandbox-account-admin -- ./run.sh $SCENARIO --vm-weblog $WEBLOG --vm-env $CI_ENVIRONMENT --vm-library $TEST_LIBRARY --vm-provider aws --vm-default-vms All --vm-only $VIRTUAL_MACHINE" + TEST_COMMAND="aws-vault exec sso-dev-apm-dcs-system-tests-account-admin -- ./run.sh $SCENARIO --vm-weblog $WEBLOG --vm-env $CI_ENVIRONMENT --vm-library $TEST_LIBRARY --vm-provider aws --vm-default-vms All --vm-only $VIRTUAL_MACHINE" echo "šŸ–„ļø Command:" echo " $TEST_COMMAND" @@ -461,7 +461,7 @@ run_test_command() { echo "āš ļø šŸ”„ **REMINDER: YOU MUST MANUALLY DESTROY THE PULUMI STACK!** šŸ”„ āš ļø" echo "šŸ–„ļø Run the following command to stop your EC2 instance:" echo "" - echo " šŸ›‘ aws-vault exec sso-sandbox-account-admin -- pulumi destroy" + echo " šŸ›‘ aws-vault exec sso-dev-apm-dcs-system-tests-account-admin -- pulumi destroy" echo "" echo "šŸ“ **Why?** Since ONBOARDING_KEEP_VMS is set, your virtual machine will stay running." echo "šŸ’” **To avoid extra AWS costs, remember to manually destroy the stack when finished.**" diff --git a/utils/virtual_machine/aws_provider.py b/utils/virtual_machine/aws_provider.py index 9679c571125..d4b80e77330 100644 --- a/utils/virtual_machine/aws_provider.py +++ b/utils/virtual_machine/aws_provider.py @@ -29,7 +29,7 @@ def __init__(self): self.commander = AWSCommander() self.pulumi_ssh = None self.datadog_event_sender = DatadogEventSender() - self.stack_name = "system-tests_onboarding" + self.stack_name = "system-tests_dev_onboarding" def configure(self, virtual_machine): super().configure(virtual_machine)