Skip to content

CH-284 secrets managers base support implementation #858

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
filippomc merged 5 commits into from
Aug 6, 2026
Merged

CH-284 secrets managers base support implementation #858

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
4046fce
CH-284 secrets managers base support implementation
filippomc Jul 31, 2026
c26815d
Merge branch 'develop' of github.com:MetaCell/cloud-harness into feat…
filippomc Aug 3, 2026
0eb0bd6
Test fix
filippomc Aug 3, 2026
a15e7d4
CH-284 refactor to separate and clarify different managers implementa…
filippomc Aug 3, 2026
7e0f8bd
CH-284 support pinning a secret version in the aws secret manager
zoran-sinnema Aug 5, 2026
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
8 changes: 4 additions & 4 deletions applications/accounts/deploy/templates/_identity_providers.tpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@
"firstBrokerLoginFlowAlias": "first broker login",
"config": {
"syncMode": "IMPORT",
"clientSecret": {{ .app.harness.secrets.github_clientSecret | default "<github_clientSecret>" | quote }},
"clientId": {{ .app.harness.secrets.github_clientId | default "<github_clientId>" | quote }},
"clientSecret": {{ include "deploy_utils.secretValue" (dict "spec" .app.harness.secrets.github_clientSecret) | default "<github_clientSecret>" | quote }},
"clientId": {{ include "deploy_utils.secretValue" (dict "spec" .app.harness.secrets.github_clientId) | default "<github_clientId>" | quote }},
"useJwksUrl": "true"
}
}
Expand All @@ -36,8 +36,8 @@
"firstBrokerLoginFlowAlias": "first broker login",
"config": {
"syncMode": "IMPORT",
"clientSecret": {{ .app.harness.secrets.google_clientSecret | default "<google_clientSecret>" | quote }},
"clientId": {{ .app.harness.secrets.google_clientId | default "<google_clientId>" | quote }},
"clientSecret": {{ include "deploy_utils.secretValue" (dict "spec" .app.harness.secrets.google_clientSecret) | default "<google_clientSecret>" | quote }},
"clientId": {{ include "deploy_utils.secretValue" (dict "spec" .app.harness.secrets.google_clientId) | default "<google_clientId>" | quote }},
"useJwksUrl": "true"
}
}
Expand Down
51 changes: 51 additions & 0 deletions deployment-configuration/compose/templates/_secrets.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,51 @@
{{/*
Secret definition helpers, shared with the helm chart.

Secret managers do not exist in a local docker compose deployment: only the plain value of
a secret definition is resolved here. Keep in sync with the reference implementation in
`deployment-configuration/helm/templates/_secrets.tpl`, which also documents the rich form.
*/}}

{{/*
Resolve the manager of a secret definition.
Outputs `cloudharness`, `unmanaged` or the manager name.
Usage: {{ include "deploy_utils.secretManager" (dict "spec" $secretDefinition) }}
*/}}
{{- define "deploy_utils.secretManager" -}}
{{- $manager := "cloudharness" -}}
{{- if kindIs "map" .spec -}}
{{- if hasKey .spec "manager" -}}
{{- $declared := get .spec "manager" -}}
{{- if kindIs "invalid" $declared -}}
{{- $manager = "unmanaged" -}}
{{- else -}}
{{- if eq (toString $declared) "" -}}
{{- $manager = "unmanaged" -}}
{{- else -}}
{{- $manager = toString $declared -}}
{{- end -}}
{{- end -}}
{{- end -}}
{{- end -}}
{{- $manager -}}
{{- end -}}

{{/*
Resolve the value of a secret definition: the definition itself in the simple form,
the `default` entry in the rich form. Empty when not defined.
Usage: {{ include "deploy_utils.secretValue" (dict "spec" $secretDefinition) }}
*/}}
{{- define "deploy_utils.secretValue" -}}
{{- if kindIs "map" .spec -}}
{{- if hasKey .spec "default" -}}
{{- $default := get .spec "default" -}}
{{- if not (kindIs "invalid" $default) -}}
{{- $default -}}
{{- end -}}
{{- end -}}
{{- else -}}
{{- if not (kindIs "invalid" .spec) -}}
{{- .spec -}}
{{- end -}}
{{- end -}}
{{- end -}}
14 changes: 10 additions & 4 deletions deployment-configuration/compose/templates/auto-secrets.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,17 @@
{{- define "deploy_utils.secret" }}
{{- if .app.harness.secrets }}
{{/* Secret managers are not available locally: every secret is resolved to its literal
value, or to the `default` entry when defined in the rich form. */}}
{{- $resolved := dict }}
{{- range $k, $v := .app.harness.secrets }}
{{- $_ := set $resolved $k (include "deploy_utils.secretValue" (dict "spec" $v)) }}
{{- end }}

{{- $secret_name := printf "%s" .app.harness.deployment.name }}
{{- $secret := (lookup "v1" "Secret" .root.Values.namespace $secret_name) }}
{{- if $secret }}
# secret already exists
{{- if not (compact (values .app.harness.secrets)) }}
{{- if not (compact (values $resolved)) }}
# secret values are null, copy from the existing secret
{{- range $k, $v := $secret.data }}
cloudharness-metadata:
Expand All @@ -17,7 +23,7 @@ data: {{ $v }}
{{- else }}
# there are non default values in values.yaml, use these
stringData:
{{- range $k, $v := .app.harness.secrets }}
{{- range $k, $v := $resolved }}
cloudharness-metadata:
path: resources/generated/auth/{{ $k }}

Expand All @@ -28,7 +34,7 @@ data: {{ $v | default (randAlphaNum 20) }}
{{- else }}
# secret doesn't exist
stringData:
{{- range $k, $v := .app.harness.secrets }}
{{- range $k, $v := $resolved }}
cloudharness-metadata:
path: resources/generated/auth/{{ $k }}
data: {{ $v | default (randAlphaNum 20) }}
Expand All @@ -46,4 +52,4 @@ data: {{ $v | default (randAlphaNum 20) }}
{{- end }}
{{- end }}
{{- end }}
{{- end }}
{{- end }}
Loading
Loading