Removed Leftover X Pack references #2517 (#2638) (#2716)

x-pack references in the code are removed as per the given files in #2517 Issue Resolved: #2517 Signed-off-by: vimal K <[email protected]> (cherry picked from commit 82f82a1) Co-authored-by: Vimal K <[email protected]>
opensearch-project · Nov 4, 2022 · 399b029 · 399b029
1 parent b8f6040
commit 399b029
Show file tree

Hide file tree

Showing 7 changed files with 9 additions and 11 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -18,7 +18,9 @@ Inspired from [Keep a Changelog](https://keepachangelog.com/en/1.0.0/)
 ### 📈 Features/Enhancements
 
 ### 🐛 Bug Fixes
+
 * [BUG] Fix suggestion list cutoff issue ([#2607](https://github.com/opensearch-project/OpenSearch-Dashboards/pull/2607))
+* Removed Leftover X Pack references ([#2638](https://github.com/opensearch-project/OpenSearch-Dashboards/pull/2638))
 
 ### 🚞 Infrastructure
 

diff --git a/packages/osd-pm/src/utils/validate_dependencies.ts b/packages/osd-pm/src/utils/validate_dependencies.ts
@@ -177,7 +177,7 @@ export async function validateDependencies(osd: OpenSearchDashboards, yarnLock:
   const devOnlyProjectsInProduction = getDevOnlyProductionDepsTree(osd, 'opensearch-dashboards');
   if (devOnlyProjectsInProduction) {
     log.error(dedent`
-      Some of the packages in the production dependency chain for OpenSearch Dashboards and X-Pack are
+      Some of the packages in the production dependency chain for OpenSearch Dashboards are
       flagged with "opensearchDashboards.devOnly" in their package.json. Please check changes made to
       packages and their dependencies to ensure they don't end up in production.
 

diff --git a/src/core/server/saved_objects/migrations/core/index_migrator.test.ts b/src/core/server/saved_objects/migrations/core/index_migrator.test.ts
@@ -137,9 +137,7 @@ describe('IndexMigrator', () => {
       },
     });
 
-    await expect(new IndexMigrator(testOpts).migrate()).rejects.toThrow(
-      /use the X-Pack upgrade assistant/
-    );
+    await expect(new IndexMigrator(testOpts).migrate()).rejects.toThrow();
   });
 
   test('fails if root doc type is not "doc"', async () => {
@@ -160,9 +158,7 @@ describe('IndexMigrator', () => {
       },
     });
 
-    await expect(new IndexMigrator(testOpts).migrate()).rejects.toThrow(
-      /use the X-Pack upgrade assistant/
-    );
+    await expect(new IndexMigrator(testOpts).migrate()).rejects.toThrow();
   });
 
   test('retains unknown core field mappings from the previous index', async () => {

diff --git a/src/core/server/saved_objects/migrations/core/opensearch_index.ts b/src/core/server/saved_objects/migrations/core/opensearch_index.ts
@@ -306,7 +306,7 @@ function assertIsSupportedIndex(indexInfo: FullIndexInfo) {
   if (!isV7Index) {
     throw new Error(
       `Index ${indexInfo.indexName} belongs to a version of OpenSearch Dashboards ` +
-        `that cannot be automatically migrated. Reset it or use the X-Pack upgrade assistant.`
+        `that cannot be automatically migrated. Reset it.`
     );
   }
 

diff --git a/src/dev/notice/cli.js b/src/dev/notice/cli.js
@@ -82,7 +82,7 @@ if (opts.help) {
 (async function run() {
   const path = resolve(REPO_ROOT, 'NOTICE.txt');
   const newContent = await generateNoticeFromSource({
-    productName: 'OpenSearch Dashboards source code with OpenSearch Dashboards X-Pack source code',
+    productName: 'OpenSearch Dashboards source code',
     directory: REPO_ROOT,
     log,
   });

diff --git a/src/plugins/apm_oss/server/tutorial/instructions/apm_server_instructions.ts b/src/plugins/apm_oss/server/tutorial/instructions/apm_server_instructions.ts
@@ -38,7 +38,7 @@ export const createEditConfig = () => ({
   }),
   textPre: i18n.translate('apmOss.tutorial.editConfig.textPre', {
     defaultMessage:
-      "If you're using an X-Pack secured version of Elastic Stack, you must specify \
+      "If you're using a secured version of OpenSearch, you must specify \
 credentials in the `apm-server.yml` config file.",
   }),
   commands: [

diff --git a/src/plugins/data/README.md b/src/plugins/data/README.md
@@ -111,7 +111,7 @@ The `SearchSource` API is a convenient way to construct and run an OpenSearch se
 
 #### Default Search Strategy
 
-One benefit of using the low-level search API, is partial response support in X-Pack, allowing for a better and more responsive user experience.
+One benefit of using the low-level search API is that it allows for a better and more responsive user experience with partial responses.
 In OSS only the final result is returned. 
 
 ```.ts