Bump ansible-lint from 6.5.2 to 6.7.0 in /.github/workflows/requirements (#276)

Author: dependabot[bot]

.github/workflows/requirements/requirements_ansible.yml

@@ -1,8 +1,10 @@
 ---
 collections:
-  - name: community.general
-    version: 5.5.0
   - name: ansible.posix
     version: 1.4.0
+  - name: community.crypto
+    version: 2.5.0
   - name: community.docker
     version: 3.1.0
+  - name: community.general
+    version: 5.5.0

.github/workflows/requirements/requirements_molecule.txt

@@ -1,6 +1,6 @@
 ansible-core==2.13.4
 Jinja2==3.1.2
-ansible-lint==6.5.2
+ansible-lint==6.7.0
 yamllint==1.28.0
 molecule[docker]==4.0.1
 docker==6.0.0

CHANGELOG.md

@@ -17,7 +17,7 @@ TESTS:
 
 * Update GitHub actions to only skip \*plus\* scenarios when the NGINX Plus license secrets are not present (it used to only run the NGINX Plus test scenarios during internal PRs).
 * Remove Yamllint (Ansible Lint now incorporates Yamllint).
-* Skip Ansible Lint line length rule.
+* Skip Ansible Lint line length rules. Slightly refactor code to incorporate changes added to Ansible Lint 6.7.0.
 
 ## 0.5.1 (April 6, 2022)
 

molecule/common/requirements/oss_requirements.yml

@@ -1,4 +1,4 @@
 ---
 roles:
   - name: nginxinc.nginx
-    version: 0.23.0
+    version: 0.23.2

molecule/common/requirements/plus_requirements.yml

@@ -1,6 +1,6 @@
 ---
 roles:
   - name: nginxinc.nginx
-    version: 0.23.0
+    version: 0.23.2
   - name: nginxinc.nginx_app_protect
-    version: 0.7.1
+    version: 0.8.1

molecule/plus/prepare.yml

@@ -3,14 +3,14 @@
   hosts: localhost
   gather_facts: false
   tasks:
-    - name: Create ephemeral license certificate file from b64 decoded env var
+    - name: Create ephemeral license certificate file from b64 decoded env var # noqa template-instead-of-copy
       ansible.builtin.copy:
         content: "{{ lookup('env', 'NGINX_CRT') | b64decode }}"
         dest: ../common/files/license/nginx-repo.crt
         force: false
         mode: 0444
 
-    - name: Create ephemeral license key file from b64 decoded env var
+    - name: Create ephemeral license key file from b64 decoded env var # noqa template-instead-of-copy
       ansible.builtin.copy:
         content: "{{ lookup('env', 'NGINX_KEY') | b64decode }}"
         dest: ../common/files/license/nginx-repo.key

molecule/plus/verify.yml

@@ -20,6 +20,7 @@
       failed_when: (service is changed) or (service is failed)
 
     - name: Functional tests
+      when: ansible_os_family != "Alpine"
       block:
         - name: Check that a page returns a status 200 and fail if the words Hello World are not in the page contents
           ansible.builtin.uri:
@@ -40,7 +41,6 @@
           register: event
           changed_when: false
           failed_when: event.stdout == "0"
-      when: ansible_os_family != "Alpine"
 
     - name: Check default.conf exists
       ansible.builtin.stat:

tasks/config/upload-config.yml

@@ -1,5 +1,6 @@
 ---
 - name: Upload NGINX config snippets
+  when: nginx_config_upload_enable | bool
   block:
     - name: Ensure NGINX config snippet directories exist
       ansible.builtin.file:
@@ -16,9 +17,9 @@
         mode: 0644
       loop: "{{ nginx_config_upload }}"
       notify: (Handler - NGINX Config) Run NGINX
-  when: nginx_config_upload_enable | bool
 
 - name: Upload HTML files
+  when: nginx_config_upload_html_enable | bool
   block:
     - name: Ensure HTML directory exists
       ansible.builtin.file:
@@ -35,9 +36,9 @@
         mode: 0644
       loop: "{{ nginx_config_upload_html }}"
       notify: (Handler - NGINX Config) Run NGINX
-  when: nginx_config_upload_html_enable | bool
 
 - name: Upload NGINX SSL certificates and keys
+  when: nginx_config_upload_ssl_enable | bool
   block:
     - name: Ensure SSL certificate and key directories exist
       ansible.builtin.file:
@@ -62,4 +63,3 @@
         mode: 0640
       loop: "{{ nginx_config_upload_ssl_key }}"
       no_log: true
-  when: nginx_config_upload_ssl_enable | bool