Bump pre-commit/pre-commit-hooks from 4.5.0 to 4.6.0 (#45)

### Description - Bump pre-commit/pre-commit-hooks from 4.5.0 to 4.6.0 - Transform some scripts from bash to sh
fabasoad · Apr 20, 2024 · 9b618ed · 9b618ed · JayCork · Apr 22, 2024
1 parent 69d2bed
commit 9b618ed
Show file tree

Hide file tree

Showing 9 changed files with 94 additions and 48 deletions.
diff --git a/.github/workflows/functional-tests.yml b/.github/workflows/functional-tests.yml
@@ -2,10 +2,14 @@
 name: Functional Tests
 
 on: # yamllint disable-line rule:truthy
+  pull_request: {}
   push:
     branches:
       - "main"
-  pull_request:
+
+defaults:
+  run:
+    shell: sh
 
 jobs:
   package-manager:
@@ -27,20 +31,19 @@ jobs:
             type: scoop
     runs-on: ${{ matrix.os }}-latest
     steps:
-      - uses: actions/checkout@v4
+      - name: Checkout ${{ github.repository }}
+        uses: actions/checkout@v4
       - name: Setup scoop
-        if: ${{ runner.os == 'Windows' && matrix.type == 'scoop' }}
+        if: ${{ matrix.type == 'scoop' }}
         uses: MinoruSekine/setup-scoop@main
       - name: Configure yarn
         if: ${{ runner.os == 'Windows' && matrix.type == 'yarn' }}
         run: yarn global bin | Out-File -FilePath $env:GITHUB_PATH -Encoding utf8 -Append
         shell: pwsh
       - name: Install snyk
         run: ./hooks/installation/install-${{ matrix.type }}.sh
-        shell: bash
       - name: Print version
         run: snyk --version
-        shell: sh
   standalone:
     name: Standalone
     timeout-minutes: 5
@@ -50,13 +53,12 @@ jobs:
         os: ["macos", "ubuntu", "windows"]
     runs-on: ${{ matrix.os }}-latest
     steps:
-      - uses: actions/checkout@v4
+      - name: Checkout ${{ github.repository }}
+        uses: actions/checkout@v4
       - name: Install snyk
         run: ./hooks/installation/install-standalone.sh
-        shell: bash
       - name: Print version
         run: snyk --version
-        shell: sh
   standalone-alpine:
     name: Standalone
     timeout-minutes: 5
@@ -68,13 +70,11 @@ jobs:
     container:
       image: ${{ matrix.image }}:latest
     steps:
-      - uses: actions/checkout@v4
+      - name: Checkout ${{ github.repository }}
+        uses: actions/checkout@v4
       - name: Install tools
-        run: apk add bash curl
-        shell: sh
+        run: apk add curl
       - name: Install snyk
         run: ./hooks/installation/install-standalone.sh
-        shell: bash
       - name: Print version
         run: snyk --version
-        shell: sh
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
@@ -43,7 +43,7 @@ repos:
       - id: prettier
         stages: ["commit"]
   - repo: https://github.com/pre-commit/pre-commit-hooks
-    rev: v4.5.0
+    rev: v4.6.0
     hooks:
       - id: check-executables-have-shebangs
       - id: check-shebang-scripts-are-executable

diff --git a/hooks/installation/install-standalone.sh b/hooks/installation/install-standalone.sh
@@ -1,7 +1,7 @@
-#!/usr/bin/env bash
+#!/usr/bin/env sh
 set -eu
 
-if [[ -f "/etc/alpine-release" ]]; then
+if [ -f "/etc/alpine-release" ]; then
   binary="snyk-alpine"
   path="/usr/local/bin/"
 else
@@ -19,7 +19,7 @@ else
       path="C:\Windows\System32"
       ;;
     *)
-      if [[ "$(uname -m)" == "arm64" ]]; then
+      if [ "$(uname -m)" = "arm64" ]; then
         binary="snyk-linux-arm64"
       else
         binary="snyk-linux"
@@ -31,6 +31,6 @@ fi
 
 url="https://static.snyk.io/cli/latest/$binary"
 echo "[pre-commit-snyk] GET $url"
-curl $url -o snyk
+curl "$url" -o snyk
 chmod +x ./snyk
-mv ./snyk $path
+mv ./snyk "$path"
diff --git a/hooks/installation/main.sh b/hooks/installation/main.sh
@@ -1,18 +1,20 @@
-#!/usr/bin/env bash
+#!/usr/bin/env sh
+# shellcheck disable=SC2039,SC3020
 set -eu
 
-if ! command -v snyk &> /dev/null
-then
-  SCRIPT_DIR="$(cd -- "$(dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd)"
+SCRIPT_PATH=$(realpath "$0")
+INSTALLATION_FOLDER_PATH=$(dirname "${SCRIPT_PATH}")
+
+if ! command -v snyk &> /dev/null; then
   if command -v brew &> /dev/null; then
-    bash "${SCRIPT_DIR}"/install-brew.sh
+    sh "${INSTALLATION_FOLDER_PATH}/install-brew.sh"
   elif command -v scoop &> /dev/null; then
-    bash "${SCRIPT_DIR}"/install-scoop.sh
+    sh "${INSTALLATION_FOLDER_PATH}/install-scoop.sh"
   elif command -v npm &> /dev/null; then
-    bash "${SCRIPT_DIR}"/install-npm.sh
+    sh "${INSTALLATION_FOLDER_PATH}/install-npm.sh"
   elif command -v yarn &> /dev/null; then
-    bash "${SCRIPT_DIR}"/install-yarn.sh
+    sh "${INSTALLATION_FOLDER_PATH}/install-yarn.sh"
   else
