Skip to content

ci: use withSecretVault #827

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 3 commits into from
May 26, 2022
Merged

ci: use withSecretVault #827

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
8dd75fb
chore: for testing purposes
v1v May 24, 2022
7326df7
ci: use withSecretVault
v1v May 24, 2022
d8a90db
Update .ci/Jenkinsfile
v1v May 25, 2022
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
17 changes: 4 additions & 13 deletions .ci/Jenkinsfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -279,26 +279,17 @@ def withKubernetes(Closure body) {

def withCloudTestEnv(Closure body) {
def maskedVars = []
// AWS
def aws = getVaultSecret(secret: "${AWS_ACCOUNT_SECRET}").data
if (!aws.containsKey('access_key')) {
error("${AWS_ACCOUNT_SECRET} doesn't contain 'access_key'")
}
if (!aws.containsKey('secret_key')) {
error("${AWS_ACCOUNT_SECRET} doesn't contain 'secret_key'")
}
maskedVars.addAll([
[var: "AWS_ACCESS_KEY_ID", password: aws.access_key],
[var: "AWS_SECRET_ACCESS_KEY", password: aws.secret_key],
])
// GCP
withGCPEnv(secret: env.ELASTIC_PACKAGE_GCP_SECRET) {
maskedVars.add([var: 'GOOGLE_CREDENTIALS', password: readFile(file: env.GOOGLE_APPLICATION_CREDENTIALS)]);
maskedVars.add([var: 'GCP_PROJECT_ID', password: env.ELASTIC_OBSERVABILITY_PROJECT_ID])
}
// Masking
withEnvMask(vars: maskedVars) {
body()
withSecretVault(secret: "${AWS_ACCOUNT_SECRET}",
data: ['access_key': 'AWS_ACCESS_KEY_ID', 'secret_key': 'AWS_SECRET_ACCESS_KEY']) {
body()
}
}
}

Expand Down