move code to another SpannerClient.php

googleapis · Jul 16, 2018 · 9b0f8c1 · 9b0f8c1
1 parent 09e5143
commit 9b0f8c1
Show file tree

Hide file tree

Showing 5 changed files with 31 additions and 122 deletions.
diff --git a/Spanner/src/Connection/Grpc.php b/Spanner/src/Connection/Grpc.php
@@ -48,6 +48,8 @@
 use Google\Protobuf\Value;
 use Grpc\UnaryCall;
 
+use Grpc\Gcp\Config;
+
 /**
  * Connection to Cloud Spanner over gRPC
  */
@@ -120,6 +122,15 @@ class Grpc implements ConnectionInterface
      */
     private $longRunningGrpcClients;
 
+    private function enableChonnectionManagement($conf_path)
+    {
+        // TODO: move this function to GrpcTrait.
+        $conf = new \Grpc\Gcp\ApiConfig();
+        $conf->mergeFromJsonString($string = file_get_contents($conf_path));
+        $config = new Config($conf);
+        return $config;
+    }
+
     /**
      * @param array $config [optional]
      */
@@ -152,6 +163,15 @@ public function __construct(array $config = [])
                 ? $config['authHttpHandler']
                 : null
         );
+
+        if (isset($config['enable-gcp'])) {
+            $api = 'spanner';
+            $conf_path = __DIR__. "/../$api.grpc.config";
+            $grpc_gcp_config = $this->enableChonnectionManagement($conf_path);
+            $grpcConfig['grpc_call_invoker'] = $grpc_gcp_config->callInvoker();
+            unset($config['enable-gcp']);
+        }
+
         $this->spannerClient = isset($config['gapicSpannerClient'])
             ? $config['gapicSpannerClient']
             : new SpannerClient($grpcConfig);

diff --git a/Spanner/src/V1/Gapic/SpannerGapicClient.php b/Spanner/src/V1/Gapic/SpannerGapicClient.php
@@ -308,23 +308,10 @@ public static function parseName($formattedName, $template = null)
      */
     public function __construct(array $options = [])
     {
-        if (isset($options['enable-gcp'])) {
-            $api = 'spanner';
-            $conf_path = "./../../$api.grpc.config";
-            $this->enableChonnectionManagement($conf_path, &$options);
-        }
         $clientOptions = $this->buildClientOptions($options);
         $this->setClientOptions($clientOptions);
     }
 
-    private function enableChonnectionManagement($conf_path, $options) {
-        // TODO: move this function to gax.
-        $conf = new \Grpc\Gcp\ApiConfig();
-        $conf->mergeFromJsonString($string = file_get_contents($conf_path));
-        $config = \Google\Cloud\Grpc($conf);
-        $options['grpc_call_invoker'] = $config->callInvoker();
-    }
-
     /**
      * Creates a new session. A session can be used to perform
      * transactions that read and/or modify data in a Cloud Spanner database.

diff --git a/Spanner/tests/Unit/SpannerClientTest.php b/Spanner/tests/Unit/SpannerClientTest.php
@@ -15,7 +15,9 @@
  * limitations under the License.
  */
 
-namespace Google\Cloud\Spanner\Tests\Unit;
+require_once (__DIR__ . "/../../../vendor/autoload.php");
+
+//namespace Google\Cloud\Spanner\Tests\Unit;
 
 use Google\Cloud\Core\Int64;
 use Google\Cloud\Core\Iterator\ItemIterator;
@@ -59,7 +61,9 @@ public function setUp()
 
         $this->connection = $this->prophesize(ConnectionInterface::class);
         $this->client = \Google\Cloud\Core\Testing\TestHelpers::stub(SpannerClient::class, [
-            ['projectId' => self::PROJECT]
+            ['projectId' => self::PROJECT,
+             'enable-gcp' => true,
+            ]
         ]);
     }
 

diff --git a/Spanner/tests/Unit/V1/SpannerClientEnableGCPTest.php b/Spanner/tests/Unit/V1/SpannerClientEnableGCPTest.php
diff --git a/spannerEnableGcpSample.php b/spannerEnableGcpSample.php
@@ -0,0 +1,5 @@
+<?php
+require('./vendor/autoload.php');
+$spanner = new SpannerClient(['projectId' => 'ddyihai-firestore',
+                               'enable_gcp' => true,
+                             ]);