diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 9c568d03..85e4b83f 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -78,6 +78,7 @@ jobs: # Ensure Timestamp Authority tests are not skipped by # having pytest show skipped tests and verifying ours are running + set -o pipefail make test TEST_ARGS="-m timestamp_authority -rs" | tee output ! grep -q "skipping test that requires a Timestamp Authority" output || (echo "ERROR: Found skip message" && exit 1) env: diff --git a/test/assets/tsa/trust_config.json b/test/assets/tsa/trust_config.json index 4be318b6..273f2739 100644 --- a/test/assets/tsa/trust_config.json +++ b/test/assets/tsa/trust_config.json @@ -113,12 +113,39 @@ ] }, "signing_config": { - "ca_url": "https://fulcio.sigstage.dev", - "tlog_urls": [ - "https://rekor.sigstage.dev" + "mediaType": "application/vnd.dev.sigstore.signingconfig.v0.2+json", + "caUrls": [ + { + "url": "https://fulcio.sigstage.dev", + "majorApiVersion": 1, + "validFor": { + "start": "2022-04-14T21:38:40.000Z" + } + } ], - "tsa_urls": [ - "placeholder-value" - ] + "rekorTlogUrls": [ + { + "url": "https://rekor.sigstage.dev", + "majorApiVersion": 1, + "validFor": { + "start": "2021-01-12T11:53:27.000Z" + } + } + ], + "tsaUrls": [ + { + "url": "placeholder", + "majorApiVersion": 1, + "validFor": { + "start": "2024-11-07T14:59:40.000Z" + } + } + ], + "rekorTlogConfig": { + "selector": "ANY" + }, + "tsaConfig": { + "selector": "ANY" + } } } diff --git a/test/unit/test_sign.py b/test/unit/test_sign.py index 04a5be75..244cfc8e 100644 --- a/test/unit/test_sign.py +++ b/test/unit/test_sign.py @@ -174,7 +174,7 @@ def sig_ctx(self, asset, tsa_url) -> SigningContext: asset("tsa/trust_config.json").read_text() ) - trust_config._inner.signing_config.tsa_urls[0] = tsa_url + trust_config._inner.signing_config.tsa_urls[0].url = tsa_url return SigningContext.from_trust_config(trust_config)