Skip to content

Commit 5e59bfb

Browse files
s1-nathangerharts1-nathangerhart
committed
standardize role files on ansible-lint v24 rules
1 parent 431ec68 commit 5e59bfb

32 files changed

+259
-264
lines changed

‎.yamllint

+2-2
Original file line numberDiff line numberDiff line change
@@ -36,5 +36,5 @@ rules:
3636
octal-values:
3737
forbid-implicit-octal: true
3838
forbid-explicit-octal: true
39-
truthy:
40-
allowed-values: ["true", "false", "yes", "no"]
39+
# truthy:
40+
# allowed-values: ["true", "false", "yes", "no"]

‎roles/s1_agent_common/.yamllint

-1
This file was deleted.

‎roles/s1_agent_download/.yamllint

-1
This file was deleted.

‎roles/s1_agent_download/meta/main.yml

+8-8
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,9 @@ galaxy_info:
1717
# - GPL-3.0-only
1818
# - Apache-2.0
1919
# - CC-BY-4.0
20-
license: 'license (GPL-3.0-or-later)'
20+
license: license (GPL-3.0-or-later)
2121

22-
min_ansible_version: '2.9'
22+
min_ansible_version: "2.9"
2323

2424
# If this a Container Enabled role, provide the minimum Ansible Container version.
2525
# min_ansible_container_version:
@@ -33,9 +33,9 @@ galaxy_info:
3333
platforms:
3434
- name: EL
3535
versions:
36-
- '6'
37-
- '7'
38-
- '8'
36+
- "6"
37+
- "7"
38+
- "8"
3939
- name: Ubuntu
4040
versions:
4141
- trusty # 14.04
@@ -46,9 +46,9 @@ galaxy_info:
4646
- hirsute # 20.04
4747
- name: Windows
4848
versions:
49-
- '2016'
50-
- '2019'
51-
- '2022'
49+
- "2016"
50+
- "2019"
51+
- "2022"
5252

5353
galaxy_tags:
5454
- edr

‎roles/s1_agent_download/tasks/main.yml

+15-15
Original file line numberDiff line numberDiff line change
@@ -48,15 +48,15 @@
4848
url: '{{ lookup("template", "packages_url.j2") }}'
4949
return_content: false
5050
headers:
51-
Authorization: 'ApiToken {{ s1_api_token }}'
51+
Authorization: ApiToken {{ s1_api_token }}
5252
validate_certs: "{{ s1_validate_certs | default('true') | bool }}"
5353
register: s1_available_packages
5454
until: s1_available_packages is not failed
5555
retries: 10
5656
delay: 10
5757
delegate_to: localhost
5858
run_once: true
59-
become: no
59+
become: false
6060

6161
- name: Show s1_agent_version
6262
ansible.builtin.debug:
@@ -80,14 +80,14 @@
8080

8181
- name: Set download variables
8282
ansible.builtin.set_fact:
83-
s1_agent_package_link: '{{ s1_download_src.link }}'
84-
s1_agent_package_sha1: '{{ s1_download_src.sha1 }}'
85-
s1_agent_package_name: '{{ s1_download_src.fileName }}'
83+
s1_agent_package_link: "{{ s1_download_src.link }}"
84+
s1_agent_package_sha1: "{{ s1_download_src.sha1 }}"
85+
s1_agent_package_name: "{{ s1_download_src.fileName }}"
8686

8787
- name: Set SentinelOne agent variables
8888
ansible.builtin.set_fact:
89-
s1_agent_src: '{{ s1_download_path }}/{{ s1_agent_package_name }}'
90-
s1_agent_version: '{{ s1_download_src.version }}'
89+
s1_agent_src: "{{ s1_download_path }}/{{ s1_agent_package_name }}"
90+
s1_agent_version: "{{ s1_download_src.version }}"
9191

9292
- name: Show package details
9393
tags:
@@ -116,25 +116,25 @@
116116

