Skip to content

Commit 2ce1fa4

Browse files
alessfgalessfg
authored
Remove Yamllint (#198)
1 parent 26d5496 commit 2ce1fa4

File tree

17 files changed

+104
-116
lines changed

17 files changed

+104
-116
lines changed

‎.ansible-lint

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,4 @@
11
---
22
offline: true
3+
skip_list:
4+
- yaml[line-length]

‎.yamllint

Lines changed: 0 additions & 12 deletions
This file was deleted.

‎CHANGELOG.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,11 @@ BUG FIXES:
1010

1111
Always refresh the `yum` cache.
1212

13+
TESTS:
14+
15+
* Remove Yamllint (Ansible Lint now incorporates Yamllint).
16+
* Skip Ansible Lint line length rule.
17+
1318
## 0.8.0 (April 6, 2022)
1419

1520
BREAKING CHANGES:

‎meta/main.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,16 +7,16 @@ galaxy_info:
77

88
license: Apache License, Version 2.0
99

10-
min_ansible_version: '2.11'
10+
min_ansible_version: "2.11"
1111

1212
platforms:
1313
- name: Amazon Linux 2
1414
versions:
1515
- all
1616
- name: EL
1717
versions:
18-
- '7'
19-
- '8'
18+
- "7"
19+
- "8"
2020
- name: Debian
2121
versions:
2222
- buster

‎molecule/advanced/molecule.yml

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@ driver:
77
name: docker
88
lint: |
99
set -e
10-
yamllint .
1110
ansible-lint --force-color
1211
platforms:
1312
- name: test-workload
@@ -22,8 +21,8 @@ platforms:
2221
dockerfile: ../common/Dockerfile.j2
2322
privileged: true
2423
volumes:
25-
- "/sys/fs/cgroup:/sys/fs/cgroup:rw"
26-
command: "/usr/sbin/init"
24+
- /sys/fs/cgroup:/sys/fs/cgroup:rw
25+
command: /usr/sbin/init
2726
groups:
2827
- nap
2928
networks:
@@ -33,8 +32,8 @@ platforms:
3332
dockerfile: ../common/Dockerfile.j2
3433
privileged: true
3534
volumes:
36-
- "/sys/fs/cgroup:/sys/fs/cgroup:rw"
37-
command: "/sbin/init"
35+
- /sys/fs/cgroup:/sys/fs/cgroup:rw
36+
command: /sbin/init
3837
groups:
3938
- nap
4039
networks:
@@ -44,8 +43,8 @@ platforms:
4443
dockerfile: ../common/Dockerfile.j2
4544
privileged: true
4645
volumes:
47-
- "/sys/fs/cgroup:/sys/fs/cgroup:rw"
48-
command: "/sbin/init"
46+
- /sys/fs/cgroup:/sys/fs/cgroup:rw
47+
command: /sbin/init
4948
groups:
5049
- nap
5150
networks:
@@ -55,8 +54,8 @@ platforms:
5554
dockerfile: ../common/Dockerfile.j2
5655
privileged: true
5756
volumes:
58-
- "/sys/fs/cgroup:/sys/fs/cgroup:rw"
59-
command: "/sbin/init"
57+
- /sys/fs/cgroup:/sys/fs/cgroup:rw
58+
command: /sbin/init
6059
groups:
6160
- nap
6261
networks:

‎molecule/default/molecule.yml

Lines changed: 14 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -3,58 +3,57 @@ driver:
33
name: docker
44
lint: |
55
set -e
6-
yamllint .
76
ansible-lint --force-color
87
platforms:
98
- name: amazonlinux-2
109
image: amazonlinux:2
1110
dockerfile: ../common/Dockerfile.j2
1211
privileged: true
1312
volumes:
14-
- "/sys/fs/cgroup:/sys/fs/cgroup:rw"
15-
command: "/usr/sbin/init"
13+
- /sys/fs/cgroup:/sys/fs/cgroup:rw
14+
command: /usr/sbin/init
1615
- name: centos-7
1716
image: centos:7
1817
dockerfile: ../common/Dockerfile.j2
1918
privileged: true
2019
volumes:
21-
- "/sys/fs/cgroup:/sys/fs/cgroup:rw"
22-
command: "/usr/sbin/init"
20+
- /sys/fs/cgroup:/sys/fs/cgroup:rw
21+
command: /usr/sbin/init
2322
- name: rhel-7
2423
image: registry.access.redhat.com/ubi7/ubi:7.9
2524
dockerfile: ../common/Dockerfile.j2
2625
privileged: true
2726
volumes:
28-
- "/sys/fs/cgroup:/sys/fs/cgroup:rw"
29-
command: "/usr/sbin/init"
27+
- /sys/fs/cgroup:/sys/fs/cgroup:rw
28+
command: /usr/sbin/init
3029
- name: rhel-8
3130
image: registry.access.redhat.com/ubi8/ubi:8.5
3231
dockerfile: ../common/Dockerfile.j2
3332
privileged: true
3433
volumes:
35-
- "/sys/fs/cgroup:/sys/fs/cgroup:rw"
36-
command: "/usr/sbin/init"
34+
- /sys/fs/cgroup:/sys/fs/cgroup:rw
35+
command: /usr/sbin/init
3736
- name: debian-buster
3837
image: debian:buster-slim
3938
dockerfile: ../common/Dockerfile.j2
4039
privileged: true
4140
volumes:
42-
- "/sys/fs/cgroup:/sys/fs/cgroup:rw"
43-
command: "/sbin/init"
41+
- /sys/fs/cgroup:/sys/fs/cgroup:rw
42+
command: /sbin/init
4443
- name: ubuntu-bionic
4544
image: ubuntu:bionic
4645
dockerfile: ../common/Dockerfile.j2
4746
privileged: true
4847
volumes:
49-
- "/sys/fs/cgroup:/sys/fs/cgroup:rw"
50-
command: "/sbin/init"
48+
- /sys/fs/cgroup:/sys/fs/cgroup:rw
49+
command: /sbin/init
5150
- name: ubuntu-focal
5251
image: ubuntu:focal
5352
dockerfile: ../common/Dockerfile.j2
5453
privileged: true
5554
volumes:
56-
- "/sys/fs/cgroup:/sys/fs/cgroup:rw"
57-
command: "/sbin/init"
55+
- /sys/fs/cgroup:/sys/fs/cgroup:rw
56+
command: /sbin/init
5857
provisioner:
5958
name: ansible
6059
playbooks:

‎molecule/dos/molecule.yml

Lines changed: 12 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -3,51 +3,50 @@ driver:
33
name: docker
44
lint: |
55
set -e
6-
yamllint .
76
ansible-lint --force-color
87
platforms:
98
- name: centos-7
109
image: centos:7
1110
dockerfile: ../common/Dockerfile.j2
1211
privileged: true
1312
volumes:
14-
- "/sys/fs/cgroup:/sys/fs/cgroup:rw"
15-
command: "/usr/sbin/init"
13+
- /sys/fs/cgroup:/sys/fs/cgroup:rw
14+
command: /usr/sbin/init
1615
- name: rhel-7
1716
image: registry.access.redhat.com/ubi7/ubi:7.9
1817
dockerfile: ../common/Dockerfile.j2
1918
privileged: true
2019
volumes:
21-
- "/sys/fs/cgroup:/sys/fs/cgroup:rw"
22-
command: "/usr/sbin/init"
20+
- /sys/fs/cgroup:/sys/fs/cgroup:rw
21+
command: /usr/sbin/init
2322
- name: rhel-8
2423
image: registry.access.redhat.com/ubi8/ubi:8.5
2524
dockerfile: ../common/Dockerfile.j2
2625
privileged: true
2726
volumes:
28-
- "/sys/fs/cgroup:/sys/fs/cgroup:rw"
29-
command: "/usr/sbin/init"
27+
- /sys/fs/cgroup:/sys/fs/cgroup:rw
28+
command: /usr/sbin/init
3029
- name: debian-buster
3130
image: debian:buster-slim
3231
dockerfile: ../common/Dockerfile.j2
3332
privileged: true
3433
volumes:
35-
- "/sys/fs/cgroup:/sys/fs/cgroup:rw"
36-
command: "/sbin/init"
34+
- /sys/fs/cgroup:/sys/fs/cgroup:rw
35+
command: /sbin/init
3736
- name: ubuntu-bionic
3837
image: ubuntu:bionic
3938
dockerfile: ../common/Dockerfile.j2
4039
privileged: true
4140
volumes:
42-
- "/sys/fs/cgroup:/sys/fs/cgroup:rw"
43-
command: "/sbin/init"
41+
- /sys/fs/cgroup:/sys/fs/cgroup:rw
42+
command: /sbin/init
4443
- name: ubuntu-focal
4544
image: ubuntu:focal
4645
dockerfile: ../common/Dockerfile.j2
4746
privileged: true
4847
volumes:
49-
- "/sys/fs/cgroup:/sys/fs/cgroup:rw"
50-
command: "/sbin/init"
48+
- /sys/fs/cgroup:/sys/fs/cgroup:rw
49+
command: /sbin/init
5150
provisioner:
5251
name: ansible
5352
playbooks:

‎molecule/specific-version/converge.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,11 @@
55
specify_app_protect_signatures_version: true
66
specify_app_protect_threat_campaigns_version: true
77
app_protect_signature_version_matrix:
8-
debian: "=2019.07.16-1"
9-
redhat: "-2019.07.16"
8+
debian: =2019.07.16-1
9+
redhat: -2019.07.16
1010
app_protect_threat_campaigns_version_matrix:
11-
debian: "=2020.08.20-1"
12-
redhat: "-2020.08.20"
11+
debian: =2020.08.20-1
12+
redhat: -2020.08.20
1313
tasks:
1414
- name: Set NGINX App Protect WAF signature version fact
1515
ansible.builtin.set_fact:

‎molecule/specific-version/molecule.yml

Lines changed: 10 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -3,44 +3,43 @@ driver:
33
name: docker
44
lint: |
55
set -e
6-
yamllint .
76
ansible-lint --force-color
87
platforms:
98
- name: centos-7
109
image: centos:7
1110
dockerfile: ../common/Dockerfile.j2
1211
privileged: true
1312
volumes:
14-
- "/sys/fs/cgroup:/sys/fs/cgroup:rw"
15-
command: "/usr/sbin/init"
13+
- /sys/fs/cgroup:/sys/fs/cgroup:rw
14+
command: /usr/sbin/init
1615
- name: rhel-7
1716
image: registry.access.redhat.com/ubi7/ubi:7.9
1817
dockerfile: ../common/Dockerfile.j2
1918
privileged: true
2019
volumes:
21-
- "/sys/fs/cgroup:/sys/fs/cgroup:rw"
22-
command: "/usr/sbin/init"
20+
- /sys/fs/cgroup:/sys/fs/cgroup:rw
21+
command: /usr/sbin/init
2322
- name: debian-buster
2423
image: debian:buster-slim
2524
dockerfile: ../common/Dockerfile.j2
2625
privileged: true
2726
volumes:
28-
- "/sys/fs/cgroup:/sys/fs/cgroup:rw"
29-
command: "/sbin/init"
27+
- /sys/fs/cgroup:/sys/fs/cgroup:rw
28+
command: /sbin/init
3029
- name: ubuntu-bionic
3130
image: ubuntu:bionic
3231
dockerfile: ../common/Dockerfile.j2
3332
privileged: true
3433
volumes:
35-
- "/sys/fs/cgroup:/sys/fs/cgroup:rw"
36-
command: "/sbin/init"
34+
- /sys/fs/cgroup:/sys/fs/cgroup:rw
35+
command: /sbin/init
3736
- name: ubuntu-focal
3837
image: ubuntu:focal
3938
dockerfile: ../common/Dockerfile.j2
4039
privileged: true
4140
volumes:
42-
- "/sys/fs/cgroup:/sys/fs/cgroup:rw"
43-
command: "/sbin/init"
41+
- /sys/fs/cgroup:/sys/fs/cgroup:rw
42+
command: /sbin/init
4443
provisioner:
4544
name: ansible
4645
playbooks:

‎molecule/specific-version/verify.yml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,11 @@
55
specify_app_protect_signatures_version: true
66
specify_app_protect_threat_campaigns_version: true
77
app_protect_signature_version_matrix:
8-
debian: "=2019.07.16-1"
9-
redhat: "-2019.07.16"
8+
debian: =2019.07.16-1
9+
redhat: -2019.07.16
1010
app_protect_threat_campaigns_version_matrix:
11-
debian: "=2020.08.20-1"
12-
redhat: "-2020.08.20"
11+
debian: =2020.08.20-1
12+
redhat: -2020.08.20
1313
tasks:
1414
- name: Check if NGINX Plus is installed
1515
ansible.builtin.package:
@@ -58,10 +58,10 @@
5858
ansible.builtin.package_facts:
5959
manager: auto
6060

61-
- name: Verify installed NAP signatures version matches requested version # noqa var-spacing
61+
- name: Verify installed NAP signatures version matches requested version # noqa var-spacing
6262
ansible.builtin.assert:
6363
that: "{{ (ansible_facts.packages['app-protect-attack-signatures'] | map(attribute='version') | first) == (app_protect_signature_version_matrix[ansible_os_family | lower] | regex_replace('^-|=','') + (ansible_os_family | lower == 'debian') | ternary('~' ~ ansible_distribution_release, '')) }}"
6464

65-
- name: Verify installed NAP threat campaigns version matches requested version # noqa var-spacing
65+
- name: Verify installed NAP threat campaigns version matches requested version # noqa var-spacing
6666
ansible.builtin.assert:
6767
that: "{{ (ansible_facts.packages['app-protect-threat-campaigns'] | map(attribute='version') | first) == (app_protect_threat_campaigns_version_matrix[ansible_os_family | lower] | regex_replace('^-|=','') + (ansible_os_family | lower == 'debian') | ternary('~' ~ ansible_distribution_release, '')) }}"

0 commit comments

Comments
 (0)