Skip to content

Commit 61d6338

Browse files
authored
Remove gcp test package (#1930)
Remove gcp test package and related references to GCP credentials
1 parent d5641d1 commit 61d6338

File tree

53 files changed

+0
-3605
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

53 files changed

+0
-3605
lines changed

.buildkite/configs/cleanup.gcp.yml

Lines changed: 0 additions & 40 deletions
This file was deleted.

.buildkite/hooks/pre-command

Lines changed: 0 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@ WORKSPACE=$(pwd)
1111
export WORKSPACE
1212

1313

14-
GCP_SERVICE_ACCOUNT_SECRET_PATH=secret/ci/elastic-elastic-package/gcp-service-account
1514
AWS_SERVICE_ACCOUNT_SECRET_PATH=kv/ci-shared/platform-ingest/aws_account_auth
1615
GITHUB_TOKEN_VAULT_PATH=kv/ci-shared/platform-ingest/github_token
1716
PRIVATE_CI_GCS_CREDENTIALS_PATH=kv/ci-shared/platform-ingest/gcp-platform-ingest-ci-service-account
@@ -82,27 +81,6 @@ if is_step_required_to_upload_safe_logs; then
8281
export JOB_GCS_BUCKET_INTERNAL="ingest-buildkite-ci"
8382
fi
8483

85-
is_step_testing_gcp () {
86-
if [[ "$BUILDKITE_PIPELINE_SLUG" != "elastic-package" ]]; then
87-
return 1
88-
fi
89-
if [[ "$BUILDKITE_STEP_KEY" == "integration-parallel-gcp-agent-false" || "$BUILDKITE_STEP_KEY" == "integration-parallel-gcp-agent-true" ]]; then
90-
return 0
91-
fi
92-
return 1
93-
}
94-
95-
if is_step_testing_gcp; then
96-
ELASTIC_PACKAGE_GCP_PROJECT_SECRET=$(retry 5 vault read -field projectId ${GCP_SERVICE_ACCOUNT_SECRET_PATH})
97-
export ELASTIC_PACKAGE_GCP_PROJECT_SECRET
98-
ELASTIC_PACKAGE_GCP_CREDENTIALS_SECRET=$(retry 5 vault read -field credentials ${GCP_SERVICE_ACCOUNT_SECRET_PATH} | jq -c)
99-
export ELASTIC_PACKAGE_GCP_CREDENTIALS_SECRET
100-
101-
# Environment variables required by the service deployer
102-
export GOOGLE_CREDENTIALS=${ELASTIC_PACKAGE_GCP_CREDENTIALS_SECRET}
103-
export GCP_PROJECT_ID=${ELASTIC_PACKAGE_GCP_PROJECT_SECRET}
104-
fi
105-
10684
is_step_testing_aws () {
10785
if [[ "$BUILDKITE_PIPELINE_SLUG" != "elastic-package" ]]; then
10886
return 1
@@ -148,15 +126,6 @@ if [[ "$BUILDKITE_PIPELINE_SLUG" == "elastic-package-cloud-cleanup" && "$BUILDKI
148126
export ELASTIC_PACKAGE_AWS_ACCESS_KEY
149127
ELASTIC_PACKAGE_AWS_USER_SECRET=$(retry 5 vault kv get -field user ${AWS_SERVICE_ACCOUNT_SECRET_PATH})
150128
export ELASTIC_PACKAGE_AWS_USER_SECRET
151-
152-
ELASTIC_PACKAGE_GCP_CREDENTIALS_SECRET=$(retry 5 vault read -field credentials ${GCP_SERVICE_ACCOUNT_SECRET_PATH} | jq -c)
153-
export ELASTIC_PACKAGE_GCP_CREDENTIALS_SECRET
154-
ELASTIC_PACKAGE_GCP_KEY_SECRET=$(echo "${ELASTIC_PACKAGE_GCP_CREDENTIALS_SECRET}" | jq -r '.private_key' | tr -d '\n')
155-
export ELASTIC_PACKAGE_GCP_KEY_SECRET
156-
ELASTIC_PACKAGE_GCP_PROJECT_SECRET=$(retry 5 vault read -field projectId ${GCP_SERVICE_ACCOUNT_SECRET_PATH})
157-
export ELASTIC_PACKAGE_GCP_PROJECT_SECRET
158-
ELASTIC_PACKAGE_GCP_EMAIL_SECRET=$(retry 5 vault read -field username ${GCP_SERVICE_ACCOUNT_SECRET_PATH})
159-
export ELASTIC_PACKAGE_GCP_EMAIL_SECRET
160129
fi
161130

162131

.buildkite/scripts/cloud-cleanup.sh

Lines changed: 0 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@ trap cleanup_cloud_stale EXIT
1818
set -euo pipefail
1919

2020
AWS_RESOURCES_FILE="aws.resources.txt"
21-
GCP_RESOURCES_FILE="gcp.resources.txt"
2221
AWS_REDSHIFT_RESOURCES_FILE="redshift_clusters.json"
2322

2423
RESOURCE_RETENTION_PERIOD="${RESOURCE_RETENTION_PERIOD:-"24 hours"}"
@@ -78,38 +77,6 @@ cloud_reaper_aws() {
7877
${COMMAND} | tee "${AWS_RESOURCES_FILE}"
7978
}
8079

81-
cloud_reaper_gcp() {
82-
echo "Validating configuration"
83-
docker run --rm -v "$(pwd)/.buildkite/configs/cleanup.gcp.yml":/etc/cloud-reaper/config.yml \
84-
-e ACCOUNT_SECRET="${ELASTIC_PACKAGE_GCP_KEY_SECRET}" \
85-
-e ACCOUNT_KEY="${ELASTIC_PACKAGE_GCP_EMAIL_SECRET}" \
86-
-e ACCOUNT_PROJECT="${ELASTIC_PACKAGE_GCP_PROJECT_SECRET}" \
87-
-e CREATION_DATE="${DELETE_RESOURCES_BEFORE_DATE}" \
88-
"${CLOUD_REAPER_IMAGE}" \
89-
cloud-reaper \
90-
--config /etc/cloud-reaper/config.yml \
91-
validate
92-
93-
echo "Scanning resources"
94-
docker run --rm -v "$(pwd)/.buildkite/configs/cleanup.gcp.yml":/etc/cloud-reaper/config.yml \
95-
-e ACCOUNT_SECRET="${ELASTIC_PACKAGE_GCP_KEY_SECRET}" \
96-
-e ACCOUNT_KEY="${ELASTIC_PACKAGE_GCP_EMAIL_SECRET}" \
97-
-e ACCOUNT_PROJECT="${ELASTIC_PACKAGE_GCP_PROJECT_SECRET}" \
98-
-e CREATION_DATE="${DELETE_RESOURCES_BEFORE_DATE}" \
99-
"${CLOUD_REAPER_IMAGE}" \
100-
cloud-reaper \
101-
--config /etc/cloud-reaper/config.yml \
102-
${COMMAND} | tee "${GCP_RESOURCES_FILE}"
103-
}
104-
105-
echo "--- Cleaning up GCP resources older than ${DELETE_RESOURCES_BEFORE_DATE}..."
106-
cloud_reaper_gcp
107-
108-
if any_resources_to_delete "${GCP_RESOURCES_FILE}"; then
109-
echo "Pending GCP resources"
110-
resources_to_delete=1
111-
fi
112-
11380
echo "--- Cleaning up AWS resources older than ${DELETE_RESOURCES_BEFORE_DATE}..."
11481
cloud_reaper_aws
11582

test/packages/parallel/gcp/_dev/build/build.yml

Lines changed: 0 additions & 3 deletions
This file was deleted.

test/packages/parallel/gcp/_dev/build/docs/README.md

Lines changed: 0 additions & 22 deletions
This file was deleted.

test/packages/parallel/gcp/_dev/build/docs/compute.md

Lines changed: 0 additions & 9 deletions
This file was deleted.

test/packages/parallel/gcp/changelog.yml

Lines changed: 0 additions & 80 deletions
This file was deleted.

test/packages/parallel/gcp/data_stream/compute/_dev/deploy/tf/.terraform.lock.hcl

Lines changed: 0 additions & 20 deletions
This file was deleted.

test/packages/parallel/gcp/data_stream/compute/_dev/deploy/tf/compute.tf

Lines changed: 0 additions & 36 deletions
This file was deleted.

test/packages/parallel/gcp/data_stream/compute/_dev/deploy/tf/env.yml

Lines changed: 0 additions & 10 deletions
This file was deleted.

0 commit comments

Comments
 (0)