Skip to content

Commit

Permalink
Merge branch 'main' into feature/addAuthSessionIndexes
Browse files Browse the repository at this point in the history
  • Loading branch information
esune authored Mar 5, 2024
2 parents 14cd182 + 9d8b9f4 commit 97e495d
Show file tree
Hide file tree
Showing 8 changed files with 393 additions and 214 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/chart_release.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ jobs:
git config user.name "$GITHUB_ACTOR"
git config user.email "[email protected]"
- name: Install Helm
uses: azure/setup-helm@v3
uses: azure/setup-helm@v4
- name: Add bitnami repository
run: helm repo add bitnami https://charts.bitnami.com/bitnami
- name: Run chart-releaser
Expand Down
30 changes: 15 additions & 15 deletions charts/vc-authn-oidc/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -6,25 +6,25 @@ type: application
# This is the chart version. This version number should be incremented each time you make changes
# to the chart and its templates, including the app version.
# Versions are expected to follow Semantic Versioning (https://semver.org/)
version: 0.1.7
version: 0.1.8

# This is the version number of the application being deployed. This version number should be
# incremented each time you make changes to the application. Versions are not expected to
# follow Semantic Versioning. They should reflect the version the application is using.
# It is recommended to use it with quotes.
appVersion: "2.0.0"
appVersion: "2.0.1-rc0"

# Charts the vc-authn-oidc service depends on
# Charts the vc-authn-oidc service depends on
dependencies:
- name: mongodb
version: "13.13.1"
repository: "https://charts.bitnami.com/bitnami"
- name: postgresql
version: 11.9.13
repository: https://charts.bitnami.com/bitnami/
condition: postgresql.enabled
- name: common
repository: "https://charts.bitnami.com/bitnami"
tags:
- bitnami-common
version: 2.x.x
- name: mongodb
version: "13.13.1"
repository: "https://charts.bitnami.com/bitnami"
- name: postgresql
version: 11.9.13
repository: https://charts.bitnami.com/bitnami/
condition: postgresql.enabled
- name: common
repository: "https://charts.bitnami.com/bitnami"
tags:
- bitnami-common
version: 2.x.x
76 changes: 37 additions & 39 deletions charts/vc-authn-oidc/README.md

Large diffs are not rendered by default.

80 changes: 42 additions & 38 deletions charts/vc-authn-oidc/values.yaml
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
## @section Common Configuration
##
## @param nameOverride
## @param nameOverride
nameOverride: ""
## @param fullnameOverride
fullnameOverride: ""

## @param image.repository
## @param image.repository
## @param image.pullPolicy
## @param image.pullSecrets [array]
## @param image.tag Overrides the image tag which defaults to the chart appVersion.
Expand Down Expand Up @@ -53,12 +53,14 @@ podAnnotations: {}
## @param podSecurityContext Pod Security Context
## ref: https://kubernetes.io/docs/tasks/configure-pod-container/security-context/
##
podSecurityContext: {}
podSecurityContext:
{}
# fsGroup: 2000
## @param containerSecurityContext Container Security Context
## ref: https://kubernetes.io/docs/tasks/configure-pod-container/security-context/
##
containerSecurityContext: {}
containerSecurityContext:
{}
# capabilities:
# drop:
# - ALL
Expand All @@ -79,7 +81,7 @@ networkPolicy:
enabled: true
namespaceSelector: []
## Example:
# network.openshift.io/policy-group: ingress
# network.openshift.io/policy-group: ingress
podSelector: {}

