Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[Backport 1.x] Removed Leftover X Pack references #2716

Merged
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -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

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