Skip to content

Spaces - make space a hidden saved object type #41688

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

Merged
legrego merged 19 commits into from
Jul 30, 2019
Merged

Spaces - make space a hidden saved object type #41688

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
19 commits
Select commit Hold shift + click to select a range
648defc
make space a hidden saved object type
legrego Jul 15, 2019
29fefcf
bulk_create api tests
legrego Jul 15, 2019
a292d1f
bulk_get tests
legrego Jul 15, 2019
5089997
create functional tests
legrego Jul 16, 2019
05dd9f6
delete space tests
legrego Jul 22, 2019
57cb5b5
export space tests
legrego Jul 22, 2019
fd7e7a5
find space tests
legrego Jul 22, 2019
eceaa62
get space tests
legrego Jul 22, 2019
c69428b
import space tests
legrego Jul 22, 2019
bcbd628
resolve_import_errirs space tests
legrego Jul 22, 2019
33310ff
update space tests
legrego Jul 22, 2019
2b55de0
standardize test names where appropriate
legrego Jul 22, 2019
f2cb519
remove unused import
legrego Jul 22, 2019
c17d6df
Merge branch 'master' of github.com:elastic/kibana into spaces/hidden…
legrego Jul 22, 2019
06614bc
Merge branch 'master' of github.com:elastic/kibana into spaces/hidden…
legrego Jul 25, 2019
ba3848c
Merge branch 'master' of github.com:elastic/kibana into spaces/hidden…
legrego Jul 25, 2019
459a057
Merge branch 'master' of github.com:elastic/kibana into spaces/hidden…
legrego Jul 30, 2019
da03e08
Switching tests from using the space type directly to a "hidden t… (#21)
kobelb Jul 30, 2019
6623a0b
add space saved object api tests
legrego Jul 30, 2019
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
1 change: 1 addition & 0 deletions x-pack/legacy/plugins/spaces/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,6 +73,7 @@ export const spaces = (kibana: Record<string, any>) =>
savedObjectSchemas: {
space: {
isNamespaceAgnostic: true,
hidden: true,
},
},
home: ['plugins/spaces/register_feature'],
Expand Down
2 changes: 1 addition & 1 deletion x-pack/legacy/plugins/spaces/server/lib/create_default_space.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ export async function createDefaultSpace({ elasticsearch, savedObjects }: Deps)

const client = await elasticsearch.dataClient$.pipe(first()).toPromise();

const savedObjectsRepository = getSavedObjectsRepository(client.callAsInternalUser);
const savedObjectsRepository = getSavedObjectsRepository(client.callAsInternalUser, ['space']);

const defaultSpaceExists = await doesDefaultSpaceExist(
SavedObjectsClient,
Expand Down
36 changes: 0 additions & 36 deletions ...es/server/lib/saved_objects_client/__snapshots__/spaces_saved_objects_client.test.ts.snap
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

152 changes: 0 additions & 152 deletions ...legacy/plugins/spaces/server/lib/saved_objects_client/spaces_saved_objects_client.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,21 +54,6 @@ const createSpacesService = async (spaceId: string) => {
).rejects.toThrowErrorMatchingSnapshot();
});

test(`throws error if type is space`, async () => {
const request = createMockRequest();
const baseClient = createMockClient();
const spacesService = await createSpacesService(currentSpace.id);

const client = new SpacesSavedObjectsClient({
request,
baseClient,
spacesService,
types,
});

await expect(client.get('space', '')).rejects.toThrowErrorMatchingSnapshot();
});

test(`supplements options with undefined namespace`, async () => {
const request = createMockRequest();
const baseClient = createMockClient();
Expand Down Expand Up @@ -114,23 +99,6 @@ const createSpacesService = async (spaceId: string) => {
).rejects.toThrowErrorMatchingSnapshot();
});

test(`throws error if objects type is space`, async () => {
const request = createMockRequest();
const baseClient = createMockClient();
const spacesService = await createSpacesService(currentSpace.id);

const client = new SpacesSavedObjectsClient({
request,
baseClient,
spacesService,
types,
});

await expect(
client.bulkGet([{ id: '', type: 'foo' }, { id: '', type: 'space' }], { namespace: 'bar' })
).rejects.toThrowErrorMatchingSnapshot();
});

