Separated grpc options to own section: grpc

Author: aneterial

README.md

@@ -562,19 +562,22 @@ $config = [
 $ydb = new \YdbPlatform\Ydb\Ydb($config);
 ```
 
-## gRPC options
+## gRPC
 
+### gRPC client's options
 You can customize the gRPC client's behavior by setting options in config array
 
 Example of using:
 ```php
 $config = [
     // ...
-    'opts' => [
-        'grpc.max_receive_message_length' => 8*1024*1024,
-        'grpc.default_compression_algorithm' => 2,
-        'grpc.default_compression_level' => 2,
+    'grpc' => [
+        'opts' => [
+            'grpc.max_receive_message_length' => 8*1024*1024,
+            'grpc.default_compression_algorithm' => 2,
+            'grpc.default_compression_level' => 2,
+        ],
     ],
-]
+];
 $ydb = new \YdbPlatform\Ydb\Ydb($config);
 ```

src/AuthService.php

@@ -28,7 +28,7 @@ public function __construct(Ydb $ydb, $logger)
     {
         $this->ydb = $ydb;
         $this->logger = $logger;
-        $this->client = new ServiceClient($ydb->endpoint(), $ydb->opts());
+        $this->client = new ServiceClient($ydb->endpoint(), $ydb->grpcOpts());
         $this->credentials = $ydb->iam();
         $this->meta = [
             'x-ydb-database' => [$ydb->database()],

src/Discovery.php

@@ -43,7 +43,7 @@ public function __construct(Ydb $ydb, LoggerInterface $logger = null)
     {
         $this->ydb = $ydb;
 
-        $this->client = new ServiceClient($ydb->endpoint(), $ydb->opts());
+        $this->client = new ServiceClient($ydb->endpoint(), $ydb->grpcOpts());
 
         $this->meta = $ydb->meta();
 

src/Operations.php

@@ -38,7 +38,7 @@ public function __construct(Ydb $ydb, LoggerInterface $logger = null)
     {
         $this->ydb = $ydb;
 
-        $this->client = new ServiceClient($ydb->endpoint(), $ydb->opts());
+        $this->client = new ServiceClient($ydb->endpoint(), $ydb->grpcOpts());
 
         $this->meta = $ydb->meta();
 

src/Scheme.php

@@ -41,7 +41,7 @@ public function __construct(Ydb $ydb, LoggerInterface $logger = null)
     {
         $this->ydb = $ydb;
 
-        $this->client = new ServiceClient($ydb->endpoint(), $ydb->opts());
+        $this->client = new ServiceClient($ydb->endpoint(), $ydb->grpcOpts());
 
         $this->meta = $ydb->meta();
 

src/Scripting.php

@@ -38,7 +38,7 @@ public function __construct(Ydb $ydb, LoggerInterface $logger = null)
     {
         $this->ydb = $ydb;
 
-        $this->client = new ServiceClient($ydb->endpoint(), $ydb->opts());
+        $this->client = new ServiceClient($ydb->endpoint(), $ydb->grpcOpts());
 
         $this->meta = $ydb->meta();
 

src/Table.php

@@ -75,7 +75,7 @@ public function __construct(Ydb $ydb, LoggerInterface $logger = null, Retry &$re
     {
         $this->ydb = $ydb;
 
-        $this->client = new ServiceClient($ydb->endpoint(), $ydb->opts());
+        $this->client = new ServiceClient($ydb->endpoint(), $ydb->grpcOpts());
 
         $this->meta = $ydb->meta();
 

src/Traits/RequestTrait.php

@@ -193,7 +193,7 @@ protected function handleGrpcStatus($service, $method, $status)
             if ($this->ydb->needDiscovery() && count($this->ydb->cluster()->all()) > 0){
                 $endpoint = $this->ydb->cluster()->all()[array_rand($this->ydb->cluster()->all())]->endpoint();
             }
-            $this->client = new $this->client($endpoint, $this->ydb->opts());
+            $this->client = new $this->client($endpoint, $this->ydb->grpcOpts());
             if (isset(self::$grpcExceptions[$status->code])) {
                 throw new self::$grpcExceptions[$status->code]($message);
             } else {

src/Ydb.php

@@ -40,7 +40,7 @@ class Ydb
     /**
      * @var array
      */
-    protected $opts;
+    protected $grpc_config;
 
     /**
      * @var Iam
@@ -111,7 +111,7 @@ public function __construct($config = [], LoggerInterface $logger = null)
         $this->endpoint = $config['endpoint'] ?? null;
         $this->database = $config['database'] ?? null;
         $this->iam_config = $config['iam_config'] ?? [];
-        $this->opts = $config['opts'] ?? [];
+        $this->grpc_config = (array) ($config['grpc'] ?? []);
 
         if (!is_null($logger) && isset($config['logger'])){
             throw new \Exception('Logger set in 2 places');
@@ -179,12 +179,12 @@ public function meta(): array
         return $meta;
     }
 
-    public function opts(): array
+    public function grpcOpts(): array
     {
-        $opts = $this->opts;
-        $opts['credentials'] = $this->iam()->getCredentials();
+        $grpcOpts = (array) ($this->grpc_config['opts'] ?? []);
+        $grpcOpts['credentials'] = $this->iam()->getCredentials();
 
-        return $opts;
+        return $grpcOpts;
     }
 
     /**