Skip to content

Commit cec5376

Browse files
committed
fixed serve tls int tests and added store copy int tests
1 parent a5d9343 commit cec5376

2 files changed

Lines changed: 21 additions & 10 deletions

File tree

.github/workflows/tests.yaml

Lines changed: 20 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -216,7 +216,20 @@ jobs:
216216
- name: Verify - hauler store copy
217217
run: |
218218
hauler store copy --help
219-
# need more tests here
219+
# verify via registry target
220+
hauler store serve registry --port 5002 --readonly=false &
221+
until curl -sf http://localhost:5002/v2/_catalog; do : ; done
222+
hauler store copy registry://localhost:5002 --plain-http
223+
# verify blobs actually landed in the registry backend
224+
[ $(find registry -type f | wc -l) -gt 0 ]
225+
# verify via --only
226+
hauler store copy registry://localhost:5002 --plain-http --only busybox
227+
pkill -f "hauler store serve registry --port 5002"
228+
rm -rf registry
229+
# verify via directory target (files and charts only; images and cosign artifacts are skipped)
230+
hauler store copy dir://./store-copy-output
231+
test -f ./store-copy-output/hauler-manifest.yaml
232+
rm -rf ./store-copy-output
220233
221234
- name: Verify - hauler store extract
222235
run: |
@@ -354,9 +367,9 @@ jobs:
354367
until curl -sf http://localhost:5001/v2/_catalog; do : ; done
355368
pkill -f "hauler store serve registry --port 5001 --readonly"
356369
# verify via registry with different port with readonly with tls
357-
# hauler store serve registry --port 5001 --readonly --tls-cert testdata/certs/server-cert.crt --tls-key testdata/certs/server-cert.key &
358-
# until curl -sf --cacert testdata/certs/cacerts.pem https://localhost:5001/v2/_catalog; do : ; done
359-
# pkill -f "hauler store serve registry --port 5001 --readonly --tls-cert testdata/certs/server-cert.crt --tls-key testdata/certs/server-cert.key"
370+
hauler store serve registry --port 5001 --readonly --tls-cert testdata/certs/server-cert.crt --tls-key testdata/certs/server-cert.key &
371+
until curl -sf --cacert testdata/certs/cacerts.pem https://localhost:5001/v2/_catalog; do : ; done
372+
pkill -f "hauler store serve registry --port 5001 --readonly --tls-cert testdata/certs/server-cert.crt --tls-key testdata/certs/server-cert.key"
360373
361374
- name: Verify - hauler store serve fileserver
362375
run: |
@@ -374,9 +387,9 @@ jobs:
374387
until curl -sf http://localhost:8000; do : ; done
375388
pkill -f "hauler store serve fileserver --port 8000 --timeout 120"
376389
# verify via fileserver with different port with timeout and tls
377-
# hauler store serve fileserver --port 8000 --timeout 120 --tls-cert testdata/certs/server-cert.crt --tls-key testdata/certs/server-cert.key &
378-
# until curl -sf --cacert testdata/certs/cacerts.pem https://localhost:8000; do : ; done
379-
# pkill -f "hauler store serve fileserver --port 8000 --timeout 120 --tls-cert testdata/certs/server-cert.crt --tls-key testdata/certs/server-cert.key"
390+
hauler store serve fileserver --port 8000 --timeout 120 --tls-cert testdata/certs/server-cert.crt --tls-key testdata/certs/server-cert.key &
391+
until curl -sf --cacert testdata/certs/cacerts.pem https://localhost:8000; do : ; done
392+
pkill -f "hauler store serve fileserver --port 8000 --timeout 120 --tls-cert testdata/certs/server-cert.crt --tls-key testdata/certs/server-cert.key"
380393
381394
- name: Verify Hauler Store Contents
382395
run: |

testdata/certificate-script.sh

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

3-
set -e
3+
set -ex
44

55
# setup directories
66
mkdir -p testdata/certs
@@ -32,7 +32,6 @@ CN = CERTIFICATE AUTHORITY CERTIFICATE
3232
3333
[v3_ca]
3434
keyUsage = critical, keyCertSign, cRLSign
35-
extendedKeyUsage = anyExtendedKeyUsage
3635
basicConstraints = critical, CA:TRUE
3736
EOF
3837

@@ -71,7 +70,6 @@ CN = INTERMEDIARY CERTIFICATE AUTHORITY CERTIFICATE
7170
7271
[v3_ca]
7372
keyUsage = critical, keyCertSign, cRLSign
74-
extendedKeyUsage = anyExtendedKeyUsage
7573
basicConstraints = critical, CA:TRUE
7674
EOF
7775

0 commit comments

Comments
 (0)