From 2802809c7ba2ebb5dd37b24a6f51dcedb063f4b0 Mon Sep 17 00:00:00 2001 From: Chris Clearwater Date: Thu, 21 Mar 2024 14:30:59 -0700 Subject: [PATCH 1/3] --- linters/pre-commit-hooks/pre_commit_hooks.test.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/linters/pre-commit-hooks/pre_commit_hooks.test.ts b/linters/pre-commit-hooks/pre_commit_hooks.test.ts index 6da4812d5..2d1a8aff6 100644 --- a/linters/pre-commit-hooks/pre_commit_hooks.test.ts +++ b/linters/pre-commit-hooks/pre_commit_hooks.test.ts @@ -4,9 +4,9 @@ import { linterFmtTest, TestCallback } from "tests"; const fmtCallbacks: TestCallback = (driver) => { const trunkYamlPath = ".trunk/trunk.yaml"; const currentContents = driver.readFile(trunkYamlPath); - const sqlfluffRegex = /- pre-commit-hooks@(.+)\n/; + const enableRegex = /- pre-commit-hooks@(.+)\n/; const newContents = currentContents.replace( - sqlfluffRegex, + enableRegex, "- pre-commit-hooks@$1:\n commands: [end-of-file-fixer]\n", ); driver.writeFile(trunkYamlPath, newContents); From 0902cb54ab661253678d40f4fdaa64579efd9cee Mon Sep 17 00:00:00 2001 From: Chris Clearwater Date: Thu, 21 Mar 2024 14:32:27 -0700 Subject: [PATCH 2/3] --- linters/ruff/ruff.test.ts | 4 ++-- linters/sqlfluff/sqlfluff.test.ts | 6 +++--- linters/stylelint/stylelint.test.ts | 4 ++-- linters/terraform/terraform.test.ts | 6 +++--- linters/tofu/terraform.test.ts | 18 ++++++++++++++++++ linters/tofu/tofu.test.ts | 4 ++-- 6 files changed, 30 insertions(+), 12 deletions(-) create mode 100644 linters/tofu/terraform.test.ts diff --git a/linters/ruff/ruff.test.ts b/linters/ruff/ruff.test.ts index bd322b90f..0c9822f1e 100644 --- a/linters/ruff/ruff.test.ts +++ b/linters/ruff/ruff.test.ts @@ -15,9 +15,9 @@ linterCheckTest({ const preCheck = (driver: TrunkLintDriver) => { const trunkYamlPath = ".trunk/trunk.yaml"; const currentContents = driver.readFile(trunkYamlPath); - const sqlfluffRegex = /- ruff@(.+)\n/; + const enableRegex = /- ruff@(.+)\n/; const newContents = currentContents.replace( - sqlfluffRegex, + enableRegex, "- ruff@$1:\n commands: [format]\n", ); driver.writeFile(trunkYamlPath, newContents); diff --git a/linters/sqlfluff/sqlfluff.test.ts b/linters/sqlfluff/sqlfluff.test.ts index 1019e9593..1a1945ef3 100644 --- a/linters/sqlfluff/sqlfluff.test.ts +++ b/linters/sqlfluff/sqlfluff.test.ts @@ -8,10 +8,10 @@ linterCheckTest({ linterName: "sqlfluff", namedTestPrefixes: ["basic_check"] }); const fmtCallbacks: TestCallback = (driver) => { const trunkYamlPath = ".trunk/trunk.yaml"; const currentContents = driver.readFile(trunkYamlPath); - const sqlfluffRegex = /- sqlfluff@(.+)\n/; + const enableRegex = /- sqlfluff@(.+)\n/; const newContents = currentContents.replace( - sqlfluffRegex, - "- sqlfluff@$1:\n commands: [lint, fix]\n" + enableRegex, + "- sqlfluff@$1:\n commands: [lint, fix]\n", ); driver.writeFile(trunkYamlPath, newContents); }; diff --git a/linters/stylelint/stylelint.test.ts b/linters/stylelint/stylelint.test.ts index fc2db68a3..74ceac80a 100644 --- a/linters/stylelint/stylelint.test.ts +++ b/linters/stylelint/stylelint.test.ts @@ -17,9 +17,9 @@ const preCheck = (driver: TrunkLintDriver) => { : "stylelint-config-standard@25.0.0"; const trunkYamlPath = ".trunk/trunk.yaml"; const currentContents = driver.readFile(trunkYamlPath); - const sqlfluffRegex = /- stylelint@(.+)\n/; + const enableRegex = /- stylelint@(.+)\n/; const newContents = currentContents.replace( - sqlfluffRegex, + enableRegex, `- stylelint@$1:\n packages: [${configVersion}]\n`, ); driver.writeFile(trunkYamlPath, newContents); diff --git a/linters/terraform/terraform.test.ts b/linters/terraform/terraform.test.ts index 1f44a3bfa..075e4d759 100644 --- a/linters/terraform/terraform.test.ts +++ b/linters/terraform/terraform.test.ts @@ -5,10 +5,10 @@ import { TrunkLintDriver } from "tests/driver"; const preCheck = (driver: TrunkLintDriver) => { const trunkYamlPath = ".trunk/trunk.yaml"; const currentContents = driver.readFile(trunkYamlPath); - const sqlfluffRegex = /- terraform@(.+)\n/; + const enableRegex = /- terraform@(.+)\n/; const newContents = currentContents.replace( - sqlfluffRegex, - "- terraform@$1:\n commands: [validate, fmt]\n" + enableRegex, + "- terraform@$1:\n commands: [validate, fmt]\n", ); driver.writeFile(trunkYamlPath, newContents); }; diff --git a/linters/tofu/terraform.test.ts b/linters/tofu/terraform.test.ts new file mode 100644 index 000000000..075e4d759 --- /dev/null +++ b/linters/tofu/terraform.test.ts @@ -0,0 +1,18 @@ +import { linterCheckTest, linterFmtTest } from "tests"; +import { TrunkLintDriver } from "tests/driver"; + +// Due to terraform's validate subcommand being disabled by default, we need to manually enable it in our test's trunk.yaml. +const preCheck = (driver: TrunkLintDriver) => { + const trunkYamlPath = ".trunk/trunk.yaml"; + const currentContents = driver.readFile(trunkYamlPath); + const enableRegex = /- terraform@(.+)\n/; + const newContents = currentContents.replace( + enableRegex, + "- terraform@$1:\n commands: [validate, fmt]\n", + ); + driver.writeFile(trunkYamlPath, newContents); +}; + +linterCheckTest({ linterName: "terraform", preCheck }); + +linterFmtTest({ linterName: "terraform" }); diff --git a/linters/tofu/tofu.test.ts b/linters/tofu/tofu.test.ts index 616f4a3b5..232c7cb3d 100644 --- a/linters/tofu/tofu.test.ts +++ b/linters/tofu/tofu.test.ts @@ -5,9 +5,9 @@ import { TrunkLintDriver } from "tests/driver"; const preCheck = (driver: TrunkLintDriver) => { const trunkYamlPath = ".trunk/trunk.yaml"; const currentContents = driver.readFile(trunkYamlPath); - const sqlfluffRegex = /- tofu@(.+)\n/; + const enableRegex = /- tofu@(.+)\n/; const newContents = currentContents.replace( - sqlfluffRegex, + enableRegex, "- tofu@$1:\n commands: [validate, fmt]\n", ); driver.writeFile(trunkYamlPath, newContents); From 36bdce8027b39746cde417e23dafc696dfacf461 Mon Sep 17 00:00:00 2001 From: Chris Clearwater Date: Thu, 21 Mar 2024 14:33:07 -0700 Subject: [PATCH 3/3] --- linters/tofu/terraform.test.ts | 18 ------------------ 1 file changed, 18 deletions(-) delete mode 100644 linters/tofu/terraform.test.ts diff --git a/linters/tofu/terraform.test.ts b/linters/tofu/terraform.test.ts deleted file mode 100644 index 075e4d759..000000000 --- a/linters/tofu/terraform.test.ts +++ /dev/null @@ -1,18 +0,0 @@ -import { linterCheckTest, linterFmtTest } from "tests"; -import { TrunkLintDriver } from "tests/driver"; - -// Due to terraform's validate subcommand being disabled by default, we need to manually enable it in our test's trunk.yaml. -const preCheck = (driver: TrunkLintDriver) => { - const trunkYamlPath = ".trunk/trunk.yaml"; - const currentContents = driver.readFile(trunkYamlPath); - const enableRegex = /- terraform@(.+)\n/; - const newContents = currentContents.replace( - enableRegex, - "- terraform@$1:\n commands: [validate, fmt]\n", - ); - driver.writeFile(trunkYamlPath, newContents); -}; - -linterCheckTest({ linterName: "terraform", preCheck }); - -linterFmtTest({ linterName: "terraform" });