fix(deps): require google-api-core >= 2.8.0 (#154)

- [ ] 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 feat: add audience parameter PiperOrigin-RevId: 456827138 Source-Link: googleapis/googleapis@23f1a15 Source-Link: https://github.com/googleapis/googleapis-gen/commit/4075a8514f676691ec156688a5bbf183aa9893ce Copy-Tag: eyJwIjoiLmdpdGh1Yi8uT3dsQm90LnlhbWwiLCJoIjoiNDA3NWE4NTE0ZjY3NjY5MWVjMTU2Njg4YTViYmYxODNhYTk4OTNjZSJ9

Author: gcf-owl-bot[bot]

google/cloud/apigateway_v1/services/api_gateway_service/client.py

@@ -526,6 +526,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 list_gateways(

google/cloud/apigateway_v1/services/api_gateway_service/transports/base.py

@@ -55,6 +55,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.
@@ -82,11 +83,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.
@@ -107,6 +103,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 (
@@ -119,6 +120,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/apigateway_v1/services/api_gateway_service/transports/grpc.py

@@ -59,6 +59,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.
 
@@ -155,6 +156,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/apigateway_v1/services/api_gateway_service/transports/grpc_asyncio.py

@@ -104,6 +104,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.
 
@@ -200,6 +201,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

@@ -26,10 +26,7 @@
 release_status = "Development Status :: 5 - Production/Stable"
 url = "https://github.com/googleapis/python-api-gateway"
 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",
 ]

testing/constraints-3.6.txt

@@ -19,6 +19,6 @@
 #
 # e.g., if setup.py has "foo >= 1.14.0, < 2.0.0dev",
 # Then this file should have foo==1.14.0
-google-api-core==1.31.5
+google-api-core==2.8.0
 proto-plus==1.15.0
 protobuf==3.19.0

testing/constraints-3.7.txt

@@ -240,6 +240,7 @@ def test_api_gateway_service_client_client_options(
  quota_project_id=None,
  client_info=transports.base.DEFAULT_CLIENT_INFO,
  always_use_jwt_access=True,
+ api_audience=None,
  )
 
  # Check the case api_endpoint is not provided and GOOGLE_API_USE_MTLS_ENDPOINT is
@@ -257,6 +258,7 @@ def test_api_gateway_service_client_client_options(
  quota_project_id=None,
  client_info=transports.base.DEFAULT_CLIENT_INFO,
  always_use_jwt_access=True,
+ api_audience=None,
  )
 
  # Check the case api_endpoint is not provided and GOOGLE_API_USE_MTLS_ENDPOINT is
@@ -274,6 +276,7 @@ def test_api_gateway_service_client_client_options(
  quota_project_id=None,
  client_info=transports.base.DEFAULT_CLIENT_INFO,
  always_use_jwt_access=True,
+ api_audience=None,
  )
 
  # Check the case api_endpoint is not provided and GOOGLE_API_USE_MTLS_ENDPOINT has
@@ -303,6 +306,25 @@ def test_api_gateway_service_client_client_options(
  quota_project_id="octopus",
  client_info=transports.base.DEFAULT_CLIENT_INFO,
  always_use_jwt_access=True,
+ api_audience=None,
+ )
+ # Check the case api_endpoint is provided
+ options = client_options.ClientOptions(
+ api_audience="https://language.googleapis.com"
+ )
+ with mock.patch.object(transport_class, "__init__") as patched:
+ patched.return_value = None
+ client = client_class(client_options=options, transport=transport_name)
+ patched.assert_called_once_with(
+ credentials=None,
+ credentials_file=None,
+ host=client.DEFAULT_ENDPOINT,
+ scopes=None,
+ client_cert_source_for_mtls=None,
+ quota_project_id=None,
+ client_info=transports.base.DEFAULT_CLIENT_INFO,
+ always_use_jwt_access=True,
+ api_audience="https://language.googleapis.com",
  )
 
 
@@ -380,6 +402,7 @@ def test_api_gateway_service_client_mtls_env_auto(
  quota_project_id=None,
  client_info=transports.base.DEFAULT_CLIENT_INFO,
  always_use_jwt_access=True,
+ api_audience=None,
  )
 
  # Check the case ADC client cert is provided. Whether client cert is used depends on
@@ -414,6 +437,7 @@ def test_api_gateway_service_client_mtls_env_auto(
  quota_project_id=None,
  client_info=transports.base.DEFAULT_CLIENT_INFO,
  always_use_jwt_access=True,
+ api_audience=None,
  )
 
  # Check the case client_cert_source and ADC client cert are not provided.
@@ -436,6 +460,7 @@ def test_api_gateway_service_client_mtls_env_auto(
  quota_project_id=None,
  client_info=transports.base.DEFAULT_CLIENT_INFO,
  always_use_jwt_access=True,
+ api_audience=None,
  )
 
 
@@ -550,6 +575,7 @@ def test_api_gateway_service_client_client_options_scopes(
  quota_project_id=None,
  client_info=transports.base.DEFAULT_CLIENT_INFO,
  always_use_jwt_access=True,
+ api_audience=None,
  )
 
 
@@ -588,6 +614,7 @@ def test_api_gateway_service_client_client_options_credentials_file(
  quota_project_id=None,
  client_info=transports.base.DEFAULT_CLIENT_INFO,
  always_use_jwt_access=True,
+ api_audience=None,
  )
 
 
@@ -608,6 +635,7 @@ def test_api_gateway_service_client_client_options_from_dict():
  quota_project_id=None,
  client_info=transports.base.DEFAULT_CLIENT_INFO,
  always_use_jwt_access=True,
+ api_audience=None,
  )
 
 
@@ -646,6 +674,7 @@ def test_api_gateway_service_client_create_channel_credentials_file(
  quota_project_id=None,
  client_info=transports.base.DEFAULT_CLIENT_INFO,
  always_use_jwt_access=True,
+ api_audience=None,
  )
 
  # test that the credentials from file are saved and used as the credentials.
@@ -5085,6 +5114,28 @@ def test_api_gateway_service_transport_auth_adc(transport_class):
  )
 
 
+@pytest.mark.parametrize(
+ "transport_class",
+ [
+ transports.ApiGatewayServiceGrpcTransport,
+ transports.ApiGatewayServiceGrpcAsyncIOTransport,
+ ],
+)
+def test_api_gateway_service_transport_auth_gdch_credentials(transport_class):
+ host = "https://language.com"
+ api_audience_tests = [None, "https://language2.com"]
+ api_audience_expect = [host, "https://language2.com"]
+ for t, e in zip(api_audience_tests, api_audience_expect):
+ with mock.patch.object(google.auth, "default", autospec=True) as adc:
+ gdch_mock = mock.MagicMock()
+ type(gdch_mock).with_gdch_audience = mock.PropertyMock(
+ return_value=gdch_mock
+ )
+ adc.return_value = (gdch_mock, None)
+ transport_class(host=host, api_audience=t)
+ gdch_mock.with_gdch_audience.assert_called_once_with(e)
+
+
 @pytest.mark.parametrize(
  "transport_class,grpc_helpers",
  [
@@ -5709,4 +5760,5 @@ def test_api_key_credentials(client_class, transport_class):
  quota_project_id=None,
  client_info=transports.base.DEFAULT_CLIENT_INFO,
  always_use_jwt_access=True,
+ api_audience=None,
  )