Skip to content

Commit 4a279f2

Browse files
hebaalazzehhebaalazzeh
committed
fix(generator): type annotate self._client_options and update workflow action SHAs
1 parent 0dc81e3 commit 4a279f2

15 files changed

Lines changed: 96 additions & 105 deletions

File tree

  • .github/workflows
  • packages
    • gapic-generator
      • gapic/templates/%namespace/%name_%version/%sub/services/%service
      • 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
    • google-api-core

‎.github/workflows/gapic-generator-tests.yml‎

Lines changed: 14 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -31,10 +31,10 @@ jobs:
3131
outputs:
3232
run_generator: ${{ steps.filter.outputs.generator }}
3333
steps:
34-
- uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6
34+
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
3535
with:
3636
persist-credentials: false
37-
- uses: dorny/paths-filter@fbd0ab8f3e69293af611ebaee6363fc25e6d187d # v4
37+
- uses: dorny/paths-filter@d1c1ffe0248fe513906c8e24db8ea791d46f8590 # v3
3838
id: filter
3939
with:
4040
filters: |
@@ -65,11 +65,11 @@ jobs:
6565
logging_scope: ["", "google"]
6666
runs-on: ubuntu-latest
6767
steps:
68-
- uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6
68+
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
6969
with:
7070
persist-credentials: false
7171
- name: Set up Python
72-
uses: actions/setup-python@ece7cb06caefa5fff74198d8649806c4678c61a1 # v6
72+
uses: actions/setup-python@a26af69be951a213d495a4c3e4e4022e16d87065 # v5
7373
with:
7474
python-version: "${{ matrix.python }}"
7575
allow-prereleases: true
@@ -98,11 +98,11 @@ jobs:
9898
needs: python_config
9999
runs-on: ubuntu-latest
100100
steps:
101-
- uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6
101+
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
102102
with:
103103
persist-credentials: false
104104
- name: Set up Python
105-
uses: actions/setup-python@ece7cb06caefa5fff74198d8649806c4678c61a1 # v6
105+
uses: actions/setup-python@a26af69be951a213d495a4c3e4e4022e16d87065 # v5
106106
with:
107107
python-version: ${{ needs.python_config.outputs.latest_stable_python }}
108108
- name: Install System Deps
@@ -117,11 +117,11 @@ jobs:
117117
needs: python_config
118118
runs-on: ubuntu-latest
119119
steps:
120-
- uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6
120+
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
121121
with:
122122
persist-credentials: false
123123
- name: Set up Python
124-
uses: actions/setup-python@ece7cb06caefa5fff74198d8649806c4678c61a1 # v6
124+
uses: actions/setup-python@a26af69be951a213d495a4c3e4e4022e16d87065 # v5
125125
with:
126126
python-version: ${{ needs.python_config.outputs.latest_stable_python }}
127127
- name: Install System Deps
@@ -151,11 +151,11 @@ jobs:
151151
needs: python_config
152152
runs-on: ubuntu-latest
153153
steps:
154-
- uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6
154+
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
155155
with:
156156
persist-credentials: false
157157
- name: Set up Python ${{ needs.python_config.outputs.prerelease_python }}
158-
uses: actions/setup-python@ece7cb06caefa5fff74198d8649806c4678c61a1 # v6
158+
uses: actions/setup-python@a26af69be951a213d495a4c3e4e4022e16d87065 # v5
159159
with:
160160
python-version: ${{ needs.python_config.outputs.prerelease_python }}
161161
allow-prereleases: true
@@ -181,11 +181,11 @@ jobs:
181181
python: ${{ fromJSON(needs.python_config.outputs.trimmed_python) }}
182182
runs-on: ubuntu-latest
183183
steps:
184-
- uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6
184+
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
185185
with:
186186
persist-credentials: false
187187
- name: Set up Python
188-
uses: actions/setup-python@ece7cb06caefa5fff74198d8649806c4678c61a1 # v6
188+
uses: actions/setup-python@a26af69be951a213d495a4c3e4e4022e16d87065 # v5
189189
with:
190190
python-version: ${{ matrix.python }}
191191
allow-prereleases: true
@@ -221,12 +221,12 @@ jobs:
221221
runs-on: ubuntu-latest
222222
container: gcr.io/gapic-images/googleapis # zizmor: ignore[unpinned-images]
223223
steps:
224-
- uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6
224+
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
225225
with:
226226
persist-credentials: false
227227
- name: Cache Bazel files
228228
id: cache-bazel
229-
uses: actions/cache@caa296126883cff596d87d8935842f9db880ef25 # v5
229+
uses: actions/cache@d4323d455f4799aea6383e50059345091701625f # v4
230230
with:
231231
path: ~/.cache/bazel
232232
# Ensure CACHE_VERSION is defined in the mono-repo secrets!
@@ -261,4 +261,3 @@ jobs:
261261
exit 1
262262
fi
263263
echo "All checks passed or were successfully skipped."
264-

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

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -565,12 +565,13 @@ class {{ service.client_name }}(metaclass={{ service.client_name }}Meta):
565565
google.auth.exceptions.MutualTLSChannelError: If mutual TLS transport
566566
creation failed for any reason.
567567
"""
568-
self._client_options = client_options
569-
if isinstance(self._client_options, dict):
570-
self._client_options = client_options_lib.from_dict(self._client_options)
571-
if self._client_options is None:
572-
self._client_options = client_options_lib.ClientOptions()
573-
self._client_options = cast(client_options_lib.ClientOptions, self._client_options)
568+
if isinstance(client_options, dict):
569+
client_options = client_options_lib.from_dict(client_options)
570+
if client_options is None:
571+
client_options = client_options_lib.ClientOptions()
572+
self._client_options: client_options_lib.ClientOptions = cast(
573+
client_options_lib.ClientOptions, client_options
574+
)
574575

575576
universe_domain_opt = getattr(self._client_options, 'universe_domain', None)
576577

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

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -723,13 +723,12 @@ def __init__(
723723
google.auth.exceptions.MutualTLSChannelError: If mutual TLS transport
724724
creation failed for any reason.
725725
"""
726-
self._client_options = client_options
727-
if isinstance(self._client_options, dict):
728-
self._client_options = client_options_lib.from_dict(self._client_options)
729-
if self._client_options is None:
730-
self._client_options = client_options_lib.ClientOptions()
731-
self._client_options = cast(
732-
client_options_lib.ClientOptions, self._client_options
726+
if isinstance(client_options, dict):
727+
client_options = client_options_lib.from_dict(client_options)
728+
if client_options is None:
729+
client_options = client_options_lib.ClientOptions()
730+
self._client_options: client_options_lib.ClientOptions = cast(
731+
client_options_lib.ClientOptions, client_options
733732
)
734733

735734
universe_domain_opt = getattr(self._client_options, "universe_domain", None)

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

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -622,13 +622,12 @@ def __init__(
622622
google.auth.exceptions.MutualTLSChannelError: If mutual TLS transport
623623
creation failed for any reason.
624624
"""
625-
self._client_options = client_options
626-
if isinstance(self._client_options, dict):
627-
self._client_options = client_options_lib.from_dict(self._client_options)
628-
if self._client_options is None:
629-
self._client_options = client_options_lib.ClientOptions()
630-
self._client_options = cast(
631-
client_options_lib.ClientOptions, self._client_options
625+
if isinstance(client_options, dict):
626+
client_options = client_options_lib.from_dict(client_options)
627+
if client_options is None:
628+
client_options = client_options_lib.ClientOptions()
629+
self._client_options: client_options_lib.ClientOptions = cast(
630+
client_options_lib.ClientOptions, client_options
632631
)
633632

634633
universe_domain_opt = getattr(self._client_options, "universe_domain", None)

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

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -960,13 +960,12 @@ def __init__(
960960
google.auth.exceptions.MutualTLSChannelError: If mutual TLS transport
961961
creation failed for any reason.
962962
"""
963-
self._client_options = client_options
964-
if isinstance(self._client_options, dict):
965-
self._client_options = client_options_lib.from_dict(self._client_options)
966-
if self._client_options is None:
967-
self._client_options = client_options_lib.ClientOptions()
968-
self._client_options = cast(
969-
client_options_lib.ClientOptions, self._client_options
963+
if isinstance(client_options, dict):
964+
client_options = client_options_lib.from_dict(client_options)
965+
if client_options is None:
966+
client_options = client_options_lib.ClientOptions()
967+
self._client_options: client_options_lib.ClientOptions = cast(
968+
client_options_lib.ClientOptions, client_options
970969
)
971970

972971
universe_domain_opt = getattr(self._client_options, "universe_domain", None)

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

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -728,13 +728,12 @@ def __init__(
728728
google.auth.exceptions.MutualTLSChannelError: If mutual TLS transport
729729
creation failed for any reason.
730730
"""
731-
self._client_options = client_options
732-
if isinstance(self._client_options, dict):
733-
self._client_options = client_options_lib.from_dict(self._client_options)
734-
if self._client_options is None:
735-
self._client_options = client_options_lib.ClientOptions()
736-
self._client_options = cast(
737-
client_options_lib.ClientOptions, self._client_options
731+
if isinstance(client_options, dict):
732+
client_options = client_options_lib.from_dict(client_options)
733+
if client_options is None:
734+
client_options = client_options_lib.ClientOptions()
735+
self._client_options: client_options_lib.ClientOptions = cast(
736+
client_options_lib.ClientOptions, client_options
738737
)
739738

740739
universe_domain_opt = getattr(self._client_options, "universe_domain", None)

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

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

622621
universe_domain_opt = getattr(self._client_options, "universe_domain", None)

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

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

621620
universe_domain_opt = getattr(self._client_options, "universe_domain", None)

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

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -728,13 +728,12 @@ def __init__(
728728
google.auth.exceptions.MutualTLSChannelError: If mutual TLS transport
729729
creation failed for any reason.
730730
"""
731-
self._client_options = client_options
732-
if isinstance(self._client_options, dict):
733-
self._client_options = client_options_lib.from_dict(self._client_options)
734-
if self._client_options is None:
735-
self._client_options = client_options_lib.ClientOptions()
736-
self._client_options = cast(
737-
client_options_lib.ClientOptions, self._client_options
731+
if isinstance(client_options, dict):
732+
client_options = client_options_lib.from_dict(client_options)
733+
if client_options is None:
734+
client_options = client_options_lib.ClientOptions()
735+
self._client_options: client_options_lib.ClientOptions = cast(
736+
client_options_lib.ClientOptions, client_options
738737
)
739738

740739
universe_domain_opt = getattr(self._client_options, "universe_domain", None)

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

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

622621
universe_domain_opt = getattr(self._client_options, "universe_domain", None)

0 commit comments

Comments
 (0)