Merge pull request #44 from Indicio-tech/chore/acapy-upgrade

chore: upgrade acapy

Author: cjhowland

acapy_cache_redis/v0_1/__init__.py

@@ -3,9 +3,9 @@
 
 import logging
 
-from aries_cloudagent.cache.base import BaseCache
-from aries_cloudagent.config.injection_context import InjectionContext
-from aries_cloudagent.protocols.problem_report.v1_0.message import ProblemReport
+from acapy_agent.cache.base import BaseCache
+from acapy_agent.config.injection_context import InjectionContext
+from acapy_agent.protocols.problem_report.v1_0.message import ProblemReport
 
 from .redis_base_cache import RedisBaseCache
 

acapy_cache_redis/v0_1/redis_base_cache.py

@@ -2,9 +2,9 @@
 import json
 import logging
 
-from aries_cloudagent.cache.base import BaseCache, CacheKeyLock
-from aries_cloudagent.core.profile import Profile
-from aries_cloudagent.core.error import BaseError
+from acapy_agent.cache.base import BaseCache, CacheKeyLock
+from acapy_agent.core.profile import Profile
+from acapy_agent.core.error import BaseError
 from redis.asyncio import RedisCluster
 from redis.exceptions import RedisError, RedisClusterException
 from typing import Any, Sequence, Text, Union
@@ -97,7 +97,9 @@ async def check_for_redis_cluster(self):
                     "Found redis connection string correspond to a cluster node,"
                     " reassigning redis to redis.asyncio.RedisCluster client."
                 )
-                self.root_profile.injector.bind_instance(RedisCluster, self.redis)
+                self.root_profile.context.injector.bind_instance(
+                    RedisCluster, self.redis
+                )
                 await self.redis.ping(target_nodes=RedisCluster.PRIMARIES)
             else:
                 LOGGER.info("Using an existing provided instance of RedisCluster.")

acapy_cache_redis/v0_1/util.py

@@ -1,4 +1,4 @@
-from aries_cloudagent.protocols.problem_report.v1_0.message import (
+from acapy_agent.protocols.problem_report.v1_0.message import (
     ProblemReport as report,
 )
 

docker/Dockerfile

@@ -1,4 +1,4 @@
-FROM python:3.9-slim-bullseye
+FROM python:3.12-slim-bullseye
 WORKDIR /usr/src/app/
 
 ENV POETRY_HOME=/opt/poetry \

docker/default.yml

@@ -35,3 +35,8 @@ plugin-config-value:
   # - redis_cache.credentials.username="username"
   # - redis_cache.credentials.password="password"
   # - redis_cache.ssl.cacerts=./ca.crt
+
+auto-provision: true
+wallet-name: default
+wallet-type: askar-anoncreds
+wallet-key: "insecure"

docker/default_cluster.yml

@@ -35,3 +35,8 @@ plugin-config-value:
   - redis_cache.credentials.username="default"
   - redis_cache.credentials.password="test1234"
   # - redis_cache.ssl.cacerts=./ca.crt
+
+auto-provision: true
+wallet-name: default
+wallet-type: askar-anoncreds
+wallet-key: "insecure"

int/Dockerfile

@@ -1,4 +1,4 @@
-FROM python:3.9-slim-bullseye
+FROM python:3.12-slim-bullseye
 WORKDIR /usr/src/app/
 
 ENV POETRY_HOME=/opt/poetry \

int/docker-compose.yml

@@ -14,6 +14,10 @@ services:
         --plugin acapy_cache_redis.v0_1
         --plugin-config-value redis_cache.connection="redis://default:[email protected]:6382"
         --log-level debug
+        --auto-provision
+        --wallet-name default
+        --wallet-type askar-anoncreds
+        --wallet-key "insecure"
     networks:
       - acapy_default
     depends_on:
@@ -193,6 +197,10 @@ services:
         --plugin acapy_cache_redis.v0_1
         --plugin-config-value redis_cache.connection="redis://redis-host:6379/0"
         --log-level debug
+        --auto-provision
+        --wallet-name default
+        --wallet-type askar-anoncreds
+        --wallet-key "insecure"
     healthcheck:
       test: curl -s -o /dev/null -w '%{http_code}' "http://localhost:3004/status/live" | grep "200" > /dev/null
       start_period: 30s

poetry.lock

@@ -5,8 +5,8 @@ description = "ACA-Py Cache Plugin for Redis enabling common cache on clustered
 authors = ["Colton Wolkins <[email protected]>", "Kim Ebert <[email protected]>", "Alex Walker <[email protected]>"]
 
 [tool.poetry.dependencies]
-python = "^3.9.0"
-aries-cloudagent = {version = ">=0.11.0,<1.0.0", extras = ["askar"]}
+python = "^3.12.0"
+acapy-agent = {version = ">=1.2.0,<1.4.0"}
 redis = "^4.3.0"
 
 [tool.poetry.dev-dependencies]