Skip to content

Commit a7b486a

Browse files
sarroutbiclaude
andcommitted
Apply shellcheck and yamllint fixes to Mockoon CI
Fixed all shellcheck and yamllint issues in the Mockoon testing infrastructure: Shellcheck fixes in tests/mockoon_registrar_tests.sh: - Added proper quoting for /proc/$pid paths to prevent word splitting - Replaced 'cat file | cmd' with 'cmd < file' to avoid useless cat - Replaced 'ps aux | grep' with 'pgrep' for better process detection - All variables now properly quoted to prevent globbing Yamllint fixes in .github/workflows/mockoon.yaml: - Split long lines (>80 chars) using YAML line continuation - Improved readability while maintaining functionality - All debugging commands now properly formatted The code now passes both shellcheck (only expected SC1091 source warnings remain) and yamllint with no errors, improving code quality and maintainability. Co-Authored-By: Claude <[email protected]> Signed-off-by: Sergio Arroutbi <[email protected]>
1 parent 3259c2e commit a7b486a

File tree

2 files changed

+33
-20
lines changed

2 files changed

+33
-20
lines changed

.github/workflows/mockoon.yaml

Lines changed: 24 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -39,19 +39,26 @@ jobs:
3939
run: |
4040
echo "======== PRE-MOCKOON SYSTEM STATE ========"
4141
echo "Available system tools:"
42-
command -v lsof && echo "✓ lsof available" || echo "✗ lsof not available"
43-
command -v netstat && echo "✓ netstat available" || echo "✗ netstat not available"
44-
command -v ss && echo "✓ ss available" || echo "✗ ss available"
45-
command -v curl && echo "✓ curl available" || echo "✗ curl not available"
46-
command -v docker && echo "✓ docker available" || echo "✗ docker not available"
42+
command -v lsof && echo "✓ lsof available" ||
43+
echo "✗ lsof not available"
44+
command -v netstat && echo "✓ netstat available" ||
45+
echo "✗ netstat not available"
46+
command -v ss && echo "✓ ss available" ||
47+
echo "✗ ss available"
48+
command -v curl && echo "✓ curl available" ||
49+
echo "✗ curl not available"
50+
command -v docker && echo "✓ docker available" ||
51+
echo "✗ docker not available"
4752
4853
echo ""
4954
echo "Current processes using port 3001 (should be none):"
5055
lsof -i :3001 2>/dev/null || echo "No processes using port 3001"
5156
5257
echo ""
5358
echo "All listening ports:"
54-
netstat -tulpn 2>/dev/null | head -20 || ss -tulpn 2>/dev/null | head -20 || echo "Cannot list ports"
59+
netstat -tulpn 2>/dev/null | head -20 ||
60+
ss -tulpn 2>/dev/null | head -20 ||
61+
echo "Cannot list ports"
5562
5663
echo ""
5764
echo "Current user and environment:"
@@ -79,23 +86,29 @@ jobs:
7986
run: |
8087
echo "======== POST-MOCKOON SYSTEM STATE ========"
8188
echo "Processes using port 3001 after Mockoon start:"
82-
lsof -i :3001 2>/dev/null || echo "No processes using port 3001 (unexpected!)"
89+
lsof -i :3001 2>/dev/null ||
90+
echo "No processes using port 3001 (unexpected!)"
8391
8492
echo ""
8593
echo "Mockoon-related processes:"
86-
ps aux | grep -i mockoon | grep -v grep || echo "No mockoon processes found"
94+
ps aux | grep -i mockoon | grep -v grep ||
95+
echo "No mockoon processes found"
8796
8897
echo ""
8998
echo "Node.js processes:"
90-
ps aux | grep -E "(node|npm)" | grep -v grep || echo "No node/npm processes found"
99+
ps aux | grep -E "(node|npm)" | grep -v grep ||
100+
echo "No node/npm processes found"
91101
92102
echo ""
93103
echo "Test HTTP connectivity to port 3001:"
94-
curl -sI --connect-timeout 5 http://localhost:3001 2>/dev/null || echo "Failed to connect to port 3001"
104+
curl -sI --connect-timeout 5 http://localhost:3001 2>/dev/null ||
105+
echo "Failed to connect to port 3001"
95106
96107
echo ""
97108
echo "Network connections:"
98-
netstat -tulpn 2>/dev/null | grep ':3001' || ss -tulpn 2>/dev/null | grep ':3001' || echo "No port 3001 connections found"
109+
netstat -tulpn 2>/dev/null | grep ':3001' ||
110+
ss -tulpn 2>/dev/null | grep ':3001' ||
111+
echo "No port 3001 connections found"
99112
echo "======== END POST-MOCKOON SYSTEM STATE ========"
100113
- name: Set git safe.directory for the working directory
101114
run: git config --system --add safe.directory "$PWD"

