Merge branch 'main' into tyler/fix-iwyu

trunk-io · Jan 8, 2024 · 4db77dd · 4db77dd
2 parents b7bb244 + 413b205
commit 4db77dd
Show file tree

Hide file tree

Showing 134 changed files with 2,348 additions and 1,249 deletions.
diff --git a/.github/dependabot.yaml b/.github/dependabot.yaml
@@ -8,6 +8,10 @@ updates:
       # trunk-ignore(yamllint/quoted-strings)
       time: "08:00" # UTC
     labels: [🤖 dependabot]
+    groups:
+      dependencies:
+        patterns:
+          - "*"
     open-pull-requests-limit: 2
 
   - package-ecosystem: npm

diff --git a/linters/actionlint/actionlint.test.ts b/linters/actionlint/actionlint.test.ts
@@ -5,12 +5,13 @@ import { TrunkLintDriver } from "tests/driver";
 import { TEST_DATA } from "tests/utils";
 
 // actionlint is specially triggered to run on github workflow files
-const preCheck = (driver: TrunkLintDriver) => {
+const preCheck = async (driver: TrunkLintDriver) => {
   // trunk-ignore-begin(semgrep): driver.getSandbox() is generated during testing and is safe
   fs.readdirSync(path.resolve(driver.getSandbox(), TEST_DATA)).forEach((file) => {
     driver.moveFile(path.join(TEST_DATA, file), path.join(".github/workflows", file));
   });
   // trunk-ignore-end(semgrep)
+  await driver.gitDriver?.add(".").commit("moved");
 };
 
-customLinterCheckTest({ linterName: "actionlint", preCheck });
+customLinterCheckTest({ linterName: "actionlint", args: ".github", preCheck });
diff --git a/linters/actionlint/test_data/actionlint_v1.6.21_CUSTOM.check.shot b/linters/actionlint/test_data/actionlint_v1.6.21_CUSTOM.check.shot
@@ -7,7 +7,7 @@ exports[`Testing linter actionlint test CUSTOM 1`] = `
       "code": "events",
       "column": "13",
       "file": ".github/workflows/bad.in.yaml",
-      "issueClass": "ISSUE_CLASS_NEW",
+      "issueClass": "ISSUE_CLASS_EXISTING",
       "issueUrl": "https://github.com/rhysd/actionlint/blob/main/docs/checks.md",
       "level": "LEVEL_HIGH",
       "line": "4",
@@ -19,7 +19,7 @@ exports[`Testing linter actionlint test CUSTOM 1`] = `
       "code": "events",
       "column": "13",
       "file": ".github/workflows/bad.in.yaml",
-      "issueClass": "ISSUE_CLASS_NEW",
+      "issueClass": "ISSUE_CLASS_EXISTING",
       "issueUrl": "https://github.com/rhysd/actionlint/blob/main/docs/checks.md",
       "level": "LEVEL_HIGH",
       "line": "6",
@@ -31,7 +31,7 @@ exports[`Testing linter actionlint test CUSTOM 1`] = `
       "code": "syntax-check",
       "column": "1",
       "file": ".github/workflows/empty.in.yaml",
-      "issueClass": "ISSUE_CLASS_NEW",
+      "issueClass": "ISSUE_CLASS_EXISTING",
       "issueUrl": "https://github.com/rhysd/actionlint/blob/main/docs/checks.md",
       "level": "LEVEL_HIGH",
       "line": "1",
@@ -59,6 +59,26 @@ exports[`Testing linter actionlint test CUSTOM 1`] = `
       ],
       "verb": "TRUNK_VERB_CHECK",
     },
+    {
+      "command": "lint",
+      "fileGroupName": "github-workflow",
+      "linter": "actionlint",
+      "paths": [
+        ".github/workflows/bad.in.yaml",
+      ],
+      "upstream": true,
+      "verb": "TRUNK_VERB_CHECK",
+    },
+    {
+      "command": "lint",
+      "fileGroupName": "github-workflow",
+      "linter": "actionlint",
+      "paths": [
+        ".github/workflows/empty.in.yaml",
+      ],
+      "upstream": true,
+      "verb": "TRUNK_VERB_CHECK",
+    },
   ],
   "taskFailures": [],
   "unformattedFiles": [],

diff --git a/linters/actionlint/test_data/actionlint_v1.6.26_CUSTOM.check.shot b/linters/actionlint/test_data/actionlint_v1.6.26_CUSTOM.check.shot
@@ -7,7 +7,7 @@ exports[`Testing linter actionlint test CUSTOM 1`] = `
       "code": "events",
       "column": "13",
       "file": ".github/workflows/bad.in.yaml",
-      "issueClass": "ISSUE_CLASS_NEW",
+      "issueClass": "ISSUE_CLASS_EXISTING",
       "issueUrl": "https://github.com/rhysd/actionlint/blob/main/docs/checks.md",
       "level": "LEVEL_HIGH",
       "line": "4",
@@ -19,7 +19,7 @@ exports[`Testing linter actionlint test CUSTOM 1`] = `
       "code": "events",
       "column": "13",
       "file": ".github/workflows/bad.in.yaml",
