chore: use secret paths without /migrated

elastic · Dec 5, 2023 · efd5aa3 · efd5aa3
1 parent aa23c6b
commit efd5aa3
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 14 deletions.
diff --git a/.buildkite/scripts/common/util.sh b/.buildkite/scripts/common/util.sh
@@ -176,7 +176,7 @@ vault_get() {
   path=$1
   field=$2
 
-  fullPath="secret/ci/elastic-kibana/migrated/$path"
+  fullPath="secret/ci/elastic-kibana/$path"
   if [[ "$VAULT_ADDR" == *"secrets.elastic.co"* ]]; then
     fullPath="secret/kibana-issues/dev/$path"
   fi
@@ -193,7 +193,7 @@ vault_set() {
   shift
   fields=("$@")
 
-  fullPath="secret/ci/elastic-kibana/migrated/$path"
+  fullPath="secret/ci/elastic-kibana/$path"
   if [[ "$VAULT_ADDR" == *"secrets.elastic.co"* ]]; then
     fullPath="secret/kibana-issues/dev/$path"
   fi

diff --git a/.buildkite/scripts/pipelines/pull_request/pipeline.ts b/.buildkite/scripts/pipelines/pull_request/pipeline.ts
@@ -27,16 +27,6 @@ const getPipeline = (filename: string, removeSteps = true) => {
   return removeSteps ? str.replace(/^steps:/, '') : str;
 };
 
-const uploadPipeline = (pipelineContent: string | object) => {
-  const str =
-    typeof pipelineContent === 'string' ? pipelineContent : JSON.stringify(pipelineContent);
-
-  execSync('buildkite-agent pipeline upload', {
-    input: str,
-    stdio: ['pipe', 'inherit', 'inherit'],
-  });
-};
-
 (async () => {
   try {
     const skippable = await areChangesSkippable(SKIPPABLE_PR_MATCHERS, REQUIRED_PATHS);

diff --git a/.buildkite/scripts/steps/cloud/purge_deployment.ts b/.buildkite/scripts/steps/cloud/purge_deployment.ts
@@ -12,7 +12,7 @@ const deploymentsListJson = execSync('ecctl deployment list --output json').toSt
 const { deployments } = JSON.parse(deploymentsListJson);
 const secretBasePath = process.env.VAULT_ADDR?.match(/secrets\.elastic\.co/g)
   ? 'secret/kibana-issues/dev'
-  : 'secret/ci/elastic-kibana/migrated';
+  : 'secret/ci/elastic-kibana';
 
 const prNumber = parseInt(
   process.env.KIBANA_PULL_REQUEST ||

diff --git a/.buildkite/scripts/steps/cloud/purge_deployments.ts b/.buildkite/scripts/steps/cloud/purge_deployments.ts
@@ -12,7 +12,7 @@ const deploymentsListJson = execSync('ecctl deployment list --output json').toSt
 const { deployments } = JSON.parse(deploymentsListJson);
 const secretBasePath = process.env.VAULT_ADDR?.match(/secrets\.elastic\.co/g)
   ? 'secret/kibana-issues/dev'
-  : 'secret/ci/elastic-kibana/migrated';
+  : 'secret/ci/elastic-kibana';
 
 const prDeployments = deployments.filter((deployment: any) =>
   deployment.name.startsWith('kibana-pr-')