diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index c5b5f5c..695d547 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -15,11 +15,13 @@ jobs: - name: Configure 1Password Connect uses: ./configure # 1password/load-secrets-action/configure@ with: - connect-host: http://localhost:8080 + connect-host: localhost:8080 connect-token: ${{ secrets.OP_CONNECT_TOKEN }} - name: Load secrets id: load_secrets uses: ./ # 1password/load-secrets-action@ + with: + export-env: false env: SECRET: op://acceptance-tests/test-secret/password SECRET_IN_SECTION: op://acceptance-tests/test-secret/test-section/password @@ -48,8 +50,6 @@ jobs: - name: Load secrets id: load_secrets uses: ./ # 1password/load-secrets-action@ - with: - export-env: true env: SECRET: op://acceptance-tests/test-secret/password SECRET_IN_SECTION: op://acceptance-tests/test-secret/test-section/password @@ -80,6 +80,8 @@ jobs: - name: Load secrets id: load_secrets uses: ./ # 1password/load-secrets-action@ + with: + export-env: false env: SECRET: op://v5pz6venw4roosmkzdq2nhpv6u/hrgkzhrlvscomepxlgafb2m3ca/password SECRET_IN_SECTION: op://v5pz6venw4roosmkzdq2nhpv6u/hrgkzhrlvscomepxlgafb2m3ca/Section_tco6nsqycj6jcbyx63h5isxcny/doxu3mhkozcznnk5vjrkpdqayy @@ -97,6 +99,8 @@ jobs: - name: Load secrets id: load_secrets uses: ./ # 1password/load-secrets-action@ + with: + export-env: false env: OP_SERVICE_ACCOUNT_TOKEN: ${{ secrets.OP_SERVICE_ACCOUNT_TOKEN }} SECRET: op://acceptance-tests/test-secret/password @@ -115,8 +119,6 @@ jobs: - name: Load secrets id: load_secrets uses: ./ # 1password/load-secrets-action@ - with: - export-env: true env: OP_SERVICE_ACCOUNT_TOKEN: ${{ secrets.OP_SERVICE_ACCOUNT_TOKEN }} SECRET: op://acceptance-tests/test-secret/password @@ -131,6 +133,8 @@ jobs: - name: Load secrets id: load_secrets uses: ./ # 1password/load-secrets-action@ + with: + export-env: false env: OP_SERVICE_ACCOUNT_TOKEN: ${{ secrets.OP_SERVICE_ACCOUNT_TOKEN }} SECRET: op://v5pz6venw4roosmkzdq2nhpv6u/hrgkzhrlvscomepxlgafb2m3ca/password @@ -149,6 +153,8 @@ jobs: - name: Load secrets id: load_secrets uses: ./ # 1password/load-secrets-action@ + with: + export-env: false env: OP_SERVICE_ACCOUNT_TOKEN: ${{ secrets.OP_SERVICE_ACCOUNT_TOKEN }} SECRET: op://acceptance-tests/test-secret/password diff --git a/README.md b/README.md index f4a6827..82d588d 100644 --- a/README.md +++ b/README.md @@ -43,6 +43,8 @@ jobs: - name: Load secret id: op-load-secret uses: 1password/load-secrets-action@v1 + with: + export-env: false env: OP_CONNECT_HOST: OP_CONNECT_TOKEN: ${{ secrets.OP_CONNECT_TOKEN }} @@ -77,6 +79,8 @@ jobs: - name: Load Docker credentials id: load-docker-credentials uses: 1password/load-secrets-action@v1 + with: + export-env: false env: OP_CONNECT_TOKEN: ${{ secrets.OP_CONNECT_TOKEN }} DOCKERHUB_USERNAME: op://app-cicd/docker/username @@ -194,7 +198,7 @@ jobs: | Name | Default | Description | | ---------------- | ------- | ---------------------------------------------------------------------------------- | -| `export-env` | `false` | Export the loaded secrets as environment variables | +| `export-env` | `true` | Export the loaded secrets as environment variables | | `unset-previous` | `false` | Whether to unset environment variables populated by 1Password in earlier job steps | ## Secrets Reference Syntax diff --git a/action.yml b/action.yml index 0736f03..289571d 100644 --- a/action.yml +++ b/action.yml @@ -10,7 +10,7 @@ inputs: default: false export-env: description: Export the secrets as environment variables - default: false + default: true runs: using: 'node16' main: 'dist/index.js' diff --git a/entrypoint.sh b/entrypoint.sh index b3a346a..c391300 100755 --- a/entrypoint.sh +++ b/entrypoint.sh @@ -14,6 +14,10 @@ auth_type=$CONNECT managed_variables_var="OP_MANAGED_VARIABLES" IFS=',' +if [[ "$OP_CONNECT_HOST" != "http://"* ]] && [[ "$OP_CONNECT_HOST" != "https://"* ]]; then + export OP_CONNECT_HOST="http://"$OP_CONNECT_HOST +fi + # Unset all secrets managed by 1Password if `unset-previous` is set. unset_prev_secrets() { if [ "$INPUT_UNSET_PREVIOUS" == "true" ]; then