Add support to enable grpc_call_invoker by WeiranFang · Pull Request #207 · googleapis/gax-php

WeiranFang · 2018-08-15T16:56:57Z

Per discussion in googleapis/google-cloud-php#1146, this PR is to move the logic of enabling channel management to gax library. Another part of the changes resides in gapic-generator library: googleapis/gapic-generator#2231

tests/ApiCore/Tests/Unit/GapicClientTraitTest.php

            'serviceName' => 'test.interface.v1.api',
            'clientConfig' => __DIR__ . '/testdata/test_service_client_config.json',
            'descriptorsConfigPath' => __DIR__.'/testdata/test_service_descriptor_config.php',
+            'gcpApiConfigPath' => __DIR__.'/../testdata/test_service_grpc_config.json',


src/ApiCore/GapicClientTrait.php

+        if (isset($options['gcpApiConfigPath'])
+                && file_exists($options['gcpApiConfigPath'])
+                && isset($options['serviceAddress'])) {
+            $grpcGcpConfig = initGrpcGcpConfig(


tests/ApiCore/Tests/Unit/GapicClientTraitTest.php

            'serviceName' => 'test.interface.v1.api',
            'clientConfig' => __DIR__ . '/testdata/test_service_client_config.json',
            'descriptorsConfigPath' => __DIR__.'/testdata/test_service_descriptor_config.php',
+            'gcpApiConfigPath' => __DIR__.'/../testdata/test_service_grpc_config.json',


composer.json

        "php": ">=5.5",
        "google/auth": "^1.2.0",
-	"google/gpc-gcp": "^0.1.0",
+	"google/grpc-gcp": "^0.1.0",


src/ApiCore/GapicClientTrait.php

            'rest' => [],
        ];

+        if (isset($defaultOptions['gcpApiConfigPath'])


codecov-io · 2018-08-16T00:28:02Z

Codecov Report

Merging #207 into master will decrease coverage by 0.19%.
The diff coverage is 75%.

@@            Coverage Diff            @@
##           master     #207     +/-   ##
=========================================
- Coverage   84.81%   84.61%   -0.2%     
=========================================
  Files          62       63      +1     
  Lines        2838     2373    -465     
=========================================
- Hits         2407     2008    -399     
+ Misses        431      365     -66

Impacted Files	Coverage Δ
src/ApiCore/GapicClientTrait.php	`87.61% <75%> (-1.28%)`	⬇️
src/ApiCore/PathTemplate.php	`86.66% <0%> (-12.35%)`	⬇️
src/ApiCore/RequestBuilder.php	`93.6% <0%> (ø)`	⬆️
src/ApiCore/Parser.php
src/ApiCore/Jison/Segment.php
src/ApiCore/Jison/Parser.php
src/ApiCore/ResourceTemplate/Segment.php	`82.22% <0%> (ø)`
src/ApiCore/ResourceTemplate/Parser.php	`91.42% <0%> (ø)`
...Core/ResourceTemplate/RelativeResourceTemplate.php	`100% <0%> (ø)`
...Core/ResourceTemplate/AbsoluteResourceTemplate.php	`97.14% <0%> (ø)`

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update f9a8568...d88ff14. Read the comment docs.

dwsupplee

Thanks so much for this @WeiranFang :). Just a few minor style nits on my end, otherwise looks great.

src/ApiCore/GapicClientTrait.php

        $options['transportConfig']['grpc'] += $defaultOptions['transportConfig']['grpc'];
        $options['transportConfig']['rest'] += $defaultOptions['transportConfig']['rest'];
-
+        


tests/ApiCore/Tests/Unit/GapicClientTraitTest.php

    {
+        $apiConfig = new ApiConfig();
+        $apiConfig->mergeFromJsonString(
+            file_get_contents(__DIR__.'/testdata/test_service_grpc_config.json'));


src/ApiCore/GapicClientTrait.php

+        
        $this->modifyClientOptions($options);
+
+        if (isset($options['gcpApiConfigPath'])


Add support to enable grpc_call_invoker

47a7c12

This was referenced Aug 15, 2018

Add gcpApiConfigPath to client default options googleapis/gapic-generator#2231

Merged

Enable gRPC GCP channel management library for the spanner API googleapis/google-cloud-php#1146

Closed

michaelbausor reviewed Aug 15, 2018

View reviewed changes

ZhouyihaiDing reviewed Aug 15, 2018

View reviewed changes

Fix bugs and unit tests

43ccf74

ZhouyihaiDing reviewed Aug 15, 2018

View reviewed changes

composer.json Outdated

"php": ">=5.5",

"google/auth": "^1.2.0",

"google/gpc-gcp": "^0.1.0",

"google/grpc-gcp": "^0.1.0",

This comment was marked as spam.

Sign in to view

This comment was marked as spam.

Sign in to view

WeiranFang added 2 commits August 15, 2018 14:40

fix indent

66997fa

indent tab to space

5c753c9

michaelbausor reviewed Aug 15, 2018

View reviewed changes

WeiranFang and others added 3 commits August 15, 2018 16:36

Move logic to after modifyClientOptions()

b297da7

Merge branch 'master' into grpc-gcp-config

328dcbe

Fix code style.

14873f1

dwsupplee reviewed Aug 16, 2018

View reviewed changes

WeiranFang added 2 commits August 16, 2018 10:31

Add semaphores check and fix style

c29e564

Skip testBuildClientOptions if sysvshm is not loaded.

d88ff14

dwsupplee approved these changes Aug 16, 2018

View reviewed changes

michaelbausor approved these changes Aug 16, 2018

View reviewed changes

dwsupplee merged commit 66e37dc into googleapis:master Aug 16, 2018

michaelbausor mentioned this pull request Aug 20, 2018

Prepare 0.37.0 #211

Merged

		$options['transportConfig']['grpc'] += $defaultOptions['transportConfig']['grpc'];
		$options['transportConfig']['rest'] += $defaultOptions['transportConfig']['rest'];


		$this->modifyClientOptions($options);

		if (isset($options['gcpApiConfigPath'])

Conversation

WeiranFang commented Aug 15, 2018 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

This comment was marked as spam.

Uh oh!

This comment was marked as spam.

Uh oh!

This comment was marked as spam.

Uh oh!

This comment was marked as spam.

Uh oh!

This comment was marked as spam.

Uh oh!

This comment was marked as spam.

Uh oh!

This comment was marked as spam.

Uh oh!

This comment was marked as spam.

Uh oh!

This comment was marked as spam.

Uh oh!

This comment was marked as spam.

Uh oh!

This comment was marked as spam.

Uh oh!

This comment was marked as spam.

Uh oh!

This comment was marked as spam.

Uh oh!

This comment was marked as spam.

Uh oh!

codecov-io commented Aug 16, 2018 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Codecov Report

Uh oh!

dwsupplee left a comment

Choose a reason for hiding this comment

Uh oh!

This comment was marked as spam.

Uh oh!

This comment was marked as spam.

Uh oh!

This comment was marked as spam.

Uh oh!

This comment was marked as spam.

Uh oh!

This comment was marked as spam.

Uh oh!

This comment was marked as spam.

Uh oh!

This comment was marked as spam.

Uh oh!

This comment was marked as spam.

Uh oh!

This comment was marked as spam.

Uh oh!

This comment was marked as spam.

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

5 participants

WeiranFang commented Aug 15, 2018 •

edited

Loading

codecov-io commented Aug 16, 2018 •

edited

Loading