googleapis · gcf-merge-on-green · Jul 6, 2022 · Jun 23, 2022 · Jun 23, 2022 · Jul 5, 2022
diff --git a/google/cloud/monitoring_metrics_scope_v1/services/metrics_scopes/client.py b/google/cloud/monitoring_metrics_scope_v1/services/metrics_scopes/client.py
@@ -444,6 +444,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 get_metrics_scope(

diff --git a/google/cloud/monitoring_metrics_scope_v1/services/metrics_scopes/transports/base.py b/google/cloud/monitoring_metrics_scope_v1/services/metrics_scopes/transports/base.py
@@ -60,6 +60,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.
@@ -87,11 +88,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.
@@ -112,6 +108,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 (
@@ -124,6 +125,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 = {

diff --git a/google/cloud/monitoring_metrics_scope_v1/services/metrics_scopes/transports/grpc.py b/google/cloud/monitoring_metrics_scope_v1/services/metrics_scopes/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:

diff --git a/google/cloud/monitoring_metrics_scope_v1/services/metrics_scopes/transports/grpc_asyncio.py b/google/cloud/monitoring_metrics_scope_v1/services/metrics_scopes/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:

diff --git a/setup.py b/setup.py
@@ -40,7 +40,7 @@
    platforms="Posix; MacOS X; Windows",
    include_package_data=True,
    install_requires=(
-        "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",
    ),

diff --git a/testing/constraints-3.6.txt b/testing/constraints-3.6.txt
diff --git a/testing/constraints-3.7.txt b/testing/constraints-3.7.txt
@@ -5,6 +5,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
diff --git a/tests/unit/gapic/monitoring_metrics_scope_v1/test_metrics_scopes.py b/tests/unit/gapic/monitoring_metrics_scope_v1/test_metrics_scopes.py
@@ -233,6 +233,7 @@ def test_metrics_scopes_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
@@ -250,6 +251,7 @@ def test_metrics_scopes_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
@@ -267,6 +269,7 @@ def test_metrics_scopes_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
@@ -296,6 +299,25 @@ def test_metrics_scopes_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",
        )


@@ -363,6 +385,7 @@ def test_metrics_scopes_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
@@ -397,6 +420,7 @@ def test_metrics_scopes_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.
@@ -419,6 +443,7 @@ def test_metrics_scopes_client_mtls_env_auto(
                    quota_project_id=None,
                    client_info=transports.base.DEFAULT_CLIENT_INFO,
                    always_use_jwt_access=True,
+                    api_audience=None,
                )


@@ -533,6 +558,7 @@ def test_metrics_scopes_client_client_options_scopes(
            quota_project_id=None,
            client_info=transports.base.DEFAULT_CLIENT_INFO,
            always_use_jwt_access=True,
+            api_audience=None,
        )


@@ -571,6 +597,7 @@ def test_metrics_scopes_client_client_options_credentials_file(
            quota_project_id=None,
            client_info=transports.base.DEFAULT_CLIENT_INFO,
            always_use_jwt_access=True,
+            api_audience=None,
        )


@@ -591,6 +618,7 @@ def test_metrics_scopes_client_client_options_from_dict():
            quota_project_id=None,
            client_info=transports.base.DEFAULT_CLIENT_INFO,
            always_use_jwt_access=True,
+            api_audience=None,
        )


@@ -629,6 +657,7 @@ def test_metrics_scopes_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.
@@ -1741,6 +1770,28 @@ def test_metrics_scopes_transport_auth_adc(transport_class):
        )


+@pytest.mark.parametrize(
+    "transport_class",
+    [
+        transports.MetricsScopesGrpcTransport,
+        transports.MetricsScopesGrpcAsyncIOTransport,
+    ],
+)
+def test_metrics_scopes_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",
    [
@@ -2265,4 +2316,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,
            )