Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commit9e8d039

Browse files
fix: [Many APIs] Resolve AttributeError 'Credentials' object has no attribute 'universe_domain' (#12266)
- [ ] Regenerate this pull request now.BEGIN_COMMIT_OVERRIDEfix: Resolve AttributeError 'Credentials' object has no attribute'universe_domain'fix: Add google-auth as a direct dependencyfix: Add staticmethod decorator to `_get_client_cert_source` and`_get_api_endpoint`END_COMMIT_OVERRIDEchore: Update gapic-generator-python to v1.14.1PiperOrigin-RevId: 603728206Source-Link:googleapis/googleapis@9063da8Source-Link:googleapis/googleapis-gen@891c67dCopy-Tag:eyJwIjoicGFja2FnZXMvZ29vZ2xlLWNsb3VkLXJlZGlzLy5Pd2xCb3QueWFtbCIsImgiOiI4OTFjNjdkMGE4NTViMDgwODVlYjMwMWRhYmIxNDA2NGVmNGIyYzZkIn0=Copy-Tag:eyJwIjoicGFja2FnZXMvZ29vZ2xlLWNsb3VkLXJlc291cmNlLW1hbmFnZXIvLk93bEJvdC55YW1sIiwiaCI6Ijg5MWM2N2QwYTg1NWIwODA4NWViMzAxZGFiYjE0MDY0ZWY0YjJjNmQifQ==Copy-Tag:eyJwIjoicGFja2FnZXMvZ29vZ2xlLWNsb3VkLXJlc291cmNlLXNldHRpbmdzLy5Pd2xCb3QueWFtbCIsImgiOiI4OTFjNjdkMGE4NTViMDgwODVlYjMwMWRhYmIxNDA2NGVmNGIyYzZkIn0=Copy-Tag:eyJwIjoicGFja2FnZXMvZ29vZ2xlLWNsb3VkLXJldGFpbC8uT3dsQm90LnlhbWwiLCJoIjoiODkxYzY3ZDBhODU1YjA4MDg1ZWIzMDFkYWJiMTQwNjRlZjRiMmM2ZCJ9Copy-Tag:eyJwIjoicGFja2FnZXMvZ29vZ2xlLWNsb3VkLXJ1bi8uT3dsQm90LnlhbWwiLCJoIjoiODkxYzY3ZDBhODU1YjA4MDg1ZWIzMDFkYWJiMTQwNjRlZjRiMmM2ZCJ9Copy-Tag:eyJwIjoicGFja2FnZXMvZ29vZ2xlLWNsb3VkLXNjaGVkdWxlci8uT3dsQm90LnlhbWwiLCJoIjoiODkxYzY3ZDBhODU1YjA4MDg1ZWIzMDFkYWJiMTQwNjRlZjRiMmM2ZCJ9Copy-Tag:eyJwIjoicGFja2FnZXMvZ29vZ2xlLWNsb3VkLXNlY3JldC1tYW5hZ2VyLy5Pd2xCb3QueWFtbCIsImgiOiI4OTFjNjdkMGE4NTViMDgwODVlYjMwMWRhYmIxNDA2NGVmNGIyYzZkIn0=Copy-Tag:eyJwIjoicGFja2FnZXMvZ29vZ2xlLWNsb3VkLXNlY3VyZXNvdXJjZW1hbmFnZXIvLk93bEJvdC55YW1sIiwiaCI6Ijg5MWM2N2QwYTg1NWIwODA4NWViMzAxZGFiYjE0MDY0ZWY0YjJjNmQifQ==Copy-Tag:eyJwIjoicGFja2FnZXMvZ29vZ2xlLWNsb3VkLXNlY3VyaXR5Y2VudGVyLy5Pd2xCb3QueWFtbCIsImgiOiI4OTFjNjdkMGE4NTViMDgwODVlYjMwMWRhYmIxNDA2NGVmNGIyYzZkIn0=Copy-Tag:eyJwIjoicGFja2FnZXMvZ29vZ2xlLWNsb3VkLXNlY3VyaXR5Y2VudGVybWFuYWdlbWVudC8uT3dsQm90LnlhbWwiLCJoIjoiODkxYzY3ZDBhODU1YjA4MDg1ZWIzMDFkYWJiMTQwNjRlZjRiMmM2ZCJ9Copy-Tag:eyJwIjoicGFja2FnZXMvZ29vZ2xlLWNsb3VkLXNlcnZpY2UtY29udHJvbC8uT3dsQm90LnlhbWwiLCJoIjoiODkxYzY3ZDBhODU1YjA4MDg1ZWIzMDFkYWJiMTQwNjRlZjRiMmM2ZCJ9Copy-Tag:eyJwIjoicGFja2FnZXMvZ29vZ2xlLWNsb3VkLXNlcnZpY2UtZGlyZWN0b3J5Ly5Pd2xCb3QueWFtbCIsImgiOiI4OTFjNjdkMGE4NTViMDgwODVlYjMwMWRhYmIxNDA2NGVmNGIyYzZkIn0=Copy-Tag:eyJwIjoicGFja2FnZXMvZ29vZ2xlLWNsb3VkLXNlcnZpY2UtbWFuYWdlbWVudC8uT3dsQm90LnlhbWwiLCJoIjoiODkxYzY3ZDBhODU1YjA4MDg1ZWIzMDFkYWJiMTQwNjRlZjRiMmM2ZCJ9Copy-Tag:eyJwIjoicGFja2FnZXMvZ29vZ2xlLWNsb3VkLXNlcnZpY2UtdXNhZ2UvLk93bEJvdC55YW1sIiwiaCI6Ijg5MWM2N2QwYTg1NWIwODA4NWViMzAxZGFiYjE0MDY0ZWY0YjJjNmQifQ==Copy-Tag:eyJwIjoicGFja2FnZXMvZ29vZ2xlLWNsb3VkLXNlcnZpY2VoZWFsdGgvLk93bEJvdC55YW1sIiwiaCI6Ijg5MWM2N2QwYTg1NWIwODA4NWViMzAxZGFiYjE0MDY0ZWY0YjJjNmQifQ==Copy-Tag:eyJwIjoicGFja2FnZXMvZ29vZ2xlLWNsb3VkLXNoZWxsLy5Pd2xCb3QueWFtbCIsImgiOiI4OTFjNjdkMGE4NTViMDgwODVlYjMwMWRhYmIxNDA2NGVmNGIyYzZkIn0=Copy-Tag:eyJwIjoicGFja2FnZXMvZ29vZ2xlLWNsb3VkLXNvdXJjZS1jb250ZXh0Ly5Pd2xCb3QueWFtbCIsImgiOiI4OTFjNjdkMGE4NTViMDgwODVlYjMwMWRhYmIxNDA2NGVmNGIyYzZkIn0=Copy-Tag:eyJwIjoicGFja2FnZXMvZ29vZ2xlLWNsb3VkLXNwZWVjaC8uT3dsQm90LnlhbWwiLCJoIjoiODkxYzY3ZDBhODU1YjA4MDg1ZWIzMDFkYWJiMTQwNjRlZjRiMmM2ZCJ9Copy-Tag:eyJwIjoicGFja2FnZXMvZ29vZ2xlLWNsb3VkLXN0b3JhZ2UtdHJhbnNmZXIvLk93bEJvdC55YW1sIiwiaCI6Ijg5MWM2N2QwYTg1NWIwODA4NWViMzAxZGFiYjE0MDY0ZWY0YjJjNmQifQ==Copy-Tag:eyJwIjoicGFja2FnZXMvZ29vZ2xlLWNsb3VkLXN0b3JhZ2VpbnNpZ2h0cy8uT3dsQm90LnlhbWwiLCJoIjoiODkxYzY3ZDBhODU1YjA4MDg1ZWIzMDFkYWJiMTQwNjRlZjRiMmM2ZCJ9---------Co-authored-by: Owl Bot <gcf-owl-bot[bot]@users.noreply.github.com>Co-authored-by: Anthonios Partheniou <partheniou@google.com>
1 parentd7d730a commit9e8d039

File tree

268 files changed

+18587
-19117
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

268 files changed

+18587
-19117
lines changed

‎packages/google-cloud-redis/google/cloud/redis/gapic_version.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,4 +13,4 @@
1313
# See the License for the specific language governing permissions and
1414
# limitations under the License.
1515
#
16-
__version__="2.15.0"# {x-release-please-version}
16+
__version__="0.0.0"# {x-release-please-version}

‎packages/google-cloud-redis/google/cloud/redis_v1/gapic_version.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,4 +13,4 @@
1313
# See the License for the specific language governing permissions and
1414
# limitations under the License.
1515
#
16-
__version__="2.15.0"# {x-release-please-version}
16+
__version__="0.0.0"# {x-release-please-version}

‎packages/google-cloud-redis/google/cloud/redis_v1/services/cloud_redis/client.py‎

Lines changed: 14 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -409,6 +409,7 @@ def _read_environment_variables():
409409
)
410410
returnuse_client_cert=="true",use_mtls_endpoint,universe_domain_env
411411

