Commit 7cbd71fe authored by Kumiko Ono's avatar Kumiko Ono Committed by Yas Naoi
Browse files

Issue #3272544 by kumikoono, yas: Fix AWS resource cleanup script for launch... 

Issue #3272544 by kumikoono, yas: Fix AWS resource cleanup script for launch templates and key pairs
parent a3ba809e

modules/cloud_service_providers/aws_cloud/tests/src/Behat/scripts/cleanup_aws_resources.sh

+3 −1
Original line number Diff line number Diff line
@@ -20,6 +20,7 @@ declare -A launch_templates=( 
  [scenario]='Scenario: Delete a Cloud launch template'

  [describe_cmd]='describe-launch-templates'

  [describe_query]='LaunchTemplates[*].LaunchTemplateId'

  # --filters Name=launch-template-name,Values=string.

  [filters_tag_name]='launch-template-name'

  [delete_cmd]='delete-launch-template'

  [delete_arg]='--launch-template-id'
@@ -64,6 +65,7 @@ declare -A key_pairs=( 
  [scenario]='Scenario: Delete the SSH key pair'

  [describe_cmd]='describe-key-pairs'

  [describe_query]='KeyPairs[*].KeyName'

  # --filters Name=key-name,Values=string.

  [filters_tag_name]='key-name'

  [delete_cmd]='delete-key-pair'

  [delete_arg]='--key-name'
@@ -158,7 +160,7 @@ function describe() { 
  local resource_name="$1"

  declare -n ref="${resource_name}"

  local describe_cmd="${ref[describe_cmd]:=describe-${resource_name}}"

  local filters_arg="Name=tag:${ref[filters_tag_name]:-Name},Values=${val_reg_exp}"

  local filters_arg="Name=${ref[filters_tag_name]:-tag:Name},Values=${val_reg_exp}"

  local query_arg=${ref[describe_query]}



  local cmd="aws ec2 ${awscli_args[@]} ${describe_cmd} --filters ${filters_arg} --query ${query_arg} --no-paginate --output text"