Revert to install CLI script

Author: volodymyrZotov

.github/workflows/acceptance-test.yml

@@ -90,7 +90,7 @@ jobs:
         if: ${{ inputs.export-env }}
         uses: ./ # 1password/load-secrets-action@<version>
         with:
-          unset-previous: "true"
+          unset-previous: true
       - name: Assert removed secrets [exported env]
         if: ${{ inputs.export-env }}
         run: ./tests/assert-env-unset.sh

action.yml

@@ -14,14 +14,17 @@ inputs:
   export-env:
     description: Export the secrets as environment variables
     default: "true"
+#runs:
+#  using: "composite"
+#  steps:
+#    - name: Install 1Password CLI
+#      uses: 1password/install-cli-action@main # change to v2 as soon as install-cli-action@v2 released
+#      with:
+#        version: ${{ inputs.version }}
+#
+#    - name: Load secrets
+#      shell: bash
+#      run: node dist/index.js
 runs:
-  using: "composite"
-  steps:
-    - name: Install 1Password CLI
-      uses: 1password/install-cli-action@main # change to v2 as soon as install-cli-action@v2 released
-      with:
-        version: ${{ inputs.version }}
-
-    - name: Load secrets
-      shell: bash
-      run: node dist/index.js
+  using: "node20"
+  main: "dist/index.js"

dist/index.js

@@ -29227,13 +29227,48 @@ module.exports = /*#__PURE__*/JSON.parse('{"name":"@1password/op-js","version":"
 /******/ }
 /******/ 
 /************************************************************************/
+/******/ /* webpack/runtime/compat get default export */
+/******/ (() => {
+/******/ 	// getDefaultExport function for compatibility with non-harmony modules
+/******/ 	__nccwpck_require__.n = (module) => {
+/******/ 		var getter = module && module.__esModule ?
+/******/ 			() => (module['default']) :
+/******/ 			() => (module);
+/******/ 		__nccwpck_require__.d(getter, { a: getter });
+/******/ 		return getter;
+/******/ 	};
+/******/ })();
+/******/ 
+/******/ /* webpack/runtime/define property getters */
+/******/ (() => {
+/******/ 	// define getter functions for harmony exports
+/******/ 	__nccwpck_require__.d = (exports, definition) => {
+/******/ 		for(var key in definition) {
+/******/ 			if(__nccwpck_require__.o(definition, key) && !__nccwpck_require__.o(exports, key)) {
+/******/ 				Object.defineProperty(exports, key, { enumerable: true, get: definition[key] });
+/******/ 			}
+/******/ 		}
+/******/ 	};
+/******/ })();
+/******/ 
+/******/ /* webpack/runtime/hasOwnProperty shorthand */
+/******/ (() => {
+/******/ 	__nccwpck_require__.o = (obj, prop) => (Object.prototype.hasOwnProperty.call(obj, prop))
+/******/ })();
+/******/ 
 /******/ /* webpack/runtime/compat */
 /******/ 
 /******/ if (typeof __nccwpck_require__ !== 'undefined') __nccwpck_require__.ab = new URL('.', import.meta.url).pathname.slice(import.meta.url.match(/^file:\/\/\/\w:/) ? 1 : 0, -1) + "/";
 /******/ 
 /************************************************************************/
 var __webpack_exports__ = {};
 
+// EXTERNAL MODULE: external "path"
+var external_path_ = __nccwpck_require__(6928);
+var external_path_default = /*#__PURE__*/__nccwpck_require__.n(external_path_);
+// EXTERNAL MODULE: external "url"
+var external_url_ = __nccwpck_require__(7016);
+var external_url_default = /*#__PURE__*/__nccwpck_require__.n(external_url_);
 // EXTERNAL MODULE: ./node_modules/@actions/core/lib/core.js
 var core = __nccwpck_require__(7484);
 // EXTERNAL MODULE: ./node_modules/@actions/exec/lib/exec.js
@@ -29321,6 +29356,10 @@ const unsetPrevious = () => {
 ;// CONCATENATED MODULE: ./src/index.ts
 
 
+
+
+
+
 const loadSecretsAction = async () => {
     try {
         // Get action inputs
@@ -29332,6 +29371,8 @@ const loadSecretsAction = async () => {
         }
         // Validate that a proper authentication configuration is set for the CLI
         validateAuth();
+        // Download and install the CLI
+        await installCLI();
         // Load secrets
         await loadSecrets(shouldExportEnv);
     }
@@ -29349,5 +29390,26 @@ const loadSecretsAction = async () => {
         core.setFailed(message);
     }
 };
+// This function's name is an exception from the naming convention
+// since we refer to the 1Password CLI here.
+// eslint-disable-next-line @typescript-eslint/naming-convention
+const installCLI = async () => {
+    // validateCli checks if there's an existing 1Password CLI installed on the runner.
+    // If there's no CLI installed, then validateCli will throw an error, which we will use
+    // as an indicator that we need to execute the installation script.
+    await (0,dist.validateCli)().catch(async () => {
+        const currentFile = external_url_default().fileURLToPath(import.meta.url);
+        const currentDir = external_path_default().dirname(currentFile);
+        const parentDir = external_path_default().resolve(currentDir, "..");
+        // Execute bash script
+        const cmdOut = await exec.getExecOutput(`sh -c "` + parentDir + `/install_cli.sh"`);
+        // Add path to 1Password CLI to $PATH
+        const outArr = cmdOut.stdout.split("\n");
+        if (outArr[0] && process.env.PATH) {
+            const cliPath = outArr[0]?.replace(/^(::debug::OP_INSTALL_DIR: )/, "");
+            core.addPath(cliPath);
+        }
+    });
+};
 void loadSecretsAction();
 

src/index.ts

@@ -1,4 +1,8 @@
+import path from "path";
+import url from "url";
 import * as core from "@actions/core";
+import * as exec from "@actions/exec";
+import { validateCli } from "@1password/op-js";
 import { loadSecrets, unsetPrevious, validateAuth } from "./utils";
 
 const loadSecretsAction = async () => {
@@ -15,6 +19,9 @@ const loadSecretsAction = async () => {
 		// Validate that a proper authentication configuration is set for the CLI
 		validateAuth();
 
+		// Download and install the CLI
+		await installCLI();
+
 		// Load secrets
 		await loadSecrets(shouldExportEnv);
 	} catch (error) {
@@ -31,4 +38,30 @@ const loadSecretsAction = async () => {
 	}
 };
 
+// This function's name is an exception from the naming convention
+// since we refer to the 1Password CLI here.
+// eslint-disable-next-line @typescript-eslint/naming-convention
+const installCLI = async (): Promise<void> => {
+	// validateCli checks if there's an existing 1Password CLI installed on the runner.
+	// If there's no CLI installed, then validateCli will throw an error, which we will use
+	// as an indicator that we need to execute the installation script.
+	await validateCli().catch(async () => {
+		const currentFile = url.fileURLToPath(import.meta.url);
+		const currentDir = path.dirname(currentFile);
+		const parentDir = path.resolve(currentDir, "..");
+
+		// Execute bash script
+		const cmdOut = await exec.getExecOutput(
+			`sh -c "` + parentDir + `/install_cli.sh"`,
+		);
+
+		// Add path to 1Password CLI to $PATH
+		const outArr = cmdOut.stdout.split("\n");
+		if (outArr[0] && process.env.PATH) {
+			const cliPath = outArr[0]?.replace(/^(::debug::OP_INSTALL_DIR: )/, "");
+			core.addPath(cliPath);
+		}
+	});
+};
+
 void loadSecretsAction();