@@ -14,6 +14,7 @@ COMPARE_VSA=$WORKSPACE/tests/vsa/compare_vsa.py
1414TEST_REPO_FINDER=$WORKSPACE /tests/e2e/repo_finder/repo_finder.py
1515TEST_COMMIT_FINDER=$WORKSPACE /tests/e2e/repo_finder/commit_finder.py
1616RUN_MACARON=" python -m macaron -o $WORKSPACE /output" 
17+ MAKE_VENV=" python -m venv" 
1718RESULT_CODE=0
1819UPDATE=0
1920
@@ -262,9 +263,9 @@ echo "apache/maven: Analyzing using a CycloneDx SBOM file of a software componen
262263echo  -e " ----------------------------------------------------------------------------------\n" 
263264SBOM_FILE=$WORKSPACE /tests/dependency_analyzer/cyclonedx/resources/private_mirror_apache_maven.json
264265DEP_EXPECTED=$WORKSPACE /tests/dependency_analyzer/expected_results/private_mirror_apache_maven.json
265- DEP_RESULT=$WORKSPACE /output/reports/private-domain_com/apache /maven/dependencies.json
266+ DEP_RESULT=$WORKSPACE /output/reports/maven/private_apache_maven /maven/dependencies.json
266267
267- $RUN_MACARON  analyze -purl pkg:private-domain.com/ apache/maven -sbom " $SBOM_FILE " ||  log_fail
268+ $RUN_MACARON  analyze -purl pkg:maven/ private. apache.maven /maven@4.0.0-alpha-1-SNAPSHOT ? type=pom  -sbom " $SBOM_FILE " ||  log_fail
268269
269270check_or_update_expected_output $COMPARE_DEPS  $DEP_RESULT  $DEP_EXPECTED  ||  log_fail
270271
@@ -457,6 +458,27 @@ $RUN_MACARON -lr $WORKSPACE/output/git_repos/github_com analyze -rp apache/maven
457458check_or_update_expected_output $COMPARE_DEPS  $DEP_RESULT  $DEP_EXPECTED  ||  log_fail
458459check_or_update_expected_output $COMPARE_JSON_OUT  $JSON_RESULT  $JSON_EXPECTED  ||  log_fail
459460
461+ echo  -e " \n----------------------------------------------------------------------------------" 
462+ echo  " pkg:pypi/django@5.0.6: Analyzing the dependencies with virtual env provided as input." 
463+ echo  -e " ----------------------------------------------------------------------------------\n" 
464+ #  Prepare the virtual environment.
465+ VIRTUAL_ENV_PATH=$WORKSPACE /.django_venv
466+ $MAKE_VENV  " $VIRTUAL_ENV_PATH " 
467+ " $VIRTUAL_ENV_PATH " 
468+ $RUN_MACARON  analyze -purl pkg:pypi/django@5.0.6 --python-venv " $VIRTUAL_ENV_PATH " ||  log_fail
469+ 
470+ #  Check the dependencies using the policy engine.
471+ RUN_POLICY=" macaron verify-policy" 
472+ POLICY_FILE=$WORKSPACE /tests/policy_engine/resources/policies/django/test_dependencies.dl
473+ POLICY_RESULT=$WORKSPACE /output/policy_report.json
474+ POLICY_EXPECTED=$WORKSPACE /tests/policy_engine/expected_results/django/test_dependencies.json
475+ 
476+ $RUN_POLICY  -f " $POLICY_FILE " " $WORKSPACE /output/macaron.db" ||  log_fail
477+ check_or_update_expected_output $COMPARE_POLICIES  " $POLICY_RESULT " " $POLICY_EXPECTED " ||  log_fail
478+ 
479+ #  Clean up and remove the virtual environment.
480+ rm -rf " $VIRTUAL_ENV_PATH " 
481+ 
460482echo  -e " \n----------------------------------------------------------------------------------" 
461483echo  " apache/maven: Analyzing with local paths in configuration and without dependency resolution." 
462484echo  -e " ----------------------------------------------------------------------------------\n" 
0 commit comments