feat: Add support for apiEndpoint and deprecate serviceAddress… (#2219)

googleapis · Aug 7, 2019 · 2b7a95c · 2b7a95c
1 parent 7b41bdf
commit 2b7a95c
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 9 deletions.
diff --git a/Redis/src/V1/Gapic/CloudRedisGapicClient.php b/Redis/src/V1/Gapic/CloudRedisGapicClient.php
@@ -145,7 +145,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/cloud_redis_client_config.json',
             'descriptorsConfigPath' => __DIR__.'/../resources/cloud_redis_descriptor_config.php',
             'gcpApiConfigPath' => __DIR__.'/../resources/cloud_redis_grpc_config.json',
@@ -312,6 +312,9 @@ public function resumeOperation($operationName, $methodName = 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 'redis.googleapis.com:443'.
      *     @type string|array|FetchAuthTokenInterface|CredentialsWrapper $credentials
@@ -339,7 +342,7 @@ public function resumeOperation($operationName, $methodName = 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

diff --git a/Redis/src/V1beta1/Gapic/CloudRedisGapicClient.php b/Redis/src/V1beta1/Gapic/CloudRedisGapicClient.php
@@ -146,7 +146,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/cloud_redis_client_config.json',
             'descriptorsConfigPath' => __DIR__.'/../resources/cloud_redis_descriptor_config.php',
             'gcpApiConfigPath' => __DIR__.'/../resources/cloud_redis_grpc_config.json',
@@ -313,6 +313,9 @@ public function resumeOperation($operationName, $methodName = 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 'redis.googleapis.com:443'.
      *     @type string|array|FetchAuthTokenInterface|CredentialsWrapper $credentials
@@ -340,7 +343,7 @@ public function resumeOperation($operationName, $methodName = 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

diff --git a/Redis/synth.metadata b/Redis/synth.metadata
@@ -1,19 +1,19 @@
 {
-  "updateTime": "2019-06-24T16:08:04.892910Z",
+  "updateTime": "2019-08-07T18:03:34.573989Z",
   "sources": [
     {
       "generator": {
         "name": "artman",
-        "version": "0.29.0",
-        "dockerImage": "googleapis/artman@sha256:b79c8c20ee51e5302686c9d1294672d59290df1489be93749ef17d0172cc508d"
+        "version": "0.29.1",
+        "dockerImage": "googleapis/artman@sha256:b2a73f4dda03ef8fcaa973e3ba26d0cf34091f6c22c70add663af325931aef4d"
       }
     },
     {
       "git": {
         "name": "googleapis",
         "remote": "https://github.com/googleapis/googleapis.git",
-        "sha": "de1150ccad2a3daa4e265a0948bec54fdf9c8b54",
-        "internalRef": "254446031"
+        "sha": "3a1b46a6668194a527e532a2c355b404c79b0e6a",
+        "internalRef": "262167956"
       }
     }
   ],