Run pre-commit hooks on everything

Author: cortinico

.pre-commit-config.yaml

@@ -1,6 +1,6 @@
 repos:
 - repo: https://github.com/pre-commit/pre-commit-hooks
-  rev: v3.4.0
+  rev: v4.0.1
   hooks:
   - id: check-merge-conflict
   - id: trailing-whitespace
@@ -12,7 +12,7 @@ repos:
     exclude: ^samples/[^/]+/src/main/java/swagger.json$
   - id: check-yaml
 - repo: https://github.com/macisamuele/language-formatters-pre-commit-hooks
-  rev: v2.0.0
+  rev: v2.1.0
   hooks:
   - id: pretty-format-java
     args: [--autofix]
@@ -22,7 +22,7 @@ repos:
     args: [--autofix, --indent, '2']
     exclude: ^config/detekt/detekt\.yml$
 - repo: https://github.com/Yelp/detect-secrets
-  rev: v0.14.3
+  rev: v1.1.0
   hooks:
   - id: detect-secrets
     args: [--baseline, .secrets.baseline]

.secrets.baseline

@@ -1,46 +1,68 @@
 {
-  "custom_plugin_paths": [],
-  "exclude": {
-    "files": null,
-    "lines": null
-  },
-  "generated_at": "2020-10-23T18:25:01Z",
+  "version": "1.1.0",
   "plugins_used": [
     {
       "name": "AWSKeyDetector"
     },
     {
-      "base64_limit": 4.5,
-      "name": "Base64HighEntropyString"
+      "name": "Base64HighEntropyString",
+      "limit": 4.5
     },
     {
       "name": "BasicAuthDetector"
     },
     {
-      "hex_limit": 3,
-      "name": "HexHighEntropyString"
+      "name": "HexHighEntropyString",
+      "limit": 3
     },
     {
-      "keyword_exclude": null,
-      "name": "KeywordDetector"
+      "name": "KeywordDetector",
+      "keyword_exclude": ""
     },
     {
       "name": "PrivateKeyDetector"
     }
   ],
-  "results": {
-    "gradle.properties.example": [
-      {
-        "hashed_secret": "6f9583b0d701174f6b64698f940f9e1470612638",
-        "is_verified": false,
-        "line_number": 2,
-        "type": "Secret Keyword"
-      }
-    ]
-  },
-  "version": "0.14.3",
-  "word_list": {
-    "file": null,
-    "hash": null
-  }
+  "filters_used": [
+    {
+      "path": "detect_secrets.filters.allowlist.is_line_allowlisted"
+    },
+    {
+      "path": "detect_secrets.filters.common.is_baseline_file",
+      "filename": ".secrets.baseline"
+    },
+    {
+      "path": "detect_secrets.filters.common.is_ignored_due_to_verification_policies",
+      "min_level": 2
+    },
+    {
+      "path": "detect_secrets.filters.heuristic.is_indirect_reference"
+    },
+    {
+      "path": "detect_secrets.filters.heuristic.is_likely_id_string"
+    },
+    {
+      "path": "detect_secrets.filters.heuristic.is_lock_file"
+    },
+    {
+      "path": "detect_secrets.filters.heuristic.is_not_alphanumeric_string"
+    },
+    {
+      "path": "detect_secrets.filters.heuristic.is_potential_uuid"
+    },
+    {
+      "path": "detect_secrets.filters.heuristic.is_prefixed_with_dollar_sign"
+    },
+    {
+      "path": "detect_secrets.filters.heuristic.is_sequential_string"
+    },
+    {
+      "path": "detect_secrets.filters.heuristic.is_swagger_file"
+    },
+    {
+      "path": "detect_secrets.filters.heuristic.is_templated_secret"
+    }
+  ],
+  "results": {},
+  "generated_at": "2021-08-08T15:04:32Z"
 }

build.gradle.kts

@@ -76,7 +76,7 @@ subprojects {
  * Python `venv/bin` folder is different based on OS.
  * On Windows it's inside the `venv/Scripts` folder.
  */
-val binFolder : String get() = if (System.getProperty("os.name").toLowerCase().contains("windows")) {
+val binFolder: String get() = if (System.getProperty("os.name").toLowerCase().contains("windows")) {
     "Scripts"
 } else {
     "bin"

gradle-plugin/plugin/src/test/testProject/build.gradle.kts

@@ -1,30 +1,30 @@
 import com.yelp.codegen.plugin.GenerateTaskConfiguration
 
 buildscript {
-  repositories {
-    maven {
-      url = uri("../../../build/localMaven")
+    repositories {
+        maven {
+            url = uri("../../../build/localMaven")
+        }
+        jcenter {
+            content {
+                excludeGroup("com.yelp.codegen")
+            }
+        }
     }
-    jcenter {
-      content {
-        excludeGroup("com.yelp.codegen")
-      }
+    dependencies {
+        // Always take the latest version from the local test repo
+        // This is not super robust and we could find a way to communicate the version to the testProject
+        // by copying the root buildSrc to the testProject or extracting the version in a properties file
+        classpath("com.yelp.codegen:plugin:+")
     }
-  }
-  dependencies {
-    // Always take the latest version from the local test repo
-    // This is not super robust and we could find a way to communicate the version to the testProject
-    // by copying the root buildSrc to the testProject or extracting the version in a properties file
-    classpath("com.yelp.codegen:plugin:+")
-  }
 }
 
 apply(plugin = "com.yelp.codegen.plugin")
 
 configure<GenerateTaskConfiguration> {
-  platform.set("kotlin")
-  packageName.set("com.yelp.codegen.samples")
-  // we are in rootDir/plugin-root/plugin/build/testProject/
-  inputFile.set(file("../../../../samples/junit-tests/junit_tests_specs.json"))
-  outputDir.set(file("./build/generatedSources"))
+    platform.set("kotlin")
+    packageName.set("com.yelp.codegen.samples")
+    // we are in rootDir/plugin-root/plugin/build/testProject/
+    inputFile.set(file("../../../../samples/junit-tests/junit_tests_specs.json"))
+    outputDir.set(file("./build/generatedSources"))
 }

gradle-plugin/plugin/src/test/testProject/settings.gradle.kts

@@ -1 +1 @@
-rootProject.name="testProject"
+rootProject.name = "testProject"

settings.gradle.kts

@@ -32,12 +32,12 @@ includeBuild("gradle-plugin")
 fun shouldIncludeAndroidProjects(): Boolean {
     if (System.getenv("CI") != null) {
         // Ensure that on CI systems we run all the gradle tasks (including the Android specific ones)
-        return true;
+        return true
     }
 
     if (System.getenv("SKIP_ANDROID") != null) {
-        return false;
+        return false
     }
 
-    return true;
+    return true
 }