From 91e231d34000f22fd133442a5606002157a24b56 Mon Sep 17 00:00:00 2001
From: Taras Mankovski <taras@frontside.com>
Date: Mon, 4 Dec 2023 18:09:57 -0500
Subject: [PATCH] Do not use yarn to execute openapi-generator-cli binary

Signed-off-by: Taras Mankovski <taras@frontside.com>
---
 .../src/commands/openapi/client/generate.ts          | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/packages/repo-tools/src/commands/openapi/client/generate.ts b/packages/repo-tools/src/commands/openapi/client/generate.ts
index 5efd4dadd9..8d85e9cd67 100644
--- a/packages/repo-tools/src/commands/openapi/client/generate.ts
+++ b/packages/repo-tools/src/commands/openapi/client/generate.ts
@@ -36,10 +36,9 @@ async function generate(spec: string, outputDirectory: string) {
   );
 
   await exec(
-    // The actual main.js file for the binary isn't executable but yarn does _something_ to make it executable.
-    // TODO (sennyeya@): Make this use the actual binary
-    `yarn openapi-generator-cli`,
+    'node',
     [
+      resolvePackagePath('@openapitools/openapi-generator-cli', 'main.js'),
       'generate',
       '-i',
       resolvedOpenapiPath,
@@ -62,10 +61,8 @@ async function generate(spec: string, outputDirectory: string) {
     ],
     {
       maxBuffer: Number.MAX_VALUE,
-      cwd: cliPaths.ownDir,
       env: {
         ...process.env,
-        // PWD: outputDirectory,
       },
     },
   );
@@ -74,8 +71,9 @@ async function generate(spec: string, outputDirectory: string) {
     `yarn backstage-cli package lint --fix ${resolvedOutputDirectory}`,
   );
 
-  if (cliPaths.resolveTargetRoot('node_modules/.bin/prettier')) {
-    await exec(`yarn prettier --write ${resolvedOutputDirectory}`);
+  const prettier = cliPaths.resolveTargetRoot('node_modules/.bin/prettier');
+  if (prettier) {
+    await exec(`${prettier} --write ${resolvedOutputDirectory}`);
   }
 
   fs.removeSync(resolve(resolvedOutputDirectory, '.openapi-generator-ignore'));