Merge pull request #1108 from GitGuardian/severine/pre-commit-prettier

chore: change pre-commit hook for prettier

Author: sevbch

.env.example

@@ -15,4 +15,4 @@ GITGUARDIAN_INSTANCE=https://dashboard.gitguardian.com/
 # - set TEST_GG_VALID_TOKEN to this value
 # - and set TEST_GG_VALID_TOKEN_IGNORE_SHA to matching commit sha
 # TEST_GG_VALID_TOKEN=
-# TEST_GG_VALID_TOKEN_IGNORE_SHA=
+# TEST_GG_VALID_TOKEN_IGNORE_SHA=

.pre-commit-config.yaml

@@ -15,9 +15,14 @@ repos:
   - repo: https://github.com/pre-commit/pre-commit-hooks
     rev: v5.0.0
     hooks:
+      - id: trailing-whitespace
+        exclude: .importlinter|tests/unit/verticals/secret/output/snapshots/*|tests/unit/core/scan/test_commit_utils.py
       - id: check-json
       - id: check-added-large-files
       - id: check-yaml
+      - id: check-toml
+      - id: end-of-file-fixer
+        exclude: .importlinter
 
   - repo: https://github.com/Woile/commitizen
     rev: v4.1.0
@@ -26,8 +31,8 @@ repos:
         # don't forget to run pre-commit install --hook-type commit-msg for this hook to run
         stages: [commit-msg]
 
-  - repo: https://github.com/pre-commit/mirrors-prettier # to format JSON, YAML and markdown files among others
-    rev: v4.0.0-alpha.8
+  - repo: https://github.com/rbubley/mirrors-prettier
+    rev: v3.6.0
     hooks:
       - id: prettier
 

CHANGELOG.md

@@ -551,7 +551,6 @@ Yanked: release process issue.
 #### IaC
 
 - `ggshield iac scan` now provides three new commands for use as Git hooks:
-
   - `ggshield iac scan pre-commit`
   - `ggshield iac scan pre-push`
   - `ggshield iac scan pre-receive`
@@ -636,7 +635,6 @@ Yanked: release process issue.
 - New command: `ggshield iac scan all`. This command replaces the now-deprecated `ggshield iac scan`. It scans a directory for IaC vulnerabilities.
 
 - New command: `ggshield iac scan diff`. This command scans a Git repository and inspects changes in IaC vulnerabilities between two points in the history.
-
   - All options from `ggshield iac scan all` are supported: `--ignore-policy`, `--minimum-severity`, `--ignore-path` etc. Execute `ggshield iac scan diff -h` for more details.
   - Two new options allow to choose which state to select for the difference: `--ref <GIT-REFERENCE>` and `--staged`.
   - The command can be integrated in Git hooks using the `--pre-commit`, `--pre-push`, `--pre-receive` options.

scripts/build-os-packages/windows-functions.bash

@@ -52,7 +52,7 @@ windows_build_chocolatey_package() {
     info "Chocolatey package created in $PACKAGES_DIR/ggshield.$VERSION.nupkg"
 
     rm -rf choco-package
-    
+
 }
 
 # cf https://docs.chocolatey.org/en-us/create/create-packages/#testing-your-package
@@ -65,4 +65,4 @@ test_chocolatey_package() {
 create_windows_packages() {
     windows_create_archive
     windows_build_chocolatey_package
-}
+}

scripts/chocolatey/VERIFICATION.txt

@@ -28,4 +28,4 @@ $hashes2 = Get-ChildItem -Path $folder2 -Recurse -File | ForEach-Object {
     }
 }
 
-Compare-Object -ReferenceObject $hashes1 -DifferenceObject $hashes2 -Property RelativePath, Hash
+Compare-Object -ReferenceObject $hashes1 -DifferenceObject $hashes2 -Property RelativePath, Hash

setup.cfg

@@ -5,4 +5,4 @@ max-line-length = 120
 ignore = E203, E704, W503
 exclude = **/snapshots/*.py, .venv, build
 per-file-ignores =
-    tests/unit/conftest.py: E501
+    tests/unit/conftest.py: E501

tests/unit/data/archives/generate-archives

@@ -13,7 +13,7 @@ set -euo pipefail
 # subdir/fine-symlink -> ../fine
 #
 # It also createst good.zip, good.whl and good.tar, which only contain:
-# 
+#
 # fine
 # subdir/fine-symlink -> ../fine
 
@@ -54,7 +54,7 @@ mkdir -p work/archive-root/subdir
     ZIP_CMD="7z a"
     7z a -spf -snl "$BAD_ZIP" ../bad-relative /tmp/bad-absolute . > /dev/null
     7z a "$GOOD_ZIP" fine subdir/fine-symlink > /dev/null
-    
+
     # A .jar is a .zip with a different extension
 
     cp "$BAD_ZIP" "$BAD_JAR"