## Service configuration
Expand Down Expand Up @@ -108,9 +110,9 @@ ingress:
##
annotations: []
## Example:
# kubernetes.io/ingress.class: nginx
# kubernetes.io/tls-acme: "true"
# route.openshift.io/termination: edge
# kubernetes.io/ingress.class: nginx
# kubernetes.io/tls-acme: "true"
# route.openshift.io/termination: edge
## @param ingress.tls Enable TLS configuration for the host defined at ingress.
tls: []
# - secretName: chart-example-tls
Expand Down Expand Up @@ -150,7 +152,7 @@ autoscaling:
minReplicas: 1
maxReplicas: 2
targetCPUUtilizationPercentage: 80
targetMemoryUtilizationPercentage: ''
targetMemoryUtilizationPercentage: ""
stabilizationWindowSeconds: 300

## ServiceAccount configuration
Expand Down Expand Up @@ -180,24 +182,23 @@ nodeSelector: {}
##
tolerations: []


## @section Acapy Configuration
##
acapy:
## @param acapy.enabled Deploy AcaPy agent instance
enabled: true
## @param acapy.agentUrl Agent host, required if `enabled`` is `false`, otherwise ignored
## @param acapy.agentUrl Agent host, required if `enabled` is `false`, otherwise ignored
agentUrl: ""
## @param acapy.adminUrl Agent admin host, required if `enabled` is `false`, otherwise ignored
adminUrl: ""
## @param acapy.existingSecret Name of existing secret, required if `enabled` is `false`; Secret must contain `adminApiKey`, `walletKey`, and `webhookApiKey` keys.
existingSecret: ""
## @param acapy.agentSeed
agentSeed: ""
## @param acapy.image.repository
## @param acapy.image.repository
## @param acapy.image.pullPolicy
## @param acapy.image.pullSecrets [array]
## @param acapy.image.tag
## @param acapy.image.tag
##
image:
repository: ghcr.io/hyperledger/aries-cloudagent-python
Expand Down Expand Up @@ -236,7 +237,7 @@ acapy:
minReplicas: 1
maxReplicas: 100
targetCPUUtilizationPercentage: 80
targetMemoryUtilizationPercentage: ''
targetMemoryUtilizationPercentage: ""
stabilizationWindowSeconds: 300

## @param acapy.labelOverride
Expand Down Expand Up @@ -296,24 +297,24 @@ acapy:
ledgers.yml:
- id: BCovrinDev
is_production: true
genesis_url: 'http://dev.bcovrin.vonx.io/genesis'
genesis_url: "http://dev.bcovrin.vonx.io/genesis"
- id: BCovrinTest
is_production: true
genesis_url: 'http://test.bcovrin.vonx.io/genesis'
genesis_url: "http://test.bcovrin.vonx.io/genesis"
- id: SovrinStagingNet
is_production: true
genesis_url: 'https://raw.githubusercontent.com/sovrin-foundation/sovrin/stable/sovrin/pool_transactions_sandbox_genesis'
genesis_url: "https://raw.githubusercontent.com/sovrin-foundation/sovrin/stable/sovrin/pool_transactions_sandbox_genesis"
- id: CANdyDev
is_production: true
genesis_url: 'https://raw.githubusercontent.com/ICCS-ISAC/dtrust-reconu/main/CANdy/dev/pool_transactions_genesis'
genesis_url: "https://raw.githubusercontent.com/ICCS-ISAC/dtrust-reconu/main/CANdy/dev/pool_transactions_genesis"
- id: CANdyTest
is_production: true
is_write: true
genesis_url: 'https://raw.githubusercontent.com/ICCS-ISAC/dtrust-reconu/main/CANdy/test/pool_transactions_genesis'
genesis_url: "https://raw.githubusercontent.com/ICCS-ISAC/dtrust-reconu/main/CANdy/test/pool_transactions_genesis"

## @section Wallet Storage configuration
## Specifies the storage configuration to use for the wallet.
## This is required if you are for using 'postgres_storage' wallet 'storage type.
## Specifies the storage configuration to use for the wallet.
## This is required if you are for using 'postgres_storage' wallet 'storage type.
## For example, '{"url":"localhost:5432", "wallet_scheme":"MultiWalletSingleTable"}'.
## This configuration maps to the indy sdk postgres plugin (PostgresConfig).
##
Expand All @@ -323,8 +324,8 @@ acapy:
## @param acapy.walletStorageConfig.wallet_scheme Wallet scheme.
##
walletStorageConfig:
json: ''
url: ''
json: ""
url: ""
max_connections: 10
wallet_scheme: DatabasePerWallet

