Skip to content

Add AWS signing for ES. #868

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
robholland merged 1 commit into from
Mar 25, 2026
Merged

Add AWS signing for ES. #868

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
18 changes: 18 additions & 0 deletions charts/temporal/templates/_admintools-env.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -106,6 +106,24 @@
value: {{ not .enableHostVerification | quote }}
{{- end }}
{{- end }}
{{- with index $store.config "aws-request-signing" }}
{{- with .credentialProvider }}
- name: AWS_CREDENTIALS
value: {{ . | quote }}
{{- end }}
{{- with .region }}
- name: AWS_REGION
value: {{ . | quote }}
{{- end }}
{{- if eq .credentialProvider "static" }}
{{- with .static }}
{{- with .token }}
- name: AWS_SESSION_TOKEN
value: {{ . | quote }}
{{- end }}
{{- end }}
{{- end }}
{{- end }}
{{- else -}}
{{- fail (printf "No valid persistence driver configuration found for %s store" $store.name) -}}
{{- end -}}
Expand Down
99 changes: 99 additions & 0 deletions charts/temporal/tests/server_job_test.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -308,3 +308,102 @@ tests:
- equal:
path: spec.template.spec.initContainers[?(@.name=="manage-schema-visibility-store")].env[?(@.name=="ES_TLS_DISABLE_HOST_VERIFICATION")].value
value: "false"
- it: sets Elasticsearch AWS request signing environment variables
set:
server:
config:
persistence:
datastores:
default:
sql:
pluginName: mysql8
connectAddr: "temporal-persistence:3306"
databaseName: temporal
visibility:
elasticsearch:
version: v7
url:
scheme: https
host: "elasticsearch:9200"
username: ""
password: ""
indices:
visibility: temporal_visibility_v1
aws-request-signing:
credentialProvider: environment
region: us-east-1
asserts:
- equal:
path: spec.template.spec.initContainers[?(@.name=="manage-schema-visibility-store")].env[?(@.name=="AWS_CREDENTIALS")].value
value: environment
- equal:
path: spec.template.spec.initContainers[?(@.name=="manage-schema-visibility-store")].env[?(@.name=="AWS_REGION")].value
value: us-east-1
- isNull:
path: spec.template.spec.initContainers[?(@.name=="manage-schema-visibility-store")].env[?(@.name=="AWS_SESSION_TOKEN")]
- it: sets AWS_SESSION_TOKEN for static Elasticsearch AWS credentials
set:
server:
config:
persistence:
datastores:
default:
sql:
pluginName: mysql8
connectAddr: "temporal-persistence:3306"
databaseName: temporal
visibility:
elasticsearch:
version: v7
url:
scheme: https
host: "elasticsearch:9200"
username: myAccessKeyID
password: mySecretAccessKey
indices:
visibility: temporal_visibility_v1
aws-request-signing:
credentialProvider: static
region: us-east-1
static:
token: mySessionToken
asserts:
- equal:
path: spec.template.spec.initContainers[?(@.name=="manage-schema-visibility-store")].env[?(@.name=="AWS_CREDENTIALS")].value
value: static
- equal:
path: spec.template.spec.initContainers[?(@.name=="manage-schema-visibility-store")].env[?(@.name=="AWS_REGION")].value
value: us-east-1
- equal:
path: spec.template.spec.initContainers[?(@.name=="manage-schema-visibility-store")].env[?(@.name=="AWS_SESSION_TOKEN")].value
value: mySessionToken
- it: omits AWS_SESSION_TOKEN when not using static Elasticsearch AWS credentials
set:
server:
config:
persistence:
datastores:
default:
sql:
pluginName: mysql8
connectAddr: "temporal-persistence:3306"
databaseName: temporal
visibility:
elasticsearch:
version: v7
url:
scheme: https
host: "elasticsearch:9200"
username: ""
password: ""
indices:
visibility: temporal_visibility_v1
aws-request-signing:
credentialProvider: aws-sdk-default
region: eu-west-1
asserts:
- equal:
path: spec.template.spec.initContainers[?(@.name=="manage-schema-visibility-store")].env[?(@.name=="AWS_CREDENTIALS")].value
value: aws-sdk-default
- isNull:
path: spec.template.spec.initContainers[?(@.name=="manage-schema-visibility-store")].env[?(@.name=="AWS_SESSION_TOKEN")]
7 changes: 7 additions & 0 deletions charts/temporal/values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -217,6 +217,13 @@ server:
# keyFile: /path/to/client.key
# serverName: elasticsearch.internal
# enableHostVerification: true
# aws-request-signing:
# credentialProvider: environment # static, environment, or aws-sdk-default
# region: us-east-1
# static:
# accessKeyID: ""
# secretAccessKey: ""
# token: ""
# Additional stores can be added here and will pass through directly
# archive:
# sql:
Expand Down
7 changes: 7 additions & 0 deletions charts/temporal/values/values.elasticsearch.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,3 +39,10 @@ server:
# keyFile: /path/to/client.key
# serverName: elasticsearch.internal
# enableHostVerification: true
# aws-request-signing:
# credentialProvider: environment # static, environment, or aws-sdk-default
# region: us-east-1
# static:
# accessKeyID: ""
# secretAccessKey: ""
# token: ""
Loading