-      "issueClass": "ISSUE_CLASS_NEW",
+      "issueClass": "ISSUE_CLASS_EXISTING",
       "issueUrl": "https://github.com/rhysd/actionlint/blob/main/docs/checks.md",
       "level": "LEVEL_HIGH",
       "line": "6",
@@ -31,7 +31,7 @@ exports[`Testing linter actionlint test CUSTOM 1`] = `
       "code": "syntax-check",
       "column": "1",
       "file": ".github/workflows/empty.in.yaml",
-      "issueClass": "ISSUE_CLASS_NEW",
+      "issueClass": "ISSUE_CLASS_EXISTING",
       "issueUrl": "https://github.com/rhysd/actionlint/blob/main/docs/checks.md",
       "level": "LEVEL_HIGH",
       "line": "1",
@@ -59,6 +59,26 @@ exports[`Testing linter actionlint test CUSTOM 1`] = `
       ],
       "verb": "TRUNK_VERB_CHECK",
     },
+    {
+      "command": "lint",
+      "fileGroupName": "github-workflow",
+      "linter": "actionlint",
+      "paths": [
+        ".github/workflows/bad.in.yaml",
+      ],
+      "upstream": true,
+      "verb": "TRUNK_VERB_CHECK",
+    },
+    {
+      "command": "lint",
+      "fileGroupName": "github-workflow",
+      "linter": "actionlint",
+      "paths": [
+        ".github/workflows/empty.in.yaml",
+      ],
+      "upstream": true,
+      "verb": "TRUNK_VERB_CHECK",
+    },
   ],
   "taskFailures": [],
   "unformattedFiles": [],

diff --git a/linters/actionlint/test_data/actionlint_v1.6.9_CUSTOM.check.shot b/linters/actionlint/test_data/actionlint_v1.6.9_CUSTOM.check.shot
@@ -7,7 +7,7 @@ exports[`Testing linter actionlint test CUSTOM 1`] = `
       "code": "events",
       "column": "13",
       "file": ".github/workflows/bad.in.yaml",
-      "issueClass": "ISSUE_CLASS_NEW",
+      "issueClass": "ISSUE_CLASS_EXISTING",
       "issueUrl": "https://github.com/rhysd/actionlint/blob/main/docs/checks.md",
       "level": "LEVEL_HIGH",
       "line": "4",
@@ -19,7 +19,7 @@ exports[`Testing linter actionlint test CUSTOM 1`] = `
       "code": "events",
       "column": "13",
       "file": ".github/workflows/bad.in.yaml",
-      "issueClass": "ISSUE_CLASS_NEW",
+      "issueClass": "ISSUE_CLASS_EXISTING",
       "issueUrl": "https://github.com/rhysd/actionlint/blob/main/docs/checks.md",
       "level": "LEVEL_HIGH",
       "line": "6",
@@ -30,7 +30,7 @@ exports[`Testing linter actionlint test CUSTOM 1`] = `
     {
       "code": "syntax-check",
       "file": ".github/workflows/empty.in.yaml",
-      "issueClass": "ISSUE_CLASS_NEW",
+      "issueClass": "ISSUE_CLASS_EXISTING",
       "issueUrl": "https://github.com/rhysd/actionlint/blob/main/docs/checks.md",
       "level": "LEVEL_HIGH",
       "linter": "actionlint",
@@ -57,6 +57,26 @@ exports[`Testing linter actionlint test CUSTOM 1`] = `
       ],
       "verb": "TRUNK_VERB_CHECK",
     },
+    {
+      "command": "lint",
+      "fileGroupName": "github-workflow",
+      "linter": "actionlint",
+      "paths": [
+        ".github/workflows/bad.in.yaml",
+      ],
+      "upstream": true,
+      "verb": "TRUNK_VERB_CHECK",
+    },
+    {
+      "command": "lint",
+      "fileGroupName": "github-workflow",
+      "linter": "actionlint",
+      "paths": [
+        ".github/workflows/empty.in.yaml",
+      ],
+      "upstream": true,
+      "verb": "TRUNK_VERB_CHECK",
+    },
   ],
   "taskFailures": [],
   "unformattedFiles": [],

