Compare commits

..

25 Commits

Author SHA1 Message Date
Volodymyr Zotov
2a576880a1 Use alpha 5 version 2025-07-31 13:47:06 -05:00
Volodymyr Zotov
18a55c6803 Use alpha 4 version 2025-07-31 13:23:40 -05:00
Volodymyr Zotov
b19207bf93 Use alpha 3 version 2025-07-31 13:14:35 -05:00
Volodymyr Zotov
b9c01e3e92 Use alpha 2 version 2025-07-31 13:06:24 -05:00
Volodymyr Zotov
e991f39528 Re-build 2025-07-31 12:45:36 -05:00
Volodymyr Zotov
986101e2bf Remove type module from package.json 2025-07-31 12:43:03 -05:00
Volodymyr Zotov
1cdbe7be4c Use install-cli-action from other op-js@v0.1.14-alpha.1 2025-07-31 12:39:46 -05:00
Volodymyr Zotov
dfb0f006ee Import install-cli-action from op-js 2025-07-31 12:24:30 -05:00
Volodymyr Zotov
a10e284f10 Use install-cli-action from other branch 2025-07-31 12:01:35 -05:00
Volodymyr Zotov
54f4c31d4e Update build 2025-07-30 14:57:42 -05:00
Volodymyr Zotov
44eaa0c9eb Revert .gitignore and tsconfig.json 2025-07-30 14:45:02 -05:00
Volodymyr Zotov
6758e26159 Add more tests to check that action works correctly with provided stable or beta version 2025-07-30 14:45:01 -05:00
Volodymyr Zotov
5184a22826 Fix lint errors 2025-07-30 12:56:39 -05:00
Volodymyr Zotov
773e006869 Use core lib to set env vars 2025-07-30 12:54:29 -05:00
Volodymyr Zotov
a241f7e820 Get inputs using core library 2025-07-30 12:53:17 -05:00
Volodymyr Zotov
32f94abf82 Write to GITHUB_ENV manually 2025-07-30 12:49:44 -05:00
Volodymyr Zotov
9de113048d Re-write configure action in JS 2025-07-30 12:43:16 -05:00
Volodymyr Zotov
4923638555 Temporary point to the current branch to enable job to run on Windows 2025-07-30 11:09:03 -05:00
Volodymyr Zotov
2195738903 Trigger workflow for updated matrix 2025-07-30 11:06:10 -05:00
Volodymyr Zotov
f8405764b3 Run tests on Windows platform 2025-07-30 11:00:45 -05:00
Volodymyr Zotov
6b6b0dc705 Update export jest.config as package now of type commonjs instead of module 2025-07-30 10:59:07 -05:00
Volodymyr Zotov
29819e3c8f Fix lint 2025-07-30 10:59:06 -05:00
Volodymyr Zotov
7e497dcd83 Make module commonjs 2025-07-30 10:59:06 -05:00
Volodymyr Zotov
aa7dbab2b7 Remove package.json
As ncc uses commonjs bundle type and we import `install-cli-action` which is also commonjs, we should not set `type: module` in the package.json so it doesn't break the load-secrets-action bundle. Therefore, we can safely remove it at all.

Revert package.json
2025-07-30 10:59:06 -05:00
Volodymyr Zotov
80da714262 Use install-cli-action to enable windows support 2025-07-30 10:59:06 -05:00
14 changed files with 1766 additions and 3794 deletions

View File

@@ -15,7 +15,7 @@ on:
export-env:
required: true
type: boolean
cli-version:
version:
required: false
type: string
default: "latest"
@@ -90,12 +90,14 @@ jobs:
id: load_secrets
uses: ./ # 1password/load-secrets-action@<version>
with:
cli-version: ${{ inputs.cli-version }}
version: ${{ inputs.version }}
export-env: ${{ inputs.export-env }}
env:
SECRET: ${{ inputs.secret }}
SECRET_IN_SECTION: ${{ inputs.secret-in-section }}
MULTILINE_SECRET: ${{ inputs.multiline-secret }}
- name: Verify installed op cli version
run: ./tests/assert-cli-version.sh ${{ inputs.version }}
- name: Assert test secret values [step output]
if: ${{ !inputs.export-env }}
env:

