From 307a0dff5d7501b86a2a083bc2c0f73e7c747357 Mon Sep 17 00:00:00 2001 From: Sijun Liu Date: Thu, 6 Jul 2023 14:33:28 -0700 Subject: [PATCH] fix: deprecate UserAccessTokenCredentials --- google/oauth2/credentials.py | 8 ++++++ system_tests/secrets.tar.enc | Bin 10324 -> 10324 bytes tests/oauth2/test_credentials.py | 44 ++++++++++++++++++++----------- 3 files changed, 36 insertions(+), 16 deletions(-) diff --git a/google/oauth2/credentials.py b/google/oauth2/credentials.py index 76ac878cc..5c40ab097 100644 --- a/google/oauth2/credentials.py +++ b/google/oauth2/credentials.py @@ -35,6 +35,7 @@ import io import json import logging +import warnings import six @@ -498,6 +499,13 @@ class UserAccessTokenCredentials(credentials.CredentialsWithQuotaProject): """ def __init__(self, account=None, quota_project_id=None): + warnings.warn( + "UserAccessTokenCredentials is deprecated, please use " + "google.oauth2.credentials.Credentials instead. To use " + "that credential type, simply run " + "`gcloud auth application-default login` and let the " + "client libraries pick up the application default credentials." + ) super(UserAccessTokenCredentials, self).__init__() self._account = account self._quota_project_id = quota_project_id diff --git a/system_tests/secrets.tar.enc b/system_tests/secrets.tar.enc index 4e6ffb1c4f617905b05908a436e21ac7f97f4376..0c81b08f517c8f84b4db29fb33b247d768acd7ab 100644 GIT binary patch literal 10324 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 literal 10324 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 diff --git a/tests/oauth2/test_credentials.py b/tests/oauth2/test_credentials.py index feb7e4311..d265d22ed 100644 --- a/tests/oauth2/test_credentials.py +++ b/tests/oauth2/test_credentials.py @@ -951,25 +951,34 @@ def test_unpickle_old_credentials_pickle(self): class TestUserAccessTokenCredentials(object): def test_instance(self): - cred = credentials.UserAccessTokenCredentials() - assert cred._account is None + with pytest.warns( + UserWarning, match="UserAccessTokenCredentials is deprecated" + ): + cred = credentials.UserAccessTokenCredentials() + assert cred._account is None - cred = cred.with_account("account") - assert cred._account == "account" + cred = cred.with_account("account") + assert cred._account == "account" @mock.patch("google.auth._cloud_sdk.get_auth_access_token", autospec=True) def test_refresh(self, get_auth_access_token): - get_auth_access_token.return_value = "access_token" - cred = credentials.UserAccessTokenCredentials() - cred.refresh(None) - assert cred.token == "access_token" + with pytest.warns( + UserWarning, match="UserAccessTokenCredentials is deprecated" + ): + get_auth_access_token.return_value = "access_token" + cred = credentials.UserAccessTokenCredentials() + cred.refresh(None) + assert cred.token == "access_token" def test_with_quota_project(self): - cred = credentials.UserAccessTokenCredentials() - quota_project_cred = cred.with_quota_project("project-foo") + with pytest.warns( + UserWarning, match="UserAccessTokenCredentials is deprecated" + ): + cred = credentials.UserAccessTokenCredentials() + quota_project_cred = cred.with_quota_project("project-foo") - assert quota_project_cred._quota_project_id == "project-foo" - assert quota_project_cred._account == cred._account + assert quota_project_cred._quota_project_id == "project-foo" + assert quota_project_cred._account == cred._account @mock.patch( "google.oauth2.credentials.UserAccessTokenCredentials.apply", autospec=True @@ -978,7 +987,10 @@ def test_with_quota_project(self): "google.oauth2.credentials.UserAccessTokenCredentials.refresh", autospec=True ) def test_before_request(self, refresh, apply): - cred = credentials.UserAccessTokenCredentials() - cred.before_request(mock.Mock(), "GET", "https://example.com", {}) - refresh.assert_called() - apply.assert_called() + with pytest.warns( + UserWarning, match="UserAccessTokenCredentials is deprecated" + ): + cred = credentials.UserAccessTokenCredentials() + cred.before_request(mock.Mock(), "GET", "https://example.com", {}) + refresh.assert_called() + apply.assert_called()