feat: add audience parameter (#209)

- [ ] Regenerate this pull request now. PiperOrigin-RevId: 459095142 Source-Link: googleapis/googleapis@4f1be99 Source-Link: https://github.com/googleapis/googleapis-gen/commit/ae686d9cde4fc3e36d0ac02efb8643b15890c1ed Copy-Tag: eyJwIjoiLmdpdGh1Yi8uT3dsQm90LnlhbWwiLCJoIjoiYWU2ODZkOWNkZTRmYzNlMzZkMGFjMDJlZmI4NjQzYjE1ODkwYzFlZCJ9 PiperOrigin-RevId: 456827138 Source-Link: googleapis/googleapis@23f1a15 Source-Link: https://github.com/googleapis/googleapis-gen/commit/4075a8514f676691ec156688a5bbf183aa9893ce Copy-Tag: eyJwIjoiLmdpdGh1Yi8uT3dsQm90LnlhbWwiLCJoIjoiNDA3NWE4NTE0ZjY3NjY5MWVjMTU2Njg4YTViYmYxODNhYTk4OTNjZSJ9 fix(deps): require google-api-core >= 2.8.0

Author: gcf-owl-bot[bot]

google/cloud/webrisk_v1/services/web_risk_service/client.py

@@ -406,6 +406,7 @@ def __init__(
  quota_project_id=client_options.quota_project_id,
  client_info=client_info,
  always_use_jwt_access=True,
+ api_audience=client_options.api_audience,
  )
 
  def compute_threat_list_diff(

google/cloud/webrisk_v1/services/web_risk_service/transports/base.py

@@ -54,6 +54,7 @@ def __init__(
  quota_project_id: Optional[str] = None,
  client_info: gapic_v1.client_info.ClientInfo = DEFAULT_CLIENT_INFO,
  always_use_jwt_access: Optional[bool] = False,
+ api_audience: Optional[str] = None,
  **kwargs,
  ) -> None:
  """Instantiate the transport.
@@ -81,11 +82,6 @@ def __init__(
  be used for service account credentials.
  """
 
- # Save the hostname. Default to port 443 (HTTPS) if none is specified.
- if ":" not in host:
- host += ":443"
- self._host = host
-
  scopes_kwargs = {"scopes": scopes, "default_scopes": self.AUTH_SCOPES}
 
  # Save the scopes.
@@ -106,6 +102,11 @@ def __init__(
  credentials, _ = google.auth.default(
  **scopes_kwargs, quota_project_id=quota_project_id
  )
+ # Don't apply audience if the credentials file passed from user.
+ if hasattr(credentials, "with_gdch_audience"):
+ credentials = credentials.with_gdch_audience(
+ api_audience if api_audience else host
+ )
 
  # If the credentials are service account credentials, then always try to use self signed JWT.
  if (
@@ -118,6 +119,11 @@ def __init__(
  # Save the credentials.
  self._credentials = credentials
 
+ # Save the hostname. Default to port 443 (HTTPS) if none is specified.
+ if ":" not in host:
+ host += ":443"
+ self._host = host
+
  def _prep_wrapped_messages(self, client_info):
  # Precompute the wrapped methods.
  self._wrapped_methods = {

google/cloud/webrisk_v1/services/web_risk_service/transports/grpc.py

@@ -58,6 +58,7 @@ def __init__(
  quota_project_id: Optional[str] = None,
  client_info: gapic_v1.client_info.ClientInfo = DEFAULT_CLIENT_INFO,
  always_use_jwt_access: Optional[bool] = False,
+ api_audience: Optional[str] = None,
  ) -> None:
  """Instantiate the transport.
 
@@ -153,6 +154,7 @@ def __init__(
  quota_project_id=quota_project_id,
  client_info=client_info,
  always_use_jwt_access=always_use_jwt_access,
+ api_audience=api_audience,
  )
 
  if not self._grpc_channel:

google/cloud/webrisk_v1/services/web_risk_service/transports/grpc_asyncio.py

@@ -103,6 +103,7 @@ def __init__(
  quota_project_id=None,
  client_info: gapic_v1.client_info.ClientInfo = DEFAULT_CLIENT_INFO,
  always_use_jwt_access: Optional[bool] = False,
+ api_audience: Optional[str] = None,
  ) -> None:
  """Instantiate the transport.
 
@@ -198,6 +199,7 @@ def __init__(
  quota_project_id=quota_project_id,
  client_info=client_info,
  always_use_jwt_access=always_use_jwt_access,
+ api_audience=api_audience,
  )
 
  if not self._grpc_channel:

google/cloud/webrisk_v1beta1/services/web_risk_service_v1_beta1/client.py

@@ -406,6 +406,7 @@ def __init__(
  quota_project_id=client_options.quota_project_id,
  client_info=client_info,
  always_use_jwt_access=True,
+ api_audience=client_options.api_audience,
  )
 
  def compute_threat_list_diff(

google/cloud/webrisk_v1beta1/services/web_risk_service_v1_beta1/transports/base.py

@@ -54,6 +54,7 @@ def __init__(
  quota_project_id: Optional[str] = None,
  client_info: gapic_v1.client_info.ClientInfo = DEFAULT_CLIENT_INFO,
  always_use_jwt_access: Optional[bool] = False,
+ api_audience: Optional[str] = None,
  **kwargs,
  ) -> None:
  """Instantiate the transport.
@@ -81,11 +82,6 @@ def __init__(
  be used for service account credentials.
  """
 
- # Save the hostname. Default to port 443 (HTTPS) if none is specified.
- if ":" not in host:
- host += ":443"
- self._host = host
-
  scopes_kwargs = {"scopes": scopes, "default_scopes": self.AUTH_SCOPES}
 
  # Save the scopes.
@@ -106,6 +102,11 @@ def __init__(
  credentials, _ = google.auth.default(
  **scopes_kwargs, quota_project_id=quota_project_id
  )
+ # Don't apply audience if the credentials file passed from user.
+ if hasattr(credentials, "with_gdch_audience"):
+ credentials = credentials.with_gdch_audience(
+ api_audience if api_audience else host
+ )
 
  # If the credentials are service account credentials, then always try to use self signed JWT.
  if (
@@ -118,6 +119,11 @@ def __init__(
  # Save the credentials.
  self._credentials = credentials
 
+ # Save the hostname. Default to port 443 (HTTPS) if none is specified.
+ if ":" not in host:
+ host += ":443"
+ self._host = host
+
  def _prep_wrapped_messages(self, client_info):
  # Precompute the wrapped methods.
  self._wrapped_methods = {

google/cloud/webrisk_v1beta1/services/web_risk_service_v1_beta1/transports/grpc.py

@@ -58,6 +58,7 @@ def __init__(
  quota_project_id: Optional[str] = None,
  client_info: gapic_v1.client_info.ClientInfo = DEFAULT_CLIENT_INFO,
  always_use_jwt_access: Optional[bool] = False,
+ api_audience: Optional[str] = None,
  ) -> None:
  """Instantiate the transport.
 
@@ -153,6 +154,7 @@ def __init__(
  quota_project_id=quota_project_id,
  client_info=client_info,
  always_use_jwt_access=always_use_jwt_access,
+ api_audience=api_audience,
  )
 
  if not self._grpc_channel:

google/cloud/webrisk_v1beta1/services/web_risk_service_v1_beta1/transports/grpc_asyncio.py

@@ -103,6 +103,7 @@ def __init__(
  quota_project_id=None,
  client_info: gapic_v1.client_info.ClientInfo = DEFAULT_CLIENT_INFO,
  always_use_jwt_access: Optional[bool] = False,
+ api_audience: Optional[str] = None,
  ) -> None:
  """Instantiate the transport.
 
@@ -198,6 +199,7 @@ def __init__(
  quota_project_id=quota_project_id,
  client_info=client_info,
  always_use_jwt_access=always_use_jwt_access,
+ api_audience=api_audience,
  )
 
  if not self._grpc_channel:

setup.py

@@ -28,10 +28,7 @@
 # 'Development Status :: 5 - Production/Stable'
 release_status = "Development Status :: 5 - Production/Stable"
 dependencies = [
- # NOTE: Maintainers, please do not require google-api-core>=2.x.x
- # Until this issue is closed
- # https://github.com/googleapis/google-cloud-python/issues/10566
- "google-api-core[grpc] >= 1.31.5, <3.0.0dev,!=2.0.*,!=2.1.*,!=2.2.*,!=2.3.0",
+ "google-api-core[grpc] >= 2.8.0, <3.0.0dev",
  "proto-plus >= 1.15.0, <2.0.0dev",
  "protobuf >= 3.19.0, <4.0.0dev",
 ]