Skip to content

Commit 0547563

Browse files
committed
update goldens
1 parent 891140e commit 0547563

22 files changed

Lines changed: 126 additions & 61 deletions

File tree

packages/gapic-generator/gapic/templates/%namespace/%name_%version/%sub/services/%service/client.py.j2

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -522,10 +522,15 @@ class {{ service.client_name }}(metaclass={{ service.client_name }}Meta):
522522

523523
self._api_endpoint = (self._api_endpoint or
524524
get_api_endpoint(
525-
self._client_options.api_endpoint,
526-
self._client_cert_source,
527-
self._universe_domain,
528-
self._use_mtls_endpoint))
525+
api_override=self._client_options.api_endpoint,
526+
universe_domain=self._universe_domain,
527+
default_universe={{ service.client_name }}._DEFAULT_UNIVERSE,
528+
default_mtls_endpoint={{ service.client_name }}.DEFAULT_MTLS_ENDPOINT,
529+
default_endpoint_template={{ service.client_name }}._DEFAULT_ENDPOINT_TEMPLATE,
530+
use_mtls=self._use_mtls_endpoint == "always" or (
531+
self._use_mtls_endpoint == "auto" and self._client_cert_source
532+
),
533+
))
529534

530535
if not transport_provided:
531536
{# TODO(https://github.com/googleapis/gapic-generator-python/issues/2121): Remove this condition when async rest is GA. #}

packages/gapic-generator/gapic/templates/tests/unit/gapic/%name_%version/%sub/test_compat.py.j2

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ import re
1414
import pytest
1515

1616
{% set package_path = api.naming.module_namespace|join('.') + "." + api.naming.versioned_module_name %}
17-
from {{package_path}}._compat import determine_domain, get_api_endpoint, get_default_mtls_endpoint
17+
from {{package_path}} import _compat as universe
1818
{% if has_auto_populated_fields %}
1919
from {{package_path}}._compat import setup_request_id
2020
{% endif %}

packages/gapic-generator/tests/integration/goldens/asset/google/cloud/asset_v1/services/asset_service/client.py

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -573,10 +573,15 @@ def __init__(self, *,
573573

574574
self._api_endpoint = (self._api_endpoint or
575575
get_api_endpoint(
576-
self._client_options.api_endpoint,
577-
self._client_cert_source,
578-
self._universe_domain,
579-
self._use_mtls_endpoint))
576+
api_override=self._client_options.api_endpoint,
577+
universe_domain=self._universe_domain,
578+
default_universe=AssetServiceClient._DEFAULT_UNIVERSE,
579+
default_mtls_endpoint=AssetServiceClient.DEFAULT_MTLS_ENDPOINT,
580+
default_endpoint_template=AssetServiceClient._DEFAULT_ENDPOINT_TEMPLATE,
581+
use_mtls=self._use_mtls_endpoint == "always" or (
582+
self._use_mtls_endpoint == "auto" and self._client_cert_source
583+
),
584+
))
580585

581586
if not transport_provided:
582587
import google.auth._default # type: ignore

packages/gapic-generator/tests/integration/goldens/asset/tests/unit/gapic/asset_v1/test_compat.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
import re
1919
import pytest
2020

21-
from google.cloud.asset_v1._compat import determine_domain, get_api_endpoint, get_default_mtls_endpoint
21+
from google.cloud.asset_v1 import _compat as universe
2222

2323
from google.auth.exceptions import MutualTLSChannelError
2424

packages/gapic-generator/tests/integration/goldens/credentials/google/iam/credentials_v1/services/iam_credentials/client.py

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -510,10 +510,15 @@ def __init__(self, *,
510510

511511
self._api_endpoint = (self._api_endpoint or
512512
get_api_endpoint(
513-
self._client_options.api_endpoint,
514-
self._client_cert_source,
515-
self._universe_domain,
516-
self._use_mtls_endpoint))
513+
api_override=self._client_options.api_endpoint,
514+
universe_domain=self._universe_domain,
515+
default_universe=IAMCredentialsClient._DEFAULT_UNIVERSE,
516+
default_mtls_endpoint=IAMCredentialsClient.DEFAULT_MTLS_ENDPOINT,
517+
default_endpoint_template=IAMCredentialsClient._DEFAULT_ENDPOINT_TEMPLATE,
518+
use_mtls=self._use_mtls_endpoint == "always" or (
519+
self._use_mtls_endpoint == "auto" and self._client_cert_source
520+
),
521+
))
517522

