Skip to content

Commit 0055127

Browse files
hebaalazzehhebaalazzeh
committed
fix(generator): update self._client_options in golden client.py files to match client.py.j2
1 parent b7577b2 commit 0055127

12 files changed

Lines changed: 84 additions & 72 deletions

File tree

  • packages/gapic-generator/tests/integration/goldens
    • asset/google/cloud/asset_v1/services/asset_service
    • credentials/google/iam/credentials_v1/services/iam_credentials
    • eventarc/google/cloud/eventarc_v1/services/eventarc
    • logging_internal/google/cloud/logging_v2/services
    • logging/google/cloud/logging_v2/services
    • redis_selective/google/cloud/redis_v1/services/cloud_redis
    • redis/google/cloud/redis_v1/services/cloud_redis
    • storagebatchoperations/google/cloud/storagebatchoperations_v1/services/storage_batch_operations

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

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -611,12 +611,13 @@ def __init__(self, *,
611611
google.auth.exceptions.MutualTLSChannelError: If mutual TLS transport
612612
creation failed for any reason.
613613
"""
614-
self._client_options = client_options
615-
if isinstance(self._client_options, dict):
616-
self._client_options = client_options_lib.from_dict(self._client_options)
617-
if self._client_options is None:
618-
self._client_options = client_options_lib.ClientOptions()
619-
self._client_options = cast(client_options_lib.ClientOptions, self._client_options)
614+
if isinstance(client_options, dict):
615+
client_options = client_options_lib.from_dict(client_options)
616+
if client_options is None:
617+
client_options = client_options_lib.ClientOptions()
618+
self._client_options: client_options_lib.ClientOptions = cast(
619+
client_options_lib.ClientOptions, client_options
620+
)
620621

621622
universe_domain_opt = getattr(self._client_options, 'universe_domain', None)
622623

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

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -548,12 +548,13 @@ def __init__(self, *,
548548
google.auth.exceptions.MutualTLSChannelError: If mutual TLS transport
549549
creation failed for any reason.
550550
"""
551-
self._client_options = client_options
552-
if isinstance(self._client_options, dict):
553-
self._client_options = client_options_lib.from_dict(self._client_options)
554-
if self._client_options is None:
555-
self._client_options = client_options_lib.ClientOptions()
556-
self._client_options = cast(client_options_lib.ClientOptions, self._client_options)
551+
if isinstance(client_options, dict):
552+
client_options = client_options_lib.from_dict(client_options)
553+
if client_options is None:
554+
client_options = client_options_lib.ClientOptions()
555+
self._client_options: client_options_lib.ClientOptions = cast(
556+
client_options_lib.ClientOptions, client_options
557+
)
557558

558559
universe_domain_opt = getattr(self._client_options, 'universe_domain', None)
559560

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

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -731,12 +731,13 @@ def __init__(self, *,
731731
google.auth.exceptions.MutualTLSChannelError: If mutual TLS transport
732732
creation failed for any reason.
733733
"""
734-
self._client_options = client_options
735-
if isinstance(self._client_options, dict):
736-
self._client_options = client_options_lib.from_dict(self._client_options)
737-
if self._client_options is None:
738-
self._client_options = client_options_lib.ClientOptions()
739-
self._client_options = cast(client_options_lib.ClientOptions, self._client_options)
734+
if isinstance(client_options, dict):
735+
client_options = client_options_lib.from_dict(client_options)
736+
if client_options is None:
737+
client_options = client_options_lib.ClientOptions()
738+
self._client_options: client_options_lib.ClientOptions = cast(
739+
client_options_lib.ClientOptions, client_options
740+
)
740741

741742
universe_domain_opt = getattr(self._client_options, 'universe_domain', None)
742743

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

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -604,12 +604,13 @@ def __init__(self, *,
604604
google.auth.exceptions.MutualTLSChannelError: If mutual TLS transport
605605
creation failed for any reason.
606606
"""
607-
self._client_options = client_options
608-
if isinstance(self._client_options, dict):
609-
self._client_options = client_options_lib.from_dict(self._client_options)
610-
if self._client_options is None:
611-
self._client_options = client_options_lib.ClientOptions()
612-
self._client_options = cast(client_options_lib.ClientOptions, self._client_options)
607+
if isinstance(client_options, dict):
608+
client_options = client_options_lib.from_dict(client_options)
609+
if client_options is None:
610+
client_options = client_options_lib.ClientOptions()
611+
self._client_options: client_options_lib.ClientOptions = cast(
612+
client_options_lib.ClientOptions, client_options
613+
)
613614

614615
universe_domain_opt = getattr(self._client_options, 'universe_domain', None)
615616

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

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -535,12 +535,13 @@ def __init__(self, *,
535535
google.auth.exceptions.MutualTLSChannelError: If mutual TLS transport
536536
creation failed for any reason.
537537
"""
538-
self._client_options = client_options
539-
if isinstance(self._client_options, dict):
540-
self._client_options = client_options_lib.from_dict(self._client_options)
541-
if self._client_options is None:
542-
self._client_options = client_options_lib.ClientOptions()
543-
self._client_options = cast(client_options_lib.ClientOptions, self._client_options)
538+
if isinstance(client_options, dict):
539+
client_options = client_options_lib.from_dict(client_options)
540+
if client_options is None:
541+
client_options = client_options_lib.ClientOptions()
542+
self._client_options: client_options_lib.ClientOptions = cast(
543+
client_options_lib.ClientOptions, client_options
544+
)
544545

545546
universe_domain_opt = getattr(self._client_options, 'universe_domain', None)
546547

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

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -536,12 +536,13 @@ def __init__(self, *,
536536
google.auth.exceptions.MutualTLSChannelError: If mutual TLS transport
537537
creation failed for any reason.
538538
"""
539-
self._client_options = client_options
540-
if isinstance(self._client_options, dict):
541-
self._client_options = client_options_lib.from_dict(self._client_options)
542-
if self._client_options is None:
543-
self._client_options = client_options_lib.ClientOptions()
544-
self._client_options = cast(client_options_lib.ClientOptions, self._client_options)
539+
if isinstance(client_options, dict):
540+
client_options = client_options_lib.from_dict(client_options)
541+
if client_options is None:
542+
client_options = client_options_lib.ClientOptions()
543+
self._client_options: client_options_lib.ClientOptions = cast(
544+
client_options_lib.ClientOptions, client_options
545+
)
545546

546547
universe_domain_opt = getattr(self._client_options, 'universe_domain', None)
547548

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

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -604,12 +604,13 @@ def __init__(self, *,
604604
google.auth.exceptions.MutualTLSChannelError: If mutual TLS transport
605605
creation failed for any reason.
606606
"""
607-
self._client_options = client_options
608-
if isinstance(self._client_options, dict):
609-
self._client_options = client_options_lib.from_dict(self._client_options)
610-
if self._client_options is None:
611-
self._client_options = client_options_lib.ClientOptions()
612-
self._client_options = cast(client_options_lib.ClientOptions, self._client_options)
607+
if isinstance(client_options, dict):
608+
client_options = client_options_lib.from_dict(client_options)
609+
if client_options is None:
610+
client_options = client_options_lib.ClientOptions()
611+
self._client_options: client_options_lib.ClientOptions = cast(
612+
client_options_lib.ClientOptions, client_options
613+
)
613614

614615
universe_domain_opt = getattr(self._client_options, 'universe_domain', None)
615616

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

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -535,12 +535,13 @@ def __init__(self, *,
535535
google.auth.exceptions.MutualTLSChannelError: If mutual TLS transport
536536
creation failed for any reason.
537537
"""
538-
self._client_options = client_options
539-
if isinstance(self._client_options, dict):
540-
self._client_options = client_options_lib.from_dict(self._client_options)
541-
if self._client_options is None:
542-
self._client_options = client_options_lib.ClientOptions()
543-
self._client_options = cast(client_options_lib.ClientOptions, self._client_options)
538+
if isinstance(client_options, dict):
539+
client_options = client_options_lib.from_dict(client_options)
540+
if client_options is None:
541+
client_options = client_options_lib.ClientOptions()
542+
self._client_options: client_options_lib.ClientOptions = cast(
543+
client_options_lib.ClientOptions, client_options
544+
)
544545

545546
universe_domain_opt = getattr(self._client_options, 'universe_domain', None)
546547

‎packages/gapic-generator/tests/integration/goldens/logging_internal/google/cloud/logging_v2/services/metrics_service_v2/client.py‎

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -536,12 +536,13 @@ def __init__(self, *,
536536
google.auth.exceptions.MutualTLSChannelError: If mutual TLS transport
537537
creation failed for any reason.
538538
"""
539-
self._client_options = client_options
540-
if isinstance(self._client_options, dict):
541-
self._client_options = client_options_lib.from_dict(self._client_options)
542-
if self._client_options is None:
543-
self._client_options = client_options_lib.ClientOptions()
544-
self._client_options = cast(client_options_lib.ClientOptions, self._client_options)
539+
if isinstance(client_options, dict):
540+
client_options = client_options_lib.from_dict(client_options)
541+
if client_options is None:
542+
client_options = client_options_lib.ClientOptions()
543+
self._client_options: client_options_lib.ClientOptions = cast(
544+
client_options_lib.ClientOptions, client_options
545+
)
545546

546547
universe_domain_opt = getattr(self._client_options, 'universe_domain', None)
547548

‎packages/gapic-generator/tests/integration/goldens/redis/google/cloud/redis_v1/services/cloud_redis/client.py‎

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -576,12 +576,13 @@ def __init__(self, *,
576576
google.auth.exceptions.MutualTLSChannelError: If mutual TLS transport
577577
creation failed for any reason.
578578
"""
579-
self._client_options = client_options
580-
if isinstance(self._client_options, dict):
581-
self._client_options = client_options_lib.from_dict(self._client_options)
582-
if self._client_options is None:
583-
self._client_options = client_options_lib.ClientOptions()
584-
self._client_options = cast(client_options_lib.ClientOptions, self._client_options)
579+
if isinstance(client_options, dict):
580+
client_options = client_options_lib.from_dict(client_options)
581+
if client_options is None:
582+
client_options = client_options_lib.ClientOptions()
583+
self._client_options: client_options_lib.ClientOptions = cast(
584+
client_options_lib.ClientOptions, client_options
585+
)
585586

586587
universe_domain_opt = getattr(self._client_options, 'universe_domain', None)
587588

0 commit comments

Comments
 (0)