test(`supplements options with undefined namespace`, async () => {
const request = createMockRequest();
const baseClient = createMockClient();
Expand Down Expand Up @@ -174,23 +142,6 @@ const createSpacesService = async (spaceId: string) => {
await expect(client.find({ namespace: 'bar' })).rejects.toThrowErrorMatchingSnapshot();
});

test(`throws error if options.type is space`, async () => {
const request = createMockRequest();
const baseClient = createMockClient();
const expectedReturnValue = Symbol();
baseClient.find.mockReturnValue(expectedReturnValue);
const spacesService = await createSpacesService(currentSpace.id);

const client = new SpacesSavedObjectsClient({
request,
baseClient,
spacesService,
types,
});

await expect(client.find({ type: 'space' })).rejects.toThrowErrorMatchingSnapshot();
});

test(`passes options.type to baseClient if valid singular type specified`, async () => {
const request = createMockRequest();
const baseClient = createMockClient();
Expand All @@ -215,44 +166,6 @@ const createSpacesService = async (spaceId: string) => {
});
});

test(`throws error if options.type is array containing space`, async () => {
const request = createMockRequest();
const baseClient = createMockClient();
const expectedReturnValue = Symbol();
baseClient.find.mockReturnValue(expectedReturnValue);
const spacesService = await createSpacesService(currentSpace.id);

const client = new SpacesSavedObjectsClient({
request,
baseClient,
spacesService,
types,
});

await expect(
client.find({ type: ['space', 'foo'] })
).rejects.toThrowErrorMatchingSnapshot();
});

test(`if options.type isn't provided specifies options.type based on the types excluding the space`, async () => {
const request = createMockRequest();
const baseClient = createMockClient();
const expectedReturnValue = Symbol();
baseClient.find.mockReturnValue(expectedReturnValue);
const spacesService = await createSpacesService(currentSpace.id);

const client = new SpacesSavedObjectsClient({
request,
baseClient,
spacesService,
types,
});

await expect(
client.find({ type: ['space', 'foo'] })
).rejects.toThrowErrorMatchingSnapshot();
});

test(`supplements options with undefined namespace`, async () => {
const request = createMockRequest();
const baseClient = createMockClient();
Expand Down Expand Up @@ -296,21 +209,6 @@ const createSpacesService = async (spaceId: string) => {
).rejects.toThrowErrorMatchingSnapshot();
});

test(`throws error if type is space`, async () => {
const request = createMockRequest();
const baseClient = createMockClient();
const spacesService = await createSpacesService(currentSpace.id);

const client = new SpacesSavedObjectsClient({
request,
baseClient,
spacesService,
types,
});

await expect(client.create('space', {})).rejects.toThrowErrorMatchingSnapshot();
});

test(`supplements options with undefined namespace`, async () => {
const request = createMockRequest();
const baseClient = createMockClient();
Expand Down Expand Up @@ -357,26 +255,6 @@ const createSpacesService = async (spaceId: string) => {
).rejects.toThrowErrorMatchingSnapshot();
});

test(`throws error if objects type is space`, async () => {
const request = createMockRequest();
const baseClient = createMockClient();
const spacesService = await createSpacesService(currentSpace.id);

const client = new SpacesSavedObjectsClient({
request,
baseClient,
spacesService,
types,
});

await expect(
client.bulkCreate([
{ id: '', type: 'foo', attributes: {} },
{ id: '', type: 'space', attributes: {} },
])
).rejects.toThrowErrorMatchingSnapshot();
});

test(`supplements options with undefined namespace`, async () => {
const request = createMockRequest();
const baseClient = createMockClient();
Expand Down Expand Up @@ -423,21 +301,6 @@ const createSpacesService = async (spaceId: string) => {
).rejects.toThrowErrorMatchingSnapshot();
});

test(`throws error if type is space`, async () => {
const request = createMockRequest();
const baseClient = createMockClient();
const spacesService = await createSpacesService(currentSpace.id);

const client = new SpacesSavedObjectsClient({
request,
baseClient,
spacesService,
types,
});

await expect(client.update('space', '', {})).rejects.toThrowErrorMatchingSnapshot();
});

test(`supplements options with undefined namespace`, async () => {
const request = createMockRequest();
const baseClient = createMockClient();
Expand Down Expand Up @@ -486,21 +349,6 @@ const createSpacesService = async (spaceId: string) => {
).rejects.toThrowErrorMatchingSnapshot();
});

test(`throws error if type is space`, async () => {
const request = createMockRequest();
const baseClient = createMockClient();
const spacesService = await createSpacesService(currentSpace.id);

const client = new SpacesSavedObjectsClient({
request,
baseClient,
spacesService,
types,
});

await expect(client.delete('space', 'foo')).rejects.toThrowErrorMatchingSnapshot();
});

