Skip to content

Commit

Permalink
feat: Add support for apiEndpoint and deprecate serviceAddress client…
Browse files Browse the repository at this point in the history
… configuration option. (#2209)
  • Loading branch information
yoshi-automation authored and dwsupplee committed Aug 7, 2019
1 parent 62329e2 commit a2a3502
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 5 deletions.
7 changes: 5 additions & 2 deletions Dlp/src/V2/Gapic/DlpServiceGapicClient.php
Original file line number Diff line number Diff line change
Expand Up @@ -169,7 +169,7 @@ private static function getClientDefaults()
{
return [
'serviceName' => self::SERVICE_NAME,
'serviceAddress' => self::SERVICE_ADDRESS.':'.self::DEFAULT_SERVICE_PORT,
'apiEndpoint' => self::SERVICE_ADDRESS.':'.self::DEFAULT_SERVICE_PORT,
'clientConfig' => __DIR__.'/../resources/dlp_service_client_config.json',
'descriptorsConfigPath' => __DIR__.'/../resources/dlp_service_descriptor_config.php',
'gcpApiConfigPath' => __DIR__.'/../resources/dlp_service_grpc_config.json',
Expand Down Expand Up @@ -527,6 +527,9 @@ public static function parseName($formattedName, $template = null)
* Optional. Options for configuring the service API wrapper.
*
* @type string $serviceAddress
* **Deprecated**. This option will be removed in a future major release. Please
* utilize the `$apiEndpoint` option instead.
* @type string $apiEndpoint
* The address of the API remote host. May optionally include the port, formatted
* as "<uri>:<port>". Default 'dlp.googleapis.com:443'.
* @type string|array|FetchAuthTokenInterface|CredentialsWrapper $credentials
Expand Down Expand Up @@ -554,7 +557,7 @@ public static function parseName($formattedName, $template = null)
* or `grpc`. Defaults to `grpc` if gRPC support is detected on the system.
* *Advanced usage*: Additionally, it is possible to pass in an already instantiated
* {@see \Google\ApiCore\Transport\TransportInterface} object. Note that when this
* object is provided, any settings in $transportConfig, and any $serviceAddress
* object is provided, any settings in $transportConfig, and any `$apiEndpoint`
* setting, will be ignored.
* @type array $transportConfig
* Configuration options that will be used to construct the transport. Options for
Expand Down
6 changes: 3 additions & 3 deletions Dlp/synth.metadata
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"updateTime": "2019-07-03T17:40:24.605936Z",
"updateTime": "2019-08-07T18:00:28.727606Z",
"sources": [
{
"generator": {
Expand All @@ -12,8 +12,8 @@
"git": {
"name": "googleapis",
"remote": "https://github.com/googleapis/googleapis.git",
"sha": "dbf13ce41f338054af6017ecff6fc3402d71e8a5",
"internalRef": "256395560"
"sha": "3a1b46a6668194a527e532a2c355b404c79b0e6a",
"internalRef": "262167956"
}
}
],
Expand Down

0 comments on commit a2a3502

Please sign in to comment.