Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: add common logic for supporting universe domain #621

Merged
merged 23 commits into from
Mar 14, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
23 commits
Select commit Hold shift + click to select a range
f185ee5
add common logic for supporting universe domain
ohmayr Feb 27, 2024
7f85158
🦉 Updates from OwlBot post-processor
gcf-owl-bot[bot] Feb 27, 2024
7660a2a
fix lint issues
ohmayr Feb 27, 2024
cd18267
add dependency to oauth2client
ohmayr Feb 27, 2024
edf51f1
Merge branch 'add-helpers-for-universe' of github.com:googleapis/pyth…
ohmayr Feb 27, 2024
16aa621
update test cases
ohmayr Feb 27, 2024
3bd6c5d
remove dependency to oauth2client
ohmayr Feb 27, 2024
0b58823
🦉 Updates from OwlBot post-processor
gcf-owl-bot[bot] Feb 27, 2024
9172a2c
fix lint issues
ohmayr Feb 27, 2024
66cd40f
Merge branch 'add-helpers-for-universe' of github.com:googleapis/pyth…
ohmayr Feb 27, 2024
e9dffa8
updates to universe helpers
ohmayr Feb 27, 2024
cbc679e
update module name and make methods public
ohmayr Mar 12, 2024
7edf13d
🦉 Updates from OwlBot post-processor
gcf-owl-bot[bot] Mar 12, 2024
812eb3d
update lint issues
ohmayr Mar 12, 2024
2b04476
Merge branch 'add-helpers-for-universe' of github.com:googleapis/pyth…
ohmayr Mar 12, 2024
8c1dd55
address PR comments
ohmayr Mar 12, 2024
44f5962
🦉 Updates from OwlBot post-processor
gcf-owl-bot[bot] Mar 12, 2024
393d2e9
use empty universe error in test cases
ohmayr Mar 12, 2024
dc593ed
Merge branch 'add-helpers-for-universe' of github.com:googleapis/pyth…
ohmayr Mar 12, 2024
f5bff28
remove mtls error and add test cases
ohmayr Mar 14, 2024
6cac3fd
🦉 Updates from OwlBot post-processor
gcf-owl-bot[bot] Mar 14, 2024
cb9a839
Merge branch 'main' into add-helpers-for-universe
ohmayr Mar 14, 2024
bc89e13
remove is True from test cases
ohmayr Mar 14, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
82 changes: 82 additions & 0 deletions google/api_core/universe.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,82 @@
# Copyright 2024 Google LLC
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.

"""Helpers for universe domain."""

from typing import Any, Optional

DEFAULT_UNIVERSE = "googleapis.com"


class EmptyUniverseError(ValueError):
def __init__(self):
message = "Universe Domain cannot be an empty string."
super().__init__(message)


class UniverseMismatchError(ValueError):
def __init__(self, client_universe, credentials_universe):
message = (
f"The configured universe domain ({client_universe}) does not match the universe domain "
f"found in the credentials ({credentials_universe}). "
"If you haven't configured the universe domain explicitly, "
f"`{DEFAULT_UNIVERSE}` is the default."
)
super().__init__(message)


def determine_domain(
client_universe_domain: Optional[str], universe_domain_env: Optional[str]
) -> str:
"""Return the universe domain used by the client.

Args:
client_universe_domain (Optional[str]): The universe domain configured via the client options.
universe_domain_env (Optional[str]): The universe domain configured via the
"GOOGLE_CLOUD_UNIVERSE_DOMAIN" environment variable.

Returns:
str: The universe domain to be used by the client.

Raises:
ValueError: If the universe domain is an empty string.
"""
universe_domain = DEFAULT_UNIVERSE
if client_universe_domain is not None:
universe_domain = client_universe_domain
elif universe_domain_env is not None:
universe_domain = universe_domain_env
if len(universe_domain.strip()) == 0:
raise EmptyUniverseError
return universe_domain


def compare_domains(client_universe: str, credentials: Any) -> bool:
"""Returns True iff the universe domains used by the client and credentials match.

Args:
client_universe (str): The universe domain configured via the client options.
credentials Any: The credentials being used in the client.

Returns:
bool: True iff client_universe matches the universe in credentials.

Raises:
ValueError: when client_universe does not match the universe in credentials.
"""
credentials_universe = getattr(credentials, "universe_domain", DEFAULT_UNIVERSE)

if client_universe != credentials_universe:
raise UniverseMismatchError(client_universe, credentials_universe)
return True
63 changes: 63 additions & 0 deletions tests/unit/test_universe.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,63 @@
# Copyright 2024 Google LLC
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.

import pytest
from google.api_core import universe


class _Fake_Credentials:
def __init__(self, universe_domain=None):
if universe_domain:
self.universe_domain = universe_domain


def test_determine_domain():
domain_client = "foo.com"
domain_env = "bar.com"

assert universe.determine_domain(domain_client, domain_env) == domain_client
assert universe.determine_domain(None, domain_env) == domain_env
assert universe.determine_domain(domain_client, None) == domain_client
assert universe.determine_domain(None, None) == universe.DEFAULT_UNIVERSE
ohmayr marked this conversation as resolved.
Show resolved Hide resolved

with pytest.raises(universe.EmptyUniverseError):
universe.determine_domain("", None)

with pytest.raises(universe.EmptyUniverseError):
universe.determine_domain(None, "")


def test_compare_domains():
fake_domain = "foo.com"
another_fake_domain = "bar.com"

assert universe.compare_domains(universe.DEFAULT_UNIVERSE, _Fake_Credentials())
assert universe.compare_domains(fake_domain, _Fake_Credentials(fake_domain))

with pytest.raises(universe.UniverseMismatchError) as excinfo:
universe.compare_domains(
universe.DEFAULT_UNIVERSE, _Fake_Credentials(fake_domain)
ohmayr marked this conversation as resolved.
Show resolved Hide resolved
)
assert str(excinfo.value).find(universe.DEFAULT_UNIVERSE) >= 0
assert str(excinfo.value).find(fake_domain) >= 0

with pytest.raises(universe.UniverseMismatchError) as excinfo:
universe.compare_domains(fake_domain, _Fake_Credentials())
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

These won't fit in one line? Darn.

assert str(excinfo.value).find(fake_domain) >= 0
assert str(excinfo.value).find(universe.DEFAULT_UNIVERSE) >= 0

with pytest.raises(universe.UniverseMismatchError) as excinfo:
universe.compare_domains(fake_domain, _Fake_Credentials(another_fake_domain))
assert str(excinfo.value).find(fake_domain) >= 0
assert str(excinfo.value).find(another_fake_domain) >= 0
Loading