diff --git a/linters/bandit/test_data/bandit_v1.7.3_basic.check.shot b/linters/bandit/test_data/bandit_v1.7.3_basic.check.shot
@@ -7,6 +7,7 @@ exports[`Testing linter bandit test basic 1`] = `
       "code": "B403",
       "file": "test_data/basic.in.py",
       "isSecurity": true,
+      "issueClass": "ISSUE_CLASS_EXISTING",
       "issueUrl": "https://pypi.org/project/bandit/",
       "level": "LEVEL_LOW",
       "line": "1",
@@ -18,6 +19,7 @@ exports[`Testing linter bandit test basic 1`] = `
       "code": "B301",
       "file": "test_data/basic.in.py",
       "isSecurity": true,
+      "issueClass": "ISSUE_CLASS_EXISTING",
       "issueUrl": "https://pypi.org/project/bandit/",
       "level": "LEVEL_MEDIUM",
       "line": "6",
@@ -36,6 +38,16 @@ exports[`Testing linter bandit test basic 1`] = `
       ],
       "verb": "TRUNK_VERB_CHECK",
     },
+    {
+      "command": "lint",
+      "fileGroupName": "python",
+      "linter": "bandit",
+      "paths": [
+        "test_data/basic.in.py",
+      ],
+      "upstream": true,
+      "verb": "TRUNK_VERB_CHECK",
+    },
   ],
   "taskFailures": [],
   "unformattedFiles": [],

diff --git a/linters/biome/test_data/biome_v1.4.1_basic_check.check.shot b/linters/biome/test_data/biome_v1.4.1_basic_check.check.shot
@@ -7,6 +7,7 @@ exports[`Testing linter biome test basic_check 1`] = `
       "code": "lint/style/useEnumInitializers",
       "column": "6",
       "file": "test_data/basic_check.in.ts",
+      "issueClass": "ISSUE_CLASS_EXISTING",
       "level": "LEVEL_HIGH",
       "line": "4",
       "linter": "biome",
