fix(deps): Require google-api-core >=1.34.0, >=2.11.0 (#234)

* fix(deps): Require google-api-core >=1.34.0, >=2.11.0 fix: Drop usage of pkg_resources fix: Fix timeout default values docs(samples): Snippetgen should call await on the operation coroutine before calling result PiperOrigin-RevId: 493260409 Source-Link: googleapis/googleapis@fea4387 Source-Link: https://github.com/googleapis/googleapis-gen/commit/387b7344c7529ee44be84e613b19a820508c612b Copy-Tag: eyJwIjoiLmdpdGh1Yi8uT3dsQm90LnlhbWwiLCJoIjoiMzg3YjczNDRjNzUyOWVlNDRiZTg0ZTYxM2IxOWE4MjA1MDhjNjEyYiJ9 * fix(deps): Require google-api-core >=1.34.0, >=2.11.0 fix: Drop usage of pkg_resources fix: Fix timeout default values docs(samples): Snippetgen should call await on the operation coroutine before calling result PiperOrigin-RevId: 493260409 Source-Link: googleapis/googleapis@fea4387 Source-Link: https://github.com/googleapis/googleapis-gen/commit/387b7344c7529ee44be84e613b19a820508c612b Copy-Tag: eyJwIjoiLmdpdGh1Yi8uT3dsQm90LnlhbWwiLCJoIjoiMzg3YjczNDRjNzUyOWVlNDRiZTg0ZTYxM2IxOWE4MjA1MDhjNjEyYiJ9 * 🦉 Updates from OwlBot post-processor See https://github.com/googleapis/repo-automation-bots/blob/main/packages/owl-bot/README.md * 🦉 Updates from OwlBot post-processor See https://github.com/googleapis/repo-automation-bots/blob/main/packages/owl-bot/README.md * 🦉 Updates from OwlBot post-processor See https://github.com/googleapis/repo-automation-bots/blob/main/packages/owl-bot/README.md * add gapic_version.py Co-authored-by: Owl Bot <gcf-owl-bot[bot]@users.noreply.github.com> Co-authored-by: Anthonios Partheniou <partheniou@google.com>

Author: gcf-owl-bot[bot]

.coveragerc

@@ -10,8 +10,3 @@ exclude_lines =
  pragma: NO COVER
  # Ignore debug-only repr
  def __repr__
- # Ignore pkg_resources exceptions.
- # This is added at the module level as a safeguard for if someone
- # generates the code and tries to run it without pip installing. This
- # makes it virtually impossible to test properly.
- except pkg_resources.DistributionNotFound

google/cloud/functions_v1/gapic_version.py

@@ -0,0 +1,16 @@
+# -*- coding: utf-8 -*-
+# Copyright 2022 Google LLC
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+__version__ = "1.8.3" # {x-release-please-version}

google/cloud/functions_v1/services/cloud_functions_service/async_client.py

@@ -34,7 +34,8 @@
 from google.api_core.client_options import ClientOptions
 from google.auth import credentials as ga_credentials # type: ignore
 from google.oauth2 import service_account # type: ignore
-import pkg_resources
+
+from google.cloud.functions_v1 import gapic_version as package_version
 
 try:
  OptionalRetry = Union[retries.Retry, gapic_v1.method._MethodDefault]
@@ -241,7 +242,7 @@ async def list_functions(
  request: Optional[Union[functions.ListFunctionsRequest, dict]] = None,
  *,
  retry: OptionalRetry = gapic_v1.method.DEFAULT,
- timeout: Optional[float] = None,
+ timeout: Union[float, object] = gapic_v1.method.DEFAULT,
  metadata: Sequence[Tuple[str, str]] = (),
  ) -> pagers.ListFunctionsAsyncPager:
  r"""Returns a list of functions that belong to the
@@ -344,7 +345,7 @@ async def get_function(
  *,
  name: Optional[str] = None,
  retry: OptionalRetry = gapic_v1.method.DEFAULT,
- timeout: Optional[float] = None,
+ timeout: Union[float, object] = gapic_v1.method.DEFAULT,
  metadata: Sequence[Tuple[str, str]] = (),
  ) -> functions.CloudFunction:
  r"""Returns a function with the given name from the
@@ -460,7 +461,7 @@ async def create_function(
  location: Optional[str] = None,
  function: Optional[functions.CloudFunction] = None,
  retry: OptionalRetry = gapic_v1.method.DEFAULT,
- timeout: Optional[float] = None,
+ timeout: Union[float, object] = gapic_v1.method.DEFAULT,
  metadata: Sequence[Tuple[str, str]] = (),
  ) -> operation_async.AsyncOperation:
  r"""Creates a new function. If a function with the given name
@@ -496,7 +497,7 @@ async def sample_create_function():
 
  print("Waiting for operation to complete...")
 
- response = await operation.result()
+ response = (await operation).result()
 
  # Handle the response
  print(response)
@@ -591,7 +592,7 @@ async def update_function(
  *,
  function: Optional[functions.CloudFunction] = None,
  retry: OptionalRetry = gapic_v1.method.DEFAULT,
- timeout: Optional[float] = None,
+ timeout: Union[float, object] = gapic_v1.method.DEFAULT,
  metadata: Sequence[Tuple[str, str]] = (),
  ) -> operation_async.AsyncOperation:
  r"""Updates existing function.
@@ -624,7 +625,7 @@ async def sample_update_function():
 
  print("Waiting for operation to complete...")
 
- response = await operation.result()
+ response = (await operation).result()
 
  # Handle the response
  print(response)
@@ -723,7 +724,7 @@ async def delete_function(
  *,
  name: Optional[str] = None,
  retry: OptionalRetry = gapic_v1.method.DEFAULT,
- timeout: Optional[float] = None,
+ timeout: Union[float, object] = gapic_v1.method.DEFAULT,
  metadata: Sequence[Tuple[str, str]] = (),
  ) -> operation_async.AsyncOperation:
  r"""Deletes a function with the given name from the
@@ -756,7 +757,7 @@ async def sample_delete_function():
 
  print("Waiting for operation to complete...")
 
- response = await operation.result()
+ response = (await operation).result()
 
  # Handle the response
  print(response)
@@ -861,7 +862,7 @@ async def call_function(
  name: Optional[str] = None,
  data: Optional[str] = None,
  retry: OptionalRetry = gapic_v1.method.DEFAULT,
- timeout: Optional[float] = None,
+ timeout: Union[float, object] = gapic_v1.method.DEFAULT,
  metadata: Sequence[Tuple[str, str]] = (),
  ) -> functions.CallFunctionResponse:
  r"""Synchronously invokes a deployed Cloud Function. To be used for
@@ -973,7 +974,7 @@ async def generate_upload_url(
  request: Optional[Union[functions.GenerateUploadUrlRequest, dict]] = None,
  *,
  retry: OptionalRetry = gapic_v1.method.DEFAULT,
- timeout: Optional[float] = None,
+ timeout: Union[float, object] = gapic_v1.method.DEFAULT,
  metadata: Sequence[Tuple[str, str]] = (),
  ) -> functions.GenerateUploadUrlResponse:
  r"""Returns a signed URL for uploading a function source code. For
@@ -1077,7 +1078,7 @@ async def generate_download_url(
  request: Optional[Union[functions.GenerateDownloadUrlRequest, dict]] = None,
  *,
  retry: OptionalRetry = gapic_v1.method.DEFAULT,
- timeout: Optional[float] = None,
+ timeout: Union[float, object] = gapic_v1.method.DEFAULT,
  metadata: Sequence[Tuple[str, str]] = (),
  ) -> functions.GenerateDownloadUrlResponse:
  r"""Returns a signed URL for downloading deployed
@@ -1159,7 +1160,7 @@ async def set_iam_policy(
  request: Optional[Union[iam_policy_pb2.SetIamPolicyRequest, dict]] = None,
  *,
  retry: OptionalRetry = gapic_v1.method.DEFAULT,
- timeout: Optional[float] = None,
+ timeout: Union[float, object] = gapic_v1.method.DEFAULT,
  metadata: Sequence[Tuple[str, str]] = (),
  ) -> policy_pb2.Policy:
  r"""Sets the IAM access control policy on the specified
@@ -1303,7 +1304,7 @@ async def get_iam_policy(
  request: Optional[Union[iam_policy_pb2.GetIamPolicyRequest, dict]] = None,
  *,
  retry: OptionalRetry = gapic_v1.method.DEFAULT,
- timeout: Optional[float] = None,
+ timeout: Union[float, object] = gapic_v1.method.DEFAULT,
  metadata: Sequence[Tuple[str, str]] = (),
  ) -> policy_pb2.Policy:
  r"""Gets the IAM access control policy for a function.
@@ -1448,7 +1449,7 @@ async def test_iam_permissions(
  request: Optional[Union[iam_policy_pb2.TestIamPermissionsRequest, dict]] = None,
  *,
  retry: OptionalRetry = gapic_v1.method.DEFAULT,
- timeout: Optional[float] = None,
+ timeout: Union[float, object] = gapic_v1.method.DEFAULT,
  metadata: Sequence[Tuple[str, str]] = (),
  ) -> iam_policy_pb2.TestIamPermissionsResponse:
  r"""Tests the specified permissions against the IAM access control
@@ -1535,14 +1536,9 @@ async def __aexit__(self, exc_type, exc, tb):
  await self.transport.close()
 
 
-try:
- DEFAULT_CLIENT_INFO = gapic_v1.client_info.ClientInfo(
- gapic_version=pkg_resources.get_distribution(
- "google-cloud-functions",
- ).version,
- )
-except pkg_resources.DistributionNotFound:
- DEFAULT_CLIENT_INFO = gapic_v1.client_info.ClientInfo()
+DEFAULT_CLIENT_INFO = gapic_v1.client_info.ClientInfo(
+ gapic_version=package_version.__version__
+)
 
 
 __all__ = ("CloudFunctionsServiceAsyncClient",)

google/cloud/functions_v1/services/cloud_functions_service/client.py

@@ -38,7 +38,8 @@
 from google.auth.transport import mtls # type: ignore
 from google.auth.transport.grpc import SslCredentials # type: ignore
 from google.oauth2 import service_account # type: ignore
-import pkg_resources
+
+from google.cloud.functions_v1 import gapic_version as package_version
 
 try:
  OptionalRetry = Union[retries.Retry, gapic_v1.method._MethodDefault]
@@ -503,7 +504,7 @@ def list_functions(
  request: Optional[Union[functions.ListFunctionsRequest, dict]] = None,
  *,
  retry: OptionalRetry = gapic_v1.method.DEFAULT,
- timeout: Optional[float] = None,
+ timeout: Union[float, object] = gapic_v1.method.DEFAULT,
  metadata: Sequence[Tuple[str, str]] = (),
  ) -> pagers.ListFunctionsPager:
  r"""Returns a list of functions that belong to the
@@ -597,7 +598,7 @@ def get_function(
  *,
  name: Optional[str] = None,
  retry: OptionalRetry = gapic_v1.method.DEFAULT,
- timeout: Optional[float] = None,
+ timeout: Union[float, object] = gapic_v1.method.DEFAULT,
  metadata: Sequence[Tuple[str, str]] = (),
  ) -> functions.CloudFunction:
  r"""Returns a function with the given name from the
@@ -703,7 +704,7 @@ def create_function(
  location: Optional[str] = None,
  function: Optional[functions.CloudFunction] = None,
  retry: OptionalRetry = gapic_v1.method.DEFAULT,
- timeout: Optional[float] = None,
+ timeout: Union[float, object] = gapic_v1.method.DEFAULT,
  metadata: Sequence[Tuple[str, str]] = (),
  ) -> operation.Operation:
  r"""Creates a new function. If a function with the given name
@@ -834,7 +835,7 @@ def update_function(
  *,
  function: Optional[functions.CloudFunction] = None,
  retry: OptionalRetry = gapic_v1.method.DEFAULT,
- timeout: Optional[float] = None,
+ timeout: Union[float, object] = gapic_v1.method.DEFAULT,
  metadata: Sequence[Tuple[str, str]] = (),
  ) -> operation.Operation:
  r"""Updates existing function.
@@ -956,7 +957,7 @@ def delete_function(
  *,
  name: Optional[str] = None,
  retry: OptionalRetry = gapic_v1.method.DEFAULT,
- timeout: Optional[float] = None,
+ timeout: Union[float, object] = gapic_v1.method.DEFAULT,
  metadata: Sequence[Tuple[str, str]] = (),
  ) -> operation.Operation:
  r"""Deletes a function with the given name from the
@@ -1084,7 +1085,7 @@ def call_function(
  name: Optional[str] = None,
  data: Optional[str] = None,
  retry: OptionalRetry = gapic_v1.method.DEFAULT,
- timeout: Optional[float] = None,
+ timeout: Union[float, object] = gapic_v1.method.DEFAULT,
  metadata: Sequence[Tuple[str, str]] = (),
  ) -> functions.CallFunctionResponse:
  r"""Synchronously invokes a deployed Cloud Function. To be used for
@@ -1196,7 +1197,7 @@ def generate_upload_url(
  request: Optional[Union[functions.GenerateUploadUrlRequest, dict]] = None,
  *,
  retry: OptionalRetry = gapic_v1.method.DEFAULT,
- timeout: Optional[float] = None,
+ timeout: Union[float, object] = gapic_v1.method.DEFAULT,
  metadata: Sequence[Tuple[str, str]] = (),
  ) -> functions.GenerateUploadUrlResponse:
  r"""Returns a signed URL for uploading a function source code. For
@@ -1301,7 +1302,7 @@ def generate_download_url(
  request: Optional[Union[functions.GenerateDownloadUrlRequest, dict]] = None,
  *,
  retry: OptionalRetry = gapic_v1.method.DEFAULT,
- timeout: Optional[float] = None,
+ timeout: Union[float, object] = gapic_v1.method.DEFAULT,
  metadata: Sequence[Tuple[str, str]] = (),
  ) -> functions.GenerateDownloadUrlResponse:
  r"""Returns a signed URL for downloading deployed
@@ -1384,7 +1385,7 @@ def set_iam_policy(
  request: Optional[Union[iam_policy_pb2.SetIamPolicyRequest, dict]] = None,
  *,
  retry: OptionalRetry = gapic_v1.method.DEFAULT,
- timeout: Optional[float] = None,
+ timeout: Union[float, object] = gapic_v1.method.DEFAULT,
  metadata: Sequence[Tuple[str, str]] = (),
  ) -> policy_pb2.Policy:
  r"""Sets the IAM access control policy on the specified
@@ -1527,7 +1528,7 @@ def get_iam_policy(
  request: Optional[Union[iam_policy_pb2.GetIamPolicyRequest, dict]] = None,
  *,
  retry: OptionalRetry = gapic_v1.method.DEFAULT,
- timeout: Optional[float] = None,
+ timeout: Union[float, object] = gapic_v1.method.DEFAULT,
  metadata: Sequence[Tuple[str, str]] = (),
  ) -> policy_pb2.Policy:
  r"""Gets the IAM access control policy for a function.
@@ -1671,7 +1672,7 @@ def test_iam_permissions(
  request: Optional[Union[iam_policy_pb2.TestIamPermissionsRequest, dict]] = None,
  *,
  retry: OptionalRetry = gapic_v1.method.DEFAULT,
- timeout: Optional[float] = None,
+ timeout: Union[float, object] = gapic_v1.method.DEFAULT,
  metadata: Sequence[Tuple[str, str]] = (),
  ) -> iam_policy_pb2.TestIamPermissionsResponse:
  r"""Tests the specified permissions against the IAM access control
@@ -1764,14 +1765,9 @@ def __exit__(self, type, value, traceback):
  self.transport.close()
 
 
-try:
- DEFAULT_CLIENT_INFO = gapic_v1.client_info.ClientInfo(
- gapic_version=pkg_resources.get_distribution(
- "google-cloud-functions",
- ).version,
- )
-except pkg_resources.DistributionNotFound:
- DEFAULT_CLIENT_INFO = gapic_v1.client_info.ClientInfo()
+DEFAULT_CLIENT_INFO = gapic_v1.client_info.ClientInfo(
+ gapic_version=package_version.__version__
+)
 
 
 __all__ = ("CloudFunctionsServiceClient",)

google/cloud/functions_v1/services/cloud_functions_service/transports/base.py

@@ -26,18 +26,13 @@
 from google.iam.v1 import policy_pb2 # type: ignore
 from google.longrunning import operations_pb2 # type: ignore
 from google.oauth2 import service_account # type: ignore
-import pkg_resources
 
+from google.cloud.functions_v1 import gapic_version as package_version
 from google.cloud.functions_v1.types import functions
 
-try:
- DEFAULT_CLIENT_INFO = gapic_v1.client_info.ClientInfo(
- gapic_version=pkg_resources.get_distribution(
- "google-cloud-functions",
- ).version,
- )
-except pkg_resources.DistributionNotFound:
- DEFAULT_CLIENT_INFO = gapic_v1.client_info.ClientInfo()
+DEFAULT_CLIENT_INFO = gapic_v1.client_info.ClientInfo(
+ gapic_version=package_version.__version__
+)
 
 
 class CloudFunctionsServiceTransport(abc.ABC):

google/cloud/functions_v2/gapic_version.py

@@ -0,0 +1,16 @@
+# -*- coding: utf-8 -*-
+# Copyright 2022 Google LLC
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+__version__ = "1.8.3" # {x-release-please-version}