117117
- name: Create working directory
118118
ansible.builtin.file:
119-
path: '{{ s1_download_path }}'
119+
path: "{{ s1_download_path }}"
120120
state: directory
121-
mode: '0755'
121+
mode: "0755"
122122
delegate_to: localhost
123123
run_once: true
124-
become: no
124+
become: false
125125

126126
- name: Download SentinelOne agent
127127
ansible.builtin.get_url:
128-
url: '{{ s1_agent_package_link }}'
129-
checksum: 'sha1:{{ s1_agent_package_sha1 }}'
130-
dest: '{{ s1_agent_src }}'
128+
url: "{{ s1_agent_package_link }}"
129+
checksum: sha1:{{ s1_agent_package_sha1 }}
130+
dest: "{{ s1_agent_src }}"
131131
mode: 440
132132
headers:
133-
Authorization: 'ApiToken {{ s1_api_token }}'
133+
Authorization: ApiToken {{ s1_api_token }}
134134
validate_certs: "{{ s1_validate_certs | default('true') | bool }}"
135135
register: url_result
136136
until: url_result is not failed
137137
retries: 10
138138
delay: 60 # Mgmt Console API is limited to 2 pkg downloads / 60 seconds
139139
delegate_to: localhost
140-
become: no
140+
become: false

‎roles/s1_agent_info/.yamllint

-1
This file was deleted.

‎roles/s1_agent_info/meta/main.yml

+7-7
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ galaxy_info:
1919
# - CC-BY-4.0
2020
license: license (GPL-3.0-or-later)
2121

22-
min_ansible_version: '2.9'
22+
min_ansible_version: "2.9"
2323

2424
# If this a Container Enabled role, provide the minimum Ansible Container version.
2525
# min_ansible_container_version:
@@ -33,9 +33,9 @@ galaxy_info:
3333
platforms:
3434
- name: EL
3535
versions:
36-
- '6'
37-
- '7'
38-
- '8'
36+
- "6"
37+
- "7"
38+
- "8"
3939
- name: Ubuntu
4040
versions:
4141
- trusty # 14.04
@@ -46,9 +46,9 @@ galaxy_info:
4646
- hirsute # 20.04
4747
- name: Windows
4848
versions:
49-
- '2016'
50-
- '2019'
51-
- '2022'
49+
- "2016"
50+
- "2019"
51+
- "2022"
5252

5353
galaxy_tags:
5454
- edr

‎roles/s1_agent_info/tasks/linux.yml

+6-6
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,9 @@
1010
ansible.builtin.command: >
1111
/opt/sentinelone/bin/sentinelctl management status
1212
register: s1_mgmt_status
13-
changed_when: no
14-
check_mode: no
15-
become: yes
13+
changed_when: false
14+
check_mode: false
15+
become: true
1616
until: "'Error: receive failed: Connection reset by peer' not in s1_mgmt_status.stdout"
1717
retries: 3
1818
delay: 10
@@ -39,7 +39,7 @@
3939
anti_tamper_enabled: "{{ (s1_mgmt_status.stdout | regex_findall(reg_tamper, '\\1') | first == 'On') | bool if s1_mgmt_status.stdout is defined else none }}"
4040
agent_enabled: "{{ (ansible_facts.services[s1_service_name]['status'] == 'enabled') | ternary(true, false) if ansible_facts.services[s1_service_name] is defined else none }}"
4141
vars:
42-
reg_uuid: 'UUID\s+([0-9a-fA-F]{8}\b-[0-9a-fA-F]{4}\b-[0-9a-fA-F]{4}\b-[0-9a-fA-F]{4}\b-[0-9a-fA-F]{12})'
43-
reg_url: 'URL\s+(http.*)'
44-
reg_tamper: 'Anti Tamper\s+(\w+)'
42+
reg_uuid: UUID\s+([0-9a-fA-F]{8}\b-[0-9a-fA-F]{4}\b-[0-9a-fA-F]{4}\b-[0-9a-fA-F]{4}\b-[0-9a-fA-F]{12})
43+
reg_url: URL\s+(http.*)
44+
reg_tamper: Anti Tamper\s+(\w+)
4545
# yamllint enable rule:line-length

