Skip to content

Commit

Permalink
Removed Leftover X Pack references #2517 (#2638) (#2716)
Browse files Browse the repository at this point in the history
x-pack references in the code are removed as per the given files in #2517

Issue Resolved:
#2517

Signed-off-by: vimal K <vimalinfo10@gmail.com>
(cherry picked from commit 82f82a1)

Co-authored-by: Vimal K <35750792+vimalMK@users.noreply.github.com>
(cherry picked from commit 399b029)
  • Loading branch information
joshuarrrr authored and github-actions[bot] committed Nov 4, 2022
1 parent 4d20f78 commit 19c9511
Show file tree
Hide file tree
Showing 7 changed files with 9 additions and 11 deletions.
2 changes: 2 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,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

Expand Down
2 changes: 1 addition & 1 deletion packages/osd-pm/src/utils/validate_dependencies.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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 () => {
Expand All @@ -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 () => {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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.`
);
}

Expand Down
2 changes: 1 addition & 1 deletion src/dev/notice/cli.js
Original file line number Diff line number Diff line change
Expand Up @@ -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,
});
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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: [
Expand Down
2 changes: 1 addition & 1 deletion src/plugins/data/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit 19c9511

Please sign in to comment.