ansible-lint: fix YAML failures

Author: markgoddard

.ansible-lint

@@ -1,14 +1,8 @@
 skip_list:
   - name[missing]
-  - name[play]
   - var-naming[no-reserved]
   - var-naming[no-role-prefix]
-  - yaml[empty-lines]
-  - yaml[indentation]
   - yaml[line-length]
-  - yaml[new-line-at-end-of-file]
-  - yaml[trailing-spaces]
-  - yaml[truthy]
   - galaxy[no-changelog]
   - galaxy[tags]
   - galaxy[version-incorrect]

.github/workflows/pull_request.yml

@@ -1,14 +1,13 @@
-
 name: Tests
 
 # Controls when the action will run.
-on:
+'on':
   pull_request:
   push:
     branches:
       - master
 env:
-  ANSIBLE_FORCE_COLOR: True
+  ANSIBLE_FORCE_COLOR: true
 
 jobs:
   lint:

roles/pulp_django_user/tasks/user_groups/add_user_to_groups.yml

@@ -13,12 +13,12 @@
 
 - name: Fail when group cannot be unambiguosly returned from Pulp
   fail:
-   msg: >
-     "Pulp API query: GET '{{ group_href_result.url }}' did not return
-     exactly one group. Groupname '{{ add_group }}' was found
-     '{{ group_href_result.json.count }}' times.
-     Groupnames should be unique and exist before associating users
-     with them"
+    msg: >
+      "Pulp API query: GET '{{ group_href_result.url }}' did not return
+      exactly one group. Groupname '{{ add_group }}' was found
+      '{{ group_href_result.json.count }}' times.
+      Groupnames should be unique and exist before associating users
+      with them"
   when: group_href_result.json.count != 1
 
 # Will fail before we get here if the group doesn't exist or has

roles/pulp_django_user/tasks/user_groups/remove_user_from_groups.yml

@@ -15,12 +15,12 @@
 # from pulp API
 - name: Fail when group cannot be unambiguosly returned from Pulp API
   fail:
-   msg: >
-     "Pulp API query: GET '{{ group_href_result.url }}' did not return
-     exactly one group. Groupname '{{ remove_group }}' was found
-     '{{ group_href_result.json.count }}' times.
-     Groupnames should be unique and exist before associating users
-     with them"
+    msg: >
+      "Pulp API query: GET '{{ group_href_result.url }}' did not return
+      exactly one group. Groupname '{{ remove_group }}' was found
+      '{{ group_href_result.json.count }}' times.
+      Groupnames should be unique and exist before associating users
+      with them"
   when: group_href_result.json.count != 1
 
 - name: Get user id from Pulp API

roles/pulp_group/tasks/main.yml

@@ -24,9 +24,9 @@
     loop_var: "group"
     label: "{{ group.item.name }}"
   when:
-   - group.json.count == 1
-   - group.item.state is defined
-   - group.item.state == "absent"
+    - group.json.count == 1
+    - group.item.state is defined
+    - group.item.state == "absent"
 
 - name: Set groups to create fact
   set_fact:
@@ -36,8 +36,8 @@
     loop_var: "group"
     label: "{{ group.item.name }}"
   when:
-   - group.json.count == 0
-   - group.item.state is not defined or group.item.state != "absent"
+    - group.json.count == 0
+    - group.item.state is not defined or group.item.state != "absent"
 
 - name: Create groups
   uri:

roles/pulp_repository/tasks/container.yml

@@ -35,7 +35,7 @@
     url: "{{ pulp_repository_container_repos[repository_index].url | default(omit) }}"
     state: "{{ pulp_repository_container_repos[repository_index].state }}"
   when: >
-    pulp_repository_container_repos[repository_index].state == "absent" or 
+    pulp_repository_container_repos[repository_index].state == "absent" or
     pulp_repository_container_repos[repository_index].url is defined
   loop: "{{ pulp_repository_container_repos | map(attribute='name') }}"
   loop_control:
@@ -56,6 +56,6 @@
   loop_control:
     index_var: repository_index
   register: pulp_repository_container_repos_sync
