Skip to content

Add scopes into a GCP token #36974

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.

Sign up for GitHub

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

Merged
potiuk merged 2 commits into from
Jan 24, 2024
Merged

Add scopes into a GCP token #36974

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a37134a
Add scopes into a GCP token
moiseenkov Jan 23, 2024
704e5ff
Update airflow/providers/google/common/hooks/base_google.py
hussein-awala Jan 23, 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
5 changes: 4 additions & 1 deletion airflow/providers/google/common/hooks/base_google.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -642,8 +642,10 @@ def __init__(
*,
project: str | None = None,
session: ClientSession | None = None,
scopes: Sequence[str] | None = None,
) -> None:
super().__init__(session=cast(Session, session))
_scopes: list[str] | None = list(scopes) if scopes else None
super().__init__(session=cast(Session, session), scopes=_scopes)
self.credentials = credentials
self.project = project

Expand All @@ -659,6 +661,7 @@ async def from_hook(
credentials=credentials,
project=project,
session=session,
scopes=hook.scopes,
)

async def get_project(self) -> str | None:
Expand Down
5 changes: 3 additions & 2 deletions tests/providers/google/common/hooks/test_base_google.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,7 @@
MODULE_NAME = "airflow.providers.google.common.hooks.base_google"
PROJECT_ID = "PROJECT_ID"
ENV_VALUE = "/tmp/a"
SCOPES = ["https://www.googleapis.com/auth/cloud-platform"]


class NoForbiddenAfterCount:
Expand Down Expand Up @@ -881,14 +882,14 @@ class TestCredentialsToken:
@pytest.mark.asyncio
async def test_get_project(self):
mock_credentials = mock.MagicMock(spec=google.auth.compute_engine.Credentials)
token = hook._CredentialsToken(mock_credentials, project=PROJECT_ID)
token = hook._CredentialsToken(mock_credentials, project=PROJECT_ID, scopes=SCOPES)
assert await token.get_project() == PROJECT_ID

@pytest.mark.asyncio
async def test_get(self):
mock_credentials = mock.MagicMock(spec=google.auth.compute_engine.Credentials)
mock_credentials.token = "ACCESS_TOKEN"
token = hook._CredentialsToken(mock_credentials, project=PROJECT_ID)
token = hook._CredentialsToken(mock_credentials, project=PROJECT_ID, scopes=SCOPES)
assert await token.get() == "ACCESS_TOKEN"
mock_credentials.refresh.assert_called_once()

Expand Down