Merge branch 'main' into feature/ui-nodemailer-auth

Signed-off-by: Ivan Polchenko <[email protected]>
bcgov · Feb 5, 2024 · fd039a6 · fd039a6
2 parents 3fd370e + 8f82233
commit fd039a6
Show file tree

Hide file tree

Showing 68 changed files with 907 additions and 9,713 deletions.
diff --git a/.github/workflows/stale.yaml b/.github/workflows/stale.yaml
@@ -19,4 +19,5 @@ jobs:
           days-before-pr-stale: 45
           days-before-issue-close: 5
           days-before-pr-close: 10
+          exempt-issue-labels: pinned, bug
 
diff --git a/charts/traction/Chart.yaml b/charts/traction/Chart.yaml
@@ -2,7 +2,7 @@ apiVersion: v2
 name: traction
 description: The Traction service allows organizations to verify, hold, and issue verifiable credentials. The Traction Tenant UI allows tenants to manage their agent.
 type: application
-version: 0.2.7
+version: 0.2.8
 appVersion: 0.3.6
 home: "https://github.com/bcgov/traction"
 sources: ["https://github.com/bcgov/traction"]

diff --git a/charts/traction/README.md b/charts/traction/README.md
@@ -148,7 +148,7 @@ kubectl delete secret,pvc --selector "app.kubernetes.io/instance"=my-release
 
 | Name                                                                                    | Description | Value                                                                                  |
 | --------------------------------------------------------------------------------------- | ----------- | -------------------------------------------------------------------------------------- |
-| `acapy.plugin-config.yml.multitenant_provider.manager.class_name`                       |             | `traction_plugins.multitenant_provider.v1_0.manager.AskarMultitokenMultitenantManager` |
+| `acapy.plugin-config.yml.multitenant_provider.manager.class_name`                       |             | `multitenant_provider.v1_0.manager.AskarMultitokenMultitenantManager` |
 | `acapy.plugin-config.yml.multitenant_provider.manager.always_check_provided_wallet_key` |             | `true`                                                                                 |
 | `acapy.plugin-config.yml.multitenant_provider.errors.on_unneeded_wallet_key`            |             | `false`                                                                                |
 | `acapy.plugin-config.yml.multitenant_provider.token_expiry.units`                       |             | `days`                                                                                 |
@@ -161,6 +161,7 @@ kubectl delete secret,pvc --selector "app.kubernetes.io/instance"=my-release
 | `acapy.plugin-config.yml.traction_innkeeper.reservation.expiry_minutes`                 |             | `2880`                                                                                 |
 | `acapy.plugin-config.yml.traction_innkeeper.reservation.auto_approve`                   |             | `false`                                                                                |
 | `acapy.plugin-config.yml.traction_innkeeper.reservation.auto_issuer`                    |             | `false`                                                                                |
+| `acapy.plugin-config.yml.basicmessage_storage.wallet_enabled`                           |             | `true`                                                                                 |
 
 ### Acapy tails persistence configuration
 

diff --git a/charts/traction/templates/acapy/deployment.yaml b/charts/traction/templates/acapy/deployment.yaml
@@ -57,13 +57,13 @@ spec:
            --plugin-config-value traction_innkeeper.innkeeper_wallet.wallet_key=\"$(INNKEEPER_WALLET_WALLET_KEY)\" \
            {{- end }}
            {{- if .Values.acapy.plugins.basicmessageStorage }}
-           --plugin traction_plugins.basicmessage_storage.v1_0 \
+           --plugin basicmessage_storage.v1_0 \
            {{- end }}
            {{- if .Values.acapy.plugins.connectionUpdate }}
-           --plugin traction_plugins.connection_update.v1_0 \
+           --plugin connection_update.v1_0 \
            {{- end }}
            {{- if .Values.acapy.plugins.multitenantProvider }}
-           --plugin traction_plugins.multitenant_provider.v1_0 \
+           --plugin multitenant_provider.v1_0 \
            {{- end }}           
            "
           ]

diff --git a/charts/traction/templates/acapy/tails_pvc.yaml b/charts/traction/templates/acapy/tails_pvc.yaml
@@ -15,5 +15,5 @@ spec:
   resources:
     requests:
       storage: {{ .Values.acapy.persistence.size | quote }}
-  {{- include "common.storage.class" (dict "persistence" .Values.acapy.persistence "global" .Values.global) | nindent 8 }}
+  {{- include "common.storage.class" (dict "persistence" .Values.acapy.persistence "global" .Values.global) | nindent 2 }}
 {{- end}}
diff --git a/charts/traction/values.yaml b/charts/traction/values.yaml
@@ -222,11 +222,12 @@ acapy:
   ## @param acapy.plugin-config.yml.traction_innkeeper.reservation.expiry_minutes
   ## @param acapy.plugin-config.yml.traction_innkeeper.reservation.auto_approve
   ## @param acapy.plugin-config.yml.traction_innkeeper.reservation.auto_issuer
+  ## @param acapy.plugin-config.yml.basicmessage_storage.wallet_enabled
   ##
   plugin-config.yml:
     multitenant_provider:
       manager:
-        class_name: traction_plugins.multitenant_provider.v1_0.manager.AskarMultitokenMultitenantManager
+        class_name: multitenant_provider.v1_0.manager.AskarMultitokenMultitenantManager
         always_check_provided_wallet_key: true
       errors:
         on_unneeded_wallet_key: false
@@ -250,6 +251,8 @@ acapy:
         expiry_minutes: 2880
         auto_approve: false
         auto_issuer: false
+    basicmessage_storage:
+      wallet_enabled: true
   ## @section Acapy tails persistence configuration
   persistence:
     ## @param acapy.persistence.existingClaim Name of an existing PVC to use

diff --git a/plugins/basicmessage_storage/README.md b/plugins/basicmessage_storage/README.md
diff --git a/plugins/basicmessage_storage/basicmessage_storage/__init__.py b/plugins/basicmessage_storage/basicmessage_storage/__init__.py
diff --git a/plugins/basicmessage_storage/basicmessage_storage/definition.py b/plugins/basicmessage_storage/basicmessage_storage/definition.py
diff --git a/plugins/basicmessage_storage/basicmessage_storage/v1_0/__init__.py b/plugins/basicmessage_storage/basicmessage_storage/v1_0/__init__.py
diff --git a/plugins/basicmessage_storage/basicmessage_storage/v1_0/models.py b/plugins/basicmessage_storage/basicmessage_storage/v1_0/models.py