Create a new ClientInfo if none is provided.

Fixes #2161.
googleapis · Sep 4, 2018 · 631db94 · 631db94
1 parent 31c19ea
commit 631db94
Show file tree

Hide file tree

Showing 4 changed files with 25 additions and 15 deletions.
diff --git a/src/main/resources/com/google/api/codegen/py/main.snip b/src/main/resources/com/google/api/codegen/py/main.snip
@@ -135,9 +135,11 @@
 
             # Client information initialization.
             if client_info is None:
-                client_info = (
-                    google.api_core.gapic_v1.client_info.DEFAULT_CLIENT_INFO)
-            client_info.gapic_version = _GAPIC_LIBRARY_VERSION
+                client_info = google.api_core.gapic_v1.client_info.ClientInfo(
+                    gapic_version=_GAPIC_LIBRARY_VERSION,
+                )
+            else:
+                client_info.gapic_version = _GAPIC_LIBRARY_VERSION
             self._client_info = client_info
 
             @# Parse out the default settings for retry and timeout for each RPC

diff --git a/src/test/java/com/google/api/codegen/testdata/py/python_library.baseline b/src/test/java/com/google/api/codegen/testdata/py/python_library.baseline
@@ -1208,9 +1208,11 @@ class LibraryServiceClient(object):
             )
 
         if client_info is None:
-            client_info = (
-                google.api_core.gapic_v1.client_info.DEFAULT_CLIENT_INFO)
-        client_info.gapic_version = _GAPIC_LIBRARY_VERSION
+            client_info = google.api_core.gapic_v1.client_info.ClientInfo(
+                gapic_version=_GAPIC_LIBRARY_VERSION,
+            )
+        else:
+            client_info.gapic_version = _GAPIC_LIBRARY_VERSION
         self._client_info = client_info
 
         # Parse out the default settings for retry and timeout for each RPC

diff --git a/src/test/java/com/google/api/codegen/testdata/py/python_multiple_services.baseline b/src/test/java/com/google/api/codegen/testdata/py/python_multiple_services.baseline
@@ -959,9 +959,11 @@ class DecrementerServiceClient(object):
             )
 
         if client_info is None:
-            client_info = (
-                google.api_core.gapic_v1.client_info.DEFAULT_CLIENT_INFO)
-        client_info.gapic_version = _GAPIC_LIBRARY_VERSION
+            client_info = google.api_core.gapic_v1.client_info.ClientInfo(
+                gapic_version=_GAPIC_LIBRARY_VERSION,
+            )
+        else:
+            client_info.gapic_version = _GAPIC_LIBRARY_VERSION
         self._client_info = client_info
 
         # Parse out the default settings for retry and timeout for each RPC
@@ -1174,9 +1176,11 @@ class IncrementerServiceClient(object):
             )
 
         if client_info is None:
-            client_info = (
-                google.api_core.gapic_v1.client_info.DEFAULT_CLIENT_INFO)
-        client_info.gapic_version = _GAPIC_LIBRARY_VERSION
+            client_info = google.api_core.gapic_v1.client_info.ClientInfo(
+                gapic_version=_GAPIC_LIBRARY_VERSION,
+            )
+        else:
+            client_info.gapic_version = _GAPIC_LIBRARY_VERSION
         self._client_info = client_info
 
         # Parse out the default settings for retry and timeout for each RPC

diff --git a/src/test/java/com/google/api/codegen/testdata/py/python_no_path_templates.baseline b/src/test/java/com/google/api/codegen/testdata/py/python_no_path_templates.baseline
@@ -902,9 +902,11 @@ class NoTemplatesAPIServiceClient(object):
             )
 
         if client_info is None:
-            client_info = (
-                google.api_core.gapic_v1.client_info.DEFAULT_CLIENT_INFO)
-        client_info.gapic_version = _GAPIC_LIBRARY_VERSION
+            client_info = google.api_core.gapic_v1.client_info.ClientInfo(
+                gapic_version=_GAPIC_LIBRARY_VERSION,
+            )
+        else:
+            client_info.gapic_version = _GAPIC_LIBRARY_VERSION
         self._client_info = client_info
 
         # Parse out the default settings for retry and timeout for each RPC