From 1ca206deef043907e293321279bdd5373ed9fa2f Mon Sep 17 00:00:00 2001 From: Patrick Zheng Date: Fri, 18 Aug 2023 10:53:19 +0800 Subject: [PATCH] updated per code review Signed-off-by: Patrick Zheng --- .github/licenserc.yml | 2 +- .github/workflows/e2e-test-sign.yml | 2 +- .github/workflows/e2e-test-verify.yml | 30 +++++++++---------- {.github/tests => tests}/e2e/Dockerfile | 0 .../e2e/trustpolicy/invalid-trustpolicy.json | 0 .../e2e/trustpolicy/trustpolicy.json | 0 .../x509/ca/e2e-test/invalid.crt | 0 7 files changed, 17 insertions(+), 17 deletions(-) rename {.github/tests => tests}/e2e/Dockerfile (100%) rename {.github/tests => tests}/e2e/trustpolicy/invalid-trustpolicy.json (100%) rename {.github/tests => tests}/e2e/trustpolicy/trustpolicy.json (100%) rename {.github/tests => tests}/e2e/truststore/invalid-trust-store/x509/ca/e2e-test/invalid.crt (100%) diff --git a/.github/licenserc.yml b/.github/licenserc.yml index 3ff2061..635ba35 100644 --- a/.github/licenserc.yml +++ b/.github/licenserc.yml @@ -39,7 +39,7 @@ header: - 'tsconfig.json' - '**/data/**' - 'dist' - - '**/tests/**' + - 'tests' comment: on-failure diff --git a/.github/workflows/e2e-test-sign.yml b/.github/workflows/e2e-test-sign.yml index 73a2d84..56b8e36 100644 --- a/.github/workflows/e2e-test-sign.yml +++ b/.github/workflows/e2e-test-sign.yml @@ -36,7 +36,7 @@ jobs: id: prepare uses: docker/build-push-action@v4 with: - context: .github/tests/e2e + context: ./tests/e2e push: true tags: localhost:5000/e2e:latest - name: Retrieve digest diff --git a/.github/workflows/e2e-test-verify.yml b/.github/workflows/e2e-test-verify.yml index f161b7d..2108923 100644 --- a/.github/workflows/e2e-test-verify.yml +++ b/.github/workflows/e2e-test-verify.yml @@ -36,7 +36,7 @@ jobs: id: prepare uses: docker/build-push-action@v4 with: - context: .github/tests/e2e + context: ./tests/e2e push: true tags: localhost:5000/e2e:latest - name: Retrieve digest @@ -52,8 +52,8 @@ jobs: run: | notation cert generate-test "e2e-test" notation cert delete --type ca --store e2e-test -y --all - mkdir -p ${GITHUB_WORKSPACE}/.github/tests/e2e/truststore/x509/ca/e2e-test - cp ${{ env.E2E_CERT }} ${GITHUB_WORKSPACE}/.github/tests/e2e/truststore/x509/ca/e2e-test/e2e-test.crt + mkdir -p ${GITHUB_WORKSPACE}/tests/e2e/truststore/x509/ca/e2e-test + cp ${{ env.E2E_CERT }} ${GITHUB_WORKSPACE}/tests/e2e/truststore/x509/ca/e2e-test/e2e-test.crt # Sign artifact - name: Sign artifact using notation plugin @@ -73,16 +73,16 @@ jobs: uses: ./verify with: target_artifact_reference: ${{ env.target_artifact_reference }} - trust_policy: .github/tests/e2e/trustpolicy/trustpolicy.json - trust_store: .github/tests/e2e/truststore + trust_policy: ./tests/e2e/trustpolicy/trustpolicy.json + trust_store: ./tests/e2e/truststore - name: Verify released artifact missing target artifact reference continue-on-error: true id: missing-artifact-reference uses: ./verify with: - trust_policy: .github/tests/e2e/trustpolicy/trustpolicy.json - trust_store: .github/tests/e2e/truststore + trust_policy: ./tests/e2e/trustpolicy/trustpolicy.json + trust_store: ./tests/e2e/truststore - name: 'Should Fail: Verify released artifact missing target artifact reference' if: steps.missing-artifact-reference.outcome != 'failure' run: | @@ -95,7 +95,7 @@ jobs: uses: ./verify with: target_artifact_reference: ${{ env.target_artifact_reference }} - trust_store: .github/tests/e2e/truststore + trust_store: ./tests/e2e/truststore - name: 'Should Fail: Verify released artifact missing trust policy' if: steps.missing-trust-policy.outcome != 'failure' run: | @@ -108,8 +108,8 @@ jobs: uses: ./verify with: target_artifact_reference: ${{ env.target_artifact_reference }} - trust_policy: .github/tests/e2e/trustpolicy/invalid-trustpolicy.json - trust_store: .github/tests/e2e/truststore + trust_policy: ./tests/e2e/trustpolicy/invalid-trustpolicy.json + trust_store: ./tests/e2e/truststore - name: 'Should Fail: Verify released artifact with invalid trust policy' if: steps.invalid-trust-policy.outcome != 'failure' run: | @@ -122,7 +122,7 @@ jobs: uses: ./verify with: target_artifact_reference: ${{ env.target_artifact_reference }} - trust_policy: .github/tests/e2e/trustpolicy/trustpolicy.json + trust_policy: ./tests/e2e/trustpolicy/trustpolicy.json - name: 'Should Fail: Verify released artifact missing trust store' if: steps.missing-trust-store.outcome != 'failure' run: | @@ -135,8 +135,8 @@ jobs: uses: ./verify with: target_artifact_reference: ${{ env.target_artifact_reference }} - trust_policy: .github/tests/e2e/trustpolicy/trustpolicy.json - trust_store: .github/tests/e2e/invalid-trust-store/x509 + trust_policy: ./tests/e2e/trustpolicy/trustpolicy.json + trust_store: ./tests/e2e/invalid-trust-store/x509 - name: 'Should Fail: Verify released artifact with invalid trust store structure' if: steps.invalid-trust-store.outcome != 'failure' run: | @@ -151,8 +151,8 @@ jobs: uses: ./verify with: target_artifact_reference: ${{ env.target_artifact_reference }} - trust_policy: .github/tests/e2e/trustpolicy/trustpolicy.json - trust_store: .github/tests/e2e/truststore/invalid-trust-store + trust_policy: ./tests/e2e/trustpolicy/trustpolicy.json + trust_store: ./tests/e2e/truststore/invalid-trust-store - name: 'Should Fail: Verify released artifact without valid cert in trust store' if: steps.invalid-cert.outcome != 'failure' run: | diff --git a/.github/tests/e2e/Dockerfile b/tests/e2e/Dockerfile similarity index 100% rename from .github/tests/e2e/Dockerfile rename to tests/e2e/Dockerfile diff --git a/.github/tests/e2e/trustpolicy/invalid-trustpolicy.json b/tests/e2e/trustpolicy/invalid-trustpolicy.json similarity index 100% rename from .github/tests/e2e/trustpolicy/invalid-trustpolicy.json rename to tests/e2e/trustpolicy/invalid-trustpolicy.json diff --git a/.github/tests/e2e/trustpolicy/trustpolicy.json b/tests/e2e/trustpolicy/trustpolicy.json similarity index 100% rename from .github/tests/e2e/trustpolicy/trustpolicy.json rename to tests/e2e/trustpolicy/trustpolicy.json diff --git a/.github/tests/e2e/truststore/invalid-trust-store/x509/ca/e2e-test/invalid.crt b/tests/e2e/truststore/invalid-trust-store/x509/ca/e2e-test/invalid.crt similarity index 100% rename from .github/tests/e2e/truststore/invalid-trust-store/x509/ca/e2e-test/invalid.crt rename to tests/e2e/truststore/invalid-trust-store/x509/ca/e2e-test/invalid.crt