update for openapi scripts

Author: GErP83

scripts/check-openapi-security.sh

@@ -27,6 +27,26 @@ SCRIPT_DIR="$(cd -- "$(dirname -- "${BASH_SOURCE[0]}")" && pwd)"
 
 OPENAPI_PATH="openapi"
 
+resolve_repo_root() {
+    # Prefer git root for local execution and subdirectory calls.
+    if root="$(git rev-parse --show-toplevel 2>/dev/null)"; then
+        printf '%s\n' "${root}"
+        return 0
+    fi
+
+    # Fallback for checked-out scripts under a conventional ./scripts layout.
+    if [ -d "${SCRIPT_DIR}/../.git" ]; then
+        (
+            cd -- "${SCRIPT_DIR}/.."
+            pwd
+        )
+        return 0
+    fi
+
+    # Last resort for piped execution (for example: curl | bash).
+    pwd
+}
+
 usage() {
     cat >&2 <<EOF
 Usage: $0 [-f openapi_path]
@@ -53,8 +73,9 @@ if [[ "${OPENAPI_PATH}" = /* ]]; then
     # Absolute paths are used as-is.
     OPENAPI_ABS_PATH="${OPENAPI_PATH}"
 else
-    # Relative paths are resolved from this script directory.
-    OPENAPI_ABS_PATH="${SCRIPT_DIR}/${OPENAPI_PATH}"
+    # Relative paths are resolved from repository root.
+    REPO_ROOT="$(resolve_repo_root)"
+    OPENAPI_ABS_PATH="${REPO_ROOT}/${OPENAPI_PATH}"
 fi
 
 # Allow extension fallback between .yml and .yaml.

scripts/check-openapi-validation.sh

@@ -29,6 +29,26 @@ SCRIPT_DIR="$(cd -- "$(dirname -- "${BASH_SOURCE[0]}")" && pwd)"
 
 OPENAPI_PATH="openapi"
 
+resolve_repo_root() {
+    # Prefer git root for local execution and subdirectory calls.
+    if root="$(git rev-parse --show-toplevel 2>/dev/null)"; then
+        printf '%s\n' "${root}"
+        return 0
+    fi
+
+    # Fallback for checked-out scripts under a conventional ./scripts layout.
+    if [ -d "${SCRIPT_DIR}/../.git" ]; then
+        (
+            cd -- "${SCRIPT_DIR}/.."
+            pwd
+        )
+        return 0
+    fi
+
+    # Last resort for piped execution (for example: curl | bash).
+    pwd
+}
+
 usage() {
     cat >&2 <<EOF
 Usage: $0 [-f openapi_path]
@@ -55,8 +75,9 @@ if [[ "${OPENAPI_PATH}" = /* ]]; then
     # Absolute paths are used as-is.
     OPENAPI_ABS_PATH="${OPENAPI_PATH}"
 else
-    # Relative paths are resolved from this script directory.
-    OPENAPI_ABS_PATH="${SCRIPT_DIR}/${OPENAPI_PATH}"
+    # Relative paths are resolved from repository root.
+    REPO_ROOT="$(resolve_repo_root)"
+    OPENAPI_ABS_PATH="${REPO_ROOT}/${OPENAPI_PATH}"
 fi
 
 # Allow extension fallback between .yml and .yaml.

scripts/run-openapi-docker.sh

@@ -38,6 +38,26 @@ PORT="8888:80"
 # If a file is provided, its parent directory will be mounted.
 OPENAPI_PATH="openapi"
 
+resolve_repo_root() {
+    # Prefer git root for local execution and subdirectory calls.
+    if root="$(git rev-parse --show-toplevel 2>/dev/null)"; then
+        printf '%s\n' "${root}"
+        return 0
+    fi
+
+    # Fallback for checked-out scripts under a conventional ./scripts layout.
+    if [ -d "${SCRIPT_DIR}/../.git" ]; then
+        (
+            cd -- "${SCRIPT_DIR}/.."
+            pwd
+        )
+        return 0
+    fi
+
+    # Last resort for piped execution (for example: curl | bash).
+    pwd
+}
+
 usage() {
     cat >&2 <<EOF
 Usage: $0 [-n name] [-p host_port:container_port] [-f openapi_path]
@@ -74,8 +94,9 @@ if [[ "${OPENAPI_PATH}" = /* ]]; then
     # Absolute paths are used as-is.
     OPENAPI_ABS_PATH="${OPENAPI_PATH}"
 else
-    # Relative paths are resolved from this script directory.
-    OPENAPI_ABS_PATH="${SCRIPT_DIR}/${OPENAPI_PATH}"
+    # Relative paths are resolved from repository root.
+    REPO_ROOT="$(resolve_repo_root)"
+    OPENAPI_ABS_PATH="${REPO_ROOT}/${OPENAPI_PATH}"
 fi
 
 # Allow extension fallback between .yml and .yaml.

tests/bats/openapi-scripts.bats

@@ -123,3 +123,25 @@ YAML
     docker_call="$(cat "$DOCKER_LOG")"
     [[ "$docker_call" == *"zap-api-scan.py"* ]]
 }
+
+@test "check-openapi-validation resolves default openapi path from repo root when run from subdirectory" {
+    repo="$(make_temp_repo)"
+    copy_openapi_scripts_into_repo "$repo"
+    install_docker_stub "$repo"
+
+    mkdir -p "$repo/openapi" "$repo/subdir"
+    cat >"$repo/openapi/openapi.yaml" <<'YAML'
+openapi: 3.0.0
+info:
+  title: Root API
+  version: 1.0.0
+paths: {}
+YAML
+
+    export DOCKER_LOG="$repo/docker.log"
+    run bash -c "cd '$repo/subdir' && bash ../scripts/check-openapi-validation.sh"
+
+    [ "$status" -eq 0 ]
+    docker_call="$(cat "$DOCKER_LOG")"
+    [[ "$docker_call" == *"/openapi/openapi.yaml:/openapi.yaml"* ]]
+}