@@ -33,6 +34,16 @@ exports[`Testing linter biome test basic_check 1`] = `
       ],
       "verb": "TRUNK_VERB_CHECK",
     },
+    {
+      "command": "lint",
+      "fileGroupName": "typescript",
+      "linter": "biome",
+      "paths": [
+        "test_data/basic_check.in.ts",
+      ],
+      "upstream": true,
+      "verb": "TRUNK_VERB_CHECK",
+    },
   ],
   "taskFailures": [],
   "unformattedFiles": [

diff --git a/linters/buf/test_data/buf_lint_v1.1.0_buf_lint.check.shot b/linters/buf/test_data/buf_lint_v1.1.0_buf_lint.check.shot
@@ -6,6 +6,7 @@ exports[`Testing linter buf-lint test buf_lint 1`] = `
     {
       "code": "FILE_LOWER_SNAKE_CASE",
       "file": "test_data/buf_lint.in.proto",
+      "issueClass": "ISSUE_CLASS_EXISTING",
       "issueUrl": "https://docs.buf.build/lint/rules#file_lower_snake_case",
       "level": "LEVEL_HIGH",
       "linter": "buf-lint",
@@ -16,6 +17,7 @@ exports[`Testing linter buf-lint test buf_lint 1`] = `
       "code": "PACKAGE_DIRECTORY_MATCH",
       "column": "1",
       "file": "test_data/buf_lint.in.proto",
+      "issueClass": "ISSUE_CLASS_EXISTING",
       "issueUrl": "https://docs.buf.build/lint/rules#package_directory_match",
       "level": "LEVEL_HIGH",
       "line": "4",
@@ -27,6 +29,7 @@ exports[`Testing linter buf-lint test buf_lint 1`] = `
       "code": "PACKAGE_VERSION_SUFFIX",
       "column": "1",
       "file": "test_data/buf_lint.in.proto",
+      "issueClass": "ISSUE_CLASS_EXISTING",
       "issueUrl": "https://docs.buf.build/lint/rules#package_version_suffix",
       "level": "LEVEL_HIGH",
       "line": "4",
@@ -38,6 +41,7 @@ exports[`Testing linter buf-lint test buf_lint 1`] = `
       "code": "ENUM_VALUE_PREFIX",
       "column": "3",
       "file": "test_data/buf_lint.in.proto",
+      "issueClass": "ISSUE_CLASS_EXISTING",
       "issueUrl": "https://docs.buf.build/lint/rules#enum_value_prefix",
       "level": "LEVEL_HIGH",
       "line": "7",
@@ -49,6 +53,7 @@ exports[`Testing linter buf-lint test buf_lint 1`] = `
       "code": "ENUM_VALUE_UPPER_SNAKE_CASE",
       "column": "3",
       "file": "test_data/buf_lint.in.proto",
+      "issueClass": "ISSUE_CLASS_EXISTING",
       "issueUrl": "https://docs.buf.build/lint/rules#enum_value_upper_snake_case",
       "level": "LEVEL_HIGH",
       "line": "7",
@@ -67,6 +72,16 @@ exports[`Testing linter buf-lint test buf_lint 1`] = `
       ],
       "verb": "TRUNK_VERB_CHECK",
     },
+    {
+      "command": "lint",
+      "fileGroupName": "proto",
+      "linter": "buf-lint",
+      "paths": [
+        "test_data/buf_lint.in.proto",
+      ],
+      "upstream": true,
+      "verb": "TRUNK_VERB_CHECK",
+    },
   ],
   "taskFailures": [],
   "unformattedFiles": [],

diff --git a/linters/buf/test_data/buf_lint_v1.17.0_buf_lint.check.shot b/linters/buf/test_data/buf_lint_v1.17.0_buf_lint.check.shot
@@ -7,6 +7,7 @@ exports[`Testing linter buf-lint test buf_lint 1`] = `
       "code": "FILE_LOWER_SNAKE_CASE",
       "column": "1",
       "file": "test_data/buf_lint.in.proto",
+      "issueClass": "ISSUE_CLASS_EXISTING",
       "issueUrl": "https://docs.buf.build/lint/rules#file_lower_snake_case",
       "level": "LEVEL_HIGH",
       "line": "1",
@@ -18,6 +19,7 @@ exports[`Testing linter buf-lint test buf_lint 1`] = `
       "code": "PACKAGE_DIRECTORY_MATCH",
       "column": "1",
       "file": "test_data/buf_lint.in.proto",
+      "issueClass": "ISSUE_CLASS_EXISTING",
       "issueUrl": "https://docs.buf.build/lint/rules#package_directory_match",
       "level": "LEVEL_HIGH",
       "line": "4",
@@ -29,6 +31,7 @@ exports[`Testing linter buf-lint test buf_lint 1`] = `
       "code": "PACKAGE_VERSION_SUFFIX",
       "column": "1",
       "file": "test_data/buf_lint.in.proto",
+      "issueClass": "ISSUE_CLASS_EXISTING",
       "issueUrl": "https://docs.buf.build/lint/rules#package_version_suffix",
       "level": "LEVEL_HIGH",
       "line": "4",
@@ -40,6 +43,7 @@ exports[`Testing linter buf-lint test buf_lint 1`] = `
       "code": "ENUM_VALUE_PREFIX",
       "column": "3",
       "file": "test_data/buf_lint.in.proto",
+      "issueClass": "ISSUE_CLASS_EXISTING",
       "issueUrl": "https://docs.buf.build/lint/rules#enum_value_prefix",
       "level": "LEVEL_HIGH",
       "line": "7",
@@ -51,6 +55,7 @@ exports[`Testing linter buf-lint test buf_lint 1`] = `
       "code": "ENUM_VALUE_UPPER_SNAKE_CASE",
       "column": "3",
       "file": "test_data/buf_lint.in.proto",
+      "issueClass": "ISSUE_CLASS_EXISTING",
       "issueUrl": "https://docs.buf.build/lint/rules#enum_value_upper_snake_case",
       "level": "LEVEL_HIGH",
       "line": "7",
@@ -69,6 +74,16 @@ exports[`Testing linter buf-lint test buf_lint 1`] = `
       ],
       "verb": "TRUNK_VERB_CHECK",
     },
+    {
+      "command": "lint",
+      "fileGroupName": "proto",
+      "linter": "buf-lint",
+      "paths": [
+        "test_data/buf_lint.in.proto",
+      ],
+      "upstream": true,
+      "verb": "TRUNK_VERB_CHECK",
+    },
   ],
   "taskFailures": [],
   "unformattedFiles": [],

diff --git a/linters/buildifier/buildifier.test.ts b/linters/buildifier/buildifier.test.ts
@@ -37,19 +37,19 @@ const writeConfigs = (driver: TrunkLintDriver) => {
 // TODO(Tyler): We will eventually need to add a couple more test cases involving failure modes.
 customLinterCheckTest({
   linterName: "buildifier",
-  args: "-a",
+  args: TEST_DATA,
   testName: "basic_check",
 });
 
 customLinterFmtTest({
   linterName: "buildifier",
-  args: "-a",
+  args: TEST_DATA,
   testName: "no_config",
   pathsToSnapshot: [path.join(TEST_DATA, "basic.bzl"), path.join(TEST_DATA, "add_tables.BUILD")],
 });
 customLinterFmtTest({
   linterName: "buildifier",
-  args: "-a",
+  args: TEST_DATA,
   testName: "with_config",
   pathsToSnapshot: [path.join(TEST_DATA, "add_tables.BUILD")],
   preCheck: writeConfigs,

diff --git a/linters/buildifier/test_data/.trunk/configs/.buildifier-tables.json b/linters/buildifier/test_data/.trunk/configs/.buildifier-tables.json