From 012b90c8280a2e59b0d77128a245b6dcf3575556 Mon Sep 17 00:00:00 2001
From: jamshale <jamiehalebc@gmail.com>
Date: Tue, 10 Dec 2024 21:17:52 +0000
Subject: [PATCH 1/2] Backport PR 3391

Signed-off-by: jamshale <jamiehalebc@gmail.com>
---
 .github/workflows/publish.yml                        | 12 +++---------
 aries_cloudagent/askar/profile.py                    |  6 ++----
 .../storage/vc_holder/tests/test_askar_vc_holder.py  |  5 ++---
 3 files changed, 7 insertions(+), 16 deletions(-)

diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
index 937c2e1bbd..d570b55b72 100644
--- a/.github/workflows/publish.yml
+++ b/.github/workflows/publish.yml
@@ -51,12 +51,6 @@ jobs:
         uses: actions/checkout@v3
         with:
           ref: ${{ inputs.ref || '' }}
-
-      - name: Gather image info
-        id: info
-        run: |
-          echo "repo-owner=${GITHUB_REPOSITORY_OWNER,,}" >> $GITHUB_OUTPUT
-
       - name: Cache Docker layers
         uses: actions/cache@v3
         with:
@@ -72,15 +66,15 @@ jobs:
         uses: docker/login-action@v2
         with:
           registry: ghcr.io
-          username: ${{ github.repository_owner }}
-          password: ${{ secrets.GITHUB_TOKEN }}
+          username: hyperledger
+          password: ${{ secrets.HYPERLEDGER_GHCR_PAT }}
 
       - name: Setup Image Metadata
         id: meta
         uses: docker/metadata-action@v4
         with:
           images: |
-            ghcr.io/${{ steps.info.outputs.repo-owner }}/aries-cloudagent-python
+            ghcr.io/hyperledger/aries-cloudagent-python
           tags: |
             type=raw,value=py${{ matrix.python-version }}-${{ inputs.tag || github.event.release.tag_name }}
 
diff --git a/aries_cloudagent/askar/profile.py b/aries_cloudagent/askar/profile.py
index e9b84db4e0..419a07ff90 100644
--- a/aries_cloudagent/askar/profile.py
+++ b/aries_cloudagent/askar/profile.py
@@ -5,7 +5,6 @@
 import time
 
 # import traceback
-
 from typing import Any, Mapping
 from weakref import ref
 
@@ -26,8 +25,7 @@
 from ..utils.multi_ledger import get_write_ledger_config_for_profile
 from ..wallet.base import BaseWallet
 from ..wallet.crypto import validate_seed
-
-from .store import AskarStoreConfig, AskarOpenStore
+from .store import AskarOpenStore, AskarStoreConfig
 
 LOGGER = logging.getLogger(__name__)
 
@@ -118,7 +116,7 @@ def bind_providers(self):
             VCHolder,
             ClassProvider(
                 "aries_cloudagent.storage.vc_holder.askar.AskarVCHolder",
-                ref(self),
+                ClassProvider.Inject(Profile),
             ),
         )
         if (
diff --git a/aries_cloudagent/storage/vc_holder/tests/test_askar_vc_holder.py b/aries_cloudagent/storage/vc_holder/tests/test_askar_vc_holder.py
index 315a20f553..4d5a265be0 100644
--- a/aries_cloudagent/storage/vc_holder/tests/test_askar_vc_holder.py
+++ b/aries_cloudagent/storage/vc_holder/tests/test_askar_vc_holder.py
@@ -1,12 +1,10 @@
 import pytest
 
-
 from ....askar.profile import AskarProfileManager
 from ....config.injection_context import InjectionContext
-
+from ..askar import AskarVCHolder
 from ..base import VCHolder
 from ..vc_record import VCRecord
-
 from . import test_in_memory_vc_holder as in_memory
 
 
@@ -22,6 +20,7 @@ async def make_profile():
             "key_derivation_method": "RAW",  # much faster than using argon-hashed keys
         },
     )
+    profile.context.injector.bind_instance(VCHolder, AskarVCHolder(profile))
     return profile
 
 

From 4b29b6c974c905259b6559c4ddd7f743713da53c Mon Sep 17 00:00:00 2001
From: jamshale <jamiehalebc@gmail.com>
Date: Tue, 10 Dec 2024 21:46:11 +0000
Subject: [PATCH 2/2] Change pypi publish workflow

Signed-off-by: jamshale <jamiehalebc@gmail.com>
---
 .github/workflows/pythonpublish.yml | 19 +++++++++++--------
 1 file changed, 11 insertions(+), 8 deletions(-)

diff --git a/.github/workflows/pythonpublish.yml b/.github/workflows/pythonpublish.yml
index 5e7ebfb330..5ff1cca8dd 100644
--- a/.github/workflows/pythonpublish.yml
+++ b/.github/workflows/pythonpublish.yml
@@ -7,20 +7,23 @@ on:
 jobs:
   deploy:
     runs-on: ubuntu-latest
+    environment:
+      name: pypi
+      url: https://pypi.org/p/aries-cloudagent
+    permissions:
+      id-token: write  # IMPORTANT: this permission is mandatory for trusted publishing
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - name: Set up Python
-        uses: actions/setup-python@v4
+        uses: actions/setup-python@v5
         with:
-          python-version: "3.x"
-      - name: Install dependencies
+          python-version: "3.9"
+      - name: Install build and publish dependencies
         run: |
           python -m pip install --upgrade pip
           pip install setuptools wheel twine poetry
       - name: Build and publish
-        env:
-          TWINE_USERNAME: ${{ secrets.PYPI_USERNAME }}
-          TWINE_PASSWORD: ${{ secrets.PYPI_PASSWORD }}
         run: |
           poetry build
-          twine upload dist/*
+      - name: Publish package distributions to PyPI
+        uses: pypa/gh-action-pypi-publish@release/v1
\ No newline at end of file