chore: fix ansible-lint 6.17.2

juju4 · juju4 · commit a40e06df1846 · 2023-08-20T14:09:28.000Z
diff --git a/.ansible-lint b/.ansible-lint
@@ -1,3 +1,6 @@
+---
 skip_list:
   - '106'
   - ignore-errors
+exclude_paths:
+  - .github/workflows/
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
@@ -1,23 +1,23 @@
 repos:
-    - repo: https://github.com/pre-commit/pre-commit-hooks
-      rev: v4.0.1
-      hooks:
-        - id: check-yaml
-          args: [--allow-multiple-documents]
-        - id: end-of-file-fixer
-        - id: trailing-whitespace
-          args: [--markdown-linebreak-ext=md]
+  - repo: https://github.com/pre-commit/pre-commit-hooks
+    rev: v4.0.1
+    hooks:
+      - id: check-yaml
+        args: [--allow-multiple-documents]
+      - id: end-of-file-fixer
+      - id: trailing-whitespace
+        args: [--markdown-linebreak-ext=md]
 
-    - repo: https://github.com/adrienverge/yamllint
-      rev: v1.26.3
-      hooks:
-        - id: yamllint
-          args: [-c=.yamllint]
+  - repo: https://github.com/adrienverge/yamllint
+    rev: v1.26.3
+    hooks:
+      - id: yamllint
+        args: [-c=.yamllint]
 
-    - repo: https://github.com/robertdebock/pre-commit
-      rev: v1.2.3
-      hooks:
-        - id: ansible_role_find_unused_variable
-        - id: ansible_role_find_empty_files
-        - id: ansible_role_find_empty_directories
-        - id: ansible_role_fix_readability
+  - repo: https://github.com/robertdebock/pre-commit
+    rev: v1.2.3
+    hooks:
+      - id: ansible_role_find_unused_variable
+      - id: ansible_role_find_empty_files
+      - id: ansible_role_find_empty_directories
+      - id: ansible_role_fix_readability
diff --git a/defaults/main.yml b/defaults/main.yml
@@ -12,10 +12,10 @@ runner_version: "latest"
 runner_state: "started"
 
 # If found on the server, delete already existing runner service and install it again
-reinstall_runner: no
+reinstall_runner: false
 
 # Do not show Ansible logs which may contain sensitive data (registration token)
-hide_sensitive_logs: yes
+hide_sensitive_logs: true
 
 # GitHub address
 github_url: "https://github.com"
@@ -27,7 +27,7 @@ github_api_url: "https://api.github.com"
 access_token: "{{ lookup('env', 'PERSONAL_ACCESS_TOKEN') }}"
 
 # Is it the runner for organization or not?
-runner_org: no
+runner_org: false
 
 # Labels to apply to the runner
 runner_labels: []
diff --git a/molecule/custom_env/cleanup.yml b/molecule/custom_env/cleanup.yml
@@ -4,9 +4,9 @@
   hosts: all
   become: yes
   vars:
-    - runner_user: ansible
-    - github_repo: ansible-github_actions_runner-testrepo
-    - github_account: monolithprojects-testorg
-    - runner_state: absent
+    runner_user: ansible
+    github_repo: ansible-github_actions_runner-testrepo
+    github_account: monolithprojects-testorg
+    runner_state: absent
   roles:
-    - ansible-github_actions_runner
+    - monolithprojects.github_actions_runner
diff --git a/molecule/custom_env/converge.yml b/molecule/custom_env/converge.yml
@@ -5,16 +5,16 @@
   gather_facts: yes
   become: yes
   vars:
-    - runner_user: ansible
-    - github_repo: ansible-github_actions_runner-testrepo
-    - github_account: monolithprojects-testorg
-    - runner_version: "latest"
-    - runner_labels:
+    runner_user: ansible
+    github_repo: ansible-github_actions_runner-testrepo
+    github_account: monolithprojects-testorg
+    runner_version: "latest"
+    runner_labels:
         - label1
         - repo-runner
