github-mirrors/kibana
1
0
Fork 0
mirror of https://github.com/elastic/kibana.git synced 2025-06-27 18:51:07 -04:00
Code Issues Projects Releases Packages Wiki Activity

Revert "[Saved objects client - bulkUpdate] Passing the correct namespace to …"

Browse source 
This reverts commit 97941682db.
This commit is contained in:
Shahzad 2025-06-25 12:18:45 +02:00 • committed by GitHub
parent 831004deac
commit a95f827030
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
4 changed files with 13 additions and 85 deletions
Download patch file Download diff file Expand all files Collapse all files

69
src/core/packages/saved-objects/api-server-internal/src/lib/apis/bulk_update.test.ts
View file

@ -53,7 +53,6 @@ import {
expectError,
createBadRequestErrorPayload,
expectUpdateResult,
MULTI_NAMESPACE_TYPE,
} from '../../test_helpers/repository.test.common';
import type { ISavedObjectsSecurityExtension } from '@kbn/core-saved-objects-server';
import { savedObjectsExtensionsMock } from '../../mocks/saved_objects_extensions.mock';
@ -621,74 +620,6 @@ describe('#bulkUpdate', () => {
2
);
});
it('migrates single namespace objects using the object namespace', async () => {
const modifiedObj2 = {
...obj2,
coreMigrationVersion: '8.0.0',
namespace: 'test',
};
const objects = [modifiedObj2];
migrator.migrateDocument.mockImplementationOnce((doc) => ({ ...doc, migrated: true }));
await bulkUpdateSuccess(client, repository, registry, objects);
expect(migrator.migrateDocument).toHaveBeenCalledTimes(2);
expectMigrationArgs(
{
id: modifiedObj2.id,
namespace: 'test',
},
true,
2
);
});
it('migrates multiple namespace objects using the object namespaces', async () => {
const modifiedObj2 = {
...obj2,
type: MULTI_NAMESPACE_TYPE,
coreMigrationVersion: '8.0.0',
namespace: 'test',
};
const objects = [modifiedObj2];
migrator.migrateDocument.mockImplementationOnce((doc) => ({ ...doc, migrated: true }));
await bulkUpdateSuccess(client, repository, registry, objects);
expect(migrator.migrateDocument).toHaveBeenCalledTimes(2);
expectMigrationArgs(
{
id: modifiedObj2.id,
namespaces: ['test'],
},
true,
2
);
});
it('migrates namespace agnsostic objects', async () => {
const modifiedObj2 = {
...obj2,
type: NAMESPACE_AGNOSTIC_TYPE,
coreMigrationVersion: '8.0.0',
namespace: 'test', // specify a namespace, but it should be ignored
};
const objects = [modifiedObj2];
migrator.migrateDocument.mockImplementationOnce((doc) => ({ ...doc, migrated: true }));
await bulkUpdateSuccess(client, repository, registry, objects);
expect(migrator.migrateDocument).toHaveBeenCalledTimes(2);
expectMigrationArgs(
{
id: modifiedObj2.id,
namespaces: [],
},
true,
2
);
});
});
describe('returns', () => {

21
src/core/packages/saved-objects/api-server-internal/src/lib/apis/bulk_update.ts
View file

@ -150,11 +150,17 @@ export const performBulkUpdate = async <T>(
};
}
// `objectNamespace` is a namespace string, while `namespace` is a namespace ID.
// The object namespace string, if defined, will supersede the operation's namespace ID.
const namespaceString = SavedObjectsUtils.namespaceIdToString(namespace);
const getNamespaceId = (objectNamespace?: string) =>
objectNamespace !== undefined
? SavedObjectsUtils.namespaceStringToId(objectNamespace)
: namespace;
const getNamespaceString = (objectNamespace?: string) => objectNamespace ?? namespaceString;
const bulkGetDocs = validObjects.map(({ value: { type, id, objectNamespace } }) => ({
_id: serializer.generateRawId(getNamespaceId(objectNamespace), type, id),
_index: commonHelper.getIndexForType(type),
@ -229,6 +235,7 @@ export const performBulkUpdate = async <T>(
mergeAttributes,
} = expectedBulkGetResult.value;
let namespaces: string[] | undefined;
const versionProperties = getExpectedVersionProperties(version);
const indexFound = bulkGetResponse?.statusCode !== 404;
const actualResult = indexFound ? bulkGetResponse?.body.docs[esRequestIndex] : undefined;
@ -251,18 +258,15 @@ export const performBulkUpdate = async <T>(
});
}
let savedObjectNamespace: string | undefined;
let savedObjectNamespaces: string[] | undefined;
if (isMultiNS) {
// @ts-expect-error MultiGetHit is incorrectly missing _id, _source
savedObjectNamespaces = actualResult!._source.namespaces ?? [
namespaces = actualResult!._source.namespaces ?? [
// @ts-expect-error MultiGetHit is incorrectly missing _id, _source
SavedObjectsUtils.namespaceIdToString(actualResult!._source.namespace),
];
} else if (registry.isSingleNamespace(type)) {
// if `objectNamespace` is undefined, fall back to `options.namespace`
savedObjectNamespace = objectNamespace ?? namespace;
namespaces = [getNamespaceString(objectNamespace)];
}
const document = getSavedObjectFromSource<T>(
@ -306,8 +310,8 @@ export const performBulkUpdate = async <T>(
...migrated!,
id,
type,
...(savedObjectNamespace && { namespace: savedObjectNamespace }),
...(savedObjectNamespaces && { namespaces: savedObjectNamespaces }),
namespace,
namespaces,
attributes: updatedAttributes,
updated_at: time,
updated_by: updatedBy,
@ -317,9 +321,6 @@ export const performBulkUpdate = async <T>(
migratedUpdatedSavedObjectDoc as SavedObjectSanitizedDoc
);
const namespaces =
savedObjectNamespaces ?? (savedObjectNamespace ? [savedObjectNamespace] : []);
const expectedResult = {
type,
id,

6
src/core/packages/saved-objects/api-server-internal/src/lib/apis/update.test.ts
View file

@ -546,13 +546,9 @@ describe('#update', () => {
namespace: 'default',
});
expect(client.index).toHaveBeenCalledWith(
expect.objectContaining({
id: expect.stringMatching(`${type}:${id}`),
}),
expect.objectContaining({ id: expect.stringMatching(`${type}:${id}`) }),
expect.anything()
);
// Assert that 'namespace' does not exist at all
expect(client.index.mock.calls[0][0]).not.toHaveProperty('namespace');
});
it(`doesn't prepend namespace to the id when using agnostic-namespace type`, async () => {

2
src/core/packages/saved-objects/api-server-internal/src/test_helpers/repository.test.common.ts
View file

@ -716,7 +716,7 @@ export const expectUpdateResult = ({
attributes,
references,
version: mockVersion,
namespaces: [],
namespaces: ['default'],
...mockTimestampFields,
});