From 090a0389b460b4d70badc2909949645eed46fa4b Mon Sep 17 00:00:00 2001
From: dblock <dblock@amazon.com>
Date: Tue, 13 Aug 2024 19:44:54 -0400
Subject: [PATCH] Move OPENSEARCH_DISTRIBUTION_OPTION.

Signed-off-by: dblock <dblock@amazon.com>
---
 tools/src/OpenSearchHttpClient.ts | 6 ------
 tools/src/tester/test.ts          | 5 +++--
 2 files changed, 3 insertions(+), 8 deletions(-)

diff --git a/tools/src/OpenSearchHttpClient.ts b/tools/src/OpenSearchHttpClient.ts
index 9a1ec9097..314a73d45 100644
--- a/tools/src/OpenSearchHttpClient.ts
+++ b/tools/src/OpenSearchHttpClient.ts
@@ -22,10 +22,6 @@ export const OPENSEARCH_URL_OPTION = new Option('--opensearch-url <url>', 'URL a
   .default(DEFAULT_URL)
   .env('OPENSEARCH_URL')
 
-export const OPENSEARCH_DISTRIBUTION_OPTION = new Option('--opensearch-distribution <key>', 'OpenSearch distribution')
-  .default('opensearch.org')
-  .env('OPENSEARCH_DISTRIBUTION')
-
 export const OPENSEARCH_USERNAME_OPTION = new Option('--opensearch-username <username>', 'username to use when authenticating with OpenSearch')
   .default(DEFAULT_USER)
   .env('OPENSEARCH_USERNAME')
@@ -68,7 +64,6 @@ export interface AwsAuth {
 
 export interface OpenSearchHttpClientOptions {
   url?: string
-  distribution?: string,
   insecure?: boolean
   responseType?: ResponseType
   logger?: Logger,
@@ -94,7 +89,6 @@ export type OpenSearchHttpClientCliOptions = {
 export function get_opensearch_opts_from_cli (opts: OpenSearchHttpClientCliOptions): OpenSearchHttpClientOptions {
   return {
     url: opts.opensearchUrl,
-    distribution: opts.opensearchDistribution,
     insecure: opts.opensearchInsecure,
     basic_auth: opts.opensearchUsername !== undefined && opts.opensearchPassword !== undefined ? {
       username: opts.opensearchUsername,
diff --git a/tools/src/tester/test.ts b/tools/src/tester/test.ts
index fbd775310..da025a34b 100644
--- a/tools/src/tester/test.ts
+++ b/tools/src/tester/test.ts
@@ -17,7 +17,6 @@ import {
   AWS_SERVICE_OPTION,
   AWS_SESSION_TOKEN_OPTION,
   get_opensearch_opts_from_cli,
-  OPENSEARCH_DISTRIBUTION_OPTION,
   OPENSEARCH_INSECURE_OPTION,
   OPENSEARCH_PASSWORD_OPTION,
   OPENSEARCH_URL_OPTION,
@@ -48,8 +47,10 @@ const command = new Command()
   .addOption(new Option('--verbose', 'whether to print the full stack trace of errors').default(false))
   .addOption(new Option('--dry-run', 'dry run only, do not make HTTP requests').default(false))
   .addOption(new Option('--opensearch-version <number>', 'target OpenSearch schema version').default(undefined))
+  .addOption(new Option('--opensearch-distribution <key>', 'OpenSearch distribution')
+    .default('opensearch.org')
+    .env('OPENSEARCH_DISTRIBUTION'))
   .addOption(OPENSEARCH_URL_OPTION)
-  .addOption(OPENSEARCH_DISTRIBUTION_OPTION)
   .addOption(OPENSEARCH_USERNAME_OPTION)
   .addOption(OPENSEARCH_PASSWORD_OPTION)
   .addOption(OPENSEARCH_INSECURE_OPTION)