Skip to content

Commit 43c1f24

Browse files
JillReganJillRegan
committed
Add more e2e tests
1 parent 3c643fe commit 43c1f24

File tree

3 files changed

+49
-1
lines changed

3 files changed

+49
-1
lines changed

‎.github/workflows/e2e-tests.yml‎

Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -63,13 +63,19 @@ jobs:
6363
echo "FILE_SECRET=op://${{ secrets.VAULT }}/test-secret/password" > tests/.env.tpl
6464
echo "FILE_SECRET_IN_SECTION=op://${{ secrets.VAULT }}/test-secret/test-section/password" >> tests/.env.tpl
6565
echo "FILE_MULTILINE_SECRET=op://${{ secrets.VAULT }}/multiline-secret/notesPlain" >> tests/.env.tpl
66+
echo "SECRET_WITH_FILE=op://${{ secrets.VAULT }}/file-secret/test.txt" >> tests/.env.tpl
67+
echo "SECRET_WITH_FILE_IN_SECTION=op://${{ secrets.VAULT }}/file-secret/file section/test.txt" >> tests/.env.tpl
68+
echo "DOUBLE_SECTION_SECRET=op://${{ secrets.VAULT }}/double-section-secret/test-section/password" >> tests/.env.tpl
6669
6770
- name: Generate .vaultId_env.tpl
6871
shell: bash
6972
run: |
7073
echo "FILE_SECRET=op://${{ secrets.VAULT_ID }}/test-secret/password" > tests/.vaultId_env.tpl
7174
echo "FILE_SECRET_IN_SECTION=op://${{ secrets.VAULT_ID }}/test-secret/test-section/password" >> tests/.vaultId_env.tpl
7275
echo "FILE_MULTILINE_SECRET=op://${{ secrets.VAULT_ID }}/multiline-secret/notesPlain" >> tests/.vaultId_env.tpl
76+
echo "SECRET_WITH_FILE=op://${{ secrets.VAULT_ID }}/file-secret/test.txt" >> tests/.vaultId_env.tpl
77+
echo "SECRET_WITH_FILE_IN_SECTION=op://${{ secrets.VAULT_ID }}/file-secret/file section/test.txt" >> tests/.vaultId_env.tpl
78+
echo "DOUBLE_SECTION_SECRET=op://${{ secrets.VAULT_ID }}/double-section-secret/test-section/password" >> tests/.vaultId_env.tpl
7379
7480
- name: Configure Service account
7581
uses: ./configure
@@ -86,6 +92,9 @@ jobs:
8692
SECRET: op://${{ secrets.VAULT }}/test-secret/password
8793
SECRET_IN_SECTION: op://${{ secrets.VAULT }}/test-secret/test-section/password
8894
MULTILINE_SECRET: op://${{ secrets.VAULT }}/multiline-secret/notesPlain
95+
SECRET_WITH_FILE: op://${{ secrets.VAULT }}/file-secret/test.txt
96+
SECRET_WITH_FILE_IN_SECTION: op://${{ secrets.VAULT }}/file-secret/file section/test.txt
97+
DOUBLE_SECTION_SECRET: op://${{ secrets.VAULT }}/double-section-secret/test-section/password
8998
OP_ENV_FILE: ./tests/.env.tpl
9099

91100
- name: Assert test secret values [step output]
@@ -98,6 +107,9 @@ jobs:
98107
FILE_SECRET: ${{ steps.load_secrets.outputs.FILE_SECRET }}
99108
FILE_SECRET_IN_SECTION: ${{ steps.load_secrets.outputs.FILE_SECRET_IN_SECTION }}
100109
FILE_MULTILINE_SECRET: ${{ steps.load_secrets.outputs.FILE_MULTILINE_SECRET }}
110+
SECRET_WITH_FILE: ${{ steps.load_secrets.outputs.SECRET_WITH_FILE }}
111+
SECRET_WITH_FILE_IN_SECTION: ${{ steps.load_secrets.outputs.SECRET_WITH_FILE_IN_SECTION }}
112+
DOUBLE_SECTION_SECRET: ${{ steps.load_secrets.outputs.DOUBLE_SECTION_SECRET }}
101113
run: ./tests/assert-env-set.sh
102114

103115
- name: Assert test secret values [exported env]
@@ -141,6 +153,9 @@ jobs:
141153
SECRET: op://${{ secrets.VAULT_ID }}/test-secret/password
142154
SECRET_IN_SECTION: op://${{ secrets.VAULT_ID }}/test-secret/test-section/password
143155
MULTILINE_SECRET: op://${{ secrets.VAULT_ID }}/multiline-secret/notesPlain
156+
SECRET_WITH_FILE: op://${{ secrets.VAULT_ID }}/file-secret/test.txt
157+
SECRET_WITH_FILE_IN_SECTION: op://${{ secrets.VAULT_ID }}/file-secret/file section/test.txt
158+
DOUBLE_SECTION_SECRET: op://${{ secrets.VAULT_ID }}/double-section-secret/test-section/password
144159
OP_ENV_FILE: ./tests/.vaultId_env.tpl
145160