-    - custom_env: |
+    custom_env: |
       # HTTPS_PROXY=YOUR_URL_HERE
 
   roles:
     - robertdebock.epel
-    - ansible-github_actions_runner
+    - monolithprojects.github_actions_runner
diff --git a/molecule/custom_env/requirements.yml b/molecule/custom_env/requirements.yml
@@ -1,5 +1,5 @@
 ---
 
 roles:
-- role: robertdebock.epel
+- name: robertdebock.epel
   version: 3.0.1
diff --git a/molecule/custom_env/verify.yml b/molecule/custom_env/verify.yml
@@ -1,20 +1,20 @@
 ---
-- name: validate Repo runners
+- name: Validate Repo runners
   user: ansible
   hosts: all
   gather_facts: yes
   become: yes
   vars:
-    - runner_user: ansible
-    - github_repo: ansible-github_actions_runner-testrepo
-    - github_account: monolithprojects-testorg
-    - github_api_url: "https://api.github.com"
-    - access_token: "{{ lookup('env', 'PERSONAL_ACCESS_TOKEN') }}"
-    - runner_name: ubuntu16-latest
+    runner_user: ansible
+    github_repo: ansible-github_actions_runner-testrepo
+    github_account: monolithprojects-testorg
+    github_api_url: "https://api.github.com"
+    access_token: "{{ lookup('env', 'PERSONAL_ACCESS_TOKEN') }}"
+    runner_name: ubuntu16-latest
 
   tasks:
     - name: Check currently registered runners
-      uri:
+      ansible.builtin.uri:
         url: "{{ github_api_url }}/repos/{{ github_owner | default(github_account) }}/{{ github_repo }}/actions/runners"
         headers:
           Authorization: "token {{ access_token }}"
@@ -24,23 +24,24 @@
         force_basic_auth: yes
       register: registered_runners
 
-    - debug:
+    - name: Debug | var registered_runners
+      ansible.builtin.debug:
         var: registered_runners.json.runners
 
     - name: Check Runner
-      assert:
+      ansible.builtin.assert:
         that:
           - runner_name in registered_runners.json.runners|map(attribute='name')|list
           - registered_runners.json.runners|map(attribute='status') == ["online"]
         quiet: true
 
     - name: Check Labels (skipped if labels are OK)
-      fail:
+      ansible.builtin.fail:
         msg: Woops some labels differ "{{ (registered_runners.json.runners.0 | json_query('labels[*].name') | difference(['self-hosted', 'Linux', 'X64', 'label1', 'repo-runner'])) }}"
       when: not (registered_runners.json.runners.0 | json_query('labels[*].name') | list ) == (['self-hosted', 'Linux', 'X64', 'label1', 'repo-runner'] | list)
 
     - name: Check custom env file is configured
-      lineinfile:
+      ansible.builtin.lineinfile:
         dest: /opt/actions-runner/.env
         line: "# HTTPS_PROXY=YOUR_URL_HERE"
       check_mode: yes
diff --git a/molecule/default/cleanup.yml b/molecule/default/cleanup.yml
@@ -4,10 +4,10 @@
   hosts: all
   become: yes
   vars:
-    - runner_user: ansible
-    - github_repo: ansible-github_actions_runner-testrepo
-    - github_account: monolithprojects-testorg
-    - runner_state: absent
-    - runner_name: test_name
+    runner_user: ansible
+    github_repo: ansible-github_actions_runner-testrepo
+    github_account: monolithprojects-testorg
+    runner_state: absent
+    runner_name: test_name
   roles:
-    - ansible-github_actions_runner
+    - monolithprojects.github_actions_runner
diff --git a/molecule/default/converge.yml b/molecule/default/converge.yml
@@ -5,17 +5,17 @@
   gather_facts: yes
   become: yes
   vars:
