From 96fbdb2a18d1522ed2d2f142ad0080b8e43de8cd Mon Sep 17 00:00:00 2001
From: Mark Hopkin <mark.hopkin@elastic.co>
Date: Tue, 8 Aug 2023 20:19:44 +0100
Subject: [PATCH] remove test code

---
 x-pack/plugins/fleet/server/config.ts           |  1 -
 x-pack/plugins/fleet/server/services/secrets.ts | 17 ++++-------------
 2 files changed, 4 insertions(+), 14 deletions(-)

diff --git a/x-pack/plugins/fleet/server/config.ts b/x-pack/plugins/fleet/server/config.ts
index 14e5a86aa73ade..9726837375eed0 100644
--- a/x-pack/plugins/fleet/server/config.ts
+++ b/x-pack/plugins/fleet/server/config.ts
@@ -139,7 +139,6 @@ export const config: PluginConfigDescriptor = {
       disableRegistryVersionCheck: schema.boolean({ defaultValue: false }),
       allowAgentUpgradeSourceUri: schema.boolean({ defaultValue: false }),
       bundledPackageLocation: schema.string({ defaultValue: DEFAULT_BUNDLED_PACKAGE_LOCATION }),
-      testSecretsIndex: schema.maybe(schema.string()),
     }),
     packageVerification: schema.object({
       gpgKeyPath: schema.string({ defaultValue: DEFAULT_GPG_KEY_PATH }),
diff --git a/x-pack/plugins/fleet/server/services/secrets.ts b/x-pack/plugins/fleet/server/services/secrets.ts
index bd70e8435b02ac..c6f14f38a54d78 100644
--- a/x-pack/plugins/fleet/server/services/secrets.ts
+++ b/x-pack/plugins/fleet/server/services/secrets.ts
@@ -49,15 +49,6 @@ interface SecretPath {
   value: PackagePolicyConfigRecordEntry;
 }
 
-// This will be removed once the secrets index PR is merged into elasticsearch
-function getSecretsIndex() {
-  const testIndex = appContextService.getConfig()?.developer?.testSecretsIndex;
-  if (testIndex) {
-    return testIndex;
-  }
-  return SECRETS_INDEX;
-}
-
 export async function createSecrets(opts: {
   esClient: ElasticsearchClient;
   values: string[];
@@ -66,7 +57,7 @@ export async function createSecrets(opts: {
   const logger = appContextService.getLogger();
   const body = values.flatMap((value) => [
     {
-      create: { _index: getSecretsIndex() },
+      create: { _index: SECRETS_INDEX },
     },
     { value },
   ]);
@@ -99,7 +90,7 @@ export async function createSecrets(opts: {
       value: values[i],
     }));
   } catch (e) {
-    const msg = `Error creating secrets in ${getSecretsIndex()} index: ${e}`;
+    const msg = `Error creating secrets in ${SECRETS_INDEX} index: ${e}`;
     logger.error(msg);
     throw new FleetError(msg);
   }
@@ -192,7 +183,7 @@ export async function _deleteSecrets(opts: {
   const logger = appContextService.getLogger();
   const body = ids.flatMap((id) => [
     {
-      delete: { _index: getSecretsIndex(), _id: id },
+      delete: { _index: SECRETS_INDEX, _id: id },
     },
   ]);
 
@@ -221,7 +212,7 @@ export async function _deleteSecrets(opts: {
       throw new Error(JSON.stringify(errorItems));
     }
   } catch (e) {
-    const msg = `Error deleting secrets from ${getSecretsIndex()} index: ${e}`;
+    const msg = `Error deleting secrets from ${SECRETS_INDEX} index: ${e}`;
     logger.error(msg);
     throw new FleetError(msg);
   }