test(`supplements options with undefined namespace`, async () => {
const request = createMockRequest();
const baseClient = createMockClient();
Expand Down
22 changes: 0 additions & 22 deletions x-pack/legacy/plugins/spaces/server/lib/saved_objects_client/spaces_saved_objects_client.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,18 +38,6 @@ const throwErrorIfNamespaceSpecified = (options: any) => {
}
};

const throwErrorIfTypeIsSpace = (type: string) => {
if (type === 'space') {
throw new Error('Spaces can not be accessed using the SavedObjectsClient');
}
};

const throwErrorIfTypesContainsSpace = (types: string[]) => {
for (const type of types) {
throwErrorIfTypeIsSpace(type);
}
};

export class SpacesSavedObjectsClient implements SavedObjectsClientContract {
private readonly client: SavedObjectsClientContract;
private readonly spaceId: string;
Expand Down Expand Up @@ -81,7 +69,6 @@ export class SpacesSavedObjectsClient implements SavedObjectsClientContract {
attributes: T = {} as T,
options: SavedObjectsCreateOptions = {}
) {
throwErrorIfTypeIsSpace(type);
throwErrorIfNamespaceSpecified(options);

return await this.client.create(type, attributes, {
Expand All @@ -103,7 +90,6 @@ export class SpacesSavedObjectsClient implements SavedObjectsClientContract {
objects: SavedObjectsBulkCreateObject[],
options: SavedObjectsBaseOptions = {}
) {
throwErrorIfTypesContainsSpace(objects.map(object => object.type));
throwErrorIfNamespaceSpecified(options);

return await this.client.bulkCreate(objects, {
Expand All @@ -122,7 +108,6 @@ export class SpacesSavedObjectsClient implements SavedObjectsClientContract {
* @returns {promise}
*/
public async delete(type: string, id: string, options: SavedObjectsBaseOptions = {}) {
throwErrorIfTypeIsSpace(type);
throwErrorIfNamespaceSpecified(options);

return await this.client.delete(type, id, {
Expand All @@ -148,10 +133,6 @@ export class SpacesSavedObjectsClient implements SavedObjectsClientContract {
* @returns {promise} - { saved_objects: [{ id, type, version, attributes }], total, per_page, page }
*/
public async find(options: SavedObjectsFindOptions = {}) {
if (options.type) {
throwErrorIfTypesContainsSpace(coerceToArray(options.type));
}

throwErrorIfNamespaceSpecified(options);

return await this.client.find({
Expand Down Expand Up @@ -181,7 +162,6 @@ export class SpacesSavedObjectsClient implements SavedObjectsClientContract {
objects: SavedObjectsBulkGetObject[] = [],
options: SavedObjectsBaseOptions = {}
) {
throwErrorIfTypesContainsSpace(objects.map(object => object.type));
throwErrorIfNamespaceSpecified(options);

return await this.client.bulkGet(objects, {
Expand All @@ -200,7 +180,6 @@ export class SpacesSavedObjectsClient implements SavedObjectsClientContract {
* @returns {promise} - { id, type, version, attributes }
*/
public async get(type: string, id: string, options: SavedObjectsBaseOptions = {}) {
throwErrorIfTypeIsSpace(type);
throwErrorIfNamespaceSpecified(options);

return await this.client.get(type, id, {
Expand All @@ -225,7 +204,6 @@ export class SpacesSavedObjectsClient implements SavedObjectsClientContract {
attributes: Partial<T>,
options: SavedObjectsUpdateOptions = {}
) {
throwErrorIfTypeIsSpace(type);
throwErrorIfNamespaceSpecified(options);

return await this.client.update(type, id, attributes, {
Expand Down
8 changes: 6 additions & 2 deletions x-pack/legacy/plugins/spaces/server/new_platform/spaces_service/spaces_service.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,12 +93,16 @@ export class SpacesService {
.pipe(
map(([clusterClient, config]) => {
const internalRepository = savedObjects.getSavedObjectsRepository(
clusterClient.callAsInternalUser
clusterClient.callAsInternalUser,
['space']
);

const callCluster = clusterClient.asScoped(request).callAsCurrentUser;

const callWithRequestRepository = savedObjects.getSavedObjectsRepository(callCluster);
const callWithRequestRepository = savedObjects.getSavedObjectsRepository(
callCluster,
['space']
);

const authorization = security.isEnabled ? security.authorization : null;

Expand Down
1 change: 1 addition & 0 deletions x-pack/test/api_integration/apis/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ export default function ({ loadTestFile }) {
loadTestFile(require.resolve('./alerting'));
loadTestFile(require.resolve('./es'));
loadTestFile(require.resolve('./security'));
loadTestFile(require.resolve('./spaces'));
loadTestFile(require.resolve('./monitoring'));
loadTestFile(require.resolve('./xpack_main'));
loadTestFile(require.resolve('./telemetry'));
Expand Down
Loading