412+
@staticmethod
412413
def_get_client_cert_source(provided_cert_source,use_cert_flag):
413414
"""Return the client cert source to be used by the client.
414415
@@ -427,6 +428,7 @@ def _get_client_cert_source(provided_cert_source, use_cert_flag):
427428
client_cert_source=mtls.default_client_cert_source()
428429
returnclient_cert_source
429430

431+
@staticmethod
430432
def_get_api_endpoint(
431433
api_override,client_cert_source,universe_domain,use_mtls_endpoint
432434
):
@@ -501,17 +503,18 @@ def _compare_universes(
501503
Raises:
502504
ValueError: when client_universe does not match the universe in credentials.
503505
"""
504-
ifcredentials:
505-
credentials_universe=credentials.universe_domain
506-
ifclient_universe!=credentials_universe:
507-
default_universe=CloudRedisClient._DEFAULT_UNIVERSE
508-
raiseValueError(
509-
"The configured universe domain "
510-
f"({client_universe}) does not match the universe domain "
511-
f"found in the credentials ({credentials_universe}). "
512-
"If you haven't configured the universe domain explicitly, "
513-
f"`{default_universe}` is the default."
514-
)
506+
507+
default_universe=CloudRedisClient._DEFAULT_UNIVERSE
508+
credentials_universe=getattr(credentials,"universe_domain",default_universe)
509+
510+
ifclient_universe!=credentials_universe:
511+
raiseValueError(
512+
"The configured universe domain "
513+
f"({client_universe}) does not match the universe domain "
514+
f"found in the credentials ({credentials_universe}). "
515+
"If you haven't configured the universe domain explicitly, "
516+
f"`{default_universe}` is the default."
517+
)
515518
returnTrue
516519