146161
- name: Assert test secret values [vault by ID]
@@ -153,6 +168,9 @@ jobs:
153168
FILE_SECRET: ${{ steps.load_secrets_by_vault_id.outputs.FILE_SECRET }}
154169
FILE_SECRET_IN_SECTION: ${{ steps.load_secrets_by_vault_id.outputs.FILE_SECRET_IN_SECTION }}
155170
FILE_MULTILINE_SECRET: ${{ steps.load_secrets_by_vault_id.outputs.FILE_MULTILINE_SECRET }}
171+
SECRET_WITH_FILE: ${{ steps.load_secrets_by_vault_id.outputs.SECRET_WITH_FILE }}
172+
SECRET_WITH_FILE_IN_SECTION: ${{ steps.load_secrets_by_vault_id.outputs.SECRET_WITH_FILE_IN_SECTION }}
173+
DOUBLE_SECTION_SECRET: ${{ steps.load_secrets_by_vault_id.outputs.DOUBLE_SECTION_SECRET }}
156174
run: ./tests/assert-env-set.sh
157175

158176
test-connect:
@@ -189,12 +207,18 @@ jobs:
189207
echo "FILE_SECRET=op://${{ secrets.VAULT }}/test-secret/password" > tests/.env.tpl
190208
echo "FILE_SECRET_IN_SECTION=op://${{ secrets.VAULT }}/test-secret/test-section/password" >> tests/.env.tpl
191209
echo "FILE_MULTILINE_SECRET=op://${{ secrets.VAULT }}/multiline-secret/notesPlain" >> tests/.env.tpl
210+
echo "SECRET_WITH_FILE=op://${{ secrets.VAULT }}/file-secret/test.txt" >> tests/.env.tpl
211+
echo "SECRET_WITH_FILE_IN_SECTION=op://${{ secrets.VAULT }}/file-secret/file section/test.txt" >> tests/.env.tpl
212+
echo "DOUBLE_SECTION_SECRET=op://${{ secrets.VAULT }}/double-section-secret/test-section/password" >> tests/.env.tpl
192213
193214
- name: Generate .vaultId_env.tpl
194215
run: |
195216
echo "FILE_SECRET=op://${{ secrets.VAULT_ID }}/test-secret/password" > tests/.vaultId_env.tpl
196217
echo "FILE_SECRET_IN_SECTION=op://${{ secrets.VAULT_ID }}/test-secret/test-section/password" >> tests/.vaultId_env.tpl
197218
echo "FILE_MULTILINE_SECRET=op://${{ secrets.VAULT_ID }}/multiline-secret/notesPlain" >> tests/.vaultId_env.tpl
219+
echo "SECRET_WITH_FILE=op://${{ secrets.VAULT_ID }}/file-secret/test.txt" >> tests/.vaultId_env.tpl
220+
echo "SECRET_WITH_FILE_IN_SECTION=op://${{ secrets.VAULT_ID }}/file-secret/file section/test.txt" >> tests/.vaultId_env.tpl
221+
echo "DOUBLE_SECTION_SECRET=op://${{ secrets.VAULT_ID }}/double-section-secret/test-section/password" >> tests/.vaultId_env.tpl
198222
199223
- name: Launch 1Password Connect instance
200224
env:
@@ -219,6 +243,9 @@ jobs:
219243
SECRET: op://${{ secrets.VAULT }}/test-secret/password
220244
SECRET_IN_SECTION: op://${{ secrets.VAULT }}/test-secret/test-section/password
221245
MULTILINE_SECRET: op://${{ secrets.VAULT }}/multiline-secret/notesPlain
246+
SECRET_WITH_FILE: op://${{ secrets.VAULT }}/file-secret/test.txt
247+
SECRET_WITH_FILE_IN_SECTION: op://${{ secrets.VAULT }}/file-secret/file section/test.txt
248+
DOUBLE_SECTION_SECRET: op://${{ secrets.VAULT }}/double-section-secret/test-section/password
222249
OP_ENV_FILE: ./tests/.env.tpl
223250

