diff --git a/x-pack/plugins/security/index.js b/x-pack/plugins/security/index.js index f0d016a658f61..96438d7d7cce5 100644 --- a/x-pack/plugins/security/index.js +++ b/x-pack/plugins/security/index.js @@ -8,8 +8,8 @@ import { resolve } from 'path'; import { getUserProvider } from './server/lib/get_user'; import { initAuthenticateApi } from './server/routes/api/v1/authenticate'; import { initUsersApi } from './server/routes/api/v1/users'; -import { initPublicRolesApi } from './server/routes/api/public/roles'; -import { initPrivilegesApi } from './server/routes/api/public/privileges'; +import { initExternalRolesApi } from './server/routes/api/external/roles'; +import { initPrivilegesApi } from './server/routes/api/external/privileges'; import { initIndicesApi } from './server/routes/api/v1/indices'; import { initOverwrittenSessionView } from './server/routes/views/overwritten_session'; import { initLoginView } from './server/routes/views/login'; @@ -212,7 +212,7 @@ export const security = (kibana) => new kibana.Plugin({ initAPIAuthorization(server, authorization); initAppAuthorization(server, xpackMainPlugin, authorization); initUsersApi(server); - initPublicRolesApi(server); + initExternalRolesApi(server); initIndicesApi(server); initPrivilegesApi(server); initLoginView(server, xpackMainPlugin); diff --git a/x-pack/plugins/security/server/routes/api/public/privileges/get.test.ts b/x-pack/plugins/security/server/routes/api/external/privileges/get.test.ts similarity index 100% rename from x-pack/plugins/security/server/routes/api/public/privileges/get.test.ts rename to x-pack/plugins/security/server/routes/api/external/privileges/get.test.ts diff --git a/x-pack/plugins/security/server/routes/api/public/privileges/get.ts b/x-pack/plugins/security/server/routes/api/external/privileges/get.ts similarity index 100% rename from x-pack/plugins/security/server/routes/api/public/privileges/get.ts rename to x-pack/plugins/security/server/routes/api/external/privileges/get.ts diff --git a/x-pack/plugins/security/server/routes/api/public/privileges/index.ts b/x-pack/plugins/security/server/routes/api/external/privileges/index.ts similarity index 100% rename from x-pack/plugins/security/server/routes/api/public/privileges/index.ts rename to x-pack/plugins/security/server/routes/api/external/privileges/index.ts diff --git a/x-pack/plugins/security/server/routes/api/public/roles/delete.js b/x-pack/plugins/security/server/routes/api/external/roles/delete.js similarity index 100% rename from x-pack/plugins/security/server/routes/api/public/roles/delete.js rename to x-pack/plugins/security/server/routes/api/external/roles/delete.js diff --git a/x-pack/plugins/security/server/routes/api/public/roles/delete.test.js b/x-pack/plugins/security/server/routes/api/external/roles/delete.test.js similarity index 100% rename from x-pack/plugins/security/server/routes/api/public/roles/delete.test.js rename to x-pack/plugins/security/server/routes/api/external/roles/delete.test.js diff --git a/x-pack/plugins/security/server/routes/api/public/roles/get.js b/x-pack/plugins/security/server/routes/api/external/roles/get.js similarity index 100% rename from x-pack/plugins/security/server/routes/api/public/roles/get.js rename to x-pack/plugins/security/server/routes/api/external/roles/get.js diff --git a/x-pack/plugins/security/server/routes/api/public/roles/get.test.js b/x-pack/plugins/security/server/routes/api/external/roles/get.test.js similarity index 100% rename from x-pack/plugins/security/server/routes/api/public/roles/get.test.js rename to x-pack/plugins/security/server/routes/api/external/roles/get.test.js diff --git a/x-pack/plugins/security/server/routes/api/public/roles/index.js b/x-pack/plugins/security/server/routes/api/external/roles/index.js similarity index 95% rename from x-pack/plugins/security/server/routes/api/public/roles/index.js rename to x-pack/plugins/security/server/routes/api/external/roles/index.js index 04b39867e86a7..e883e8a6a8631 100644 --- a/x-pack/plugins/security/server/routes/api/public/roles/index.js +++ b/x-pack/plugins/security/server/routes/api/external/roles/index.js @@ -10,7 +10,7 @@ import { initGetRolesApi } from './get'; import { initDeleteRolesApi } from './delete'; import { initPutRolesApi } from './put'; -export function initPublicRolesApi(server) { +export function initExternalRolesApi(server) { const callWithRequest = getClient(server).callWithRequest; const routePreCheckLicenseFn = routePreCheckLicense(server); diff --git a/x-pack/plugins/security/server/routes/api/public/roles/put.js b/x-pack/plugins/security/server/routes/api/external/roles/put.js similarity index 100% rename from x-pack/plugins/security/server/routes/api/public/roles/put.js rename to x-pack/plugins/security/server/routes/api/external/roles/put.js diff --git a/x-pack/plugins/security/server/routes/api/public/roles/put.test.js b/x-pack/plugins/security/server/routes/api/external/roles/put.test.js similarity index 100% rename from x-pack/plugins/security/server/routes/api/public/roles/put.test.js rename to x-pack/plugins/security/server/routes/api/external/roles/put.test.js diff --git a/x-pack/plugins/spaces/index.ts b/x-pack/plugins/spaces/index.ts index 88071058b638f..13309a800e8b4 100644 --- a/x-pack/plugins/spaces/index.ts +++ b/x-pack/plugins/spaces/index.ts @@ -27,8 +27,8 @@ import { spacesSavedObjectsClientWrapperFactory } from './server/lib/saved_objec import { SpacesClient } from './server/lib/spaces_client'; import { createSpacesTutorialContextFactory } from './server/lib/spaces_tutorial_context_factory'; import { toggleUICapabilities } from './server/lib/toggle_ui_capabilities'; -import { initPublicSpacesApi } from './server/routes/api/public'; -import { initPrivateApis } from './server/routes/api/v1'; +import { initExternalSpacesApi } from './server/routes/api/external'; +import { initInternalApis } from './server/routes/api/v1'; export const spaces = (kibana: Record) => new kibana.Plugin({ @@ -170,8 +170,8 @@ export const spaces = (kibana: Record) => server.addScopedTutorialContextFactory(createSpacesTutorialContextFactory(spacesService)); - initPrivateApis(server); - initPublicSpacesApi(server); + initInternalApis(server); + initExternalSpacesApi(server); initSpacesRequestInterceptors(server); diff --git a/x-pack/plugins/spaces/server/routes/api/public/delete.test.ts b/x-pack/plugins/spaces/server/routes/api/external/delete.test.ts similarity index 100% rename from x-pack/plugins/spaces/server/routes/api/public/delete.test.ts rename to x-pack/plugins/spaces/server/routes/api/external/delete.test.ts diff --git a/x-pack/plugins/spaces/server/routes/api/public/delete.ts b/x-pack/plugins/spaces/server/routes/api/external/delete.ts similarity index 100% rename from x-pack/plugins/spaces/server/routes/api/public/delete.ts rename to x-pack/plugins/spaces/server/routes/api/external/delete.ts diff --git a/x-pack/plugins/spaces/server/routes/api/public/get.test.ts b/x-pack/plugins/spaces/server/routes/api/external/get.test.ts similarity index 100% rename from x-pack/plugins/spaces/server/routes/api/public/get.test.ts rename to x-pack/plugins/spaces/server/routes/api/external/get.test.ts diff --git a/x-pack/plugins/spaces/server/routes/api/public/get.ts b/x-pack/plugins/spaces/server/routes/api/external/get.ts similarity index 100% rename from x-pack/plugins/spaces/server/routes/api/public/get.ts rename to x-pack/plugins/spaces/server/routes/api/external/get.ts diff --git a/x-pack/plugins/spaces/server/routes/api/public/index.ts b/x-pack/plugins/spaces/server/routes/api/external/index.ts similarity index 93% rename from x-pack/plugins/spaces/server/routes/api/public/index.ts rename to x-pack/plugins/spaces/server/routes/api/external/index.ts index 602b62ab26d06..8d88b33bfbeaa 100644 --- a/x-pack/plugins/spaces/server/routes/api/public/index.ts +++ b/x-pack/plugins/spaces/server/routes/api/external/index.ts @@ -10,7 +10,7 @@ import { initGetSpacesApi } from './get'; import { initPostSpacesApi } from './post'; import { initPutSpacesApi } from './put'; -export function initPublicSpacesApi(server: any) { +export function initExternalSpacesApi(server: any) { const routePreCheckLicenseFn = routePreCheckLicense(server); initDeleteSpacesApi(server, routePreCheckLicenseFn); diff --git a/x-pack/plugins/spaces/server/routes/api/public/post.test.ts b/x-pack/plugins/spaces/server/routes/api/external/post.test.ts similarity index 100% rename from x-pack/plugins/spaces/server/routes/api/public/post.test.ts rename to x-pack/plugins/spaces/server/routes/api/external/post.test.ts diff --git a/x-pack/plugins/spaces/server/routes/api/public/post.ts b/x-pack/plugins/spaces/server/routes/api/external/post.ts similarity index 100% rename from x-pack/plugins/spaces/server/routes/api/public/post.ts rename to x-pack/plugins/spaces/server/routes/api/external/post.ts diff --git a/x-pack/plugins/spaces/server/routes/api/public/put.test.ts b/x-pack/plugins/spaces/server/routes/api/external/put.test.ts similarity index 100% rename from x-pack/plugins/spaces/server/routes/api/public/put.test.ts rename to x-pack/plugins/spaces/server/routes/api/external/put.test.ts diff --git a/x-pack/plugins/spaces/server/routes/api/public/put.ts b/x-pack/plugins/spaces/server/routes/api/external/put.ts similarity index 100% rename from x-pack/plugins/spaces/server/routes/api/public/put.ts rename to x-pack/plugins/spaces/server/routes/api/external/put.ts diff --git a/x-pack/plugins/spaces/server/routes/api/v1/index.ts b/x-pack/plugins/spaces/server/routes/api/v1/index.ts index 75659c14c03ae..658cf8e7e4cf0 100644 --- a/x-pack/plugins/spaces/server/routes/api/v1/index.ts +++ b/x-pack/plugins/spaces/server/routes/api/v1/index.ts @@ -5,9 +5,9 @@ */ import { routePreCheckLicense } from '../../../lib/route_pre_check_license'; -import { initPrivateSpacesApi } from './spaces'; +import { initInternalSpacesApi } from './spaces'; -export function initPrivateApis(server: any) { +export function initInternalApis(server: any) { const routePreCheckLicenseFn = routePreCheckLicense(server); - initPrivateSpacesApi(server, routePreCheckLicenseFn); + initInternalSpacesApi(server, routePreCheckLicenseFn); } diff --git a/x-pack/plugins/spaces/server/routes/api/v1/spaces.test.ts b/x-pack/plugins/spaces/server/routes/api/v1/spaces.test.ts index 4ad464d3ea119..4d9952f4ab3dc 100644 --- a/x-pack/plugins/spaces/server/routes/api/v1/spaces.test.ts +++ b/x-pack/plugins/spaces/server/routes/api/v1/spaces.test.ts @@ -24,14 +24,14 @@ jest.mock('../../../../../../server/lib/get_client_shield', () => { import Boom from 'boom'; import { createTestHandler, RequestRunner, TeardownFn } from '../__fixtures__'; -import { initPrivateSpacesApi } from './spaces'; +import { initInternalSpacesApi } from './spaces'; describe('Spaces API', () => { let request: RequestRunner; let teardowns: TeardownFn[]; beforeEach(() => { - const setup = createTestHandler(initPrivateSpacesApi); + const setup = createTestHandler(initInternalSpacesApi); request = setup.request; teardowns = setup.teardowns; diff --git a/x-pack/plugins/spaces/server/routes/api/v1/spaces.ts b/x-pack/plugins/spaces/server/routes/api/v1/spaces.ts index 427878e2caf2f..375802528090a 100644 --- a/x-pack/plugins/spaces/server/routes/api/v1/spaces.ts +++ b/x-pack/plugins/spaces/server/routes/api/v1/spaces.ts @@ -11,7 +11,7 @@ import { SpacesClient } from '../../../lib/spaces_client'; import { addSpaceIdToPath } from '../../../lib/spaces_url_parser'; import { getSpaceById } from '../../lib'; -export function initPrivateSpacesApi(server: any, routePreCheckLicenseFn: any) { +export function initInternalSpacesApi(server: any, routePreCheckLicenseFn: any) { server.route({ method: 'POST', path: '/api/spaces/v1/space/{id}/select',