ci: make platform verification portable

Author: LarHope

.github/workflows/ci.yml

@@ -91,7 +91,7 @@ jobs:
           test "$("$binary" --version)" = "sno $version"
           help="$($binary --help)"
           for command in account station starport; do
-            rg -q "^[[:space:]]+$command" <<<"$help"
+            grep -Eq "^[[:space:]]+$command([[:space:]]|$)" <<<"$help"
           done
           profile="$(mktemp -d)"
           test "$(SNO_PROFILE_DIR="$profile" "$binary" station telemetry consent get --json)" = '{"consent":"metadata-only"}'
@@ -154,7 +154,7 @@ jobs:
           test "$(docker run --rm --pull=always -v "$binary:/sno:ro" "$image" /sno --version)" = "sno $version"
           help="$(docker run --rm -v "$binary:/sno:ro" "$image" /sno --help)"
           for command in account station starport; do
-            rg -q "^[[:space:]]+$command" <<<"$help"
+            grep -Eq "^[[:space:]]+$command([[:space:]]|$)" <<<"$help"
           done
           output="$(docker run --rm -v "$binary:/sno:ro" -v "$profile:/profile" -e SNO_PROFILE_DIR=/profile "$image" /sno station telemetry consent get --json)"
           test "$output" = '{"consent":"metadata-only"}'

policy/test-substitutes.json

@@ -24,7 +24,7 @@
     "vi\\.mock\\s*\\(",
     "mockery\\.patch",
     "monkeypatch\\.",
-    "(?<![A-Za-z0-9_])patch\\s*\\(",
+    "(^|[^A-Za-z0-9_])patch\\s*\\(",
     "(struct|class)\\s+(Fake|Mock)(FileSystem|Filesystem|Database|Db|Process|Command|Service)",
     "(Fake|Mock)(FileSystem|Filesystem|Database|Db|Process|Command|Service)\\s*[({]",
     "InMemory(FileSystem|Filesystem|Database|Db|Process)"

scripts/check-test-substitutes.sh

@@ -37,11 +37,11 @@ source_pattern="$(jq -r '.banned_source_patterns | join("|")' "$policy")"
 server_pattern="$(jq -r '.service_server_patterns | join("|")' "$policy")"
 
 mapfile -t manifests < <(printf '%s\n' "${files[@]}" | rg '/(Cargo\.toml|package\.json|pyproject\.toml)$' || true)
-if [[ "${#manifests[@]}" -gt 0 ]] && rg -n -i --pcre2 "(^|[^A-Za-z0-9_-])($dependency_pattern)([^A-Za-z0-9_-]|$)" "${manifests[@]}"; then
+if [[ "${#manifests[@]}" -gt 0 ]] && rg -n -i "(^|[^A-Za-z0-9_-])($dependency_pattern)([^A-Za-z0-9_-]|$)" "${manifests[@]}"; then
   fail "forbidden mocking dependency detected"
 fi
 
-if rg -n --pcre2 "$source_pattern" "${files[@]}"; then
+if rg -n "$source_pattern" "${files[@]}"; then
   fail "forbidden internal mock or monkey-patch detected"
 fi
 
@@ -52,7 +52,7 @@ while IFS= read -r server_file; do
     printf '%s\n' "$relative" >&2
     fail "undeclared service replacement detected"
   }
-done < <(rg -l --pcre2 "$server_pattern" "${files[@]}" || true)
+done < <(rg -l "$server_pattern" "${files[@]}" || true)
 
 while IFS= read -r allowed_path; do
   [[ -n "$allowed_path" ]] || continue

scripts/test-test-substitute-policy.sh

@@ -31,6 +31,11 @@ printf '[package]\nname = "seed"\nversion = "0.0.0"\n' >"$tmp_dir/colocated/Carg
 printf '#[cfg(test)] mod tests { mock!(InternalService {}); }\n' >"$tmp_dir/colocated/src/lib.rs"
 expect_failure colocated
 
+mkdir -p "$tmp_dir/patch/tests"
+printf '[package]\nname = "seed"\nversion = "0.0.0"\n' >"$tmp_dir/patch/Cargo.toml"
+printf 'patch("module.internal");\n' >"$tmp_dir/patch/tests/internal.py"
+expect_failure patch
+
 for kind in filesystem database process; do
   mkdir -p "$tmp_dir/fake-$kind/src"
   printf '[package]\nname = "seed"\nversion = "0.0.0"\n' >"$tmp_dir/fake-$kind/Cargo.toml"
@@ -58,4 +63,4 @@ printf 'let listener = TcpListener::bind("127.0.0.1:0");\n' >"$tmp_dir/allowed/t
 "$checker" "$tmp_dir/allowed" "$policy" >/dev/null
 
 "$checker" "$repo_root" "$policy" >/dev/null
-printf 'test-substitute policy self-test passed: 8 forbidden mutations rejected, allowlist and repository accepted\n'
+printf 'test-substitute policy self-test passed: 9 forbidden mutations rejected, allowlist and repository accepted\n'

tests/support/sno_service_server.rs

@@ -57,6 +57,9 @@ impl SnoServiceServer {
                         Err(error) => panic!("accept request: {error}"),
                     }
                 };
+                stream
+                    .set_nonblocking(false)
+                    .expect("set request stream blocking");
                 stream
                     .set_read_timeout(Some(Duration::from_secs(2)))
                     .expect("set request timeout");