Skip to content

Commit 4d0a3d9

Browse files
committed
fix e2e test to use existing secrets files
1 parent 393104d commit 4d0a3d9

File tree

7 files changed

+10
-30
lines changed

7 files changed

+10
-30
lines changed

.dockerignore

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
.direnv
22

33
docker-compose.yml
4-
e2e/
54
example/
65
justfile
76
README.md

.gitignore

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
11
.direnv
22

33
example/templates
4-
e2e/secrets
5-
e2e/templates

docker-compose.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,9 @@ services:
1212

1313
tester:
1414
image: bash:latest
15-
command: ["bash", "/templates/confirm.sh"]
15+
command: ["bash", "/example/confirm.sh"]
1616
depends_on:
1717
dcsm:
1818
condition: service_completed_successfully
1919
volumes:
20-
- ./templates:/templates
20+
- ./example:/example

example/confirm.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#!/bin/bash
22

33
# Path to the file to check
4-
file_path="/templates/test"
4+
file_path="/example/templates/test"
55

66
# The expected content
77
expected_content="expected string"

example/secrets.encrypted

26 Bytes
Binary file not shown.

example/secrets.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,3 +4,4 @@ LONG_SECRET: |
44
this is a very long secret.
55
like, a paragraph.
66
or maybe an essay.
7+
TEST: "expected string"

justfile

Lines changed: 6 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -7,31 +7,13 @@ encrypt:
77
decrypt:
88
docker compose run --build --rm dcsm decrypt
99

10-
test-run:
11-
#!/usr/bin/env bash
12-
set -euo pipefail
13-
export DCSM_KEYFILE=example/key.private
14-
export DCSM_SECRETS_FILE=example/secrets.encrypted
15-
export DCSM_TEMPLATE_DIR1=example/templates
16-
python3 ./dcsn.py decrypt
17-
18-
docker-decrypt: build
19-
docker run --rm --env DCSM_KEYFILE=/run/secrets/key.private --env DCSM_SECRET_FILE=/run/secrets/secrets.encrypted --env DCSM_TEMPLATE_DIR1=/run/secrets/templates --volume ${PWD}/example:/run/secrets dcsn:latest
10+
run:
11+
docker compose run --build --rm dcsm
2012

21-
docker-e2e:
13+
test:
2214
#!/usr/bin/env bash
2315
set -euo pipefail
24-
cd e2e
25-
#
26-
# remove any dangling files from previous test
27-
rm -rf templates/test secrets
28-
#
29-
# make a secrets directory with key and encrypted secrets file
30-
mkdir -p secrets
31-
age-keygen -o secrets/key.private
32-
echo 'TEST: "expected string"' > secrets/secrets.yaml
33-
age --encrypt --armor --identity secrets/key.private --output secrets/secrets.encrypted secrets/secrets.yaml
34-
rm secrets/secrets.yaml
35-
#
16+
# remove dangling result from previous test
17+
rm -rf example/templates/test
3618
# now run the test
37-
docker compose up
19+
docker compose up --build --remove-orphans --force-recreate

0 commit comments

Comments
 (0)