[PR #1751/989f4dd8 backport][stable-6] Cleanup after renamed plugins

changelogs/fragments/20230908-alias-cleanup.yml

@@ -0,0 +1,2 @@
+trivial:
+- Update integration tests to reflect renamed plugins

tests/integration/targets/cloudwatch_metric_alarm/tasks/main.yml

@@ -397,7 +397,7 @@
         - 'alarm_info.metric_alarms | length == 0'
 
   - name: create ec2 metric alarm with metrics
-    ec2_metric_alarm:
+    cloudwatch_metric_alarm:
       state: present
       name: '{{ alarm_full_name }}'
       treat_missing_data: missing
@@ -444,7 +444,7 @@
 
 
   - name: try to remove the alarm
-    ec2_metric_alarm:
+    cloudwatch_metric_alarm:
       state: absent
       name: '{{ alarm_full_name }}'
     register: ec2_instance_metric_alarm_deletion_no_unit
@@ -466,7 +466,7 @@
         - 'alarm_info_no_unit.metric_alarms | length == 0'
 
   - name: create ec2 metric alarm by providing mutually exclusive values
-    ec2_metric_alarm:
+    cloudwatch_metric_alarm:
       dimensions:
         InstanceId: '{{ ec2_instance_results.instances[0].instance_id }}'
       state: present

tests/integration/targets/lookup_secretsmanager_secret/tasks/main.yaml

@@ -26,7 +26,7 @@
 
   - name: lookup missing secret (skip)
     set_fact:
-      missing_secret: "{{ lookup('amazon.aws.aws_secret', secret_name, on_missing=skip, **connection_args) }}"
+      missing_secret: "{{ lookup('amazon.aws.secretsmanager_secret', secret_name, on_missing=skip, **connection_args) }}"
 
   - name: assert that missing_secret is defined
     assert:
@@ -36,7 +36,7 @@
 
   - name: lookup missing secret (warn)
     set_fact:
-      missing_secret: "{{ lookup('amazon.aws.aws_secret', secret_name, on_missing=warn, **connection_args) }}"
+      missing_secret: "{{ lookup('amazon.aws.secretsmanager_secret', secret_name, on_missing=warn, **connection_args) }}"
 
   - name: assert that missing_secret is defined
     assert:
@@ -46,7 +46,7 @@
 
   - name: lookup missing secret (error)
     set_fact:
-      missing_secret: "{{ lookup('amazon.aws.aws_secret', secret_name, **connection_args) }}"
+      missing_secret: "{{ lookup('amazon.aws.secretsmanager_secret', secret_name, **connection_args) }}"
     ignore_errors: True
     register: get_missing_secret
 
@@ -56,7 +56,7 @@
         - get_missing_secret is failed
 
   - name: create secret "{{ secret_name }}"
-    aws_secret:
+    secretsmanager_secret:
       name: "{{ secret_name }}"
       secret: "{{ secret_value }}"
       tags:
@@ -65,22 +65,22 @@
 
   - name: read secret value
     set_fact:
-      look_secret: "{{ lookup('amazon.aws.aws_secret', secret_name, **connection_args) }}"
+      look_secret: "{{ lookup('amazon.aws.secretsmanager_secret', secret_name, **connection_args) }}"
 
   - name: assert that secret was successfully retrieved
     assert:
       that:
         - look_secret == secret_value
 
   - name: delete secret
-    aws_secret:
+    secretsmanager_secret:
       name: "{{ secret_name }}"
       state: absent
       recovery_window: 7
 
   - name: lookup deleted secret (skip)
     set_fact:
-      deleted_secret: "{{ lookup('amazon.aws.aws_secret', secret_name, on_deleted=skip, **connection_args) }}"
+      deleted_secret: "{{ lookup('amazon.aws.secretsmanager_secret', secret_name, on_deleted=skip, **connection_args) }}"
 
   - name: assert that deleted_secret is defined
     assert:
@@ -90,7 +90,7 @@
 
   - name: lookup deleted secret (warn)
     set_fact:
-      deleted_secret: "{{ lookup('amazon.aws.aws_secret', secret_name, on_deleted=warn, **connection_args) }}"
+      deleted_secret: "{{ lookup('amazon.aws.secretsmanager_secret', secret_name, on_deleted=warn, **connection_args) }}"
 
   - name: assert that deleted_secret is defined
     assert:
@@ -100,7 +100,7 @@
 
   - name: lookup deleted secret (error)
     set_fact:
-      missing_secret: "{{ lookup('amazon.aws.aws_secret', secret_name, **connection_args) }}"
+      missing_secret: "{{ lookup('amazon.aws.secretsmanager_secret', secret_name, **connection_args) }}"
     ignore_errors: True
     register: get_deleted_secret
 
@@ -113,7 +113,7 @@
 
   # delete secret created
   - name: delete secret
-    aws_secret:
+    secretsmanager_secret:
       name: "{{ secret_name }}"
       state: absent
       recovery_window: 0

tests/integration/targets/setup_ec2_vpc/tasks/cleanup.yml

@@ -18,7 +18,7 @@
       register: remaining_enis
 
     - name: '(VPC Cleanup) Retrieve security group info based on VPC ID'
-      ec2_group_info:
+      ec2_security_group_info:
         filters:
           vpc-id: '{{ vpc_id }}'
       register: remaining_groups