-    - runner_user: ansible
-    - github_repo: ansible-github_actions_runner-testrepo
-    - github_account: monolithprojects-testorg
-    - runner_version: "latest"
-    - runner_name: test_name
-    - runner_on_ghes: yes
-    - reinstall_runner: false
-    - hide_sensitive_logs: no
-    - runner_labels:
+    runner_user: ansible
+    github_repo: ansible-github_actions_runner-testrepo
+    github_account: monolithprojects-testorg
+    runner_version: "latest"
+    runner_name: test_name
+    runner_on_ghes: yes
+    reinstall_runner: false
+    hide_sensitive_logs: no
+    runner_labels:
         - label1
         - repo-runner
   roles:
     - robertdebock.epel
-    - ansible-github_actions_runner
+    - monolithprojects.github_actions_runner
diff --git a/molecule/default/requirements.yml b/molecule/default/requirements.yml
@@ -1,5 +1,5 @@
 ---
 
 roles:
-- role: robertdebock.epel
+- name: robertdebock.epel
   version: 3.0.1
diff --git a/molecule/default/verify.yml b/molecule/default/verify.yml
@@ -1,20 +1,20 @@
 ---
-- name: validate Repo runners
+- name: Validate Repo runners
   user: ansible
   hosts: all
   gather_facts: yes
   become: yes
   vars:
-    - runner_user: ansible
-    - github_repo: ansible-github_actions_runner-testrepo
-    - github_account: monolithprojects-testorg
-    - github_api_url: "https://api.github.com"
-    - access_token: "{{ lookup('env', 'PERSONAL_ACCESS_TOKEN') }}"
-    - runner_name: ubuntu16-latest
+    runner_user: ansible
+    github_repo: ansible-github_actions_runner-testrepo
+    github_account: monolithprojects-testorg
+    github_api_url: "https://api.github.com"
+    access_token: "{{ lookup('env', 'PERSONAL_ACCESS_TOKEN') }}"
+    runner_name: ubuntu16-latest
 
   tasks:
     - name: Check currently registered runners
-      uri:
+      ansible.builtin.uri:
         url: "{{ github_api_url }}/repos/{{ github_owner | default(github_account) }}/{{ github_repo }}/actions/runners"
         headers:
           Authorization: "token {{ access_token }}"
@@ -24,17 +24,18 @@
         force_basic_auth: yes
       register: registered_runners
 
-    - debug:
+    - name: Debug | var registered_runners
+      ansible.builtin.debug:
         var: registered_runners.json.runners
 
     - name: Check Runner
-      assert:
+      ansible.builtin.assert:
         that:
           - runner_name in registered_runners.json.runners|map(attribute='name')|list
           - registered_runners.json.runners|map(attribute='status') == ["online"]
         quiet: true
 
     - name: Check Labels (skipped if labels are OK)
-      fail:
+      ansible.builtin.fail:
         msg: Woops some labels differ "{{ (registered_runners.json.runners.0 | json_query('labels[*].name') | difference(['self-hosted', 'Linux', 'X64', 'label1', 'repo-runner'])) }}"
       when: not (registered_runners.json.runners.0 | json_query('labels[*].name') | list ) == (['self-hosted', 'Linux', 'X64', 'label1', 'repo-runner'] | list)
diff --git a/molecule/org/cleanup.yml b/molecule/org/cleanup.yml
@@ -4,9 +4,9 @@
   hosts: all
   become: yes
   vars:
-    - runner_user: ansible
-    - github_account: monolithprojects-testorg
-    - runner_org: yes
-    - runner_state: absent
+    runner_user: ansible
+    github_account: monolithprojects-testorg
+    runner_org: yes
+    runner_state: absent
   roles:
-    - ansible-github_actions_runner
+    - monolithprojects.github_actions_runner
diff --git a/molecule/org/converge.yml b/molecule/org/converge.yml
@@ -4,11 +4,11 @@
   hosts: all
   become: yes
   vars:
