chore(NA): move installation process of bazelisk into npm

elastic · Feb 5, 2021 · a0aba71 · a0aba71
1 parent f692376
commit a0aba71
Show file tree

Hide file tree

Showing 3 changed files with 43 additions and 22 deletions.
diff --git a/packages/kbn-pm/dist/index.js b/packages/kbn-pm/dist/index.js
@@ -48106,23 +48106,34 @@ async function isBazelBinAvailable() {
   }
 }
 
+async function isBazeliskInstalled(bazeliskVersion) {
+  try {
+    const {
+      stdout: bazeliskPkgInstallStdout
+    } = await Object(_child_process__WEBPACK_IMPORTED_MODULE_2__["spawn"])('npm', ['ls', '--global', '--parseable', '--long', `@bazel/bazelisk@${bazeliskVersion}`], {
+      stdio: 'pipe'
+    });
+    return bazeliskPkgInstallStdout.includes(`@bazel/bazelisk@${bazeliskVersion}`);
+  } catch {
+    return false;
+  }
+}
+
 async function installBazelTools(repoRootPath) {
   _log__WEBPACK_IMPORTED_MODULE_4__["log"].debug(`[bazel_tools] reading bazel tools versions from version files`);
   const bazeliskVersion = await readBazelToolsVersionFile(repoRootPath, '.bazeliskversion');
   const bazelVersion = await readBazelToolsVersionFile(repoRootPath, '.bazelversion'); // Check what globals are installed
 
-  _log__WEBPACK_IMPORTED_MODULE_4__["log"].debug(`[bazel_tools] verify if bazelisk is installed`);
-  const {
-    stdout: bazeliskPkgInstallStdout
-  } = await Object(_child_process__WEBPACK_IMPORTED_MODULE_2__["spawn"])('yarn', ['global', 'list'], {
-    stdio: 'pipe'
-  });
+  _log__WEBPACK_IMPORTED_MODULE_4__["log"].debug(`[bazel_tools] verify if bazelisk is installed`); // Test if bazelisk is already installed in the correct version
+
+  const isBazeliskPkgInstalled = await isBazeliskInstalled(bazeliskVersion); // Test if bazel bin is available
+
   const isBazelBinAlreadyAvailable = await isBazelBinAvailable(); // Install bazelisk if not installed
 
-  if (!bazeliskPkgInstallStdout.includes(`@bazel/bazelisk@${bazeliskVersion}`) || !isBazelBinAlreadyAvailable) {
+  if (!isBazeliskPkgInstalled || !isBazelBinAlreadyAvailable) {
     _log__WEBPACK_IMPORTED_MODULE_4__["log"].info(`[bazel_tools] installing Bazel tools`);
     _log__WEBPACK_IMPORTED_MODULE_4__["log"].debug(`[bazel_tools] bazelisk is not installed. Installing @bazel/bazelisk@${bazeliskVersion} and bazel@${bazelVersion}`);
-    await Object(_child_process__WEBPACK_IMPORTED_MODULE_2__["spawn"])('yarn', ['global', 'add', `@bazel/bazelisk@${bazeliskVersion}`], {
+    await Object(_child_process__WEBPACK_IMPORTED_MODULE_2__["spawn"])('npm', ['install', '--global', `@bazel/bazelisk@${bazeliskVersion}`], {
       env: {
         USE_BAZEL_VERSION: bazelVersion
       },
@@ -48132,7 +48143,7 @@ async function installBazelTools(repoRootPath) {
 
     if (!isBazelBinAvailableAfterInstall) {
       throw new Error(dedent__WEBPACK_IMPORTED_MODULE_0___default.a`
-        [bazel_tools] an error occurred when installing the Bazel tools. Please make sure 'yarn global bin' is on your $PATH, otherwise just add it there
+        [bazel_tools] an error occurred when installing the Bazel tools. Please make sure you have access to npm globally installed modules on your $PATH
       `);
     }
   }

diff --git a/packages/kbn-pm/src/utils/bazel/install_tools.ts b/packages/kbn-pm/src/utils/bazel/install_tools.ts
@@ -36,30 +36,44 @@ async function isBazelBinAvailable() {
   }
 }
 
+async function isBazeliskInstalled(bazeliskVersion) {
+  try {
+    const { stdout: bazeliskPkgInstallStdout } = await spawn(
+      'npm',
+      ['ls', '--global', '--parseable', '--long', `@bazel/bazelisk@${bazeliskVersion}`],
+      {
+        stdio: 'pipe',
+      }
+    );
+
+    return bazeliskPkgInstallStdout.includes(`@bazel/bazelisk@${bazeliskVersion}`);
+  } catch {
+    return false;
+  }
+}
+
 export async function installBazelTools(repoRootPath: string) {
   log.debug(`[bazel_tools] reading bazel tools versions from version files`);
   const bazeliskVersion = await readBazelToolsVersionFile(repoRootPath, '.bazeliskversion');
   const bazelVersion = await readBazelToolsVersionFile(repoRootPath, '.bazelversion');
 
   // Check what globals are installed
   log.debug(`[bazel_tools] verify if bazelisk is installed`);
-  const { stdout: bazeliskPkgInstallStdout } = await spawn('yarn', ['global', 'list'], {
-    stdio: 'pipe',
-  });
 
+  // Test if bazelisk is already installed in the correct version
+  const isBazeliskPkgInstalled = await isBazeliskInstalled(bazeliskVersion);
+
+  // Test if bazel bin is available
   const isBazelBinAlreadyAvailable = await isBazelBinAvailable();
 
   // Install bazelisk if not installed
-  if (
-    !bazeliskPkgInstallStdout.includes(`@bazel/bazelisk@${bazeliskVersion}`) ||
-    !isBazelBinAlreadyAvailable
-  ) {
+  if (!isBazeliskPkgInstalled || !isBazelBinAlreadyAvailable) {
     log.info(`[bazel_tools] installing Bazel tools`);
 
     log.debug(
       `[bazel_tools] bazelisk is not installed. Installing @bazel/bazelisk@${bazeliskVersion} and bazel@${bazelVersion}`
     );
-    await spawn('yarn', ['global', 'add', `@bazel/bazelisk@${bazeliskVersion}`], {
+    await spawn('npm', ['install', '--global', `@bazel/bazelisk@${bazeliskVersion}`], {
       env: {
         USE_BAZEL_VERSION: bazelVersion,
       },
@@ -69,7 +83,7 @@ export async function installBazelTools(repoRootPath: string) {
     const isBazelBinAvailableAfterInstall = await isBazelBinAvailable();
     if (!isBazelBinAvailableAfterInstall) {
       throw new Error(dedent`
-        [bazel_tools] an error occurred when installing the Bazel tools. Please make sure 'yarn global bin' is on your $PATH, otherwise just add it there
+        [bazel_tools] an error occurred when installing the Bazel tools. Please make sure you have access to npm globally installed modules on your $PATH
       `);
     }
   }

diff --git a/src/dev/ci_setup/setup_env.sh b/src/dev/ci_setup/setup_env.sh
@@ -119,10 +119,6 @@ yarn config set yarn-offline-mirror "$cacheDir/yarn-offline-cache"
 ###
 yarnGlobalDir="$(yarn global bin)"
 export PATH="$PATH:$yarnGlobalDir"
-# In some situations looks lik the yarn binaries added through
-# yarn global add will not be placed on yarn global bin
-# but on $HOME/.yarn/bin. I'm also adding it into the PATH
-export PATH="$PATH:$HOME/.yarn/bin"
 
 # use a proxy to fetch chromedriver/geckodriver asset
 export GECKODRIVER_CDNURL="https://us-central1-elastic-kibana-184716.cloudfunctions.net/kibana-ci-proxy-cache"