Skip to content

Commit

Permalink
Merge branch 'main' into feature/ui-nodemailer-auth
Browse files Browse the repository at this point in the history
  • Loading branch information
i5okie authored Feb 2, 2024
2 parents 3fd370e + 8f82233 commit c7ab45c
Show file tree
Hide file tree
Showing 68 changed files with 907 additions and 9,713 deletions.
1 change: 1 addition & 0 deletions .github/workflows/stale.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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

2 changes: 1 addition & 1 deletion charts/traction/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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"]
Expand Down
3 changes: 2 additions & 1 deletion charts/traction/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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` |
Expand All @@ -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

Expand Down
6 changes: 3 additions & 3 deletions charts/traction/templates/acapy/deployment.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}
"
]
Expand Down
2 changes: 1 addition & 1 deletion charts/traction/templates/acapy/tails_pvc.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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}}
5 changes: 4 additions & 1 deletion charts/traction/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down
21 changes: 0 additions & 21 deletions plugins/basicmessage_storage/README.md

This file was deleted.

Empty file.
10 changes: 0 additions & 10 deletions plugins/basicmessage_storage/basicmessage_storage/definition.py

This file was deleted.

37 changes: 0 additions & 37 deletions plugins/basicmessage_storage/basicmessage_storage/v1_0/__init__.py

This file was deleted.

92 changes: 0 additions & 92 deletions plugins/basicmessage_storage/basicmessage_storage/v1_0/models.py

This file was deleted.

Loading

0 comments on commit c7ab45c

Please sign in to comment.