-  until: "pulp_repository_container_repos_sync is not failed" 
+  until: "pulp_repository_container_repos_sync is not failed"
   retries: "{{ pulp_repository_container_repos_sync_retries }}"
   delay: 1

roles/pulp_repository/tasks/deb.yml

@@ -35,7 +35,7 @@
     url: "{{ pulp_repository_deb_repos[repository_index].url | default(omit) }}"
     state: "{{ pulp_repository_deb_repos[repository_index].state }}"
   when: >
-    pulp_repository_deb_repos[repository_index].state == "absent" or 
+    pulp_repository_deb_repos[repository_index].state == "absent" or
     pulp_repository_deb_repos[repository_index].url is defined
   loop: "{{ pulp_repository_deb_repos | map(attribute='name') }}"
   loop_control:
@@ -57,6 +57,6 @@
   loop_control:
     index_var: repository_index
   register: pulp_repository_deb_repos_sync
-  until: "pulp_repository_deb_repos_sync is not failed" 
+  until: "pulp_repository_deb_repos_sync is not failed"
   retries: "{{ pulp_repository_deb_repos_sync_retries }}"
   delay: 1

roles/pulp_repository/tasks/python.yml

@@ -35,7 +35,7 @@
     url: "{{ pulp_repository_python_repos[repository_index].url | default(omit) }}"
     state: "{{ pulp_repository_python_repos[repository_index].state }}"
   when: >
-    pulp_repository_python_repos[repository_index].state == "absent" or 
+    pulp_repository_python_repos[repository_index].state == "absent" or
     pulp_repository_python_repos[repository_index].url is defined
   loop: "{{ pulp_repository_python_repos | map(attribute='name') }}"
   loop_control:
@@ -56,7 +56,6 @@
   loop_control:
     index_var: repository_index
   register: pulp_repository_python_repos_sync
-  until: "pulp_repository_python_repos_sync is not failed" 
+  until: "pulp_repository_python_repos_sync is not failed"
   retries: "{{ pulp_repository_python_repos_sync_retries }}"
   delay: 1
-

roles/pulp_repository/tasks/rpm.yml

@@ -32,7 +32,7 @@
     url: "{{ pulp_repository_rpm_repos[repository_index].url | default(omit) }}"
     state: "{{ pulp_repository_rpm_repos[repository_index].state }}"
   when: >
-    pulp_repository_rpm_repos[repository_index].state == "absent" or 
+    pulp_repository_rpm_repos[repository_index].state == "absent" or
     pulp_repository_rpm_repos[repository_index].url is defined
   loop: "{{ pulp_repository_rpm_repos | map(attribute='name') }}"
   loop_control:
@@ -54,6 +54,6 @@
   loop_control:
     index_var: repository_index
   register: pulp_repository_rpm_repos_sync
-  until: "pulp_repository_rpm_repos_sync is not failed" 
+  until: "pulp_repository_rpm_repos_sync is not failed"
   retries: "{{ pulp_repository_rpm_repos_sync_retries }}"
   delay: 1

tests/test_container_repository.yml

@@ -82,15 +82,15 @@
         that: container_remotes.remotes | length == 0
 
     - block:
-      - include_role:
-          name: pulp_repository
-        vars:
-          pulp_repository_container_repos:
-            - name: test_container_repo_bad_url
-              upstream_name: pulp/test-fixture-1
-              url: "https://google.com/404"
-              policy: immediate
-              state: present
+        - include_role:
+            name: pulp_repository
+          vars:
+            pulp_repository_container_repos:
+              - name: test_container_repo_bad_url
+                upstream_name: pulp/test-fixture-1
+                url: "https://google.com/404"
+                policy: immediate
+                state: present
 
       rescue:
         - set_fact:
@@ -111,5 +111,5 @@
             name: pulp_repository
           vars:
             pulp_repository_deb_repos:
-            - name: test_container_repo_bad_url
-              state: absent
+              - name: test_container_repo_bad_url
+                state: absent

tests/test_content_guard_rbac.yml

