From f02ceaf66a6a0050b6552d7cc461462dfc643019 Mon Sep 17 00:00:00 2001 From: Matt Clay Date: Fri, 7 Feb 2020 21:31:48 -0800 Subject: [PATCH] Fix AWS test names and aliases. (#67232) * Fix AWS test names and aliases. * Add missing alias. * Rename ec2_vpc_vpn_facts test. --- test/integration/targets/aws_config/aliases | 5 +++++ .../integration/targets/{aws_eks => aws_eks_cluster}/aliases | 1 - .../targets/{aws_eks => aws_eks_cluster}/defaults/main.yml | 0 .../{aws_eks => aws_eks_cluster}/files/eks-trust-policy.json | 0 .../targets/{aws_eks => aws_eks_cluster}/meta/main.yml | 0 .../tasks/botocore_lt_1.10.1.yml | 0 .../tasks/botocore_lt_1.12.38.yml | 0 .../targets/{aws_eks => aws_eks_cluster}/tasks/full_test.yml | 0 .../targets/{aws_eks => aws_eks_cluster}/tasks/main.yml | 0 .../targets/{aws_inspector => aws_inspector_target}/aliases | 0 .../defaults/main.yml | 0 .../{aws_inspector => aws_inspector_target}/tasks/main.yml | 0 .../{aws_ssm_parameters => aws_ssm_parameter_store}/aliases | 0 .../defaults/main.yml | 0 .../tasks/main.yml | 0 test/integration/targets/cloudwatchlogs/aliases | 1 + .../targets/{ec2_vpc_vpn_facts => ec2_vpc_vpn_info}/aliases | 0 .../{ec2_vpc_vpn_facts => ec2_vpc_vpn_info}/tasks/main.yml | 0 18 files changed, 6 insertions(+), 1 deletion(-) rename test/integration/targets/{aws_eks => aws_eks_cluster}/aliases (57%) rename test/integration/targets/{aws_eks => aws_eks_cluster}/defaults/main.yml (100%) rename test/integration/targets/{aws_eks => aws_eks_cluster}/files/eks-trust-policy.json (100%) rename test/integration/targets/{aws_eks => aws_eks_cluster}/meta/main.yml (100%) rename test/integration/targets/{aws_eks => aws_eks_cluster}/tasks/botocore_lt_1.10.1.yml (100%) rename test/integration/targets/{aws_eks => aws_eks_cluster}/tasks/botocore_lt_1.12.38.yml (100%) rename test/integration/targets/{aws_eks => aws_eks_cluster}/tasks/full_test.yml (100%) rename test/integration/targets/{aws_eks => aws_eks_cluster}/tasks/main.yml (100%) rename test/integration/targets/{aws_inspector => aws_inspector_target}/aliases (100%) rename test/integration/targets/{aws_inspector => aws_inspector_target}/defaults/main.yml (100%) rename test/integration/targets/{aws_inspector => aws_inspector_target}/tasks/main.yml (100%) rename test/integration/targets/{aws_ssm_parameters => aws_ssm_parameter_store}/aliases (100%) rename test/integration/targets/{aws_ssm_parameters => aws_ssm_parameter_store}/defaults/main.yml (100%) rename test/integration/targets/{aws_ssm_parameters => aws_ssm_parameter_store}/tasks/main.yml (100%) rename test/integration/targets/{ec2_vpc_vpn_facts => ec2_vpc_vpn_info}/aliases (100%) rename test/integration/targets/{ec2_vpc_vpn_facts => ec2_vpc_vpn_info}/tasks/main.yml (100%) diff --git a/test/integration/targets/aws_config/aliases b/test/integration/targets/aws_config/aliases index 3d0ccecba87..c598f3e8b47 100644 --- a/test/integration/targets/aws_config/aliases +++ b/test/integration/targets/aws_config/aliases @@ -1,3 +1,8 @@ cloud/aws disabled shippable/aws/group2 +aws_config_aggregation_authorization +aws_config_aggregator +aws_config_delivery_channel +aws_config_recorder +aws_config_rule diff --git a/test/integration/targets/aws_eks/aliases b/test/integration/targets/aws_eks_cluster/aliases similarity index 57% rename from test/integration/targets/aws_eks/aliases rename to test/integration/targets/aws_eks_cluster/aliases index 811b1890f6e..56927195182 100644 --- a/test/integration/targets/aws_eks/aliases +++ b/test/integration/targets/aws_eks_cluster/aliases @@ -1,3 +1,2 @@ cloud/aws unsupported -aws_eks_cluster diff --git a/test/integration/targets/aws_eks/defaults/main.yml b/test/integration/targets/aws_eks_cluster/defaults/main.yml similarity index 100% rename from test/integration/targets/aws_eks/defaults/main.yml rename to test/integration/targets/aws_eks_cluster/defaults/main.yml diff --git a/test/integration/targets/aws_eks/files/eks-trust-policy.json b/test/integration/targets/aws_eks_cluster/files/eks-trust-policy.json similarity index 100% rename from test/integration/targets/aws_eks/files/eks-trust-policy.json rename to test/integration/targets/aws_eks_cluster/files/eks-trust-policy.json diff --git a/test/integration/targets/aws_eks/meta/main.yml b/test/integration/targets/aws_eks_cluster/meta/main.yml similarity index 100% rename from test/integration/targets/aws_eks/meta/main.yml rename to test/integration/targets/aws_eks_cluster/meta/main.yml diff --git a/test/integration/targets/aws_eks/tasks/botocore_lt_1.10.1.yml b/test/integration/targets/aws_eks_cluster/tasks/botocore_lt_1.10.1.yml similarity index 100% rename from test/integration/targets/aws_eks/tasks/botocore_lt_1.10.1.yml rename to test/integration/targets/aws_eks_cluster/tasks/botocore_lt_1.10.1.yml diff --git a/test/integration/targets/aws_eks/tasks/botocore_lt_1.12.38.yml b/test/integration/targets/aws_eks_cluster/tasks/botocore_lt_1.12.38.yml similarity index 100% rename from test/integration/targets/aws_eks/tasks/botocore_lt_1.12.38.yml rename to test/integration/targets/aws_eks_cluster/tasks/botocore_lt_1.12.38.yml diff --git a/test/integration/targets/aws_eks/tasks/full_test.yml b/test/integration/targets/aws_eks_cluster/tasks/full_test.yml similarity index 100% rename from test/integration/targets/aws_eks/tasks/full_test.yml rename to test/integration/targets/aws_eks_cluster/tasks/full_test.yml diff --git a/test/integration/targets/aws_eks/tasks/main.yml b/test/integration/targets/aws_eks_cluster/tasks/main.yml similarity index 100% rename from test/integration/targets/aws_eks/tasks/main.yml rename to test/integration/targets/aws_eks_cluster/tasks/main.yml diff --git a/test/integration/targets/aws_inspector/aliases b/test/integration/targets/aws_inspector_target/aliases similarity index 100% rename from test/integration/targets/aws_inspector/aliases rename to test/integration/targets/aws_inspector_target/aliases diff --git a/test/integration/targets/aws_inspector/defaults/main.yml b/test/integration/targets/aws_inspector_target/defaults/main.yml similarity index 100% rename from test/integration/targets/aws_inspector/defaults/main.yml rename to test/integration/targets/aws_inspector_target/defaults/main.yml diff --git a/test/integration/targets/aws_inspector/tasks/main.yml b/test/integration/targets/aws_inspector_target/tasks/main.yml similarity index 100% rename from test/integration/targets/aws_inspector/tasks/main.yml rename to test/integration/targets/aws_inspector_target/tasks/main.yml diff --git a/test/integration/targets/aws_ssm_parameters/aliases b/test/integration/targets/aws_ssm_parameter_store/aliases similarity index 100% rename from test/integration/targets/aws_ssm_parameters/aliases rename to test/integration/targets/aws_ssm_parameter_store/aliases diff --git a/test/integration/targets/aws_ssm_parameters/defaults/main.yml b/test/integration/targets/aws_ssm_parameter_store/defaults/main.yml similarity index 100% rename from test/integration/targets/aws_ssm_parameters/defaults/main.yml rename to test/integration/targets/aws_ssm_parameter_store/defaults/main.yml diff --git a/test/integration/targets/aws_ssm_parameters/tasks/main.yml b/test/integration/targets/aws_ssm_parameter_store/tasks/main.yml similarity index 100% rename from test/integration/targets/aws_ssm_parameters/tasks/main.yml rename to test/integration/targets/aws_ssm_parameter_store/tasks/main.yml diff --git a/test/integration/targets/cloudwatchlogs/aliases b/test/integration/targets/cloudwatchlogs/aliases index c5fae7f2a37..500ca9a8ac1 100644 --- a/test/integration/targets/cloudwatchlogs/aliases +++ b/test/integration/targets/cloudwatchlogs/aliases @@ -1,3 +1,4 @@ cloud/aws shippable/aws/group1 +cloudwatchlogs_log_group cloudwatchlogs_log_group_metric_filter diff --git a/test/integration/targets/ec2_vpc_vpn_facts/aliases b/test/integration/targets/ec2_vpc_vpn_info/aliases similarity index 100% rename from test/integration/targets/ec2_vpc_vpn_facts/aliases rename to test/integration/targets/ec2_vpc_vpn_info/aliases diff --git a/test/integration/targets/ec2_vpc_vpn_facts/tasks/main.yml b/test/integration/targets/ec2_vpc_vpn_info/tasks/main.yml similarity index 100% rename from test/integration/targets/ec2_vpc_vpn_facts/tasks/main.yml rename to test/integration/targets/ec2_vpc_vpn_info/tasks/main.yml