224251
- name: Assert test secret values [step output]
@@ -230,6 +257,9 @@ jobs:
230257
FILE_SECRET: ${{ steps.load_secrets.outputs.FILE_SECRET }}
231258
FILE_SECRET_IN_SECTION: ${{ steps.load_secrets.outputs.FILE_SECRET_IN_SECTION }}
232259
FILE_MULTILINE_SECRET: ${{ steps.load_secrets.outputs.FILE_MULTILINE_SECRET }}
260+
SECRET_WITH_FILE: ${{ steps.load_secrets.outputs.SECRET_WITH_FILE }}
261+
SECRET_WITH_FILE_IN_SECTION: ${{ steps.load_secrets.outputs.SECRET_WITH_FILE_IN_SECTION }}
262+
DOUBLE_SECTION_SECRET: ${{ steps.load_secrets.outputs.DOUBLE_SECTION_SECRET }}
233263
run: ./tests/assert-env-set.sh
234264

235265
- name: Assert test secret values [exported env]
@@ -271,6 +301,9 @@ jobs:
271301
SECRET: op://${{ secrets.VAULT_ID }}/test-secret/password
272302
SECRET_IN_SECTION: op://${{ secrets.VAULT_ID }}/test-secret/test-section/password
273303
MULTILINE_SECRET: op://${{ secrets.VAULT_ID }}/multiline-secret/notesPlain
304+
SECRET_WITH_FILE: op://${{ secrets.VAULT_ID }}/file-secret/test.txt
305+
SECRET_WITH_FILE_IN_SECTION: op://${{ secrets.VAULT_ID }}/file-secret/file section/test.txt
306+
DOUBLE_SECTION_SECRET: op://${{ secrets.VAULT_ID }}/double-section-secret/test-section/password
274307
OP_ENV_FILE: ./tests/.vaultId_env.tpl
275308

276309
- name: Assert test secret values [vault by ID]
@@ -283,4 +316,7 @@ jobs:
283316
FILE_SECRET: ${{ steps.load_secrets_by_vault_id.outputs.FILE_SECRET }}
284317
FILE_SECRET_IN_SECTION: ${{ steps.load_secrets_by_vault_id.outputs.FILE_SECRET_IN_SECTION }}
285318
FILE_MULTILINE_SECRET: ${{ steps.load_secrets_by_vault_id.outputs.FILE_MULTILINE_SECRET }}
319+
SECRET_WITH_FILE: ${{ steps.load_secrets_by_vault_id.outputs.SECRET_WITH_FILE }}
320+
SECRET_WITH_FILE_IN_SECTION: ${{ steps.load_secrets_by_vault_id.outputs.SECRET_WITH_FILE_IN_SECTION }}
321+
DOUBLE_SECTION_SECRET: ${{ steps.load_secrets_by_vault_id.outputs.DOUBLE_SECTION_SECRET }}
286322
run: ./tests/assert-env-set.sh

‎tests/assert-env-set.sh‎

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,9 @@ assert_env_equals() {
1010
}
1111

1212
readonly SECRET="RGVhciBzZWN1cml0eSByZXNlYXJjaGVyLCB0aGlzIGlzIGp1c3QgYSBkdW1teSBzZWNyZXQuIFBsZWFzZSBkb24ndCByZXBvcnQgaXQu"
13+
readonly FILE_SECRET_CONTENT="This is a test"
14+
readonly DOUBLE_SECTION_SECRET_CONTENT="test-password"
15+
1316
MULTILINE_SECRET="$(cat << EOF
1417
-----BEGIN PRIVATE KEY-----
1518
RGVhciBzZWN1cml0eSByZXNlYXJjaGVyLApXaGls
@@ -34,4 +37,9 @@ assert_env_equals "SECRET_IN_SECTION" "${SECRET}"
3437
assert_env_equals "FILE_SECRET_IN_SECTION" "${SECRET}"
3538

3639
assert_env_equals "MULTILINE_SECRET" "${MULTILINE_SECRET}"
37-
assert_env_equals "FILE_MULTILINE_SECRET" "${MULTILINE_SECRET}"
40+
assert_env_equals "FILE_MULTILINE_SECRET" "${MULTILINE_SECRET}"
41+
42+
assert_env_equals "SECRET_WITH_FILE" "${FILE_SECRET_CONTENT}"
43+
assert_env_equals "SECRET_WITH_FILE_IN_SECTION" "${FILE_SECRET_CONTENT}"
44+
45+
assert_env_equals "DOUBLE_SECTION_SECRET" "${DOUBLE_SECTION_SECRET_CONTENT}"

‎tests/assert-env-unset.sh‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,3 +17,7 @@ assert_env_unset "FILE_SECRET_IN_SECTION"
1717

1818
assert_env_unset "MULTILINE_SECRET"
1919
assert_env_unset "FILE_MULTILINE_SECRET"
20+
21+
assert_env_unset "SECRET_WITH_FILE"
22+
assert_env_unset "SECRET_WITH_FILE_IN_SECTION"
23+
assert_env_unset "DOUBLE_SECTION_SECRET"

0 commit comments

Comments
 (0)