Skip to content

fix(console): move object values #116

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Feb 24, 2025
Merged

fix(console): move object values #116

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
93e6743
fix: move console cookie in .global.platform.console.cookie
Dav-14 Feb 20, 2025
2a1a859
fix: tests
Dav-14 Feb 20, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,13 +5,13 @@
| Readme | Chart Version | App Version | Description | Hub |
|--------|---------------|-------------|-------------|-----|
| [Agent](./charts/agent/README.md) | 2.6.3 | v2.2.1 | Formance Membership Agent Helm Chart | [![Artifact HUB](https://img.shields.io/endpoint?url=https://artifacthub.io/badge/repository/agent)](https://artifacthub.io/packages/search?repo=agent) |
| [Cloudprem](./charts/cloudprem/README.md) | 3.0.0-rc.15 | v1.1.0 | Formance control-plane | [![Artifact HUB](https://img.shields.io/endpoint?url=https://artifacthub.io/badge/repository/cloudprem)](https://artifacthub.io/packages/search?repo=cloudprem) |
| [Console](./charts/console/README.md) | 2.1.2 | console-on.v1.0.2 | Formance Console | [![Artifact HUB](https://img.shields.io/endpoint?url=https://artifacthub.io/badge/repository/console)](https://artifacthub.io/packages/search?repo=console) |
| [Cloudprem](./charts/cloudprem/README.md) | 3.0.0-rc.16 | v1.1.0 | Formance control-plane | [![Artifact HUB](https://img.shields.io/endpoint?url=https://artifacthub.io/badge/repository/cloudprem)](https://artifacthub.io/packages/search?repo=cloudprem) |
| [Console](./charts/console/README.md) | 2.1.3 | console-on.v1.0.2 | Formance Console | [![Artifact HUB](https://img.shields.io/endpoint?url=https://artifacthub.io/badge/repository/console)](https://artifacthub.io/packages/search?repo=console) |
| [Console-V3](./charts/console-v3/README.md) | 2.1.2 | 5e7b404a3a208b1f38603719e02a8b1883c10acf | Formance Console | [![Artifact HUB](https://img.shields.io/endpoint?url=https://artifacthub.io/badge/repository/console-v3)](https://artifacthub.io/packages/search?repo=console-v3) |
| [Core](./charts/core/README.md) | 1.2.2 | latest | Formance Core Library | [![Artifact HUB](https://img.shields.io/endpoint?url=https://artifacthub.io/badge/repository/core)](https://artifacthub.io/packages/search?repo=core) |
| [Demo](./charts/demo/README.md) | 2.1.0 | latest | Formance Private Regions Demo | [![Artifact HUB](https://img.shields.io/endpoint?url=https://artifacthub.io/badge/repository/demo)](https://artifacthub.io/packages/search?repo=demo) |
| [Membership](./charts/membership/README.md) | 2.3.3 | v1.1.1 | Formance EE Membership API. Manage stacks, organizations, regions, invitations, users, roles, and permissions. | [![Artifact HUB](https://img.shields.io/endpoint?url=https://artifacthub.io/badge/repository/membership)](https://artifacthub.io/packages/search?repo=membership) |
| [Portal](./charts/portal/README.md) | 2.1.2 | 5e7b404a3a208b1f38603719e02a8b1883c10acf | Formance Portal | [![Artifact HUB](https://img.shields.io/endpoint?url=https://artifacthub.io/badge/repository/portal)](https://artifacthub.io/packages/search?repo=portal) |
| [Portal](./charts/portal/README.md) | 2.1.3 | 5e7b404a3a208b1f38603719e02a8b1883c10acf | Formance Portal | [![Artifact HUB](https://img.shields.io/endpoint?url=https://artifacthub.io/badge/repository/portal)](https://artifacthub.io/packages/search?repo=portal) |
| [Regions](./charts/regions/README.md) | 2.12.0 | latest | Formance Private Regions Helm Chart | [![Artifact HUB](https://img.shields.io/endpoint?url=https://artifacthub.io/badge/repository/regions)](https://artifacthub.io/packages/search?repo=regions) |
| [Stargate](./charts/stargate/README.md) | 0.7.3 | latest | Formance EE Stargate gRPC Gateway | [![Artifact HUB](https://img.shields.io/endpoint?url=https://artifacthub.io/badge/repository/stargate)](https://artifacthub.io/packages/search?repo=stargate) |

Expand Down
8 changes: 4 additions & 4 deletions charts/cloudprem/Chart.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,12 @@ dependencies:
version: 2.3.3
- name: portal
repository: file://../portal
version: 2.1.2
version: 2.1.3
- name: console
repository: file://../console
version: 2.1.2
version: 2.1.3
- name: console-v3
repository: file://../console-v3
version: 2.1.2
digest: sha256:5d08a3882c6493d0aa566fce38251a43c762f9364bd6ebf0a7438320b6df4407
generated: "2025-02-19T15:57:24.79117+01:00"
digest: sha256:3c58797ca52402498b0331279e0f3b8e1e5524620f1b08478eb187daced6d534
generated: "2025-02-20T12:04:14.231324+01:00"
2 changes: 1 addition & 1 deletion charts/cloudprem/Chart.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ 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: 3.0.0-rc.15
version: 3.0.0-rc.16

# 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
Expand Down
9 changes: 5 additions & 4 deletions charts/cloudprem/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# Formance cloudprem Helm chart

[![Artifact Hub](https://img.shields.io/endpoint?url=https://artifacthub.io/badge/repository/cloudprem)](https://artifacthub.io/packages/search?repo=cloudprem)
![Version: 3.0.0-rc.15](https://img.shields.io/badge/Version-3.0.0--rc.15-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: v1.1.0](https://img.shields.io/badge/AppVersion-v1.1.0-informational?style=flat-square)
![Version: 3.0.0-rc.16](https://img.shields.io/badge/Version-3.0.0--rc.16-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: v1.1.0](https://img.shields.io/badge/AppVersion-v1.1.0-informational?style=flat-square)

Formance control-plane

Expand Down Expand Up @@ -302,6 +302,7 @@ Portal and Console v3 are no longer sharing Oauth clients and cookies. The cooki

> The structure does not change

- `.global.platform.cookie` has been moved to `.global.platform.console.cookie`
- `.global.platform.portal.cookie` has been removed in favor of `.portal.config.cookie`
- `.global.platform.portal.cookie.secretKeys.encryptionKey` -> `.portal.config.cookie.secretKeys.secret`
- `.global.platform.portal.cookie.encryptionKey` -> `.portal.config.cookie.secret`
Expand Down Expand Up @@ -410,6 +411,9 @@ Dex:
| global.monitoring.traces.mode | string | `"grpc"` | Mode |
| global.monitoring.traces.port | int | `4317` | Port |
| global.nats.url | string | `""` | NATS URL: nats://nats:4222 nats://$PUBLISHER_NATS_USERNAME:$PUBLISHER_NATS_PASSWORD@nats:4222 |
| global.platform.console.cookie.encryptionKey | string | `"changeMe00"` | is used to encrypt a cookie that share authentication between platform services (console, portal, ...),is used to store the current state organizationId-stackId It is not shared with console-v3 and the domain is only limited to portal app |
| global.platform.console.cookie.existingSecret | string | `""` | is the name of the secret |
| global.platform.console.cookie.secretKeys | object | `{"encryptionKey":""}` | is the key contained within the secret |
| global.platform.console.host | string | `"console.{{ .Values.global.serviceHost }}"` | is the host for the console |
| global.platform.console.scheme | string | `"https"` | is the scheme for the console |
| global.platform.consoleV3 | object | `{"host":"console.v3.{{ .Values.global.serviceHost }}","oauth":{"client":{"existingSecret":"","id":"console-v3","secret":"changeMe2","secretKeys":{"secret":""}}},"scheme":"https"}` | Console V3: EXPERIMENTAL |
Expand All @@ -431,9 +435,6 @@ Dex:
| global.platform.portal.oauth.client.scopes | list | `["supertoken","accesses","remember_me","keep_refresh_token"]` | is the name of the secret |
| global.platform.portal.oauth.client.secret | string | `"changeMe1"` | is the secret of the client |
| global.platform.portal.oauth.client.secretKeys | object | `{"secret":""}` | is the key contained within the secret |
| global.platform.portal.oauth.cookie.encryptionKey | string | `"changeMe00"` | is used to encrypt a cookie that share authentication between platform services (console, portal, ...),is used to store the current state organizationId-stackId It is not shared with console-v3 and the domain is only limited to portal app |
| global.platform.portal.oauth.cookie.existingSecret | string | `""` | is the name of the secret |
| global.platform.portal.oauth.cookie.secretKeys | object | `{"encryptionKey":""}` | is the key contained within the secret |
| global.platform.portal.scheme | string | `"https"` | is the scheme for the portal |
| global.postgresql.additionalArgs | string | `"sslmode=disable"` | Additional arguments for PostgreSQL Connection URI |
| global.postgresql.auth.database | string | `"formance"` | Name for a custom database to create (overrides `auth.database`) |
Expand Down
1 change: 1 addition & 0 deletions charts/cloudprem/README.md.gotmpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -297,6 +297,7 @@ Portal and Console v3 are no longer sharing Oauth clients and cookies. The cooki

> The structure does not change

- `.global.platform.cookie` has been moved to `.global.platform.console.cookie`
- `.global.platform.portal.cookie` has been removed in favor of `.portal.config.cookie`
- `.global.platform.portal.cookie.secretKeys.encryptionKey` -> `.portal.config.cookie.secretKeys.secret`
- `.global.platform.portal.cookie.encryptionKey` -> `.portal.config.cookie.secret`
Expand Down
2 changes: 1 addition & 1 deletion charts/console/Chart.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ 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: 2.1.2
version: 2.1.3

# 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
Expand Down
8 changes: 4 additions & 4 deletions charts/console/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# console

![Version: 2.1.2](https://img.shields.io/badge/Version-2.1.2-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: console-on.v1.0.2](https://img.shields.io/badge/AppVersion-console--on.v1.0.2-informational?style=flat-square)
![Version: 2.1.3](https://img.shields.io/badge/Version-2.1.3-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: console-on.v1.0.2](https://img.shields.io/badge/AppVersion-console--on.v1.0.2-informational?style=flat-square)

Formance Console

Expand Down Expand Up @@ -44,6 +44,9 @@ Kubernetes: `>=1.14.0-0`
| global.monitoring.traces.insecure | bool | `true` | Insecure |
| global.monitoring.traces.mode | string | `"grpc"` | Mode |
| global.monitoring.traces.port | int | `4317` | Port |
| global.platform.console.cookie.encryptionKey | string | `"changeMe00"` | is used to encrypt a cookie that share authentication between platform services (console, portal, ...),is used to store the current state organizationId-stackId It is not shared with console-v3 and the domain is only limited to portal app |
| global.platform.console.cookie.existingSecret | string | `""` | is the name of the secret |
| global.platform.console.cookie.secretKeys | object | `{"encryptionKey":""}` | is the key contained within the secret |
| global.platform.console.host | string | `"console.{{ .Values.global.serviceHost }}"` | is the host for the console |
| global.platform.console.scheme | string | `"https"` | is the scheme for the console |
| global.platform.membership.host | string | `"membership.{{ .Values.global.serviceHost }}"` | is the host for the membership |
Expand All @@ -53,9 +56,6 @@ Kubernetes: `>=1.14.0-0`
| global.platform.portal.oauth.client.id | string | `"portal"` | is the id of the client |
| global.platform.portal.oauth.client.secret | string | `"changeMe1"` | is the secret of the client |
| global.platform.portal.oauth.client.secretKeys | object | `{"secret":""}` | is the key contained within the secret |
| global.platform.portal.oauth.cookie.encryptionKey | string | `"changeMe00"` | is used to encrypt a cookie that share authentication between platform services (console, portal, ...),is used to store the current state organizationId-stackId It is not shared with console-v3 and the domain is only limited to portal app |
| global.platform.portal.oauth.cookie.existingSecret | string | `""` | is the name of the secret |
| global.platform.portal.oauth.cookie.secretKeys | object | `{"encryptionKey":""}` | is the key contained within the secret |
| global.platform.portal.scheme | string | `"https"` | is the scheme for the portal |
| global.serviceHost | string | `""` | is the base domain for portal and console |

Expand Down
8 changes: 4 additions & 4 deletions charts/console/templates/_helpers.tpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,13 +57,13 @@
- name: NODE_ENV
value: {{ .Values.config.environment }}
- name: ENCRYPTION_KEY
{{- if .Values.global.platform.portal.oauth.cookie.existingSecret }}
{{- if .Values.global.platform.console.cookie.existingSecret }}
valueFrom:
secretKeyRef:
name: {{ .Values.global.platform.portal.oauth.cookie.existingSecret }}
key: {{ .Values.global.platform.portal.oauth.cookie.secretKeys.encryptionKey }}
name: {{ .Values.global.platform.console.cookie.existingSecret }}
key: {{ .Values.global.platform.console.cookie.secretKeys.encryptionKey }}
{{- else }}
value: {{ .Values.global.platform.portal.oauth.cookie.encryptionKey | default .Values.config.encryption_key | quote }}
value: {{ .Values.global.platform.console.cookie.encryptionKey | default .Values.config.encryption_key | quote }}
{{- end }}
- name: PLATFORM_URL
value: {{ tpl (default (printf "%s://%s" .Values.global.platform.portal.scheme .Values.global.platform.portal.host) .Values.config.platform_url) $ }}
Expand Down
38 changes: 19 additions & 19 deletions charts/console/values.schema.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -156,6 +156,25 @@
"properties": {
"console": {
"properties": {
"cookie": {
"properties": {
"encryptionKey": {
"type": "string"
},
"existingSecret": {
"type": "string"
},
"secretKeys": {
"properties": {
"encryptionKey": {
"type": "string"
}
},
"type": "object"
}
},
"type": "object"
},
"host": {
"type": "string"
},
Expand Down Expand Up @@ -204,25 +223,6 @@
}
},
"type": "object"
},
"cookie": {
"properties": {
"encryptionKey": {
"type": "string"
},
"existingSecret": {
"type": "string"
},
"secretKeys": {
"properties": {
"encryptionKey": {
"type": "string"
}
},
"type": "object"
}
},
"type": "object"
}
},
"type": "object"
Expand Down
24 changes: 12 additions & 12 deletions charts/console/values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,18 @@ global:
# -- is the host for the console
# @section -- Global configuration
host: "console.{{ .Values.global.serviceHost }}"
cookie:
# -- is used to encrypt a cookie that share authentication between platform services (console, portal, ...),is used to store the current state organizationId-stackId
# It is not shared with console-v3 and the domain is only limited to portal app
# @section -- Global configuration
encryptionKey: "changeMe00"
# -- is the name of the secret
# @section -- Global configuration
existingSecret: ""
# -- is the key contained within the secret
# @section -- Global configuration
secretKeys:
encryptionKey: ""
portal:
# -- is the scheme for the portal
# @section -- Global configuration
Expand All @@ -65,18 +77,6 @@ global:
# @section -- Global configuration
secretKeys:
secret: ""
cookie:
# -- is used to encrypt a cookie that share authentication between platform services (console, portal, ...),is used to store the current state organizationId-stackId
# It is not shared with console-v3 and the domain is only limited to portal app
# @section -- Global configuration
encryptionKey: "changeMe00"
# -- is the name of the secret
# @section -- Global configuration
existingSecret: ""
# -- is the key contained within the secret
# @section -- Global configuration
secretKeys:
encryptionKey: ""

membership:
# -- is the scheme for the membership
Expand Down
2 changes: 1 addition & 1 deletion charts/portal/Chart.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ 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: 2.1.2
version: 2.1.3

# 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
Expand Down
Loading
Loading