Skip to content

Reduce the scope of the legacy gcp secrets #10734

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 15 commits into from
Oct 28, 2025
Merged

Reduce the scope of the legacy gcp secrets #10734

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
5ab6292
Reduce the scope of the legacy secrets usage only for integration-tes…
fr4nc1sc0-r4m0n Oct 23, 2025
fdd923a
Fix pipeline slug
fr4nc1sc0-r4m0n Oct 23, 2025
3df2b36
Merge branch 'main' into chore/reduce-legacy-secrets-scope
fr4nc1sc0-r4m0n Oct 23, 2025
ecb3c82
Add google oidc plugin in integration tests ech step
fr4nc1sc0-r4m0n Oct 23, 2025
a3f7aaf
Merge branch 'main' into chore/reduce-legacy-secrets-scope
fr4nc1sc0-r4m0n Oct 23, 2025
6536db8
Remove gcp auth plugin usage and fix pre exit command
fr4nc1sc0-r4m0n Oct 23, 2025
1622f16
Fix typo
fr4nc1sc0-r4m0n Oct 23, 2025
488b419
Preserve ESS Credentials logic
fr4nc1sc0-r4m0n Oct 23, 2025
4f6147b
Use parameter expansion instead of adding more logic to reduce the co…
fr4nc1sc0-r4m0n Oct 23, 2025
2607890
Merge branch 'main' into chore/reduce-legacy-secrets-scope
fr4nc1sc0-r4m0n Oct 23, 2025
9a5b5d9
Merge branch 'main' into chore/reduce-legacy-secrets-scope
fr4nc1sc0-r4m0n Oct 24, 2025
f9578a3
Merge branch 'main' into chore/reduce-legacy-secrets-scope
fr4nc1sc0-r4m0n Oct 27, 2025
822f89e
Merge branch 'main' into chore/reduce-legacy-secrets-scope
fr4nc1sc0-r4m0n Oct 27, 2025
1eb7ace
Merge branch 'main' into chore/reduce-legacy-secrets-scope
fr4nc1sc0-r4m0n Oct 28, 2025
1a3bd72
Merge branch 'main' into chore/reduce-legacy-secrets-scope
fr4nc1sc0-r4m0n Oct 28, 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
4 changes: 3 additions & 1 deletion .buildkite/hooks/pre-command
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,14 +34,16 @@ if [[ "$BUILDKITE_PIPELINE_SLUG" == "elastic-agent-package" ]]; then
fi
fi

if [[ "$BUILDKITE_STEP_KEY" == *"integration-tests"* ]]; then
if [[ "$BUILDKITE_PIPELINE_SLUG" == "buildkite-elastic-agent-integration-matrix" ]]; then
echo "Setting credentials"
# Set GCP credentials
export GOOGLE_APPLICATION_GCP_SECRET=$(retry 5 vault kv get -format=json -field=data ${CI_GCP_OBS_PATH})
echo "${GOOGLE_APPLICATION_GCP_SECRET}" > ./gcp.json
export GOOGLE_APPLICATION_CREDENTIALS=$(realpath ./gcp.json)
export TEST_INTEG_AUTH_GCP_SERVICE_TOKEN_FILE=$(realpath ./gcp.json)
fi

if [[ "$BUILDKITE_STEP_KEY" == *"integration-tests"* ]]; then
# ESS credentials
export API_KEY_TOKEN=$(vault kv get -field apiKey ${CI_ESS_PATH})
echo ${API_KEY_TOKEN} > ./apiKey
Expand Down
4 changes: 2 additions & 2 deletions .buildkite/hooks/pre-exit
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,13 +14,13 @@ if [[ "$BUILDKITE_STEP_KEY" == *"integration-tests"* ]]; then
SNAPSHOT=true mage integration:clean
fi

if [ -n "$GOOGLE_APPLICATION_CREDENTIALS" ]; then
if [ -n "${GOOGLE_APPLICATION_CREDENTIALS:-}" ]; then
if test -f "$GOOGLE_APPLICATION_CREDENTIALS"; then
rm $GOOGLE_APPLICATION_CREDENTIALS
fi
fi

if [ -n "$TEST_INTEG_AUTH_GCP_SERVICE_TOKEN_FILE" ]; then
if [ -n "${TEST_INTEG_AUTH_GCP_SERVICE_TOKEN_FILE:-}" ]; then
if test -f "$TEST_INTEG_AUTH_GCP_SERVICE_TOKEN_FILE"; then
rm $TEST_INTEG_AUTH_GCP_SERVICE_TOKEN_FILE
fi
Expand Down