diff --git a/.github/workflows/e2e-tests.yml b/.github/workflows/e2e-tests.yml index 07e597a..f0fec24 100644 --- a/.github/workflows/e2e-tests.yml +++ b/.github/workflows/e2e-tests.yml @@ -64,6 +64,8 @@ jobs: echo "FILE_TEST_SSH_KEY=op://${{ secrets.VAULT }}/test-ssh-key/private key" >> tests/.env.tpl echo "FILE_TEST_SSH_KEY_OPENSSH=op://${{ secrets.VAULT }}/test-ssh-key/private key?ssh-format=openssh" >> tests/.env.tpl echo "FILE_SSH_KEY_DATE=op://${{ secrets.VAULT }}/test-ssh-key/test-section/date" >> tests/.env.tpl + echo "FILE_TEST_CREDENTIALS=op://${{ secrets.VAULT }}/test-credentials/credential" >> tests/.env.tpl + echo "FILE_TEST_CREDENTIALS_NOTES=op://${{ secrets.VAULT }}/test-credentials/notes" >> tests/.env.tpl - name: Configure Service account uses: ./configure @@ -84,6 +86,8 @@ jobs: TEST_SSH_KEY: op://${{ secrets.VAULT }}/test-ssh-key/private key TEST_SSH_KEY_OPENSSH: "op://${{ secrets.VAULT }}/test-ssh-key/private key?ssh-format=openssh" SSH_KEY_DATE: op://${{ secrets.VAULT }}/test-ssh-key/test-section/date + TEST_CREDENTIALS: op://${{ secrets.VAULT }}/test-credentials/credential + TEST_CREDENTIALS_NOTES: op://${{ secrets.VAULT }}/test-credentials/notes OP_ENV_FILE: ./tests/.env.tpl - name: Assert test secret values [step output] @@ -105,6 +109,10 @@ jobs: FILE_TEST_SSH_KEY_OPENSSH: ${{ steps.load_secrets.outputs.FILE_TEST_SSH_KEY_OPENSSH }} SSH_KEY_DATE: ${{ steps.load_secrets.outputs.SSH_KEY_DATE }} FILE_SSH_KEY_DATE: ${{ steps.load_secrets.outputs.FILE_SSH_KEY_DATE }} + TEST_CREDENTIALS: ${{ steps.load_secrets.outputs.TEST_CREDENTIALS }} + FILE_TEST_CREDENTIALS: ${{ steps.load_secrets.outputs.FILE_TEST_CREDENTIALS }} + TEST_CREDENTIALS_NOTES: ${{ steps.load_secrets.outputs.TEST_CREDENTIALS_NOTES }} + FILE_TEST_CREDENTIALS_NOTES: ${{ steps.load_secrets.outputs.FILE_TEST_CREDENTIALS_NOTES }} run: ./tests/assert-env-set.sh - name: Assert SSH key env vars [step output] @@ -178,6 +186,8 @@ jobs: echo "FILE_TEST_SSH_KEY=op://${{ secrets.VAULT }}/test-ssh-key/private key" >> tests/.env.tpl echo "FILE_TEST_SSH_KEY_OPENSSH=op://${{ secrets.VAULT }}/test-ssh-key/private key?ssh-format=openssh" >> tests/.env.tpl echo "FILE_SSH_KEY_DATE=op://${{ secrets.VAULT }}/test-ssh-key/test-section/date" >> tests/.env.tpl + echo "FILE_TEST_CREDENTIALS=op://${{ secrets.VAULT }}/test-credentials/credential" >> tests/.env.tpl + echo "FILE_TEST_CREDENTIALS_NOTES=op://${{ secrets.VAULT }}/test-credentials/notes" >> tests/.env.tpl - name: Launch 1Password Connect instance env: @@ -223,6 +233,8 @@ jobs: TEST_SSH_KEY: op://${{ secrets.VAULT }}/test-ssh-key/private key TEST_SSH_KEY_OPENSSH: "op://${{ secrets.VAULT }}/test-ssh-key/private key?ssh-format=openssh" SSH_KEY_DATE: op://${{ secrets.VAULT }}/test-ssh-key/test-section/date + TEST_CREDENTIALS: op://${{ secrets.VAULT }}/test-credentials/credential + TEST_CREDENTIALS_NOTES: op://${{ secrets.VAULT }}/test-credentials/notes OP_ENV_FILE: ./tests/.env.tpl - name: Assert test secret values [step output] @@ -241,6 +253,10 @@ jobs: FILE_TEST_SSH_KEY_OPENSSH: ${{ steps.load_secrets.outputs.FILE_TEST_SSH_KEY_OPENSSH }} SSH_KEY_DATE: ${{ steps.load_secrets.outputs.SSH_KEY_DATE }} FILE_SSH_KEY_DATE: ${{ steps.load_secrets.outputs.FILE_SSH_KEY_DATE }} + TEST_CREDENTIALS: ${{ steps.load_secrets.outputs.TEST_CREDENTIALS }} + FILE_TEST_CREDENTIALS: ${{ steps.load_secrets.outputs.FILE_TEST_CREDENTIALS }} + TEST_CREDENTIALS_NOTES: ${{ steps.load_secrets.outputs.TEST_CREDENTIALS_NOTES }} + FILE_TEST_CREDENTIALS_NOTES: ${{ steps.load_secrets.outputs.FILE_TEST_CREDENTIALS_NOTES }} run: ./tests/assert-env-set.sh - name: Assert SSH key env vars [step output] diff --git a/tests/assert-env-set.sh b/tests/assert-env-set.sh index 2aab1ff..1240223 100755 --- a/tests/assert-env-set.sh +++ b/tests/assert-env-set.sh @@ -28,6 +28,8 @@ EOF readonly MULTILINE_SECRET readonly WEBSITE="www.test.com" readonly SSH_KEY_DATE="1773057660" +readonly TEST_CREDENTIALS="this-is-a-test" +readonly TEST_CREDENTIALS_NOTES="test note" assert_env_equals "SECRET" "${SECRET}" assert_env_equals "FILE_SECRET" "${SECRET}" @@ -54,3 +56,8 @@ fi assert_env_equals "SSH_KEY_DATE" "${SSH_KEY_DATE}" assert_env_equals "FILE_SSH_KEY_DATE" "${SSH_KEY_DATE}" + +assert_env_equals "TEST_CREDENTIALS" "${TEST_CREDENTIALS}" +assert_env_equals "FILE_TEST_CREDENTIALS" "${TEST_CREDENTIALS}" +assert_env_equals "TEST_CREDENTIALS_NOTES" "${TEST_CREDENTIALS_NOTES}" +assert_env_equals "FILE_TEST_CREDENTIALS_NOTES" "${TEST_CREDENTIALS_NOTES}" diff --git a/tests/assert-env-unset.sh b/tests/assert-env-unset.sh index 17c0b6a..f60ed9b 100755 --- a/tests/assert-env-unset.sh +++ b/tests/assert-env-unset.sh @@ -28,3 +28,8 @@ assert_env_unset "FILE_TEST_SSH_KEY_OPENSSH" assert_env_unset "SSH_KEY_DATE" assert_env_unset "FILE_SSH_KEY_DATE" + +assert_env_unset "TEST_CREDENTIALS" +assert_env_unset "FILE_TEST_CREDENTIALS" +assert_env_unset "TEST_CREDENTIALS_NOTES" +assert_env_unset "FILE_TEST_CREDENTIALS_NOTES"