Rename to getScopedCallCluster

elastic · Apr 24, 2020 · d4d3bd8 · d4d3bd8
1 parent b21d4bd
commit d4d3bd8
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 6 deletions.
diff --git a/x-pack/plugins/actions/server/plugin.ts b/x-pack/plugins/actions/server/plugin.ts
@@ -296,11 +296,11 @@ export class ActionsPlugin implements Plugin<Promise<PluginSetupContract>, Plugi
     return request => ({
       callCluster: elasticsearch.legacy.client.asScoped(request).callAsCurrentUser,
       savedObjectsClient: savedObjects.getScopedClient(request),
-      getScopedClusterClient(clusterClient: IClusterClient) {
+      getScopedCallCluster(clusterClient: IClusterClient) {
         if (!(clusterClient instanceof ClusterClient)) {
           throw new Error('given clusterClient is not an instance of ClusterClient');
         }
-        return clusterClient.asScoped(request);
+        return clusterClient.asScoped(request).callAsCurrentUser;
       },
     });
   }

diff --git a/x-pack/plugins/actions/server/types.ts b/x-pack/plugins/actions/server/types.ts
@@ -24,7 +24,7 @@ export type SpaceIdToNamespaceFunction = (spaceId?: string) => string | undefine
 export interface Services {
   callCluster(path: string, opts: any): Promise<any>;
   savedObjectsClient: SavedObjectsClientContract;
-  getScopedClusterClient(clusterClient: IClusterClient): IScopedClusterClient;
+  getScopedCallCluster(clusterClient: IClusterClient): IScopedClusterClient['callAsCurrentUser'];
 }
 
 declare module 'src/core/server' {

diff --git a/x-pack/plugins/alerting/server/plugin.ts b/x-pack/plugins/alerting/server/plugin.ts
@@ -269,11 +269,11 @@ export class AlertingPlugin {
     return request => ({
       callCluster: elasticsearch.legacy.client.asScoped(request).callAsCurrentUser,
       savedObjectsClient: savedObjects.getScopedClient(request),
-      getScopedClusterClient(clusterClient: IClusterClient) {
+      getScopedCallCluster(clusterClient: IClusterClient) {
         if (!(clusterClient instanceof ClusterClient)) {
           throw new Error('given clusterClient is not an instance of ClusterClient');
         }
-        return clusterClient.asScoped(request);
+        return clusterClient.asScoped(request).callAsCurrentUser;
       },
     });
   }

diff --git a/x-pack/plugins/alerting/server/types.ts b/x-pack/plugins/alerting/server/types.ts
@@ -36,7 +36,7 @@ declare module 'src/core/server' {
 export interface Services {
   callCluster(path: string, opts: any): Promise<any>;
   savedObjectsClient: SavedObjectsClientContract;
-  getScopedClusterClient(clusterClient: IClusterClient): IScopedClusterClient;
+  getScopedCallCluster(clusterClient: IClusterClient): IScopedClusterClient['callAsCurrentUser'];
 }
 
 export interface AlertServices extends Services {