Expand All @@ -343,11 +344,11 @@ acapy:
## @param acapy.walletStorageCredentials.existingSecret Name of an existing secret containing 'database-user', 'database-password', 'admin-password' keys.
##
walletStorageCredentials:
json: ''
account: ''
password: ''
json: ""
account: ""
password: ""
admin_account: postgres
admin_password: ''
admin_password: ""
existingSecret: ""
## @section Acapy tails persistence configuration
persistence:
Expand Down Expand Up @@ -382,7 +383,7 @@ acapy:
##
resources:
limits:
cpu: '1'
cpu: "1"
memory: 1000Mi
requests:
cpu: 250m
Expand All @@ -394,12 +395,14 @@ acapy:
## @param acapy.podSecurityContext Pod Security Context
## ref: https://kubernetes.io/docs/tasks/configure-pod-container/security-context/
##
podSecurityContext: {}
podSecurityContext:
{}
# fsGroup: 2000
## @param acapy.containerSecurityContext Container Security Context
## ref: https://kubernetes.io/docs/tasks/configure-pod-container/security-context/
##
containerSecurityContext: {}
containerSecurityContext:
{}
# capabilities:
# drop:
# - ALL
Expand Down Expand Up @@ -433,7 +436,7 @@ acapy:
## ref: https://kubernetes.io/docs/concepts/configuration/taint-and-toleration/
##
tolerations: []

## @section Acapy NetworkPolicy parameters

## Add networkpolicies
Expand Down Expand Up @@ -535,8 +538,8 @@ mongodb:
## @param mongodb.auth.usernames List of custom users to be created during the initialization
## @param mongodb.auth.databases List of custom databases to be created during the initialization
##
usernames: ['vcauthn']
databases: ['vcauthn']
usernames: ["vcauthn"]
databases: ["vcauthn"]
## @param mongodb.commonLabels [array] Add labels to all the deployed resources (sub-charts are not considered). Evaluated as a template
##
commonLabels:
Expand Down Expand Up @@ -676,11 +679,12 @@ postgresql:
service:
ports:
postgresql: 5432
## @param postgresql.primary.extendedConfiguration Extended PostgreSQL Primary configuration (appended to main or default configuration)
## ref: https://github.com/bitnami/containers/tree/main/bitnami/postgresql#allow-settings-to-be-loaded-from-files-other-than-the-default-postgresqlconf
##
extendedConfiguration: |
max_connections = 500
## @param postgresql.primary.extendedConfiguration Extended PostgreSQL Primary configuration (appended to main or default configuration)
## ref: https://github.com/bitnami/containers/tree/main/bitnami/postgresql#allow-settings-to-be-loaded-from-files-other-than-the-default-postgresqlconf
##
primary:
extendedConfiguration: |
max_connections = 500
## @param postgresql-ha.enabled Deploy HA PostgreSQL chart. Not currently supported, provided for future use.
postgresql-ha:
Expand Down
3 changes: 2 additions & 1 deletion oidc-controller/api/authSessions/models.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
from datetime import datetime, timedelta
from enum import StrEnum, auto
from typing import Dict
from typing import Dict, Optional

from api.core.acapy.client import AcapyClient
from api.core.models import UUIDModel
Expand All @@ -25,6 +25,7 @@ class AuthSessionBase(BaseModel):
request_parameters: dict
pyop_auth_code: str
response_url: str
presentation_request_msg: Optional[dict] = None

class Config:
allow_population_by_field_name = True
Expand Down
Loading

0 comments on commit 97e495d

Please sign in to comment.