From d883f3766ae6a90e7559883555031912212d0449 Mon Sep 17 00:00:00 2001 From: Henry Birge-Lee Date: Mon, 24 Feb 2025 20:28:35 -0500 Subject: [PATCH 1/2] key auth hash change --- pyproject.toml | 4 ++-- tests/integration/test_deployed_mpic_api.py | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/pyproject.toml b/pyproject.toml index dadc439..8c3aae0 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@birgelee-dcv-caa-perspective-code-response", + "open-mpic-core @ git+https://github.com/open-mpic/open-mpic-core-python.git@birgelee-key-auth-hash", "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==5.1.0", +# "open-mpic-core==5.1.0", "aioboto3~=13.3.0", "black==24.8.0", ] diff --git a/tests/integration/test_deployed_mpic_api.py b/tests/integration/test_deployed_mpic_api.py index d0aab1b..575e85a 100644 --- a/tests/integration/test_deployed_mpic_api.py +++ b/tests/integration/test_deployed_mpic_api.py @@ -179,7 +179,7 @@ def api_should_return_200_given_valid_dns_01_validation(self, api_client, domain domain_or_ip_target=domain_or_ip_target, orchestration_parameters=MpicRequestOrchestrationParameters(perspective_count=3, quorum_count=2), dcv_check_parameters=DcvAcmeDns01ValidationParameters( - key_authorization="7FwkJPsKf-TH54wu4eiIFA3nhzYaevsL7953ihy-tpo" + key_authorization_hash="7FwkJPsKf-TH54wu4eiIFA3nhzYaevsL7953ihy-tpo" ), ) @@ -205,7 +205,7 @@ def api_should_return_200_is_valid_false_given_invalid_dns_01_validation( domain_or_ip_target=domain_or_ip_target, orchestration_parameters=MpicRequestOrchestrationParameters(perspective_count=3, quorum_count=2), dcv_check_parameters=DcvAcmeDns01ValidationParameters( - key_authorization="7FwkJPsKf-TH54wu4eiIFA3nhzYaevsL7953ihy-tpo" + key_authorization_hash="7FwkJPsKf-TH54wu4eiIFA3nhzYaevsL7953ihy-tpo" ), ) @@ -244,7 +244,7 @@ def api_should_return_200_given_valid_http_01_validation( ('integration-testing.open-mpic.org', 'Failed 302 http-01 test', "evaGxfADs6pSRb2LAv9IZf17Dt3juxGJ-PCt92wr-oB", "evaGxfADs6pSRb2LAv9IZf17Dt3juxGJ-PCt92wr-oA.NzbLsXh8uDCcd-6MNwXF4W_7noWXFZAfHkxZsRGC9Xa") ]) # fmt: on - def api_should_return_200_given_invalid_http_01_validation( + def api_should_return_200_given_invalid_dns_01_validation( self, api_client, domain_or_ip_target, purpose_of_test, token, key_authorization ): print(f"Running test for {domain_or_ip_target} ({purpose_of_test})") @@ -252,7 +252,7 @@ def api_should_return_200_given_invalid_http_01_validation( domain_or_ip_target=domain_or_ip_target, orchestration_parameters=MpicRequestOrchestrationParameters(perspective_count=3, quorum_count=2), dcv_check_parameters=DcvAcmeDns01ValidationParameters( - key_authorization="7FwkJPsKf-TH54wu4eiIFA3nhzYaevsL7953ihy-tpo" + key_authorization_hash="7FwkJPsKf-TH54wu4eiIFA3nhzYaevsL7953ihy-tpo" ), ) From 16cf85a246acf8f88d4ccbc0bc162201408c07ea Mon Sep 17 00:00:00 2001 From: Henry Birge-Lee Date: Tue, 25 Feb 2025 13:46:12 -0500 Subject: [PATCH 2/2] updated api version --- README.md | 2 +- pyproject.toml | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index e0e2927..1a79794 100644 --- a/README.md +++ b/README.md @@ -43,7 +43,7 @@ The above sample must be run from the root directory of a deployed Open MPIC aws The API is compliant with the [Open MPIC Specification](https://github.com/open-mpic/open-mpic-specification). -Documentation based on the API specification used in this version can be viewed [here](https://open-mpic.org/documentation.html?commit=9c1e2e9a73f63e2c9156909e949e0a724aeccb6a). +Documentation based on the API specification used in this version can be viewed [here](https://open-mpic.org/documentation.html?commit=44c941d395430b022063b2e5353526ba07034771). ## Development Code changes can easily be deployed by editing the .py files and then rezipping the project via `./zip-all.sh` and `./2-package.sh` in the `layer` directory. Then, running `tofu apply` run from the open-tofu directory will update only on the required resources and leave the others unchanged. If any `.tf.template` files are changed or `config.yaml` is edited, `hatch run ./configure.py` must be rerun followed by `tofu apply` in the open-tofu directory. diff --git a/pyproject.toml b/pyproject.toml index 8c3aae0..424ce22 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@birgelee-key-auth-hash", +# "open-mpic-core @ git+https://github.com/open-mpic/open-mpic-core-python.git@birgelee-key-auth-hash", "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==5.1.0", + "open-mpic-core==5.2.0", "aioboto3~=13.3.0", "black==24.8.0", ] @@ -56,7 +56,7 @@ Source = "https://github.com/open-mpic/aws-lambda-python" #virtual = ".hatch" [tool.api] -spec_version = "3.0.0" +spec_version = "3.1.0" spec_repository = "https://github.com/open-mpic/open-mpic-specification" [tool.hatch]