Improve website check

.github/workflows/e2e-tests.yml

@@ -91,6 +91,7 @@ jobs:
         if: ${{ !matrix.export-env }}
         shell: bash
         env:
+          ASSERT_WEBSITE: "true"
           SECRET: ${{ steps.load_secrets.outputs.SECRET }}
           SECRET_IN_SECTION: ${{ steps.load_secrets.outputs.SECRET_IN_SECTION }}
           MULTILINE_SECRET: ${{ steps.load_secrets.outputs.MULTILINE_SECRET }}
@@ -122,6 +123,8 @@ jobs:
       - name: Assert test secret values [exported env]
         if: ${{ matrix.export-env }}
         shell: bash
+        env:
+          ASSERT_WEBSITE: "true"
         run: ./tests/assert-env-set.sh
 
       - name: Assert SSH key env vars [exported env]
@@ -184,7 +187,7 @@ jobs:
           OP_CONNECT_CREDENTIALS: ${{ secrets.OP_CONNECT_CREDENTIALS }}
         run: |
           echo "$OP_CONNECT_CREDENTIALS" > 1password-credentials.json
-          docker compose -f tests/fixtures/docker-compose.yml up -d && sleep 10
+          docker compose -f tests/fixtures/docker-compose.yml up -d && sleep 25
 
       - name: Configure 1Password Connect
         uses: ./configure
@@ -211,6 +214,7 @@ jobs:
       - name: Assert test secret values [step output]
         if: ${{ !matrix.export-env }}
         env:
+          ASSERT_WEBSITE: "false"
           SECRET: ${{ steps.load_secrets.outputs.SECRET }}
           SECRET_IN_SECTION: ${{ steps.load_secrets.outputs.SECRET_IN_SECTION }}
           MULTILINE_SECRET: ${{ steps.load_secrets.outputs.MULTILINE_SECRET }}
@@ -238,6 +242,8 @@ jobs:
 
       - name: Assert test secret values [exported env]
         if: ${{ matrix.export-env }}
+        env:
+          ASSERT_WEBSITE: "false"
         run: ./tests/assert-env-set.sh
 
       - name: Assert SSH key env vars [exported env]

tests/assert-env-set.sh

@@ -39,11 +39,17 @@ assert_env_equals "FILE_SECRET_IN_SECTION" "${SECRET}"
 assert_env_equals "MULTILINE_SECRET" "${MULTILINE_SECRET}"
 assert_env_equals "FILE_MULTILINE_SECRET" "${MULTILINE_SECRET}"
 
-# WEBSITE/FILE_WEBSITE only loaded by Service Account as Connect does not support website field
-if [ -n "$(printenv WEBSITE 2>/dev/null)" ]; then
+# WEBSITE/FILE_WEBSITE: required when ASSERT_WEBSITE=true (Service Account), skipped when false (Connect)
+if [ "${ASSERT_WEBSITE:-false}" = "true" ]; then
+  if [ -z "$(printenv WEBSITE 2>/dev/null)" ]; then
+    echo "Expected WEBSITE to be set (Service Account)"
+    exit 1
+  fi
+  if [ -z "$(printenv FILE_WEBSITE 2>/dev/null)" ]; then
+    echo "Expected FILE_WEBSITE to be set (Service Account)"
+    exit 1
+  fi
   assert_env_equals "WEBSITE" "${WEBSITE}"
-fi
-if [ -n "$(printenv FILE_WEBSITE 2>/dev/null)" ]; then
   assert_env_equals "FILE_WEBSITE" "${WEBSITE}"
 fi