Skip to content
This repository has been archived by the owner on Jun 28, 2022. It is now read-only.

Add gcpApiConfigPath to client default options #2231

Merged
merged 5 commits into from
Aug 20, 2018
Merged

Add gcpApiConfigPath to client default options #2231

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
2583a28
Add gcpApiConfigPath to client default options
WeiranFang Aug 15, 2018
bc51095
Fix template names
WeiranFang Aug 16, 2018
5fafa02
Merge branch 'master' into grpc-gcp-config
WeiranFang Aug 16, 2018
9dc490f
Merge branch 'master' into grpc-gcp-config
WeiranFang Aug 16, 2018
e743304
Merge branch 'master' into grpc-gcp-config
WeiranFang Aug 20, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions src/main/resources/com/google/api/codegen/php/client_impl.snip
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -132,6 +132,7 @@
@end
'clientConfig' => __DIR__ . '{@xapiClass.clientConfigPath}',
'descriptorsConfigPath' => __DIR__ . '/../resources/{@xapiClass.clientConfigName}_descriptor_config.php',
'gcpApiConfigPath' => __DIR__ . '/../resources/{@xapiClass.clientConfigName}_grpc_config.json',
'credentialsConfig' => [
@if xapiClass.hasDefaultServiceScopes
'scopes' => self::$serviceScopes,
Expand Down
1 change: 1 addition & 0 deletions src/test/java/com/google/api/codegen/testdata/php/php_library.baseline
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -196,6 +196,7 @@ class LibraryServiceGapicClient
'serviceAddress' => self::SERVICE_ADDRESS . ':' . self::DEFAULT_SERVICE_PORT,
'clientConfig' => __DIR__ . '/../resources/library_service_client_config.json',
'descriptorsConfigPath' => __DIR__ . '/../resources/library_service_descriptor_config.php',
'gcpApiConfigPath' => __DIR__ . '/../resources/library_service_grpc_config.json',
'credentialsConfig' => [
'scopes' => self::$serviceScopes,
],
Expand Down
1 change: 1 addition & 0 deletions src/test/java/com/google/api/codegen/testdata/php/php_longrunning.baseline
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -143,6 +143,7 @@ class OperationsGapicClient
'serviceName' => self::SERVICE_NAME,
'clientConfig' => __DIR__ . '/../resources/operations_client_config.json',
'descriptorsConfigPath' => __DIR__ . '/../resources/operations_descriptor_config.php',
'gcpApiConfigPath' => __DIR__ . '/../resources/operations_grpc_config.json',
'credentialsConfig' => [
],
'transportConfig' => [
Expand Down
1 change: 1 addition & 0 deletions src/test/java/com/google/api/codegen/testdata/php/php_no_path_templates.baseline
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -115,6 +115,7 @@ class NoTemplatesApiServiceGapicClient
'serviceName' => self::SERVICE_NAME,
'clientConfig' => __DIR__ . '/../resources/no_templates_api_service_client_config.json',
'descriptorsConfigPath' => __DIR__ . '/../resources/no_templates_api_service_descriptor_config.php',
'gcpApiConfigPath' => __DIR__ . '/../resources/no_templates_api_service_grpc_config.json',
'credentialsConfig' => [
],
'transportConfig' => [
Expand Down