-    bash "${SCRIPT_DIR}"/install-standalone.sh
+    sh "${INSTALLATION_FOLDER_PATH}/install-standalone.sh"
   fi
 fi
diff --git a/hooks/snyk-code.sh b/hooks/snyk-code.sh
@@ -1,6 +1,10 @@
-#!/usr/bin/env bash
+#!/usr/bin/env sh
 set -eu
-SCRIPT_DIR="$(cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd)"
-bash "${SCRIPT_DIR}"/installation/main.sh
+
+SCRIPT_PATH=$(realpath "$0")
+HOOKS_FOLDER_PATH=$(dirname "${SCRIPT_PATH}")
+INSTALLATION_FOLDER_PATH="${HOOKS_FOLDER_PATH}/installation"
+
+sh "${INSTALLATION_FOLDER_PATH}/main.sh"
 
 snyk code test "$@"
diff --git a/hooks/snyk-container.sh b/hooks/snyk-container.sh
@@ -1,7 +1,38 @@
 #!/usr/bin/env bash
 set -eu
-SCRIPT_DIR="$(cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd)"
-bash "${SCRIPT_DIR}"/installation/main.sh
+
+SCRIPT_PATH=$(realpath "$0")
+HOOKS_FOLDER_PATH=$(dirname "${SCRIPT_PATH}")
+INSTALLATION_FOLDER_PATH="${HOOKS_FOLDER_PATH}/installation"
+
+sh "${INSTALLATION_FOLDER_PATH}/main.sh"
+
+prefix="[pre-commit-snyk]"
+
+container_build() {
+  tag="$1"
+  path="$2"
+  if command -v docker &> /dev/null; then
+    docker build -t "$tag" "$path"
+  elif command -v podman &> /dev/null; then
+    podman build -t "$tag" "$path"
+  else
+    echo "$prefix docker or podman are not found. Please install one of these tools and try again"
+    exit 1
+  fi
+}
+
+container_rmi() {
+  image="$1"
+  if command -v docker &> /dev/null; then
+    docker rmi "$(docker images "$image" -q)" || printf "\n%s Unable to remove %s" "$prefix" "$image"
+  elif command -v podman &> /dev/null; then
+    podman rmi "$(podman images "$image" -q)" || printf "\n%s Unable to remove %s" "$prefix" "$image"
+  else
+    echo "$prefix docker or podman are not found. Please install one of these tools and try again"
+    exit 1
+  fi
+}
 
 snyk_args=()
 dockerfiles=()
@@ -13,22 +44,19 @@ for arg in "$@"; do
   fi
 done
 
-prefix="[pre-commit-snyk]"
-
 tag=$(date +%s)
 i=1
 
 for file_path in "${dockerfiles[@]}"; do
   image="pre-commit-snyk:$tag-$i"
-  if [[ $i -gt 1 ]]
-  then
+  if [ $i -gt 1 ]; then
     echo ""
   fi
   printf "%s Building %s from %s\n\n" "$prefix" "$image" "$file_path"
-  docker build -t "$image" "$(echo "$file_path" | rev | cut -d'/' -f2- | rev)"
+  container_build "$image" "$(echo "$file_path" | rev | cut -d'/' -f2- | rev)"
   printf "\n%s Testing %s\n" "$prefix" "$image"
   snyk container test "$image" "--file=$file_path" "${snyk_args[*]}"
   printf "\n%s Removing %s" "$prefix" "$image"
-  docker rmi "$(docker images "$image" -q)" || printf "\n%s Unable to remove %s" "$prefix" "$image"
+  container_rmi "$image"
   i=$((i + 1))
 done
diff --git a/hooks/snyk-iac.sh b/hooks/snyk-iac.sh
@@ -1,6 +1,10 @@
-#!/usr/bin/env bash
+#!/usr/bin/env sh
 set -eu
-SCRIPT_DIR="$(cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd)"
-bash "${SCRIPT_DIR}"/installation/main.sh
+
+SCRIPT_PATH=$(realpath "$0")
+HOOKS_FOLDER_PATH=$(dirname "${SCRIPT_PATH}")
+INSTALLATION_FOLDER_PATH="${HOOKS_FOLDER_PATH}/installation"
+
+sh "${INSTALLATION_FOLDER_PATH}/main.sh"
 
 snyk iac test "$@"
diff --git a/hooks/snyk-log4shell.sh b/hooks/snyk-log4shell.sh
@@ -1,6 +1,10 @@
-#!/usr/bin/env bash
+#!/usr/bin/env sh
 set -eu
-SCRIPT_DIR="$(cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd)"
-bash "${SCRIPT_DIR}"/installation/main.sh
+
+SCRIPT_PATH=$(realpath "$0")
+HOOKS_FOLDER_PATH=$(dirname "${SCRIPT_PATH}")
+INSTALLATION_FOLDER_PATH="${HOOKS_FOLDER_PATH}/installation"
+
+sh "${INSTALLATION_FOLDER_PATH}/main.sh"
 
 snyk log4shell "$@"
diff --git a/hooks/snyk-test.sh b/hooks/snyk-test.sh
@@ -1,6 +1,10 @@
-#!/usr/bin/env bash
+#!/usr/bin/env sh
 set -eu
-SCRIPT_DIR="$(cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd)"
-bash "${SCRIPT_DIR}"/installation/main.sh
+
+SCRIPT_PATH=$(realpath "$0")
+HOOKS_FOLDER_PATH=$(dirname "${SCRIPT_PATH}")
+INSTALLATION_FOLDER_PATH="${HOOKS_FOLDER_PATH}/installation"
+
+sh "${INSTALLATION_FOLDER_PATH}/main.sh"
 
 snyk test "$@"