Skip to content

Commit fc998db

Browse files
committed
chore: replace macaron with RUN_MACARON in integration_test.sh and add integration test case to integration_tests_docker.sh
1 parent 9149aaa commit fc998db

File tree

2 files changed

+23
-1
lines changed

2 files changed

+23
-1
lines changed

scripts/dev_scripts/integration_tests.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -752,7 +752,7 @@ PROVENANCE_FILE=$WORKSPACE/tests/slsa_analyzer/provenance/resources/valid_proven
752752
# Cloning the repository locally
753753
git clone https://github.com/behnazh-w/example-maven-app.git $WORKSPACE/output/git_repos/local_repos/example-maven-app || log_fail
754754

755-
macaron analyze -pf $PROVENANCE_FILE -pe $EXPECTATION_FILE -purl pkg:maven/io.github.behnazh-w.demo/example-maven-app@1.0-SNAPSHOT?type=jar --repo-path example-maven-app --digest 34c06e8ae3811885c57f8bd42db61f37ac57eb6c --skip-deps || log_fail
755+
$RUN_MACARON analyze -pf $PROVENANCE_FILE -pe $EXPECTATION_FILE -purl pkg:maven/io.github.behnazh-w.demo/example-maven-app@1.0-SNAPSHOT?type=jar --repo-path example-maven-app --digest 34c06e8ae3811885c57f8bd42db61f37ac57eb6c --skip-deps || log_fail
756756

757757
$RUN_POLICY -f $POLICY_FILE -d "$WORKSPACE/output/macaron.db" || log_fail
758758

scripts/dev_scripts/integration_tests_docker.sh

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -160,6 +160,28 @@ $RUN_MACARON_SCRIPT verify-policy -f $POLICY_FILE -d "$WORKSPACE/output/macaron.
160160
python $COMPARE_POLICIES $POLICY_RESULT $POLICY_EXPECTED || log_fail
161161
python "$COMPARE_VSA" "$VSA_RESULT" "$VSA_PAYLOAD_EXPECTED" || log_fail
162162

163+
echo -e "\n----------------------------------------------------------------------------------"
164+
echo "behnazh-w/example-maven-app as a local repository"
165+
echo "Test Witness provenance as an input, Cue expectation validation, Policy CLI and VSA generation."
166+
echo -e "----------------------------------------------------------------------------------\n"
167+
POLICY_FILE=$WORKSPACE/tests/policy_engine/resources/policies/example-maven-project/policy.dl
168+
POLICY_RESULT=$WORKSPACE/output/policy_report.json
169+
POLICY_EXPECTED=$WORKSPACE/tests/policy_engine/expected_results/example-maven-project/example_maven_project_policy_report.json
170+
VSA_RESULT=$WORKSPACE/output/vsa.intoto.jsonl
171+
VSA_PAYLOAD_EXPECTED=$WORKSPACE/tests/vsa/integration/local_witness_example-maven-project/vsa_payload.json
172+
EXPECTATION_FILE=$WORKSPACE/tests/slsa_analyzer/provenance/expectations/cue/resources/valid_expectations/example-maven-project.cue
173+
PROVENANCE_FILE=$WORKSPACE/tests/slsa_analyzer/provenance/resources/valid_provenances/example-maven-project.json
174+
175+
# Cloning the repository locally
176+
git clone https://github.com/behnazh-w/example-maven-app.git $WORKSPACE/output/git_repos/local_repos/example-maven-app || log_fail
177+
178+
$RUN_MACARON_SCRIPT analyze -pf $PROVENANCE_FILE -pe $EXPECTATION_FILE -purl pkg:maven/io.github.behnazh-w.demo/example-maven-app@1.0-SNAPSHOT?type=jar --repo-path example-maven-app --digest 34c06e8ae3811885c57f8bd42db61f37ac57eb6c --skip-deps || log_fail
179+
180+
$RUN_MACARON_SCRIPT verify-policy -f $POLICY_FILE -d "$WORKSPACE/output/macaron.db" || log_fail
181+
182+
python $COMPARE_POLICIES $POLICY_RESULT $POLICY_EXPECTED || log_fail
183+
python "$COMPARE_VSA" "$VSA_RESULT" "$VSA_PAYLOAD_EXPECTED" || log_fail
184+
163185
echo -e "\n----------------------------------------------------------------------------------"
164186
echo "Test running the analysis without setting the GITHUB_TOKEN environment variables."
165187
echo -e "----------------------------------------------------------------------------------\n"

0 commit comments

Comments
 (0)