518523
if not transport_provided:
519524
import google.auth._default # type: ignore

packages/gapic-generator/tests/integration/goldens/credentials/tests/unit/gapic/credentials_v1/test_compat.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
import re
1919
import pytest
2020

21-
from google.iam.credentials_v1._compat import determine_domain, get_api_endpoint, get_default_mtls_endpoint
21+
from google.iam.credentials_v1 import _compat as universe
2222

2323
from google.auth.exceptions import MutualTLSChannelError
2424

packages/gapic-generator/tests/integration/goldens/eventarc/google/cloud/eventarc_v1/services/eventarc/client.py

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -693,10 +693,15 @@ def __init__(self, *,
693693

694694
self._api_endpoint = (self._api_endpoint or
695695
get_api_endpoint(
696-
self._client_options.api_endpoint,
697-
self._client_cert_source,
698-
self._universe_domain,
699-
self._use_mtls_endpoint))
696+
api_override=self._client_options.api_endpoint,
697+
universe_domain=self._universe_domain,
698+
default_universe=EventarcClient._DEFAULT_UNIVERSE,
699+
default_mtls_endpoint=EventarcClient.DEFAULT_MTLS_ENDPOINT,
700+
default_endpoint_template=EventarcClient._DEFAULT_ENDPOINT_TEMPLATE,
701+
use_mtls=self._use_mtls_endpoint == "always" or (
702+
self._use_mtls_endpoint == "auto" and self._client_cert_source
703+
),
704+
))
700705

701706
if not transport_provided:
702707
import google.auth._default # type: ignore

packages/gapic-generator/tests/integration/goldens/eventarc/tests/unit/gapic/eventarc_v1/test_compat.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
import re
1919
import pytest
2020

21-
from google.cloud.eventarc_v1._compat import determine_domain, get_api_endpoint, get_default_mtls_endpoint
21+
from google.cloud.eventarc_v1 import _compat as universe
2222

2323
from google.auth.exceptions import MutualTLSChannelError
2424

packages/gapic-generator/tests/integration/goldens/logging/google/cloud/logging_v2/services/config_service_v2/client.py

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -566,10 +566,15 @@ def __init__(self, *,
566566

567567
self._api_endpoint = (self._api_endpoint or
568568
get_api_endpoint(
569-
self._client_options.api_endpoint,
570-
self._client_cert_source,
571-
self._universe_domain,
572-
self._use_mtls_endpoint))
569+
api_override=self._client_options.api_endpoint,
570+
universe_domain=self._universe_domain,
571+
default_universe=ConfigServiceV2Client._DEFAULT_UNIVERSE,
572+
default_mtls_endpoint=ConfigServiceV2Client.DEFAULT_MTLS_ENDPOINT,
573+
default_endpoint_template=ConfigServiceV2Client._DEFAULT_ENDPOINT_TEMPLATE,
574+
use_mtls=self._use_mtls_endpoint == "always" or (
575+
self._use_mtls_endpoint == "auto" and self._client_cert_source
576+
),
577+
))
573578

574579
if not transport_provided:
575580
import google.auth._default # type: ignore

packages/gapic-generator/tests/integration/goldens/logging/google/cloud/logging_v2/services/logging_service_v2/client.py

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -497,10 +497,15 @@ def __init__(self, *,
497497

498498
self._api_endpoint = (self._api_endpoint or
499499
get_api_endpoint(
500-
self._client_options.api_endpoint,
501-
self._client_cert_source,
502-
self._universe_domain,
503-
self._use_mtls_endpoint))
500+
api_override=self._client_options.api_endpoint,
501+
universe_domain=self._universe_domain,
502+
default_universe=LoggingServiceV2Client._DEFAULT_UNIVERSE,
503+
default_mtls_endpoint=LoggingServiceV2Client.DEFAULT_MTLS_ENDPOINT,
504+
default_endpoint_template=LoggingServiceV2Client._DEFAULT_ENDPOINT_TEMPLATE,
505+
use_mtls=self._use_mtls_endpoint == "always" or (
506+
self._use_mtls_endpoint == "auto" and self._client_cert_source
507+
),
508+
))
504509

505510
if not transport_provided:
506511
import google.auth._default # type: ignore

0 commit comments

Comments
 (0)