fix: upgrade ansible version, address test and lint errors

tests/integration/targets/gcp_compute_router/tasks/autogen.yml

@@ -13,7 +13,7 @@
 #
 # ----------------------------------------------------------------------------
 # Pre-test setup
-- name: create a network
+- name: Create a network
   google.cloud.gcp_compute_network:
     name: network-router
     project: "{{ gcp_project }}"
@@ -22,7 +22,7 @@
     auto_create_subnetworks: true
     state: present
   register: network
-- name: delete a router
+- name: Delete a router
   google.cloud.gcp_compute_router:
     name: "{{ resource_name }}"
     network: "{{ network }}"
@@ -30,17 +30,17 @@
       asn: 64514
       advertise_mode: CUSTOM
       advertised_groups:
-      - ALL_SUBNETS
+        - ALL_SUBNETS
       advertised_ip_ranges:
-      - range: 1.2.3.4
-      - range: 6.7.0.0/16
+        - range: 1.2.3.4
+        - range: 6.7.0.0/16
     region: us-central1
     project: "{{ gcp_project }}"
     auth_kind: "{{ gcp_cred_kind }}"
     service_account_file: "{{ gcp_cred_file | default(omit) }}"
     state: absent
 #----------------------------------------------------------
-- name: create a router
+- name: Create a router
   google.cloud.gcp_compute_router:
     name: "{{ resource_name }}"
     network: "{{ network }}"
@@ -48,37 +48,37 @@
       asn: 64514
       advertise_mode: CUSTOM
       advertised_groups:
-      - ALL_SUBNETS
+        - ALL_SUBNETS
       advertised_ip_ranges:
-      - range: 1.2.3.4
-      - range: 6.7.0.0/16
+        - range: 1.2.3.4
+        - range: 6.7.0.0/16
     region: us-central1
     project: "{{ gcp_project }}"
     auth_kind: "{{ gcp_cred_kind }}"
     service_account_file: "{{ gcp_cred_file | default(omit) }}"
     state: present
   register: result
-- name: assert changed is true
-  assert:
+- name: Assert changed is true
+  ansible.builtin.assert:
     that:
       - result.changed == true
-- name: verify that router was created
+- name: Verify that router was created
   google.cloud.gcp_compute_router_info:
-      filters:
-         - name = {{ resource_name }}
-      region: us-central1
-      project: "{{ gcp_project }}"
-      auth_kind: "{{ gcp_cred_kind }}"
-      service_account_file: "{{ gcp_cred_file | default(omit) }}"
-      scopes:
-        - https://www.googleapis.com/auth/compute
+    filters:
+      - name = {{ resource_name }}
+    region: us-central1
+    project: "{{ gcp_project }}"
+    auth_kind: "{{ gcp_cred_kind }}"
+    service_account_file: "{{ gcp_cred_file | default(omit) }}"
+    scopes:
+      - https://www.googleapis.com/auth/compute
   register: results
-- name: verify that command succeeded
-  assert:
+- name: Verify that command succeeded
+  ansible.builtin.assert:
     that:
       - results['resources'] | length == 1
 # ----------------------------------------------------------------------------
-- name: create a router that already exists
+- name: Create a router that already exists
   google.cloud.gcp_compute_router:
     name: "{{ resource_name }}"
     network: "{{ network }}"
@@ -86,22 +86,22 @@
       asn: 64514
       advertise_mode: CUSTOM
       advertised_groups:
-      - ALL_SUBNETS
+        - ALL_SUBNETS
       advertised_ip_ranges:
-      - range: 1.2.3.4
-      - range: 6.7.0.0/16
+        - range: 1.2.3.4
+        - range: 6.7.0.0/16
     region: us-central1
     project: "{{ gcp_project }}"
     auth_kind: "{{ gcp_cred_kind }}"
     service_account_file: "{{ gcp_cred_file | default(omit) }}"
     state: present
   register: result
-- name: assert changed is false
-  assert:
+- name: Assert changed is false
+  ansible.builtin.assert:
     that:
       - result.changed == false
 #----------------------------------------------------------
-- name: delete a router
+- name: Delete a router
   google.cloud.gcp_compute_router:
     name: "{{ resource_name }}"
     network: "{{ network }}"
@@ -109,37 +109,37 @@
       asn: 64514
       advertise_mode: CUSTOM
       advertised_groups:
-      - ALL_SUBNETS
+        - ALL_SUBNETS
       advertised_ip_ranges:
-      - range: 1.2.3.4
-      - range: 6.7.0.0/16
+        - range: 1.2.3.4
+        - range: 6.7.0.0/16
     region: us-central1
     project: "{{ gcp_project }}"
     auth_kind: "{{ gcp_cred_kind }}"
     service_account_file: "{{ gcp_cred_file | default(omit) }}"
     state: absent
   register: result
-- name: assert changed is true
-  assert:
+- name: Assert changed is true
+  ansible.builtin.assert:
     that:
       - result.changed == true
-- name: verify that router was deleted
+- name: Verify that router was deleted
   google.cloud.gcp_compute_router_info:
-      filters:
-         - name = {{ resource_name }}
-      region: us-central1
-      project: "{{ gcp_project }}"
-      auth_kind: "{{ gcp_cred_kind }}"
-      service_account_file: "{{ gcp_cred_file | default(omit) }}"
-      scopes:
-        - https://www.googleapis.com/auth/compute
+    filters:
+      - name = {{ resource_name }}
+    region: us-central1
+    project: "{{ gcp_project }}"
+    auth_kind: "{{ gcp_cred_kind }}"
+    service_account_file: "{{ gcp_cred_file | default(omit) }}"
+    scopes:
+      - https://www.googleapis.com/auth/compute
   register: results
-- name: verify that command succeeded
-  assert:
+- name: Verify that command succeeded
+  ansible.builtin.assert:
     that:
       - results['resources'] | length == 0
 # ----------------------------------------------------------------------------
-- name: delete a router that does not exist
+- name: Delete a router that does not exist
   google.cloud.gcp_compute_router:
     name: "{{ resource_name }}"
     network: "{{ network }}"
@@ -147,24 +147,24 @@
       asn: 64514
       advertise_mode: CUSTOM
       advertised_groups:
-      - ALL_SUBNETS
+        - ALL_SUBNETS
       advertised_ip_ranges:
-      - range: 1.2.3.4
-      - range: 6.7.0.0/16
+        - range: 1.2.3.4
+        - range: 6.7.0.0/16
     region: us-central1
     project: "{{ gcp_project }}"
     auth_kind: "{{ gcp_cred_kind }}"
     service_account_file: "{{ gcp_cred_file | default(omit) }}"
     state: absent
   register: result
-- name: assert changed is false
-  assert:
+- name: Assert changed is false
+  ansible.builtin.assert:
     that:
       - result.changed == false
 #---------------------------------------------------------
 # Post-test teardown
 # If errors happen, don't crash the playbook!
-- name: delete a network
+- name: Delete a network
   google.cloud.gcp_compute_network:
     name: network-router
     project: "{{ gcp_project }}"

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

@@ -1,2 +1,3 @@
 ---
-- include_tasks: autogen.yml
+- name: Generated tests
+  ansible.builtin.include_tasks: autogen.yml