@@ -151,7 +151,7 @@
       assert:
         that:
           - rbac_cg_list.json.results | json_query(query) | length == 0
-    
+
     - name: Cleanup
       include_role:
         name: pulp_content_guard

tests/test_deb_repository.yml

@@ -82,15 +82,15 @@
         that: deb_remotes.remotes | length == 0
 
     - block:
-      - include_role:
-          name: pulp_repository
-        vars:
-          pulp_repository_deb_repos:
-            - name: test_deb_repo_bad_url
-              url: "https://google.com/404"
-              distributions: "ragnarok"
-              policy: immediate
-              state: present
+        - include_role:
+            name: pulp_repository
+          vars:
+            pulp_repository_deb_repos:
+              - name: test_deb_repo_bad_url
+                url: "https://google.com/404"
+                distributions: "ragnarok"
+                policy: immediate
+                state: present
       rescue:
         - set_fact:
             failed_task: "{{ ansible_failed_task }}"
@@ -110,5 +110,5 @@
             name: pulp_repository
           vars:
             pulp_repository_deb_repos:
-            - name: test_deb_repo_bad_url
-              state: absent
+              - name: test_deb_repo_bad_url
+                state: absent

tests/test_django_user.yml

@@ -19,7 +19,7 @@
     - name: Set Pulp version fact
       set_fact:
         pulp_version: "{{ pulp_status.json.versions | selectattr('component', 'equalto', 'core') | map(attribute='version') | first }}"
-    
+
     - name: Run Django user test on Pulp =< 3.18
       when: pulp_version is version('3.18', 'le', version_type='strict')
       block:
@@ -33,7 +33,7 @@
             status_code: 200
             force_basic_auth: true
           register: groups_result
-  
+
         - name: Create groups
           uri:
             url: "{{ pulp_url }}/pulp/api/v3/groups/"
@@ -49,7 +49,7 @@
             - test_group1
             - test_group2
           when: item not in groups_result.json.results | map(attribute='name') | list
-  
+
         - include_role:
             name: pulp_django_user
           vars:
@@ -58,7 +58,7 @@
                 password: correct horse battery staple
                 groups:
                   - test_group1
-  
+
         - name: Query user
           uri:
             url: "{{ pulp_url }}/pulp/api/v3/users/?username=test_user"
@@ -68,15 +68,15 @@
             status_code: 200
             force_basic_auth: true
           register: user_result
-  
+
         - name: Verify django user creation
           assert:
             that:
               - user_result.json.count == 1
               - user_result.json.results[0].username == "test_user"
               - user_result.json.results[0].groups | length == 1
               - user_result.json.results[0].groups[0].name == "test_group1"
-  
+
         # Update group membership.
         - include_role:
             name: pulp_django_user
@@ -86,7 +86,7 @@
                 password: correct horse battery staple
                 groups:
                   - test_group2
-  
+
         - name: Query user
           uri:
             url: "{{ pulp_url }}/pulp/api/v3/users/?username=test_user"
@@ -96,7 +96,7 @@
             status_code: 200
             force_basic_auth: true
           register: user_result
-  
+
         - name: Verify django user group update
           assert:
             that:

tests/test_rpm_repository.yml

@@ -80,14 +80,14 @@
         that: rpm_remotes.remotes | length == 0
 
     - block:
-      - include_role:
-          name: pulp_repository
-        vars:
-          pulp_repository_rpm_repos:
-            - name: test_rpm_repo_bad_url
-              url: "https://google.com/404"
-              policy: immediate
-              state: present
+        - include_role:
+            name: pulp_repository
+          vars:
+            pulp_repository_rpm_repos:
+              - name: test_rpm_repo_bad_url
+                url: "https://google.com/404"
+                policy: immediate
+                state: present
       rescue:
         - set_fact:
             failed_task: "{{ ansible_failed_task }}"
@@ -107,5 +107,5 @@
             name: pulp_repository
           vars:
             pulp_repository_rpm_repos:
-            - name: test_rpm_repo_bad_url
-              state: absent
+              - name: test_rpm_repo_bad_url
+                state: absent