diff --git a/clean.sh b/clean.sh index cf0d5c1..14c71ca 100755 --- a/clean.sh +++ b/clean.sh @@ -10,9 +10,11 @@ rm open-tofu/*.generated.tf rm -r layer/create_layer_virtualenv rm -r layer/python311_layer_content rm -r layer/mpic_coordinator_layer_content +rm -r layer/mpic_caa_checker_layer_content +rm -r layer/mpic_dcv_checker_layer_content +rm -r layer/mpic_common_layer_content -rm layer/python311_layer_content.zip -rm layer/mpic_coordinator_layer_content.zip +rm layer/*.zip rm "${FUNCTIONS_DIR}"/mpic_coordinator_lambda/mpic_coordinator_lambda.zip rm "${FUNCTIONS_DIR}"/mpic_caa_checker_lambda/mpic_caa_checker_lambda.zip diff --git a/pyproject.toml b/pyproject.toml index e08cc41..1aaff2f 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -26,14 +26,14 @@ classifiers = [ "Programming Language :: Python :: Implementation :: PyPy", ] dependencies = [ - #"open-mpic-core @ git+https://github.com/open-mpic/open-mpic-core-python.git@main", +# "open-mpic-core @ git+https://github.com/open-mpic/open-mpic-core-python.git@main", "pyyaml==6.0.1", "requests>=2.32.3", "dnspython==2.6.1", "pydantic==2.8.2", "aiohttp==3.11.11", "aws-lambda-powertools[parser]==3.2.0", - "open-mpic-core==4.1.2", + "open-mpic-core==4.4.0", "aioboto3~=13.3.0", ] diff --git a/tests/integration/test_deployed_mpic_api.py b/tests/integration/test_deployed_mpic_api.py index 42777cf..1050753 100644 --- a/tests/integration/test_deployed_mpic_api.py +++ b/tests/integration/test_deployed_mpic_api.py @@ -81,12 +81,14 @@ def api_should_return_200_and_passed_corroboration_given_successful_caa_check(se def api_should_return_is_valid_false_for_all_tests_in_do_not_issue_caa_test_suite(self, api_client, domain_or_ip_target, purpose_of_test, is_wildcard_domain): print(f"Running test for {domain_or_ip_target} ({purpose_of_test})") + if is_wildcard_domain: + domain_or_ip_target = "*." + domain_or_ip_target request = MpicCaaRequest( domain_or_ip_target=domain_or_ip_target, orchestration_parameters=MpicRequestOrchestrationParameters(perspective_count=3, quorum_count=2), caa_check_parameters=CaaCheckParameters( - certificate_type=CertificateType.TLS_SERVER if not is_wildcard_domain else CertificateType.TLS_SERVER_WILDCARD, - caa_domains=['example.com']) + certificate_type=CertificateType.TLS_SERVER, caa_domains=['example.com'] + ) ) response = api_client.post(MPIC_REQUEST_PATH, json.dumps(request.model_dump())) mpic_response = self.mpic_response_adapter.validate_json(response.text) @@ -114,12 +116,13 @@ def api_should_return_is_valid_false_for_all_tests_in_do_not_issue_caa_test_suit def api_should_return_is_valid_true_for_valid_tests_in_caa_test_suite_when_caa_domain_is_caatestsuite_com(self, api_client, domain_or_ip_target, purpose_of_test, is_wildcard_domain): print(f"Running test for {domain_or_ip_target} ({purpose_of_test})") + if is_wildcard_domain: + domain_or_ip_target = "*." + domain_or_ip_target request = MpicCaaRequest( domain_or_ip_target=domain_or_ip_target, orchestration_parameters=MpicRequestOrchestrationParameters(perspective_count=3, quorum_count=2), caa_check_parameters=CaaCheckParameters( - certificate_type=CertificateType.TLS_SERVER if not is_wildcard_domain else CertificateType.TLS_SERVER_WILDCARD, - caa_domains=['caatestsuite.com', 'example.com']) + certificate_type=CertificateType.TLS_SERVER, caa_domains=['caatestsuite.com', 'example.com']) ) response = api_client.post(MPIC_REQUEST_PATH, json.dumps(request.model_dump())) mpic_response = self.mpic_response_adapter.validate_json(response.text)