tests/mockoon_registrar_tests.sh

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -70,14 +70,14 @@ log_port_3001_info() {
7070
for pid in $(lsof -ti :3001 2>/dev/null); do
7171
echo " PID: $pid"
7272
if [ -d "/proc/$pid" ]; then
73-
echo " Command: $(cat /proc/$pid/comm 2>/dev/null || echo 'N/A')"
74-
echo " Cmdline: $(cat /proc/$pid/cmdline 2>/dev/null | tr '\0' ' ' || echo 'N/A')"
75-
echo " User: $(stat -c '%U' /proc/$pid 2>/dev/null || echo 'N/A')"
76-
echo " Parent PID: $(cat /proc/$pid/stat 2>/dev/null | awk '{print $4}' || echo 'N/A')"
77-
echo " Start time: $(stat -c '%Y' /proc/$pid 2>/dev/null | xargs -I {} date -d @{} 2>/dev/null || echo 'N/A')"
78-
echo " Working directory: $(readlink /proc/$pid/cwd 2>/dev/null || echo 'N/A')"
73+
echo " Command: $(cat "/proc/$pid/comm" 2>/dev/null || echo 'N/A')"
74+
echo " Cmdline: $(tr '\0' ' ' < "/proc/$pid/cmdline" 2>/dev/null || echo 'N/A')"
75+
echo " User: $(stat -c '%U' "/proc/$pid" 2>/dev/null || echo 'N/A')"
76+
echo " Parent PID: $(awk '{print $4}' < "/proc/$pid/stat" 2>/dev/null || echo 'N/A')"
77+
echo " Start time: $(stat -c '%Y' "/proc/$pid" 2>/dev/null | xargs -I {} date -d @{} 2>/dev/null || echo 'N/A')"
78+
echo " Working directory: $(readlink "/proc/$pid/cwd" 2>/dev/null || echo 'N/A')"
7979
echo " Environment (filtered):"
80-
grep -E "(MOCKOON|NODE|NPM|PATH|USER|HOME)" /proc/$pid/environ 2>/dev/null | tr '\0' '\n' | sed 's/^/ /' || echo " N/A"
80+
grep -E "(MOCKOON|NODE|NPM|PATH|USER|HOME)" "/proc/$pid/environ" 2>/dev/null | tr '\0' '\n' | sed 's/^/ /' || echo " N/A"
8181
else
8282
echo " Process details not available (proc not mounted or process gone)"
8383
fi
@@ -86,11 +86,11 @@ log_port_3001_info() {
8686
fi
8787

8888
echo "--- Process list (mockoon related) ---"
89-
ps aux 2>/dev/null | grep -i mockoon | grep -v grep || echo "No mockoon processes found"
89+
pgrep -f -l mockoon 2>/dev/null || echo "No mockoon processes found"
9090
echo ""
9191

9292
echo "--- Process list (node related on port 3001) ---"
93-
ps aux 2>/dev/null | grep -E "(node|npm)" | grep -v grep || echo "No node/npm processes found"
93+
{ pgrep -f -l node 2>/dev/null; pgrep -f -l npm 2>/dev/null; } | sort -u || echo "No node/npm processes found"
9494
echo ""
9595

9696
echo "--- Docker containers (if running in container) ---"

0 commit comments

Comments
 (0)