‎roles/s1_agent_info/tasks/main.yml

+3-3
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33

44
- name: Include tasks to get the agent info
55
ansible.builtin.include_tasks:
6-
file: '{{ loop_family }}'
6+
file: "{{ loop_family }}"
77
with_first_found:
88
- files:
99
- "{{ ansible_distribution | lower | replace(' ', '_') }}_{{ ansible_distribution_version }}.yml"
@@ -12,9 +12,9 @@
1212
- "{{ ansible_os_family | replace(' ', '_') | lower }}_{{ ansible_distribution_major_version }}.yml"
1313
- "{{ ansible_os_family | replace(' ', '_') | lower }}.yml"
1414
- "{{ ansible_system | replace(' ', '_') | lower }}.yml"
15-
- 'unsupported.yml'
15+
- unsupported.yml
1616
loop_control:
1717
loop_var: loop_family
18-
label: '{{ loop_family | basename }}'
18+
label: "{{ loop_family | basename }}"
1919
tags:
2020
- always

‎roles/s1_agent_info/tasks/redhat_6.yml

+8-8
Original file line numberDiff line numberDiff line change
@@ -6,17 +6,17 @@
66
- name: Get service facts | Red Hat 6
77
ansible.builtin.command: service {{ s1_service_name }} status # noqa command-instead-of-module
88
register: s1_rhel6_agent_status
9-
changed_when: no
10-
become: yes
9+
changed_when: false
10+
become: true
1111
when: ansible_facts.packages[s1_package_name] is defined
1212

1313
- name: Get agent status | Red Hat 6
1414
ansible.builtin.command: >
1515
/opt/sentinelone/bin/sentinelctl management status
1616
register: s1_mgmt_status
17-
changed_when: no
18-
check_mode: no
19-
become: yes
17+
changed_when: false
18+
check_mode: false
19+
become: true
2020
until: "'Error: receive failed: Connection reset by peer' not in s1_mgmt_status.stdout"
2121
retries: 3
2222
delay: 10
@@ -36,7 +36,7 @@
3636
anti_tamper_enabled: "{{ (s1_mgmt_status.stdout | regex_search(reg_tamper, '\\1') | first == 'On') | bool if s1_mgmt_status.stdout is defined else none }}"
3737
agent_enabled: "{{ ('Agent state Enabled' in s1_rhel6_agent_status.stdout) | ternary(true, false, none) if s1_rhel6_agent_status.stdout is defined else none }}"
3838
vars:
39-
reg_uuid: 'UUID\s+([0-9a-fA-F]{8}\b-[0-9a-fA-F]{4}\b-[0-9a-fA-F]{4}\b-[0-9a-fA-F]{4}\b-[0-9a-fA-F]{12})'
40-
reg_url: 'URL\s+(http.*)'
41-
reg_tamper: 'Anti Tamper\s+(\w+)'
39+
reg_uuid: UUID\s+([0-9a-fA-F]{8}\b-[0-9a-fA-F]{4}\b-[0-9a-fA-F]{4}\b-[0-9a-fA-F]{4}\b-[0-9a-fA-F]{12})
40+
reg_url: URL\s+(http.*)
41+
reg_tamper: Anti Tamper\s+(\w+)
4242
# yamllint enable rule:line-length

‎roles/s1_agent_info/tasks/windows.yml

