From 2be3f6a827a1ffc9b71aa694fa0e0ad3f560f805 Mon Sep 17 00:00:00 2001
From: Lauri Takacsi <lauri@trunk.io>
Date: Fri, 18 Aug 2023 14:54:32 -0700
Subject: [PATCH 1/2]

---
 tools/circleci-cli/circleci_cli.test.ts | 20 ++++++++++++++++++
 tools/circleci-cli/plugin.yaml          | 28 +++++++++++++++++++++++++
 2 files changed, 48 insertions(+)
 create mode 100644 tools/circleci-cli/circleci_cli.test.ts
 create mode 100644 tools/circleci-cli/plugin.yaml

diff --git a/tools/circleci-cli/circleci_cli.test.ts b/tools/circleci-cli/circleci_cli.test.ts
new file mode 100644
index 000000000..4c692a6c2
--- /dev/null
+++ b/tools/circleci-cli/circleci_cli.test.ts
@@ -0,0 +1,20 @@
+import { makeToolTestConfig, toolTest } from "tests";
+toolTest({
+  toolName: "circleci-cli",
+  toolVersion: "VERSION_HERE",
+  testConfigs: [
+    makeToolTestConfig({
+      command: ["SHIM_NAME", "COMMAND_HERE"],
+      expectedOut: "OUTPUT_HERE",
+    }),
+  ],
+});
+
+// Guidelines for configuring tests:
+//  - Usually, just a version or help text command is sufficient
+//  - add a test for each command that is used in the plugin.yaml
+//  - exit code 0 is assumed, so set expectedExitCode if it is different
+//  - expectedOut/expectedErr do a substring match, so you can just put a portion of the output
+//
+// If you are unable to write a test for this tool, please document why in your PR, and add
+// it to the list in tests/repo_tests/test_coverage_test.ts
diff --git a/tools/circleci-cli/plugin.yaml b/tools/circleci-cli/plugin.yaml
new file mode 100644
index 000000000..62573a3cc
--- /dev/null
+++ b/tools/circleci-cli/plugin.yaml
@@ -0,0 +1,28 @@
+version: 0.1
+# Tools can be either runtime package-based or
+# download-based. This boilerplate assumes the (far more verbose) latter case.
+downloads:
+  - name: circleci-cli
+    # executable: true
+    # NOTE: These are (common) sample values. Please replace with real values.
+    downloads:
+      - os:
+          linux: linux
+          macos: darwin
+          windows: windows
+        cpu:
+          x86_64: amd64
+          arm_64: arm64
+        url: https://github.com/CircleCI-Public/circleci-cli/releases/download/v${version}/circleci-cli_${version}_${cpu}_${os}.tar.gz
+      - os:
+          windows: windows
+        cpu:
+          x86_64: amd64
+          arm_64: arm64
+        url: https://github.com/CircleCI-Public/circleci-cli/releases/download/v${version}/circleci-cli_${version}_${os}_${cpu}.zip
+tools:
+  definitions:
+    - name: circleci-cli
+      download: circleci-cli
+      known_good_version: 0.1.28811
+      shims: [circleci-cli]

From f68394ee8611f53be4b31db84e5b821234f23f40 Mon Sep 17 00:00:00 2001
From: Lauri Takacsi <lauri@trunk.io>
Date: Fri, 18 Aug 2023 15:03:25 -0700
Subject: [PATCH 2/2]

---
 tools/circleci-cli/circleci_cli.test.ts | 20 ----------------
 tools/circleci-cli/plugin.yaml          | 28 ----------------------
 tools/circleci/plugin.yaml              | 31 +++++++++++--------------
 3 files changed, 13 insertions(+), 66 deletions(-)
 delete mode 100644 tools/circleci-cli/circleci_cli.test.ts
 delete mode 100644 tools/circleci-cli/plugin.yaml

