Skip to content

Commit ccd5566

Browse files
Bump ansible-lint from 5.4.0 to 6.0.1 in /.github/workflows/requirements (#173)
1 parent e1ed588 commit ccd5566

28 files changed

+125
-125
lines changed
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
ansible-core==2.12.3
22
Jinja2==3.0.3
3-
ansible-lint==5.4.0
3+
ansible-lint==6.0.1
44
yamllint==1.26.3
55
molecule[docker]==3.6.1
66
docker==5.0.3

handlers/main.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
---
22
- name: (Handler - NGINX App Protect) Systemd daemon-reload
3-
systemd:
3+
ansible.builtin.systemd:
44
daemon_reload: true
55

66
- name: (Handler - NGINX App Protect) Restart NGINX
7-
service:
7+
ansible.builtin.service:
88
name: nginx
99
state: restarted
1010
enabled: true
@@ -14,14 +14,14 @@
1414
listen: (Handler - NGINX App Protect) Run NGINX
1515

1616
- name: (Handler - NGINX App Protect) Check NGINX
17-
command: nginx -t
17+
ansible.builtin.command: nginx -t
1818
register: config_check
1919
ignore_errors: true
2020
changed_when: false
2121
listen: (Handler - NGINX App Protect) Run NGINX
2222

2323
- name: (Handler - NGINX App Protect) Print NGINX error if syntax check fails
24-
debug:
24+
ansible.builtin.debug:
2525
var: config_check.stderr_lines
2626
failed_when: config_check.rc != 0
2727
when:

molecule/advanced/converge.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
hosts: nap
44
tasks:
55
- name: Install NGINX App Protect WAF
6-
include_role:
6+
ansible.builtin.include_role:
77
name: ansible-role-nginx-app-protect
88
vars:
99
nginx_app_protect_license:

molecule/advanced/prepare.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,14 +4,14 @@
44
gather_facts: false
55
tasks:
66
- name: Create ephemeral license certificate file from b64 decoded env var
7-
copy:
7+
ansible.builtin.copy:
88
content: "{{ lookup('env','NGINX_CRT') | b64decode }}"
99
dest: ../../files/license/nginx-repo.crt
1010
force: false
1111
mode: 0444
1212

1313
- name: Create ephemeral license key file from b64 decoded env var
14-
copy:
14+
ansible.builtin.copy:
1515
content: "{{ lookup('env','NGINX_KEY') | b64decode }}"
1616
dest: ../../files/license/nginx-repo.key
1717
force: false
@@ -21,7 +21,7 @@
2121
hosts: nap
2222
tasks:
2323
- name: Set up rsyslog
24-
include_role:
24+
ansible.builtin.include_role:
2525
name: robertdebock.rsyslog
2626
vars:
2727
rsyslog_receiver: true
@@ -33,5 +33,5 @@
3333
gather_facts: false
3434
tasks:
3535
- name: Start nginx on test workload
36-
raw: nohup nginx </dev/null >/dev/null 2>&1 & sleep 1
36+
ansible.builtin.raw: nohup nginx </dev/null >/dev/null 2>&1 & sleep 1
3737
changed_when: false

molecule/advanced/verify.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,31 +3,31 @@
33
hosts: nap
44
tasks:
55
- name: Check if NGINX Plus is installed
6-
package:
6+
ansible.builtin.package:
77
name: nginx-plus
88
state: present
99
check_mode: true
1010
register: install
1111
failed_when: (install is changed) or (install is failed)
1212

1313
- name: Check if NGINX App Protect WAF is installed
14-
package:
14+
ansible.builtin.package:
1515
name: app-protect
1616
state: present
1717
check_mode: true
1818
register: install
1919
failed_when: (install is changed) or (install is failed)
2020

2121
- name: Check if NGINX App Protect WAF signatures is installed
22-
package:
22+
ansible.builtin.package:
2323
name: app-protect-attack-signatures
2424
state: present
2525
check_mode: true
2626
register: install
2727
failed_when: (install is changed) or (install is failed)
2828

2929
- name: Check if NGINX App Protect WAF threat campaigns is installed
30-
package:
30+
ansible.builtin.package:
3131
name: app-protect-threat-campaigns
3232
state: present
3333
check_mode: true

molecule/common/cleanup.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,18 +6,18 @@
66
- name: Block
77
block:
88
- name: Wait for containers to be up
9-
wait_for_connection:
9+
ansible.builtin.wait_for_connection:
1010
delay: 1
1111
timeout: 2
1212
register: connection
1313
ignore_errors: true
1414

1515
- name: Containers are not up, quit from here
16-
fail:
16+
ansible.builtin.fail:
1717
when: connection.failed
1818

1919
- name: Gather facts
20-
setup:
20+
ansible.builtin.setup:
2121
gather_subset:
2222
- "!all"
2323
- "!any"
@@ -29,4 +29,4 @@
2929
when: ansible_distribution == "RedHat"
3030
rescue:
3131
- name: It's ok we're at startup
32-
meta: noop
32+
ansible.builtin.meta: noop

molecule/common/prepare.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,14 +4,14 @@
44
gather_facts: false
55
tasks:
66
- name: Create ephemeral license certificate file from b64 decoded env var
7-
copy:
7+
ansible.builtin.copy:
88
content: "{{ lookup('env', 'NGINX_CRT') | b64decode }}"
99
dest: ../../files/license/nginx-repo.crt
1010
force: false
1111
mode: 0444
1212

1313
- name: Create ephemeral license key file from b64 decoded env var
14-
copy:
14+
ansible.builtin.copy:
1515
content: "{{ lookup('env', 'NGINX_KEY') | b64decode }}"
1616
dest: ../../files/license/nginx-repo.key
1717
force: false

molecule/default/converge.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
rhel_subscription: false
66
pre_tasks:
77
- name: (RHEL) Check if there is a valid RHEL subscription
8-
set_fact:
8+
ansible.builtin.set_fact:
99
rhel_subscription: true
1010
when:
1111
- lookup('env', 'RHEL_USERNAME') | length > 0
@@ -20,7 +20,7 @@
2020
- rhel_subscription| bool
2121
tasks:
2222
- name: Install NGINX App Protect WAF
23-
include_role:
23+
ansible.builtin.include_role:
2424
name: ansible-role-nginx-app-protect
2525
vars:
2626
nginx_app_protect_license:

molecule/default/verify.yml

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -3,39 +3,39 @@
33
hosts: all
44
tasks:
55
- name: Check if NGINX Plus is installed
6-
package:
6+
ansible.builtin.package:
77
name: nginx-plus
88
state: present
99
check_mode: true
1010
register: install
1111
failed_when: (install is changed) or (install is failed)
1212

1313
- name: Check if NGINX App Protect WAF is installed
14-
package:
14+
ansible.builtin.package:
1515
name: app-protect
1616
state: present
1717
check_mode: true
1818
register: install
1919
failed_when: (install is changed) or (install is failed)
2020

2121
- name: Check if NGINX App Protect WAF signatures is installed
22-
package:
22+
ansible.builtin.package:
2323
name: app-protect-attack-signatures
2424
state: present
2525
check_mode: true
2626
register: install
2727
failed_when: (install is changed) or (install is failed)
2828

2929
- name: Check if NGINX App Protect WAF threat campaigns is installed
30-
package:
30+
ansible.builtin.package:
3131
name: app-protect-threat-campaigns
3232
state: present
3333
check_mode: true
3434
register: install
3535
failed_when: (install is changed) or (install is failed)
3636

3737
- name: Check if NGINX service is running
38-
service:
38+
ansible.builtin.service:
3939
name: nginx
4040
state: started
4141
enabled: true
@@ -44,19 +44,19 @@
4444
failed_when: (service is changed) or (service is failed)
4545

4646
- name: Store the statistics of /etc/app_protect/conf/test-security-policy.json in the 'security_policy' variable
47-
stat:
47+
ansible.builtin.stat:
4848
path: /etc/app_protect/conf/test-security-policy.json
4949
register: security_policy
5050

5151
- name: Ensure /etc/app_protect/conf/test-security-policy.json exists
52-
assert:
52+
ansible.builtin.assert:
5353
that: security_policy.stat.exists | bool
5454

5555
- name: Store the statistics of /etc/app_protect/conf/test-log-profile.json in the 'log_profile' variable
56-
stat:
56+
ansible.builtin.stat:
5757
path: /etc/app_protect/conf/test-log-profile.json
5858
register: log_profile
5959

6060
- name: Ensure /etc/app_protect/conf/test-security-profile.json exists
61-
assert:
61+
ansible.builtin.assert:
6262
that: log_profile.stat.exists | bool

molecule/dos/converge.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
rhel_subscription: false
66
pre_tasks:
77
- name: (RHEL) Check if there is a valid RHEL subscription
8-
set_fact:
8+
ansible.builtin.set_fact:
99
rhel_subscription: true
1010
when:
1111
- lookup('env', 'RHEL_USERNAME') | length > 0
@@ -20,7 +20,7 @@
2020
- rhel_subscription| bool
2121
tasks:
2222
- name: Install NGINX App Protect DoS
23-
include_role:
23+
ansible.builtin.include_role:
2424
name: ansible-role-nginx-app-protect
2525
vars:
2626
nginx_app_protect_waf_enable: false

0 commit comments

Comments
 (0)