Replace unnecessary shell with command

NETWAYS · Oct 13, 2023 · 51967e2 · 51967e2
1 parent 2f5a802
commit 51967e2
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 15 deletions.
diff --git a/roles/beats/tasks/main.yml b/roles/beats/tasks/main.yml
@@ -84,9 +84,8 @@
   when: beats_metricbeat | bool
 
 # Free up some space to let elsticsearch allocate replica in GitHub Action
-- name: Remove cache # noqa: risky-shell-pipe
-  ansible.builtin.shell: >
-    if test -n "$(ps -p $$ | grep bash)"; then set -o pipefail; fi;
+- name: Remove cache
+  ansible.builtin.command: >
     rm -rf /var/cache/*
   changed_when: false
   when: ansible_virtualization_type == "container" or ansible_virtualization_type == "docker"
diff --git a/roles/elasticsearch/tasks/elasticsearch-security.yml b/roles/elasticsearch/tasks/elasticsearch-security.yml
@@ -455,9 +455,8 @@
   when: ansible_virtualization_type == "container" or ansible_virtualization_type == "docker"
   block:
     # Free up some space to let elsticsearch allocate replica in GitHub Action
-    - name: Remove cache # noqa: risky-shell-pipe
-      ansible.builtin.shell: >
-        if test -n "$(ps -p $$ | grep bash)"; then set -o pipefail; fi;
+    - name: Remove cache
+      ansible.builtin.command: >
         rm -rf /var/cache/*
       changed_when: false
 

diff --git a/roles/elasticsearch/tasks/main.yml b/roles/elasticsearch/tasks/main.yml
@@ -178,9 +178,8 @@
   when: ansible_virtualization_type == "container" or ansible_virtualization_type == "docker"
 
 # Free up some space to let elsticsearch allocate replica in GitHub Action
-- name: Remove cache # noqa: risky-shell-pipe
-  ansible.builtin.shell: >
-    if test -n "$(ps -p $$ | grep bash)"; then set -o pipefail; fi;
+- name: Remove cache
+  ansible.builtin.command: >
     rm -rf /var/cache/*
   changed_when: false
   when: ansible_virtualization_type == "container" or ansible_virtualization_type == "docker"

diff --git a/roles/kibana/tasks/main.yml b/roles/kibana/tasks/main.yml
@@ -93,9 +93,8 @@
     port: 5601
 
 # Free up some space to let elsticsearch allocate replica in GitHub Action
-- name: Remove cache # noqa: risky-shell-pipe
-  ansible.builtin.shell: >
-    if test -n "$(ps -p $$ | grep bash)"; then set -o pipefail; fi;
+- name: Remove cache
+  ansible.builtin.command: >
     rm -rf /var/cache/*
   changed_when: false
   when: ansible_virtualization_type == "container" or ansible_virtualization_type == "docker"
diff --git a/roles/logstash/tasks/main.yml b/roles/logstash/tasks/main.yml
@@ -233,9 +233,8 @@
   register: logstash_freshstart
 
 # Free up some space to let elsticsearch allocate replica in GitHub Action
-- name: Remove cache # noqa: risky-shell-pipe
-  ansible.builtin.shell: >
-    if test -n "$(ps -p $$ | grep bash)"; then set -o pipefail; fi;
+- name: Remove cache
+  ansible.builtin.command: >
     rm -rf /var/cache/*
   changed_when: false
   when: ansible_virtualization_type == "container" or ansible_virtualization_type == "docker"