diff --git a/.github/workflows/e2e-tests.yml b/.github/workflows/e2e-tests.yml index 7b7d534..0b86e68 100644 --- a/.github/workflows/e2e-tests.yml +++ b/.github/workflows/e2e-tests.yml @@ -30,7 +30,6 @@ jobs: runs-on: ${{ matrix.os }} strategy: fail-fast: true - max-parallel: 2 matrix: os: [ubuntu-latest, macos-latest, windows-latest] version: [latest, 2.30.0] @@ -64,7 +63,6 @@ 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_FILE_CONTENT=op://${{ secrets.VAULT }}/file-secret/test.txt" >> tests/.env.tpl - name: Configure Service account uses: ./configure @@ -85,7 +83,6 @@ 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_FILE_CONTENT: op://${{ secrets.VAULT }}/file-secret/test.txt OP_ENV_FILE: ./tests/.env.tpl - name: Assert test secret values [step output] @@ -107,8 +104,6 @@ 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_FILE_CONTENT: ${{ steps.load_secrets.outputs.TEST_FILE_CONTENT }} - FILE_TEST_FILE_CONTENT: ${{ steps.load_secrets.outputs.FILE_TEST_FILE_CONTENT }} run: ./tests/assert-env-set.sh - name: Assert SSH key env vars [step output] @@ -149,7 +144,6 @@ jobs: runs-on: ubuntu-latest strategy: fail-fast: true - max-parallel: 2 matrix: os: [ubuntu-latest, macos-latest, windows-latest] version: [latest, 2.30.0] @@ -182,7 +176,6 @@ 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_FILE_CONTENT=op://${{ secrets.VAULT }}/file-secret/test.txt" >> tests/.env.tpl - name: Launch 1Password Connect instance env: @@ -210,7 +203,6 @@ 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_FILE_CONTENT: op://${{ secrets.VAULT }}/file-secret/test.txt OP_ENV_FILE: ./tests/.env.tpl - name: Assert test secret values [step output] @@ -229,8 +221,6 @@ 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_FILE_CONTENT: ${{ steps.load_secrets.outputs.TEST_FILE_CONTENT }} - FILE_TEST_FILE_CONTENT: ${{ steps.load_secrets.outputs.FILE_TEST_FILE_CONTENT }} 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 e8d68fc..2aab1ff 100755 --- a/tests/assert-env-set.sh +++ b/tests/assert-env-set.sh @@ -28,7 +28,6 @@ EOF readonly MULTILINE_SECRET readonly WEBSITE="www.test.com" readonly SSH_KEY_DATE="1773057660" -readonly TEST_FILE_CONTENT_EXPECTED="This is a test" assert_env_equals "SECRET" "${SECRET}" assert_env_equals "FILE_SECRET" "${SECRET}" @@ -55,6 +54,3 @@ fi assert_env_equals "SSH_KEY_DATE" "${SSH_KEY_DATE}" assert_env_equals "FILE_SSH_KEY_DATE" "${SSH_KEY_DATE}" - -assert_env_equals "TEST_FILE_CONTENT" "${TEST_FILE_CONTENT_EXPECTED}" -assert_env_equals "FILE_TEST_FILE_CONTENT" "${TEST_FILE_CONTENT_EXPECTED}" diff --git a/tests/assert-env-unset.sh b/tests/assert-env-unset.sh index 92010f0..17c0b6a 100755 --- a/tests/assert-env-unset.sh +++ b/tests/assert-env-unset.sh @@ -28,6 +28,3 @@ 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_FILE_CONTENT" -assert_env_unset "FILE_TEST_FILE_CONTENT"