+6-6
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,10 @@
55
script: |
66
Get-ChildItem -Force -Recurse HKLM:\SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall | Get-ItemProperty | Where-Object {$_.DisplayName -eq '{{ s1_package_name }}'} | Select-Object DisplayName, DisplayVersion, Publisher, InstallDate, @{Name='ProductId'; Expression={$('{0}' -f $_.PSChildName)}}
77
Get-ChildItem -Force -Recurse HKLM:\Software\Wow6432Node\Microsoft\Windows\CurrentVersion\Uninstall | Get-ItemProperty | Where-Object {$_.DisplayName -eq '{{ s1_package_name }}'} | Select-Object DisplayName, DisplayVersion, Publisher, InstallDate, @{Name='ProductId'; Expression={$('{0}' -f $_.PSChildName)}}
8-
# yamllint enable rule:line-length
8+
# yamllint enable rule:line-length
99
register: s1_windows_software
10-
become: yes
11-
changed_when: no
10+
become: true
11+
changed_when: false
1212
tags:
1313
- skip_ansible_lint
1414

@@ -23,9 +23,9 @@
2323
$helper = New-Object -ComObject "SentinelHelper.1"
2424
$helper.GetAgentStatusJSON()
2525
register: s1_com_status
26-
changed_when: no
27-
check_mode: no
28-
become: no
26+
changed_when: false
27+
check_mode: false
28+
become: false
2929
until: s1_com_status.output != ""
3030
retries: 3
3131
delay: 10

‎roles/s1_agent_install/.yamllint

-1
This file was deleted.

‎roles/s1_agent_install/defaults/main.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -58,13 +58,13 @@ s1_agent_site_token: "{{ undef(hint='You must specify your agent Site Token') }}
5858

5959
# If there is a proxy server between the Agent and the Management, enter the proxy URL (or IP address) and the proxy port.
6060
# By default, proxy settings are taken from the default_* variables, if they are not defined they are ignored.
61-
s1_agent_management_proxy: '{{ default_proxy | default(None) }}'
61+
s1_agent_management_proxy: "{{ default_proxy | default(None) }}"
6262
# s1_agent_management_proxy_password: '{{ default_proxy_password | default(None) }}' # NOT IMPLEMENTED
6363
# s1_agent_management_proxy_username: '{{ default_proxy_username | default(None) }}' # NOT IMPLEMENTED
6464

6565
# If there is a proxy server between the Agent and the Deep Visibility service, enter the proxy URL (or IP address) and the port.
6666
# By default, proxy settings are taken from the default_* variables, if they are not defined they are ignored.
67-
s1_agent_dv_proxy: '{{ default_proxy | default(None) }}'
67+
s1_agent_dv_proxy: "{{ default_proxy | default(None) }}"
6868
# s1_agent_dv_proxy_password: '{{ default_proxy_password | default(None) }}' # NOT IMPLEMENTED
6969
# s1_agent_dv_proxy_username: '{{ default_proxy_username | default(None) }}' # NOT IMPLEMENTED
7070

‎roles/s1_agent_install/meta/main.yml

+8-8
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,9 @@ galaxy_info:
1717
# - GPL-3.0-only
1818
# - Apache-2.0
1919
# - CC-BY-4.0
20-
license: 'license (GPL-3.0-or-later)'
20+
license: license (GPL-3.0-or-later)
2121

22-
min_ansible_version: '2.9'
22+
min_ansible_version: "2.9"
2323

2424
# If this a Container Enabled role, provide the minimum Ansible Container version.
2525
# min_ansible_container_version:
@@ -33,9 +33,9 @@ galaxy_info:
3333
platforms:
3434
- name: EL
3535
versions:
36-
- '6'
37-
- '7'
38-
- '8'
36+
- "6"
37+
- "7"
38+
- "8"
3939
- name: Ubuntu
4040
versions:
4141
- trusty # 14.04
@@ -46,9 +46,9 @@ galaxy_info:
4646
- hirsute # 20.04
4747
- name: Windows
4848
versions:
49-
- '2016'
50-
- '2019'
51-
- '2022'
49+
- "2016"
50+
- "2019"
51+
- "2022"
5252

5353
galaxy_tags:
5454
- edr

0 commit comments

Comments
 (0)