⬆️ ✨ Upgrade ACA-Py and resolve noisy error logs (#1162)

* 🚧 test acapy changes * 🚧 update plugin commit hashes * 🚧 update plugin commit hashes * 🚧 debug IndyVdrLedger close issue * 🚧 test no banner on startup * 🚧 test skipping k6 tests See if that impacts the unawaited coroutine * 🚧 test correction * 🚧 test indy-vdr-ledger-pool singleton behaviour * 🚧 test indy-vdr-ledger-pool singleton behaviour * 👷 Filter PR Validator Comments (#1167) * Add a Markdown Comment to identify comments left by PR validator * ⬆️ Update Local Tilt Resources (#1168) * Bump `bitnami/postgresql-ha` `14.2.33` -> `14.3.6` * Bump `bitnami/nats` `8.4.4` -> `8.4.6` * Set `podManagementPolicy` to `Parallel` * 🚧 test logging improvements * 🚧 * 🚧 test rebased branch * 🚧 update plugin commit hashes * 🚧 test-1.1.1a4 * 🚧 Test 1.1.1a5 * 🚧 * 🚧 * 🚧 * 🚧 Test with latest upstream and logging changes * 🚧 * 🚧 Test DeferLoad caching * 🚧 Test ClassLoader caching * 🚧 Test with less logging * 🚧 test-1.1.1b5 * 🚧 * 🚧 test latest main sync * 🚧 test latest log improvements * 🎨 Ensure alice did is qualified in rotate request * 🎨 Update example * 🔧 Configure asyncio_default_fixture_loop_scope * ✅ Fix test * ⬆️ Mise `2024.12.0` (#1218) * Mise `2024.12.0` * Use Aqua instead of Go to install NATS CLI * 🚧 * 🚧 * 🚧 Possibly final test ... * ✨ Update base image tag * 🚧 Update plugin commit hashes * 🚧 Test new cloudcontroller * ⬆️ Update lock files * ⬆️ Use new cloudcontroller release * ⬆️ Update plugins to latest releases * ⏪ Revert change to skip k6 --------- Co-authored-by: Robbie Blaine <4052340+rblaine95@users.noreply.github.com>
didx-xyz · Dec 6, 2024 · e13468e · e13468e
1 parent 6cc74c8
commit e13468e
Show file tree

Hide file tree

Showing 14 changed files with 878 additions and 916 deletions.
diff --git a/app/models/wallet.py b/app/models/wallet.py
@@ -63,7 +63,7 @@ class DIDCreate(DIDCreateAcaPy):
         default=None,
         deprecated=True,
         description="(Deprecated) Define a key type and/or a DID depending on the chosen DID method.",
-        examples=[{"key_type": "ed25519", "did": "did:peer:2"}],
+        examples=[{"key_type": "ed25519", "did": "did:peer:2..."}],
     )
     seed: Optional[StrictStr] = Field(
         default=None,

diff --git a/app/poetry.lock b/app/poetry.lock
diff --git a/app/pyproject.toml b/app/pyproject.toml
@@ -9,7 +9,7 @@ package-mode = false
 python = "^3.12"
 
 aiohttp = "~3.11.7"
-aries-cloudcontroller = "==1.1.1b3"
+aries-cloudcontroller = "==1.2.0.post20241205"
 base58 = "~2.1.1"
 fastapi = "~0.115.0"
 httpx = "~0.28.0"
@@ -51,3 +51,4 @@ profile = "black"
 [tool.pytest.ini_options]
 addopts = "--junitxml=junit.xml -p no:cacheprovider --cov-report=xml --cov-report=term"
 junit_family = "xunit2"
+asyncio_default_fixture_loop_scope = "function"
diff --git a/app/tests/e2e/test_did_rotate.py b/app/tests/e2e/test_did_rotate.py
@@ -3,6 +3,7 @@
 from assertpy import assert_that
 from fastapi import HTTPException
 
+from app.models.wallet import DIDCreate
 from app.routes.connections import router as connections_router
 from app.services import acapy_wallet
 from app.tests.util.webhooks import check_webhook_state
@@ -13,10 +14,12 @@
 
 
 @pytest.mark.anyio
+@pytest.mark.parametrize("did_method", ["did:peer:2", "did:peer:4"])
 async def test_rotate_did(
     alice_member_client: RichAsyncClient,
     alice_acapy_client: AcaPyClient,
     faber_acapy_client: AcaPyClient,
+    did_method: str,
 ):
     # First, create did-exchange connections between Alice and Faber:
     faber_public_did = await acapy_wallet.get_public_did(controller=faber_acapy_client)
@@ -36,7 +39,9 @@ async def test_rotate_did(
     )
 
     # Create a new did for Alice and rotate
-    new_did = await acapy_wallet.create_did(controller=alice_acapy_client)
+    new_did = await acapy_wallet.create_did(
+        controller=alice_acapy_client, did_create=DIDCreate(method=did_method)
+    )
     alice_new_did = new_did.did
 
     rotate_response = await alice_member_client.post(

diff --git a/dockerfiles/agents/Dockerfile b/dockerfiles/agents/Dockerfile
@@ -1,4 +1,4 @@
-FROM ghcr.io/didx-xyz/acapy-agent-bbs:py3.12-1.1.1-20241115
+FROM ghcr.io/didx-xyz/acapy-agent-bbs:py3.12-1.2.0-20241205
 
 COPY configuration ./configuration
 COPY scripts ./scripts
diff --git a/dockerfiles/agents/Dockerfile.agent b/dockerfiles/agents/Dockerfile.agent
@@ -1,4 +1,4 @@
-FROM ghcr.io/didx-xyz/acapy-agent-bbs:py3.12-1.1.1-20241115
+FROM ghcr.io/didx-xyz/acapy-agent-bbs:py3.12-1.2.0-20241205
 
 USER root
 
@@ -7,7 +7,7 @@ ARG PROTOBUF_VERSION=5.29.0
 RUN pip install --no-cache-dir protobuf==${PROTOBUF_VERSION}
 
 # install nats-events plugin
-RUN pip install --no-cache-dir git+https://github.com/didx-xyz/aries-acapy-plugins@1.1.1-20241115#subdirectory=nats_events
+RUN pip install --no-cache-dir git+https://github.com/didx-xyz/aries-acapy-plugins@1.2.0-20241205#subdirectory=nats_events
 
 COPY scripts/startup.sh startup.sh
 RUN chmod +x ./startup.sh

diff --git a/dockerfiles/agents/Dockerfile.author.agent b/dockerfiles/agents/Dockerfile.author.agent
@@ -1,4 +1,4 @@
-FROM ghcr.io/didx-xyz/acapy-agent-bbs:py3.12-1.1.1-20241115
+FROM ghcr.io/didx-xyz/acapy-agent-bbs:py3.12-1.2.0-20241205
 
 USER root
 
@@ -7,10 +7,10 @@ ARG PROTOBUF_VERSION=5.29.0
 RUN pip install --no-cache-dir protobuf==${PROTOBUF_VERSION}
 
 # Install wallet group id plugin
-RUN pip install --no-cache-dir acapy-wallet-groups-plugin==1.1.1.post20241115
+RUN pip install --no-cache-dir acapy-wallet-groups-plugin==1.2.0.post20241205
 
 # install nats-events plugin
-RUN pip install --no-cache-dir git+https://github.com/didx-xyz/aries-acapy-plugins@1.1.1-20241115#subdirectory=nats_events
+RUN pip install --no-cache-dir git+https://github.com/didx-xyz/aries-acapy-plugins@1.2.0-20241205#subdirectory=nats_events
 
 COPY scripts/startup.sh startup.sh
 RUN chmod +x ./startup.sh

diff --git a/endorser/poetry.lock b/endorser/poetry.lock
diff --git a/endorser/pyproject.toml b/endorser/pyproject.toml
@@ -8,7 +8,7 @@ package-mode = false
 [tool.poetry.dependencies]
 python = "^3.12"
 
-aries-cloudcontroller = "==1.1.1b3"
+aries-cloudcontroller = "==1.2.0.post20241205"
 dependency-injector-fork = "~=4.42.1"                    # https://github.com/ets-labs/python-dependency-injector/pull/765#issuecomment-1915100744
 fastapi = "~0.115.0"
 httpx = "~0.28.0"
@@ -43,3 +43,4 @@ profile = "black"
 [tool.pytest.ini_options]
 addopts = "--junitxml=junit.xml -p no:cacheprovider --cov-report=xml --cov-report=term"
 junit_family = "xunit2"
+asyncio_default_fixture_loop_scope = "function"
diff --git a/pyproject.toml b/pyproject.toml
@@ -19,3 +19,4 @@ profile = "black"
 [tool.pytest.ini_options]
 addopts = "--junitxml=junit.xml -p no:cacheprovider --cov-report=xml --cov-report=term"
 junit_family = "xunit2"
+asyncio_default_fixture_loop_scope = "function"
diff --git a/trustregistry/poetry.lock b/trustregistry/poetry.lock
diff --git a/trustregistry/pyproject.toml b/trustregistry/pyproject.toml
@@ -43,3 +43,4 @@ profile = "black"
 [tool.pytest.ini_options]
 addopts = "--junitxml=junit.xml -p no:cacheprovider --cov-report=xml --cov-report=term"
 junit_family = "xunit2"
+asyncio_default_fixture_loop_scope = "function"