View File

@@ -22,13 +22,13 @@ jobs:
github.event_name == 'pull_request' &&
github.event.pull_request.head.repo.full_name == github.repository
)
uses: 1password/load-secrets-action/.github/workflows/acceptance-test.yml@vzt/rename-version-input # TODO: temporary point to this branch so tests can run with update input
uses: 1password/load-secrets-action/.github/workflows/acceptance-test.yml@vzt/windows-support2 #TODO: after merge, this to main, revert to consume yml file from main (delete '@vzt/windows-support2')
secrets: inherit
strategy:
matrix:
os: [ubuntu-latest, macos-latest, windows-latest]
cli-version: [latest, latest-beta, 2.30.0, 2.30.0-beta.03]
auth: [connect, service-account]
os: [ ubuntu-latest, macos-latest, windows-latest ]
version: [ latest, latest-beta, 2.30.0, 2.30.0-beta.03 ]
auth: [ connect, service-account ]
exclude:
- os: macos-latest
auth: connect
@@ -36,7 +36,7 @@ jobs:
auth: connect
with:
os: ${{ matrix.os }}
cli-version: ${{ matrix.cli-version }}
version: ${{ matrix.version }}
auth: ${{ matrix.auth }}
secret: op://acceptance-tests/test-secret/password
secret-in-section: op://acceptance-tests/test-secret/test-section/password
@@ -50,13 +50,13 @@ jobs:
github.event_name == 'pull_request' &&
github.event.pull_request.head.repo.full_name == github.repository
)
uses: 1password/load-secrets-action/.github/workflows/acceptance-test.yml@vzt/rename-version-input # TODO: temporary point to this branch so tests can run with update input
uses: 1password/load-secrets-action/.github/workflows/acceptance-test.yml@vzt/windows-support2 #TODO: after merge, this to main, revert to consume yml file from main (delete '@vzt/windows-support2')
secrets: inherit
strategy:
matrix:
os: [ubuntu-latest, macos-latest, windows-latest]
cli-version: [latest, latest-beta, 2.30.0, 2.30.0-beta.03]
auth: [connect, service-account]
os: [ ubuntu-latest, macos-latest, windows-latest ]
version: [ latest, latest-beta, 2.30.0, 2.30.0-beta.03 ]
auth: [ connect, service-account ]
exclude:
- os: macos-latest
auth: connect
@@ -64,7 +64,7 @@ jobs:
auth: connect
with:
os: ${{ matrix.os }}
cli-version: ${{ matrix.cli-version }}
version: ${{ matrix.version }}
auth: ${{ matrix.auth }}
secret: op://acceptance-tests/test-secret/password
secret-in-section: op://acceptance-tests/test-secret/test-section/password
@@ -78,13 +78,13 @@ jobs:
github.event_name == 'pull_request' &&
github.event.pull_request.head.repo.full_name == github.repository
)
uses: 1password/load-secrets-action/.github/workflows/acceptance-test.yml@vzt/rename-version-input # TODO: temporary point to this branch so tests can run with update input
uses: 1password/load-secrets-action/.github/workflows/acceptance-test.yml@vzt/windows-support2 #TODO: after merge, this to main, revert to consume yml file from main (delete '@vzt/windows-support2')
secrets: inherit
strategy:
matrix:
os: [ubuntu-latest, macos-latest, windows-latest]
cli-version: [latest, latest-beta, 2.30.0, 2.30.0-beta.03]
auth: [connect, service-account]
os: [ ubuntu-latest, macos-latest, windows-latest ]
version: [ latest, latest-beta, 2.30.0, 2.30.0-beta.03 ]
auth: [ connect, service-account ]
exclude:
- os: macos-latest
auth: connect
@@ -92,7 +92,7 @@ jobs:
auth: connect
with:
os: ${{ matrix.os }}
cli-version: ${{ matrix.cli-version }}
version: ${{ matrix.version }}
auth: ${{ matrix.auth }}
secret: op://v5pz6venw4roosmkzdq2nhpv6u/hrgkzhrlvscomepxlgafb2m3ca/password
secret-in-section: op://v5pz6venw4roosmkzdq2nhpv6u/hrgkzhrlvscomepxlgafb2m3ca/Section_tco6nsqycj6jcbyx63h5isxcny/doxu3mhkozcznnk5vjrkpdqayy

