Skip to content

feat(oidc): for using EC credentials #13926

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 29, 2025
Merged

feat(oidc): for using EC credentials #13926

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
7e15a13
feat(oidc): for using EC credentials
v1v May 16, 2025
52daeaf
Merge branch 'main' into feature/use-google-secrets
v1v May 26, 2025
ca8359e
use -ci account
v1v May 26, 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
5 changes: 0 additions & 5 deletions .buildkite/hooks/pre-command
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,6 @@ export REPO_BUILD_TAG

BUILDKITE_API_TOKEN_PATH=kv/ci-shared/platform-ingest/buildkite_token

EC_TOKEN_PATH=kv/ci-shared/platform-ingest/platform-ingest-ec-qa
EC_DATA_PATH=secret/ci/elastic-integrations/ec_data

# variables required for terraform
Expand Down Expand Up @@ -117,10 +116,6 @@ if [[ "${BUILDKITE_PIPELINE_SLUG}" == "integrations-serverless" ]]; then
BUILDKITE_API_TOKEN=$(retry 5 vault kv get -field buildkite_token "${BUILDKITE_API_TOKEN_PATH}")
export BUILDKITE_API_TOKEN

EC_API_KEY_SECRET=$(retry 5 vault kv get -field apiKey "${EC_TOKEN_PATH}")
export EC_API_KEY_SECRET
EC_HOST_SECRET=$(retry 5 vault kv get -field url "${EC_TOKEN_PATH}")
export EC_HOST_SECRET
EC_REGION_SECRET=$(retry 5 vault read -field region_qa "${EC_DATA_PATH}")
export EC_REGION_SECRET
fi
Expand Down
2 changes: 1 addition & 1 deletion .buildkite/hooks/pre-exit
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ if [[ "$BUILDKITE_PIPELINE_SLUG" == "integrations-serverless" ]]; then
# Ensure elastic stack is stopped
if [ -f "${ELASTIC_PACKAGE_BIN}" ]; then
echo "--- Take down the Elastic stack"
EC_API_KEY=${EC_API_KEY_SECRET} EC_HOST=${EC_HOST_SECRET} ${ELASTIC_PACKAGE_BIN} stack down -v
${ELASTIC_PACKAGE_BIN} stack down -v
fi
fi
fi
Expand Down
7 changes: 6 additions & 1 deletion .buildkite/pipeline.serverless.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,11 +73,16 @@ steps:
- elastic/oblt-aws-auth#v0.1.0:
duration: 10800 # seconds
# See https://github.com/elastic/oblt-infra/blob/main/conf/resources/repos/integrations/01-gcp-buildkite-oidc.tf
# This plugin authenticates to Google Cloud using the OIDC token.
# This plugin authenticates to CI Google Cloud using the OIDC token.
- elastic/oblt-google-auth#v1.3.0:
lifetime: 10800 # seconds
project-id: "elastic-observability-ci"
project-number: "911195782929"
lifetime: 10800 # seconds
- avaly/gcp-secret-manager#v1.2.0:
env:
EC_API_KEY: elastic-cloud-observability-team-qa-api-key
EC_HOST: elastic-cloud-observability-team-qa-endpoint
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think this secret is not really a secret, shall we use the value instead?

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

When this feature was implemented, I was not totally sure if that URL should be public or not. That's why I added that as a secret.

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

If possible I think it would be interesting to keep both values as secrets. It would be quick to change and both values are in the same location.

artifact_paths:
- "build/test-results/*.xml"
- "build/elastic-stack-dump/*/logs/*.log"
Expand Down
3 changes: 0 additions & 3 deletions .buildkite/scripts/common.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -540,9 +540,6 @@ prepare_serverless_stack() {
fi
create_elastic_package_profile "${profile_name}"

export EC_API_KEY=${EC_API_KEY_SECRET}
export EC_HOST=${EC_HOST_SECRET}

echo "Boot up the Elastic stack"
# grep command required to remove password from the output
if ! ${ELASTIC_PACKAGE_BIN} stack up \
Expand Down