Switching from public/private to external/internal APIs

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

x-pack/plugins/security/server/routes/api/public/roles/index.js → 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);
 

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

x-pack/plugins/spaces/server/routes/api/public/index.ts → 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);

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

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;

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