View File

@@ -23,40 +23,16 @@ Read more on the [1Password Developer Portal](https://developer.1password.com/do
## ✨ Quickstart
### Export secrets as a step's output (recommended)
```yml
on: push
jobs:
hello-world:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
- uses: actions/checkout@v3
- name: Load secret
id: load_secret
uses: 1password/load-secrets-action@v3
env:
OP_SERVICE_ACCOUNT_TOKEN: ${{ secrets.OP_SERVICE_ACCOUNT_TOKEN }}
SECRET: op://app-cicd/hello-world/secret
- name: Print masked secret
run: 'echo "Secret: ${{ steps.load_secrets.outputs.SECRET }}"'
# Prints: Secret: ***
```
### Export secrets as env variables
```yml
on: push
jobs:
hello-world:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
- name: Load secret
uses: 1password/load-secrets-action@v3
uses: 1password/load-secrets-action@v2
with:
# Export loaded secrets as environment variables
export-env: true

View File

@@ -5,15 +5,15 @@ branding:
icon: lock
color: blue
inputs:
version:
description: Version of the 1Password CLI to install
default: latest
unset-previous:
description: Whether to unset environment variables populated by 1Password in earlier job steps
default: "false"
export-env:
description: Export the secrets as environment variables
default: "false"
cli-version:
description: Specify which 1Password CLI version to install. Defaults to "latest".
default: "latest"
default: "true"
runs:
using: "node20"
main: "dist/index.js"

View File

@@ -25,4 +25,4 @@ const jestConfig = {
verbose: true,
};
export default jestConfig;
module.exports = jestConfig;

File diff suppressed because one or more lines are too long

View File

@@ -1,3 +0,0 @@
{
"type": "commonjs"
}

4426
dist/index.js vendored

File diff suppressed because one or more lines are too long

3
dist/package.json vendored
View File

@@ -1,3 +0,0 @@
{
"type": "commonjs"
}

46
install_cli.sh Executable file
View File

@@ -0,0 +1,46 @@
#!/bin/bash
set -e
# Install op-cli
install_op_cli() {
# Create a temporary directory where the CLI is installed
OP_INSTALL_DIR="$(mktemp -d)"
if [[ ! -d "$OP_INSTALL_DIR" ]]; then
echo "Install dir $OP_INSTALL_DIR not found"
exit 1
fi
echo "::debug::OP_INSTALL_DIR: ${OP_INSTALL_DIR}"
# Get the latest stable version of the CLI
CLI_VERSION="v$(curl https://app-updates.agilebits.com/check/1/0/CLI2/en/2.0.0/N -s | grep -Eo '[0-9]+\.[0-9]+\.[0-9]+')"
if [[ "$OSTYPE" == "linux-gnu"* ]]; then
# Get runner's architecture
ARCH=$(uname -m)
if [[ "$(getconf LONG_BIT)" = 32 ]]; then
ARCH="386"
elif [[ "$ARCH" == "x86_64" ]]; then
ARCH="amd64"
elif [[ "$ARCH" == "aarch64" ]]; then
ARCH="arm64"
fi
if [[ "$ARCH" != "386" ]] && [[ "$ARCH" != "amd64" ]] && [[ "$ARCH" != "arm" ]] && [[ "$ARCH" != "arm64" ]]; then
echo "Unsupported architecture for the 1Password CLI: $ARCH."
exit 1
fi
curl -sSfLo op.zip "https://cache.agilebits.com/dist/1P/op2/pkg/${CLI_VERSION}/op_linux_${ARCH}_${CLI_VERSION}.zip"
unzip -od "$OP_INSTALL_DIR" op.zip && rm op.zip
elif [[ "$OSTYPE" == "darwin"* ]]; then
curl -sSfLo op.pkg "https://cache.agilebits.com/dist/1P/op2/pkg/${CLI_VERSION}/op_apple_universal_${CLI_VERSION}.pkg"
pkgutil --expand op.pkg temp-pkg
tar -xvf temp-pkg/op.pkg/Payload -C "$OP_INSTALL_DIR"
rm -rf temp-pkg && rm op.pkg
else
echo "Operating system not supported yet for this GitHub Action: $OSTYPE."
exit 1
fi
}
install_op_cli

90
package-lock.json generated
View File

@@ -9,10 +9,10 @@
"version": "2.0.0",
"license": "MIT",
"dependencies": {
"@1password/op-js": "^0.1.11",
"@actions/core": "^1.10.1",
"@1password/op-js": "^0.1.14-alpha.5",
"@actions/core": "^1.11.1",
"@actions/exec": "^1.1.1",
"op-cli-installer": "github:1Password/op-cli-installer#e6c1c758bc3339e5fe9b06255728039f688f73fa"
"@actions/tool-cache": "^2.0.2"
},
"devDependencies": {
"@1password/eslint-config": "^4.3.1",
@@ -27,6 +27,38 @@
"typescript": "^5.4.2"
}
},
"../op-js": {
"name": "@1password/op-js",
"version": "0.1.14-alpha.1",
"extraneous": true,
"license": "MIT",
"dependencies": {
"@actions/core": "^1.11.1",
"@actions/tool-cache": "^2.0.2",
"lookpath": "^1.2.2",
"semver": "^7.6.2"
},
"devDependencies": {
"@1password/eslint-config": "^4.3.0",
"@1password/prettier-config": "^1.1.3",
"@types/jest": "^29.5.12",
"@types/node": "^20.12.12",
"@types/semver": "^7.5.8",
"@typescript-eslint/eslint-plugin": "^7.9.0",
"esbuild": "^0.21.2",
"eslint": "^8.57.0",
"husky": "^9.0.11",
"jest": "^29.7.0",
"jest-environment-jsdom": "^29.6.2",
"joi": "^17.13.1",
"license-checker-rseidelsohn": "^4.3.0",
"lint-staged": "^15.2.2",
"prettier": "^3.2.5",
"prettier-plugin-organize-imports": "^3.2.4",
"ts-jest": "^29.1.2",
"typescript": "5.4.5"
}
},
"node_modules/@1password/eslint-config": {
"version": "4.3.1",
"resolved": "https://registry.npmjs.org/@1password/eslint-config/-/eslint-config-4.3.1.tgz",
@@ -52,11 +84,12 @@
}
},
"node_modules/@1password/op-js": {
"version": "0.1.13",
"resolved": "https://registry.npmjs.org/@1password/op-js/-/op-js-0.1.13.tgz",
"integrity": "sha512-ZZBLxVqywFdvIbLv2xWw2N1ImSi183rRKf90vV19KRMReNyLwuD0dv6IrKrIdrJU33IuV3Gz85Z4K2a1PJTBDg==",
"license": "MIT",
"version": "0.1.14-alpha.5",
"resolved": "https://registry.npmjs.org/@1password/op-js/-/op-js-0.1.14-alpha.5.tgz",
"integrity": "sha512-G+psqF+8CEGAfUzHIk1Y8m6F8y6UAyyYk2pT8078hmvoKDmpEUZXCvA2X0QrVfZhTllvRPuKVI+GbCgy8l74Yw==",
"dependencies": {
"@actions/core": "^1.11.1",
"@actions/tool-cache": "^2.0.2",
"lookpath": "^1.2.2",
"semver": "^7.6.2"
}
@@ -1662,11 +1695,10 @@
}
},
"node_modules/acorn": {
"version": "8.14.0",
"resolved": "https://registry.npmjs.org/acorn/-/acorn-8.14.0.tgz",
"integrity": "sha512-cl669nCJTZBsL97OF4kUQm5g5hC2uihk0NxY3WENAC0TYdILVkAyHymAntgxGkl7K+t0cXIrH5siy5S4XkFycA==",
"version": "8.15.0",
"resolved": "https://registry.npmjs.org/acorn/-/acorn-8.15.0.tgz",
"integrity": "sha512-NZyJarBfL7nWwIq+FDL6Zp/yHEhePMNnnJ0y3qfieCrmNvYct8uvtiV41UvlSe6apAfk0fY1FbWx+NwfmpvtTg==",
"dev": true,
"license": "MIT",
"peer": true,
"bin": {
"acorn": "bin/acorn"
@@ -6051,10 +6083,9 @@
}
},
"node_modules/lookpath": {
"version": "1.2.2",
"resolved": "https://registry.npmjs.org/lookpath/-/lookpath-1.2.2.tgz",
"integrity": "sha512-k2Gmn8iV6qdME3ztZC2spubmQISimFOPLuQKiPaLcVdRz0IpdxrNClVepMlyTJlhodm/zG/VfbkWERm3kUIh+Q==",
"license": "MIT",
"version": "1.2.3",
"resolved": "https://registry.npmjs.org/lookpath/-/lookpath-1.2.3.tgz",
"integrity": "sha512-kthRVhf4kH4+HW3anM4UBHxsw/XFESf13euCEldhXr6GpBdmBoa7rDd7WO5G0Mhd4G5XtKTcEy8OR0iRZXpS3Q==",
"bin": {
"lookpath": "bin/lookpath.js"
},
@@ -6386,28 +6417,6 @@
"url": "https://github.com/sponsors/sindresorhus"
}
},
"node_modules/op-cli-installer": {
"version": "1.0.0",
"resolved": "git+ssh://git@github.com/1Password/op-cli-installer.git#e6c1c758bc3339e5fe9b06255728039f688f73fa",
"integrity": "sha512-ueyYQAgtbIHP2QWx9iCiztoPov01GdxPZNZ4+Qg3IaAyC4khMIk4/vYPagRhRKta+HI6fWV6jO3/ajBj27KBZA==",
"license": "MIT",
"dependencies": {
"@actions/core": "^1.11.1",
"@actions/tool-cache": "^2.0.2",
"semver": "^7.7.2"
}
},
"node_modules/op-cli-installer/node_modules/semver": {
"version": "7.7.2",
"resolved": "https://registry.npmjs.org/semver/-/semver-7.7.2.tgz",
"integrity": "sha512-RF0Fw+rO5AMf9MAyaRXI4AV0Ulj5lMHqVxxdSgiVbixSCXoEmmX/jk0CuJw4+3SqroYO9VoUh+HcuJivvtJemA==",
"bin": {
"semver": "bin/semver.js"
},
"engines": {
"node": ">=10"
}
},
"node_modules/optionator": {
"version": "0.9.4",
"resolved": "https://registry.npmjs.org/optionator/-/optionator-0.9.4.tgz",
@@ -7032,10 +7041,9 @@
}
},
"node_modules/semver": {
"version": "7.6.3",
"resolved": "https://registry.npmjs.org/semver/-/semver-7.6.3.tgz",
"integrity": "sha512-oVekP1cKtI+CTDvHWYFUcMtsK/00wmAEfyqKfNdARm8u1wNVhSgaX7A8d4UuIlUI5e84iEwOhs7ZPYRmzU9U6A==",
"license": "ISC",
"version": "7.7.2",
"resolved": "https://registry.npmjs.org/semver/-/semver-7.7.2.tgz",
"integrity": "sha512-RF0Fw+rO5AMf9MAyaRXI4AV0Ulj5lMHqVxxdSgiVbixSCXoEmmX/jk0CuJw4+3SqroYO9VoUh+HcuJivvtJemA==",
"bin": {
"semver": "bin/semver.js"
},

View File

@@ -9,7 +9,6 @@
"scripts": {
"build": "ncc build ./src/index.ts",
"build:configure": "ncc build ./configure/index.js -o ./configure/dist",
"build:all": "npm run build && npm run build:configure",
"format": "prettier --ignore-path ./config/.prettierignore",
"format:check": "npm run format -- --check ./",
"format:write": "npm run format -- --write ./",
@@ -40,10 +39,10 @@
},
"homepage": "https://github.com/1Password/load-secrets-action#readme",
"dependencies": {
"@1password/op-js": "^0.1.11",
"@actions/core": "^1.10.1",
"@1password/op-js": "^0.1.14-alpha.5",
"@actions/core": "^1.11.1",
"@actions/exec": "^1.1.1",
"op-cli-installer": "github:1Password/op-cli-installer#e6c1c758bc3339e5fe9b06255728039f688f73fa"
"@actions/tool-cache": "^2.0.2"
},
"devDependencies": {
"@1password/eslint-config": "^4.3.1",

View File

@@ -1,6 +1,5 @@
import * as core from "@actions/core";
import { validateCli } from "@1password/op-js";
import { installCliOnGithubActionRunner } from "op-cli-installer";
import { validateCli, installCliOnGithubRunner } from "@1password/op-js";
import { loadSecrets, unsetPrevious, validateAuth } from "./utils";
const loadSecretsAction = async () => {
@@ -44,9 +43,7 @@ const installCLI = async (): Promise<void> => {
// 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 () => {
// defaults to `latest` if not provided
const cliVersion = core.getInput("cli-version");
await installCliOnGithubActionRunner(cliVersion);
await installCliOnGithubRunner();
});
};

30
tests/assert-cli-version.sh Executable file
View File

@@ -0,0 +1,30 @@
#!/bin/bash
set -e
OP_CLI_VERSION="$1"
CLI_URL="https://app-updates.agilebits.com/product_history/CLI2"
get_latest_cli_version() {
conditional_path="/beta/"
if [ "$1" == "non_beta" ]; then
conditional_path="!/beta/"
fi
# This long command parses the HTML page at "CLI_URL" and finds the latest CLI version
# based on the release channel we're looking for (stable or beta).
#
# The ideal call (i.e. 'curl https://app-updates.agilebits.com/check/1/0/CLI2/en/2.0.0/Y -s | jq -r .version')
# doesn't retrieve the latest CLI version on a channel basis.
# If the latest release is stable and we want the latest beta, this command will return the stable still.
OP_CLI_VERSION="$(curl -s $CLI_URL | awk -v RS='<h3>|</h3>' 'NR % 2 == 0 {gsub(/[[:blank:]]+/, ""); gsub(/<span[^>]*>|<\/span>|[\r\n]+/, ""); gsub(/&nbsp;.*$/, ""); if (!'"$1"' && '"$conditional_path"'){print; '"$1"'=1;}}')"
}
if [ "$OP_CLI_VERSION" == "latest" ]; then
get_latest_cli_version non_beta
elif [ "$OP_CLI_VERSION" == "latest-beta" ]; then
get_latest_cli_version beta
fi
if [ "$(op --version)" != "$OP_CLI_VERSION" ]; then
echo -e "Expected CLI version to be:\n$OP_CLI_VERSION\nBut got:\n$(op --version)"
exit 1
fi