-    - runner_user: ansible
-    - github_account: monolithprojects-testorg
-    - runner_org: yes
-    - runner_state: "stopped"
-    - runner_version: "2.303.0"
+    runner_user: ansible
+    github_account: monolithprojects-testorg
+    runner_org: yes
+    runner_state: "stopped"
+    runner_version: "2.303.0"
   roles:
     - robertdebock.epel
-    - ansible-github_actions_runner
+    - monolithprojects.github_actions_runner
diff --git a/molecule/org/requirements.yml b/molecule/org/requirements.yml
@@ -1,5 +1,5 @@
 ---
 
 roles:
-- role: robertdebock.epel
+- name: robertdebock.epel
   version: 3.0.1
diff --git a/molecule/org/verify.yml b/molecule/org/verify.yml
@@ -1,24 +1,24 @@
 ---
-- name: validate Repo runners
+- name: Validate Repo runners
   user: ansible
   hosts: all
   gather_facts: yes
   become: yes
   vars:
-    - runner_user: ansible
-    - github_account: monolithprojects-testorg
-    - runner_org: yes
-    - github_api_url: "https://api.github.com"
-    - access_token: "{{ lookup('env', 'PERSONAL_ACCESS_TOKEN') }}"
-    - runner_name: "{{ ansible_hostname }}"
+    runner_user: ansible
+    github_account: monolithprojects-testorg
+    runner_org: yes
+    github_api_url: "https://api.github.com"
+    access_token: "{{ lookup('env', 'PERSONAL_ACCESS_TOKEN') }}"
+    runner_name: "{{ ansible_hostname }}"
 
   tasks:
     - name: Give the runners a minute
-      pause:
+      ansible.builtin.pause:
         seconds: 30
 
     - name: Check currently registered runners
-      uri:
+      ansible.builtin.uri:
         url: "{{ github_api_url }}/orgs/{{ github_owner | default(github_account) }}/actions/runners"
         headers:
           Authorization: "token {{ access_token }}"
@@ -29,7 +29,7 @@
       register: registered_runners
 
     - name: Check Runner
-      assert:
+      ansible.builtin.assert:
         that:
           - runner_name in registered_runners.json.runners|map(attribute='name')|list
         quiet: true
diff --git a/molecule/repo/cleanup.yml b/molecule/repo/cleanup.yml
@@ -4,9 +4,9 @@
   hosts: all
   become: yes
   vars:
-    - runner_user: ansible
-    - github_repo: ansible-github_actions_runner-testrepo
-    - github_account: monolithprojects-testorg
-    - runner_state: absent
+    runner_user: ansible
+    github_repo: ansible-github_actions_runner-testrepo
+    github_account: monolithprojects-testorg
+    runner_state: absent
   roles:
-    - ansible-github_actions_runner
+    - monolithprojects.github_actions_runner
diff --git a/molecule/repo/converge.yml b/molecule/repo/converge.yml
@@ -5,13 +5,13 @@
   gather_facts: yes
   become: yes
   vars:
-    - runner_user: ansible
-    - github_repo: ansible-github_actions_runner-testrepo
-    - github_account: monolithprojects-testorg
-    - runner_version: "latest"
-    - runner_labels:
+    runner_user: ansible
+    github_repo: ansible-github_actions_runner-testrepo
+    github_account: monolithprojects-testorg
+    runner_version: "latest"
+    runner_labels:
         - label1
         - repo-runner
   roles:
     - robertdebock.epel
-    - ansible-github_actions_runner
+    - monolithprojects.github_actions_runner
diff --git a/molecule/repo/requirements.yml b/molecule/repo/requirements.yml
diff --git a/molecule/repo/verify.yml b/molecule/repo/verify.yml
diff --git a/tasks/collect_info.yml b/tasks/collect_info.yml