diff --git a/tools/circleci-cli/circleci_cli.test.ts b/tools/circleci-cli/circleci_cli.test.ts
deleted file mode 100644
index 4c692a6c2..000000000
--- a/tools/circleci-cli/circleci_cli.test.ts
+++ /dev/null
@@ -1,20 +0,0 @@
-import { makeToolTestConfig, toolTest } from "tests";
-toolTest({
-  toolName: "circleci-cli",
-  toolVersion: "VERSION_HERE",
-  testConfigs: [
-    makeToolTestConfig({
-      command: ["SHIM_NAME", "COMMAND_HERE"],
-      expectedOut: "OUTPUT_HERE",
-    }),
-  ],
-});
-
-// Guidelines for configuring tests:
-//  - Usually, just a version or help text command is sufficient
-//  - add a test for each command that is used in the plugin.yaml
-//  - exit code 0 is assumed, so set expectedExitCode if it is different
-//  - expectedOut/expectedErr do a substring match, so you can just put a portion of the output
-//
-// If you are unable to write a test for this tool, please document why in your PR, and add
-// it to the list in tests/repo_tests/test_coverage_test.ts
diff --git a/tools/circleci-cli/plugin.yaml b/tools/circleci-cli/plugin.yaml
deleted file mode 100644
index 62573a3cc..000000000
--- a/tools/circleci-cli/plugin.yaml
+++ /dev/null
@@ -1,28 +0,0 @@
-version: 0.1
-# Tools can be either runtime package-based or
-# download-based. This boilerplate assumes the (far more verbose) latter case.
-downloads:
-  - name: circleci-cli
-    # executable: true
-    # NOTE: These are (common) sample values. Please replace with real values.
-    downloads:
-      - os:
-          linux: linux
-          macos: darwin
-          windows: windows
-        cpu:
-          x86_64: amd64
-          arm_64: arm64
-        url: https://github.com/CircleCI-Public/circleci-cli/releases/download/v${version}/circleci-cli_${version}_${cpu}_${os}.tar.gz
-      - os:
-          windows: windows
-        cpu:
-          x86_64: amd64
-          arm_64: arm64
-        url: https://github.com/CircleCI-Public/circleci-cli/releases/download/v${version}/circleci-cli_${version}_${os}_${cpu}.zip
-tools:
-  definitions:
-    - name: circleci-cli
-      download: circleci-cli
-      known_good_version: 0.1.28811
-      shims: [circleci-cli]
diff --git a/tools/circleci/plugin.yaml b/tools/circleci/plugin.yaml
index bb71414dd..ea452518e 100644
--- a/tools/circleci/plugin.yaml
+++ b/tools/circleci/plugin.yaml
@@ -2,25 +2,20 @@ version: 0.1
 downloads:
   - name: circleci
     downloads:
-      - os: macos
-        cpu: arm_64
-        url: https://github.com/CircleCI-Public/circleci-cli/releases/download/v${version}/circleci-cli_${version}_darwin_amd64.tar.gz
+      - os:
+          linux: linux
+          macos: darwin
+        cpu:
+          x86_64: amd64
+          arm_64: arm64
+        url: https://github.com/CircleCI-Public/circleci-cli/releases/download/v${version}/circleci-cli_${version}_${os}_${cpu}.tar.gz
         strip_components: 1
-      - os: macos
-        cpu: x86_64
-        url: https://github.com/CircleCI-Public/circleci-cli/releases/download/v${version}/circleci-cli_${version}_darwin_amd64.tar.gz
-        strip_components: 1
-      - os: linux
-        cpu: x86_64
-        url: https://github.com/CircleCI-Public/circleci-cli/releases/download/v${version}/circleci-cli_${version}_linux_amd64.tar.gz
-        strip_components: 1
-      - os: linux
-        cpu: arm_64
-        url: https://github.com/CircleCI-Public/circleci-cli/releases/download/v${version}/circleci-cli_${version}_linux_arm64.tar.gz
-        strip_components: 1
-      - os: windows
-        cpu: x86_64
-        url: https://github.com/CircleCI-Public/circleci-cli/releases/download/v${version}/circleci-cli_${version}_windows_amd64.zip
+      - os:
+          windows: windows
+        cpu:
+          x86_64: amd64
+          arm_64: arm64
+        url: https://github.com/CircleCI-Public/circleci-cli/releases/download/v${version}/circleci-cli_${version}_${os}_${cpu}.zip
         strip_components: 1
 tools:
   definitions: