Merge pull request #54 from yandex-cloud/CLOUD-86841

v2.0-alpha
yandex-cloud · Jan 12, 2022 · 2c76c40 · 2c76c40
2 parents a6dc0f4 + 12e118e
commit 2c76c40
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 5 deletions.
diff --git a/src/index.ts b/src/index.ts
@@ -3,3 +3,4 @@ export * as cloudApi from './generated/yandex/cloud';
 export * from './session';
 export * from './utils/operation';
 export * from './utils/decode-message';
+export { WrappedServiceClientType } from './types';
diff --git a/src/service-endpoints.ts b/src/service-endpoints.ts
@@ -163,10 +163,20 @@ const SERVICE_ENDPOINTS_LIST: ServiceEndpointsList = [
     {
         serviceIds: [
             'yandex.cloud.logging.v1.LogGroupService',
-            'yandex.cloud.logging.v1.LogIngestionService',
+        ],
+        endpoint: 'logging.api.cloud.yandex.net:443',
+    },
+    {
+        serviceIds: [
             'yandex.cloud.logging.v1.LogReadingService',
         ],
-        endpoint: 'logs.api.cloud.yandex.net:443',
+        endpoint: 'reader.logging.yandexcloud.net:443',
+    },
+    {
+        serviceIds: [
+            'yandex.cloud.logging.v1.LogIngestionService',
+        ],
+        endpoint: 'ingester.logging.yandexcloud.net:443',
     },
     {
         serviceIds: [

diff --git a/src/session.ts b/src/session.ts
@@ -7,7 +7,7 @@ import {
     GeneratedServiceClientCtor,
     IamTokenCredentialsConfig,
     OAuthCredentialsConfig,
-    ServiceAccountCredentialsConfig,
+    ServiceAccountCredentialsConfig, WrappedServiceClientType,
     SessionConfig,
 } from './types';
 import { IamTokenService } from './token-service/iam-token-service';
@@ -94,8 +94,8 @@ export class Session {
         return this.config.pollInterval;
     }
 
-    client<S extends ServiceDefinition>(clientClass: GeneratedServiceClientCtor<S>) {
-        const endpoint = getServiceClientEndpoint(clientClass);
+    client<S extends ServiceDefinition>(clientClass: GeneratedServiceClientCtor<S>, customEndpoint?: string): WrappedServiceClientType<S> {
+        const endpoint = customEndpoint || getServiceClientEndpoint(clientClass);
         const channel = createChannel(endpoint, this.channelCredentials);
 
         return clientFactory.create(clientClass.service, channel);

diff --git a/src/types.ts b/src/types.ts
@@ -1,6 +1,9 @@
 import {
     ChannelCredentials, ChannelOptions, Client, ServiceDefinition,
 } from '@grpc/grpc-js';
+import { RawClient } from 'nice-grpc';
+import { NormalizedServiceDefinition } from 'nice-grpc/lib/service-definitions';
+import { DeadlineOptions } from 'nice-grpc-client-middleware-deadline';
 
 export interface TokenService {
     getToken: () => Promise<string>;
@@ -48,3 +51,5 @@ export type SessionConfig =
     | IamTokenCredentialsConfig
     | ServiceAccountCredentialsConfig
     | GenericCredentialsConfig;
+
+export type WrappedServiceClientType<S extends ServiceDefinition> = RawClient<NormalizedServiceDefinition<S>, DeadlineOptions>;