Switching from public/private to external/internal APIs (#36815) (#36886)

* Switching from public/private to external/internal APIs

We use the public folder a lot of other places to denote files which
should be exposed client-side. Using folders names public was causing
issues with some of the operations team's tooling, so we're renaming
these.

* Fixing forgotten import in test
This commit is contained in:
Brandon Kobel 2019-05-24 12:56:58 -04:00 committed by GitHub
parent 97a78d377f
commit ef0bfba39d
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
24 changed files with 15 additions and 15 deletions

View file

@ -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);

View file

@ -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);

View file

@ -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<string, any>) =>
new kibana.Plugin({
@ -170,8 +170,8 @@ export const spaces = (kibana: Record<string, any>) =>
server.addScopedTutorialContextFactory(createSpacesTutorialContextFactory(spacesService));
initPrivateApis(server);
initPublicSpacesApi(server);
initInternalApis(server);
initExternalSpacesApi(server);
initSpacesRequestInterceptors(server);

View file

@ -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);

View file

@ -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);
}

View file

@ -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;

View file

@ -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',