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.

Sign up for GitHub

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

[Tests] remove _type from OpenSearch Archiver #1289

Merged
merged 1 commit into from
Feb 26, 2022
Merged

[Tests] remove _type from OpenSearch Archiver #1289

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
18 changes: 15 additions & 3 deletions packages/osd-opensearch-archiver/src/lib/docs/__tests__/index_doc_records_stream.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,9 +41,21 @@ import { createStubStats, createStubClient, createPersonDocRecords } from './stu

const recordsToBulkBody = (records: any[]) => {
return records.reduce((acc, record) => {
const { index, type, id, source } = record.value;

return [...acc, { index: { _index: index, _type: type, _id: id } }, source];
const { index, id, source } = record.value;

return [
...acc,
{
index: {
_index: index,
// TODO: verify no BWC issues here
// Removed: https://github.com/opensearch-project/OpenSearch/pull/2239
// _type: type,
_id: id,
},
},
source,
];
}, [] as any[]);
};

Expand Down
4 changes: 3 additions & 1 deletion packages/osd-opensearch-archiver/src/lib/docs/generate_doc_records_stream.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,9 @@ export function createGenerateDocRecordsStream({
// always rewrite the .kibana_* index to .kibana_1 so that
// when it is loaded it can skip migration, if possible
index: hit._index.startsWith('.kibana') ? '.kibana_1' : hit._index,
type: hit._type,
// TODO: verify no BWC issues here
// Removed: https://github.com/opensearch-project/OpenSearch/pull/2239
// type: hit._type,
id: hit._id,
source: hit._source,
},
Expand Down
4 changes: 3 additions & 1 deletion packages/osd-opensearch-archiver/src/lib/docs/index_doc_records_stream.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,9 @@ export function createIndexDocRecordsStream(
{
[operation]: {
_index: doc.index,
_type: doc.type,
// TODO: verify no BWC issues here
// Removed: https://github.com/opensearch-project/OpenSearch/pull/2239
// _type: doc.type,
_id: doc.id,
},
},
Expand Down
8 changes: 6 additions & 2 deletions test/functional/apps/management/_handle_version_conflict.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,9 @@ export default function ({ getService, getPageObjects }) {
await PageObjects.settings.setScriptedFieldScript(`doc['bytes'].value`);
const response = await opensearch.update({
index: '.kibana',
type: '_doc',
// TODO: verify no BWC issues here
// Removed: https://github.com/opensearch-project/OpenSearch/pull/2239
// type: '_doc',
id: 'index-pattern:logstash-*',
body: {
doc: { 'index-pattern': { fieldFormatMap: '{"geo.src":{"id":"number"}}' } },
Expand All @@ -93,7 +95,9 @@ export default function ({ getService, getPageObjects }) {
await PageObjects.settings.setFieldFormat('url');
const response = await opensearch.update({
index: '.kibana',
type: '_doc',
// TODO: verify no BWC issues here
// Removed: https://github.com/opensearch-project/OpenSearch/pull/2239
// type: '_doc',
id: 'index-pattern:logstash-*',
body: {
doc: { 'index-pattern': { fieldFormatMap: '{"geo.dest":{"id":"number"}}' } },
Expand Down