517520
def_validate_universe_domain(self):

‎packages/google-cloud-redis/google/cloud/redis_v1beta1/gapic_version.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,4 +13,4 @@
1313
# See the License for the specific language governing permissions and
1414
# limitations under the License.
1515
#
16-
__version__="2.15.0"# {x-release-please-version}
16+
__version__="0.0.0"# {x-release-please-version}

‎packages/google-cloud-redis/google/cloud/redis_v1beta1/services/cloud_redis/client.py‎

Lines changed: 14 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -408,6 +408,7 @@ def _read_environment_variables():
408408
)
409409
returnuse_client_cert=="true",use_mtls_endpoint,universe_domain_env
410410

411+
@staticmethod
411412
def_get_client_cert_source(provided_cert_source,use_cert_flag):
412413
"""Return the client cert source to be used by the client.
413414
@@ -426,6 +427,7 @@ def _get_client_cert_source(provided_cert_source, use_cert_flag):
426427
client_cert_source=mtls.default_client_cert_source()
427428
returnclient_cert_source
428429

430+
@staticmethod
429431
def_get_api_endpoint(
430432
api_override,client_cert_source,universe_domain,use_mtls_endpoint
431433
):
@@ -500,17 +502,18 @@ def _compare_universes(
500502
Raises:
501503
ValueError: when client_universe does not match the universe in credentials.
502504
"""
503-
ifcredentials:
504-
credentials_universe=credentials.universe_domain
505-
ifclient_universe!=credentials_universe:
506-
default_universe=CloudRedisClient._DEFAULT_UNIVERSE
507-
raiseValueError(
508-
"The configured universe domain "
509-
f"({client_universe}) does not match the universe domain "
510-
f"found in the credentials ({credentials_universe}). "
511-
"If you haven't configured the universe domain explicitly, "
512-
f"`{default_universe}` is the default."
513-
)
505+
506+
default_universe=CloudRedisClient._DEFAULT_UNIVERSE
507+
credentials_universe=getattr(credentials,"universe_domain",default_universe)
508+
509+
ifclient_universe!=credentials_universe:
510+
raiseValueError(
511+
"The configured universe domain "
512+
f"({client_universe}) does not match the universe domain "
513+
f"found in the credentials ({credentials_universe}). "
514+
"If you haven't configured the universe domain explicitly, "
515+
f"`{default_universe}` is the default."
516+
)
514517
returnTrue
515518

516519
def_validate_universe_domain(self):

‎packages/google-cloud-redis/samples/generated_samples/snippet_metadata_google.cloud.redis.v1.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
],
99
"language":"PYTHON",
1010
"name":"google-cloud-redis",
11-
"version":"2.15.0"
11+
"version":"0.1.0"
1212
},
1313
"snippets": [
1414
{

‎packages/google-cloud-redis/samples/generated_samples/snippet_metadata_google.cloud.redis.v1beta1.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
],
99
"language":"PYTHON",
1010
"name":"google-cloud-redis",
11-
"version":"2.15.0"
11+
"version":"0.1.0"
1212
},
1313
"snippets": [
1414
{

‎packages/google-cloud-redis/setup.py‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,7 @@
4040

4141
dependencies= [
4242
"google-api-core[grpc] >= 1.34.0, <3.0.0dev,!=2.0.*,!=2.1.*,!=2.2.*,!=2.3.*,!=2.4.*,!=2.5.*,!=2.6.*,!=2.7.*,!=2.8.*,!=2.9.*,!=2.10.*",
43+
"google-auth >= 2.14.1, <3.0.0dev",
4344
"proto-plus >= 1.22.3, <2.0.0dev",
4445
"protobuf>=3.19.5,<5.0.0dev,!=3.20.0,!=3.20.1,!=4.21.0,!=4.21.1,!=4.21.2,!=4.21.3,!=4.21.4,!=4.21.5",
4546
]

‎packages/google-cloud-redis/testing/constraints-3.7.txt‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,5 +5,6 @@
55
# e.g., if setup.py has "google-cloud-foo >= 1.14.0, < 2.0.0dev",
66
# Then this file should have google-cloud-foo==1.14.0
77
google-api-core==1.34.0
8+
google-auth==2.14.1
89
proto-plus==1.22.3
910
protobuf==3.19.5

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp