Resolve duplicated code in cli error wrapper

mjewildnhs · mjewildnhs · commit 5ff8589dbfb5 · 2026-03-18T14:55:06.000Z
diff --git a/tools/client-subscriptions-management/src/__tests__/entrypoint/cli/clients-get.test.ts b/tools/client-subscriptions-management/src/__tests__/entrypoint/cli/clients-get.test.ts
@@ -11,6 +11,7 @@ jest.mock("src/container", () => ({
 }));
 
 jest.mock("src/entrypoint/cli/helper", () => ({
+  ...jest.requireActual("src/entrypoint/cli/helper"),
   resolveBucketName: mockResolveBucketName,
   resolveProfile: mockResolveProfile,
   resolveRegion: mockResolveRegion,
diff --git a/tools/client-subscriptions-management/src/__tests__/entrypoint/cli/clients-list.test.ts b/tools/client-subscriptions-management/src/__tests__/entrypoint/cli/clients-list.test.ts
@@ -11,6 +11,7 @@ jest.mock("src/container", () => ({
 }));
 
 jest.mock("src/entrypoint/cli/helper", () => ({
+  ...jest.requireActual("src/entrypoint/cli/helper"),
   resolveBucketName: mockResolveBucketName,
   resolveProfile: mockResolveProfile,
   resolveRegion: mockResolveRegion,
diff --git a/tools/client-subscriptions-management/src/__tests__/entrypoint/cli/clients-put.test.ts b/tools/client-subscriptions-management/src/__tests__/entrypoint/cli/clients-put.test.ts
@@ -15,13 +15,15 @@ jest.mock("src/container", () => ({
 }));
 
 jest.mock("src/entrypoint/cli/helper", () => ({
+  ...jest.requireActual("src/entrypoint/cli/helper"),
   resolveBucketName: mockResolveBucketName,
   resolveProfile: mockResolveProfile,
   resolveRegion: mockResolveRegion,
   runTerraformApply: jest.fn(),
 }));
 
 jest.mock("node:fs", () => ({
+  ...jest.requireActual("node:fs"),
   readFileSync: jest.fn(),
 }));
 
diff --git a/tools/client-subscriptions-management/src/__tests__/entrypoint/cli/subscriptions-add.test.ts b/tools/client-subscriptions-management/src/__tests__/entrypoint/cli/subscriptions-add.test.ts
@@ -19,6 +19,7 @@ jest.mock("src/domain/client-subscription-builder", () => ({
 }));
 
 jest.mock("src/entrypoint/cli/helper", () => ({
+  ...jest.requireActual("src/entrypoint/cli/helper"),
   formatClientConfig: mockFormatClientConfig,
   resolveBucketName: mockResolveBucketName,
   resolveProfile: mockResolveProfile,
diff --git a/tools/client-subscriptions-management/src/__tests__/entrypoint/cli/subscriptions-del.test.ts b/tools/client-subscriptions-management/src/__tests__/entrypoint/cli/subscriptions-del.test.ts
@@ -12,6 +12,7 @@ jest.mock("src/container", () => ({
 }));
 
 jest.mock("src/entrypoint/cli/helper", () => ({
+  ...jest.requireActual("src/entrypoint/cli/helper"),
   formatClientConfig: mockFormatClientConfig,
   resolveBucketName: mockResolveBucketName,
   resolveProfile: mockResolveProfile,
diff --git a/tools/client-subscriptions-management/src/__tests__/entrypoint/cli/subscriptions-list.test.ts b/tools/client-subscriptions-management/src/__tests__/entrypoint/cli/subscriptions-list.test.ts
@@ -12,6 +12,7 @@ jest.mock("src/container", () => ({
 }));
 
 jest.mock("src/entrypoint/cli/helper", () => ({
+  ...jest.requireActual("src/entrypoint/cli/helper"),
   formatSubscriptionsTable: mockFormatSubscriptionsTable,
   resolveBucketName: mockResolveBucketName,
   resolveProfile: mockResolveProfile,
diff --git a/tools/client-subscriptions-management/src/__tests__/entrypoint/cli/subscriptions-set-states.test.ts b/tools/client-subscriptions-management/src/__tests__/entrypoint/cli/subscriptions-set-states.test.ts
@@ -12,6 +12,7 @@ jest.mock("src/container", () => ({
 }));
 
 jest.mock("src/entrypoint/cli/helper", () => ({
+  ...jest.requireActual("src/entrypoint/cli/helper"),
   formatClientConfig: mockFormatClientConfig,
   resolveBucketName: mockResolveBucketName,
   resolveProfile: mockResolveProfile,
diff --git a/tools/client-subscriptions-management/src/__tests__/entrypoint/cli/targets-add.test.ts b/tools/client-subscriptions-management/src/__tests__/entrypoint/cli/targets-add.test.ts
@@ -17,6 +17,7 @@ jest.mock("src/domain/client-subscription-builder", () => ({
 }));
 
 jest.mock("src/entrypoint/cli/helper", () => ({
+  ...jest.requireActual("src/entrypoint/cli/helper"),
   formatClientConfig: mockFormatClientConfig,
   resolveBucketName: mockResolveBucketName,
   resolveProfile: mockResolveProfile,
diff --git a/tools/client-subscriptions-management/src/__tests__/entrypoint/cli/targets-del.test.ts b/tools/client-subscriptions-management/src/__tests__/entrypoint/cli/targets-del.test.ts
@@ -12,6 +12,7 @@ jest.mock("src/container", () => ({
 }));
 
 jest.mock("src/entrypoint/cli/helper", () => ({
+  ...jest.requireActual("src/entrypoint/cli/helper"),
   formatClientConfig: mockFormatClientConfig,
   resolveBucketName: mockResolveBucketName,
   resolveProfile: mockResolveProfile,
diff --git a/tools/client-subscriptions-management/src/__tests__/entrypoint/cli/targets-list.test.ts b/tools/client-subscriptions-management/src/__tests__/entrypoint/cli/targets-list.test.ts
@@ -12,6 +12,7 @@ jest.mock("src/container", () => ({
 }));
 
 jest.mock("src/entrypoint/cli/helper", () => ({
+  ...jest.requireActual("src/entrypoint/cli/helper"),
   formatTargetsTable: mockFormatTargetsTable,
   resolveBucketName: mockResolveBucketName,
   resolveProfile: mockResolveProfile,
diff --git a/tools/client-subscriptions-management/src/entrypoint/cli/clients-get.ts b/tools/client-subscriptions-management/src/entrypoint/cli/clients-get.ts
@@ -5,6 +5,7 @@ import {
   resolveBucketName,
   resolveProfile,
   resolveRegion,
+  wrapCli,
 } from "src/entrypoint/cli/helper";
 
 export const parseArgs = (args: string[]) =>
@@ -64,14 +65,7 @@ export async function main(args: string[] = process.argv) {
   }
 }
 
-export const runCli = async (args: string[] = process.argv) => {
-  try {
-    await main(args);
-  } catch (error) {
-    console.error(error);
-    process.exitCode = 1;
-  }
-};
+export const runCli = wrapCli(main);
 
 export const runIfMain = async (
   args: string[] = process.argv,
diff --git a/tools/client-subscriptions-management/src/entrypoint/cli/clients-list.ts b/tools/client-subscriptions-management/src/entrypoint/cli/clients-list.ts
@@ -5,6 +5,7 @@ import {
   resolveBucketName,
   resolveProfile,
   resolveRegion,
+  wrapCli,
 } from "src/entrypoint/cli/helper";
 
 export const parseArgs = (args: string[]) =>
@@ -56,14 +57,7 @@ export async function main(args: string[] = process.argv) {
   }
 }
 
-export const runCli = async (args: string[] = process.argv) => {
-  try {
-    await main(args);
-  } catch (error) {
-    console.error(error);
-    process.exitCode = 1;
-  }
-};
+export const runCli = wrapCli(main);
 
 export const runIfMain = async (
   args: string[] = process.argv,
diff --git a/tools/client-subscriptions-management/src/entrypoint/cli/clients-put.ts b/tools/client-subscriptions-management/src/entrypoint/cli/clients-put.ts
@@ -8,6 +8,7 @@ import {
   resolveProfile,
   resolveRegion,
   runTerraformApply,
+  wrapCli,
 } from "src/entrypoint/cli/helper";
 
 export const parseArgs = (args: string[]) =>
@@ -145,14 +146,7 @@ export async function main(args: string[] = process.argv) {
   }
 }
 
-export const runCli = async (args: string[] = process.argv) => {
-  try {
-    await main(args);
-  } catch (error) {
-    console.error(error);
-    process.exitCode = 1;
-  }
-};
+export const runCli = wrapCli(main);
 
 export const runIfMain = async (
   args: string[] = process.argv,
diff --git a/tools/client-subscriptions-management/src/entrypoint/cli/helper.ts b/tools/client-subscriptions-management/src/entrypoint/cli/helper.ts
@@ -206,3 +206,14 @@ export const runTerraformApply = async (opts: {
   }
   return true;
 };
+
+export const wrapCli =
+  (mainFn: (args: string[]) => Promise<void>) =>
+  async (args: string[] = process.argv): Promise<void> => {
+    try {
+      await mainFn(args);
+    } catch (error) {
+      console.error(error);
+      process.exitCode = 1;
+    }
+  };
diff --git a/tools/client-subscriptions-management/src/entrypoint/cli/subscriptions-add.ts b/tools/client-subscriptions-management/src/entrypoint/cli/subscriptions-add.ts
@@ -16,6 +16,7 @@ import {
   resolveBucketName,
   resolveProfile,
   resolveRegion,
+  wrapCli,
 } from "src/entrypoint/cli/helper";
 
 export const parseArgs = (args: string[]) =>
@@ -180,14 +181,7 @@ export async function main(args: string[] = process.argv) {
   console.log(formatClientConfig(result));
 }
 
-export const runCli = async (args: string[] = process.argv) => {
-  try {
-    await main(args);
-  } catch (error) {
-    console.error(error);
-    process.exitCode = 1;
-  }
-};
+export const runCli = wrapCli(main);
 
 export const runIfMain = async (
   args: string[] = process.argv,
diff --git a/tools/client-subscriptions-management/src/entrypoint/cli/subscriptions-del.ts b/tools/client-subscriptions-management/src/entrypoint/cli/subscriptions-del.ts
@@ -6,6 +6,7 @@ import {
   resolveBucketName,
   resolveProfile,
   resolveRegion,
+  wrapCli,
 } from "src/entrypoint/cli/helper";
 
 export const parseArgs = (args: string[]) =>
@@ -83,14 +84,7 @@ export async function main(args: string[] = process.argv) {
   console.log(formatClientConfig(result));
 }
 
-export const runCli = async (args: string[] = process.argv) => {
-  try {
-    await main(args);
-  } catch (error) {
-    console.error(error);
-    process.exitCode = 1;
-  }
-};
+export const runCli = wrapCli(main);
 
 export const runIfMain = async (
   args: string[] = process.argv,
diff --git a/tools/client-subscriptions-management/src/entrypoint/cli/subscriptions-list.ts b/tools/client-subscriptions-management/src/entrypoint/cli/subscriptions-list.ts
@@ -6,6 +6,7 @@ import {
   resolveBucketName,
   resolveProfile,
   resolveRegion,
+  wrapCli,
 } from "src/entrypoint/cli/helper";
 
 export const parseArgs = (args: string[]) =>
@@ -71,14 +72,7 @@ export async function main(args: string[] = process.argv) {
   console.log(formatSubscriptionsTable(config.subscriptions));
 }
 
-export const runCli = async (args: string[] = process.argv) => {
-  try {
-    await main(args);
-  } catch (error) {
-    console.error(error);
-    process.exitCode = 1;
-  }
-};
+export const runCli = wrapCli(main);
 
 export const runIfMain = async (
   args: string[] = process.argv,
diff --git a/tools/client-subscriptions-management/src/entrypoint/cli/subscriptions-set-states.ts b/tools/client-subscriptions-management/src/entrypoint/cli/subscriptions-set-states.ts
@@ -11,6 +11,7 @@ import {
   resolveBucketName,
   resolveProfile,
   resolveRegion,
+  wrapCli,
 } from "src/entrypoint/cli/helper";
 
 export const parseArgs = (args: string[]) =>
@@ -127,14 +128,7 @@ export async function main(args: string[] = process.argv) {
   console.log(formatClientConfig(result));
 }
 
-export const runCli = async (args: string[] = process.argv) => {
-  try {
-    await main(args);
-  } catch (error) {
-    console.error(error);
-    process.exitCode = 1;
-  }
-};
+export const runCli = wrapCli(main);
 
 export const runIfMain = async (
   args: string[] = process.argv,
diff --git a/tools/client-subscriptions-management/src/entrypoint/cli/targets-add.ts b/tools/client-subscriptions-management/src/entrypoint/cli/targets-add.ts
@@ -7,6 +7,7 @@ import {
   resolveBucketName,
   resolveProfile,
   resolveRegion,
+  wrapCli,
 } from "src/entrypoint/cli/helper";
 
 export const parseArgs = (args: string[]) =>
@@ -115,14 +116,7 @@ export async function main(args: string[] = process.argv) {
   console.log(formatClientConfig(result));
 }
 
-export const runCli = async (args: string[] = process.argv) => {
-  try {
-    await main(args);
-  } catch (error) {
-    console.error(error);
-    process.exitCode = 1;
-  }
-};
+export const runCli = wrapCli(main);
 
 export const runIfMain = async (
   args: string[] = process.argv,
diff --git a/tools/client-subscriptions-management/src/entrypoint/cli/targets-del.ts b/tools/client-subscriptions-management/src/entrypoint/cli/targets-del.ts
@@ -6,6 +6,7 @@ import {
   resolveBucketName,
   resolveProfile,
   resolveRegion,
+  wrapCli,
 } from "src/entrypoint/cli/helper";
 
 export const parseArgs = (args: string[]) =>
@@ -84,14 +85,7 @@ export async function main(args: string[] = process.argv) {
   console.log(formatClientConfig(result));
 }
 
-export const runCli = async (args: string[] = process.argv) => {
-  try {
-    await main(args);
-  } catch (error) {
-    console.error(error);
-    process.exitCode = 1;
-  }
-};
+export const runCli = wrapCli(main);
 
 export const runIfMain = async (
   args: string[] = process.argv,
diff --git a/tools/client-subscriptions-management/src/entrypoint/cli/targets-list.ts b/tools/client-subscriptions-management/src/entrypoint/cli/targets-list.ts
@@ -6,6 +6,7 @@ import {
   resolveBucketName,
   resolveProfile,
   resolveRegion,
+  wrapCli,
 } from "src/entrypoint/cli/helper";
 
 export const parseArgs = (args: string[]) =>
@@ -71,14 +72,7 @@ export async function main(args: string[] = process.argv) {
   console.log(formatTargetsTable(config.targets));
 }
 
-export const runCli = async (args: string[] = process.argv) => {
-  try {
-    await main(args);
-  } catch (error) {
-    console.error(error);
-    process.exitCode = 1;
-  }
-};
+export const runCli = wrapCli(main);
 
 export const runIfMain = async (
   args: string[] = process.argv,
