From 934acd2a2a66f574a09011883fc1e589e13d110f Mon Sep 17 00:00:00 2001 From: Jill Regan Date: Mon, 9 Mar 2026 14:08:08 -0400 Subject: [PATCH] Remove website check --- .github/workflows/e2e-tests.yml | 4 ---- tests/assert-env-set.sh | 9 +++++++-- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/.github/workflows/e2e-tests.yml b/.github/workflows/e2e-tests.yml index fa53052..f2240ac 100644 --- a/.github/workflows/e2e-tests.yml +++ b/.github/workflows/e2e-tests.yml @@ -174,7 +174,6 @@ jobs: echo "FILE_SECRET=op://${{ secrets.VAULT }}/test-secret/password" > tests/.env.tpl echo "FILE_SECRET_IN_SECTION=op://${{ secrets.VAULT }}/test-secret/test-section/password" >> tests/.env.tpl echo "FILE_MULTILINE_SECRET=op://${{ secrets.VAULT }}/multiline-secret/notesPlain" >> tests/.env.tpl - echo "FILE_WEBSITE=op://${{ secrets.VAULT }}/test-secret/website" >> tests/.env.tpl 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 @@ -203,7 +202,6 @@ jobs: SECRET: op://${{ secrets.VAULT }}/test-secret/password SECRET_IN_SECTION: op://${{ secrets.VAULT }}/test-secret/test-section/password MULTILINE_SECRET: op://${{ secrets.VAULT }}/multiline-secret/notesPlain - WEBSITE: op://${{ secrets.VAULT }}/test-secret/website 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 @@ -219,8 +217,6 @@ jobs: FILE_SECRET: ${{ steps.load_secrets.outputs.FILE_SECRET }} FILE_SECRET_IN_SECTION: ${{ steps.load_secrets.outputs.FILE_SECRET_IN_SECTION }} FILE_MULTILINE_SECRET: ${{ steps.load_secrets.outputs.FILE_MULTILINE_SECRET }} - WEBSITE: ${{ steps.load_secrets.outputs.WEBSITE }} - FILE_WEBSITE: ${{ steps.load_secrets.outputs.FILE_WEBSITE }} TEST_SSH_KEY: ${{ steps.load_secrets.outputs.TEST_SSH_KEY }} FILE_TEST_SSH_KEY: ${{ steps.load_secrets.outputs.FILE_TEST_SSH_KEY }} TEST_SSH_KEY_OPENSSH: ${{ steps.load_secrets.outputs.TEST_SSH_KEY_OPENSSH }} diff --git a/tests/assert-env-set.sh b/tests/assert-env-set.sh index 95de03d..3292d43 100755 --- a/tests/assert-env-set.sh +++ b/tests/assert-env-set.sh @@ -39,8 +39,13 @@ assert_env_equals "FILE_SECRET_IN_SECTION" "${SECRET}" assert_env_equals "MULTILINE_SECRET" "${MULTILINE_SECRET}" assert_env_equals "FILE_MULTILINE_SECRET" "${MULTILINE_SECRET}" -assert_env_equals "WEBSITE" "${WEBSITE}" -assert_env_equals "FILE_WEBSITE" "${WEBSITE}" +# WEBSITE/FILE_WEBSITE only loaded by Service Account as Connect does not support website field +if [ -n "$(printenv WEBSITE 2>/dev/null)" ]; then + assert_env_equals "WEBSITE" "${WEBSITE}" +fi +if [ -n "$(printenv FILE_WEBSITE 2>/dev/null)" ]; then + assert_env_equals "FILE_WEBSITE" "${WEBSITE}" +fi assert_env_equals "SSH_KEY_DATE" "${SSH_KEY_DATE}" assert_env_equals "FILE_SSH_KEY_DATE" "${SSH_KEY_DATE}"