Skip to content

chore: sync to master #628

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
merged 15 commits into from
Oct 22, 2020
Merged

chore: sync to master #628

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
41599ae
refactor: split 'with_quota_project' into separate base class (#561)
busunkim96 Sep 2, 2020
d32f7df
fix: dummy commit to trigger a auto release (#597)
arithmetic1728 Sep 3, 2020
892dc37
chore: release 1.21.1 (#599)
release-please[bot] Sep 3, 2020
694d83f
fix: migrate signBlob to iamcredentials.googleapis.com (#600)
busunkim96 Sep 8, 2020
b921a0a
chore: release 1.21.2 (#601)
release-please[bot] Sep 16, 2020
d0e0aba
fix: fix expiry for `to_json()` (#589)
wescpy Sep 17, 2020
da3526f
chore: add default CODEOWNERS (#609)
busunkim96 Sep 22, 2020
cc91e75
chore: release 1.21.3 (#607)
release-please[bot] Sep 23, 2020
7e15258
feat: add asyncio based auth flow (#612)
crwilcox Sep 28, 2020
ee5617c
chore: release 1.22.0 (#615)
release-please[bot] Sep 28, 2020
a924011
fix: move aiohttp to extra as it is currently internal surface (#619)
crwilcox Oct 5, 2020
7f957ba
chore: release 1.22.1 (#620)
release-please[bot] Oct 5, 2020
6407258
fix: remove checks for ancient versions of Cryptography (#596)
akx Oct 8, 2020
abb4f4d
Merge remote-tracking branch 'upstream/byoid'
bojeil-google Oct 20, 2020
41767b6
chore: sync to master
bojeil-google Oct 21, 2020
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
4 changes: 1 addition & 3 deletions noxfile.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
"grpcio",
]

ASYNC_DEPENDENCIES = ["pytest-asyncio", "aioresponses"]
ASYNC_DEPENDENCIES = ["pytest-asyncio", "aioresponses", "asynctest"]

BLACK_VERSION = "black==19.3b0"
BLACK_PATHS = [
Expand Down Expand Up @@ -64,9 +64,7 @@ def lint(session):
@nox.session(python="3.6")
def blacken(session):
"""Run black.

Format code to uniform standard.

This currently uses Python 3.6 due to the automated Kokoro run of synthtool.
That run uses an image that doesn't have 3.6 installed. Before updating this
check the state of the `gcp_ubuntu_config` we use for that Kokoro run.
Expand Down
2 changes: 0 additions & 2 deletions setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,15 +20,13 @@

DEPENDENCIES = (
"cachetools>=2.0.0,<5.0",
'enum34; python_version < "3.4"',
"pyasn1-modules>=0.2.1",
# rsa==4.5 is the last version to support 2.7
# https://github.com/sybrenstuvel/python-rsa/issues/152#issuecomment-643470233
'rsa<4.6; python_version < "3.5"',
'rsa>=3.1.4,<5; python_version >= "3.5"',
"setuptools>=40.3.0",
"six>=1.9.0",
'aiohttp >= 3.6.2, < 4.0.0dev; python_version>="3.6"',
)

extras = {"aiohttp": "aiohttp >= 3.6.2, < 4.0.0dev; python_version>='3.6'"}
Expand Down
69 changes: 38 additions & 31 deletions tests/test_identity_pool.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,19 +72,20 @@ class TestCredentials(object):
@classmethod
def make_mock_request(
cls,
data,
status=http_client.OK,
impersonation_data=None,
token_status=http_client.OK,
token_data=None,
impersonation_status=None,
impersonation_data=None,
):
responses = []
# STS token exchange request.
token_response = mock.create_autospec(transport.Response, instance=True)
token_response.status = status
token_response.data = json.dumps(data).encode("utf-8")
responses = [token_response]
token_response.status = token_status
token_response.data = json.dumps(token_data).encode("utf-8")
responses.append(token_response)

# If service account impersonation is requested, mock the expected response.
if impersonation_status and impersonation_status:
if impersonation_status:
impersonation_response = mock.create_autospec(
transport.Response, instance=True
)
Expand Down Expand Up @@ -169,8 +170,6 @@ def assert_underlying_credentials_refresh(
"subject_token": subject_token,
"subject_token_type": subject_token_type,
}
if token_scopes == "":
token_request_data.pop("scope", None)
# Service account impersonation request/response.
impersonation_response = {
"accessToken": "SA_ACCESS_TOKEN",
Expand All @@ -180,8 +179,6 @@ def assert_underlying_credentials_refresh(
"Content-Type": "application/json",
"authorization": "Bearer {}".format(token_response["access_token"]),
}
if quota_project_id:
impersonation_headers["x-goog-user-project"] = quota_project_id
impersonation_request_data = {
"delegates": None,
"scope": scopes,
Expand All @@ -190,8 +187,8 @@ def assert_underlying_credentials_refresh(
# Initialize mock request to handle token exchange and service account
# impersonation request.
request = cls.make_mock_request(
status=http_client.OK,
data=token_response,
token_status=http_client.OK,
token_data=token_response,
impersonation_status=impersonation_status,
impersonation_data=impersonation_response,
)
Expand Down Expand Up @@ -243,7 +240,8 @@ def make_credentials(
scopes=scopes,
)

def test_from_info_full_options(self):
@mock.patch.object(identity_pool.Credentials, "__init__", return_value=None)
def test_from_info_full_options(self, mock_init):
credentials = identity_pool.Credentials.from_info(
{
"audience": AUDIENCE,
Expand All @@ -259,18 +257,19 @@ def test_from_info_full_options(self):

# Confirm identity_pool.Credentials instantiated with expected attributes.
assert isinstance(credentials, identity_pool.Credentials)
self.assert_underlying_credentials_refresh(
credentials=credentials,
mock_init.assert_called_once_with(
audience=AUDIENCE,
subject_token=TEXT_FILE_SUBJECT_TOKEN,
subject_token_type=SUBJECT_TOKEN_TYPE,
token_url=TOKEN_URL,
service_account_impersonation_url=SERVICE_ACCOUNT_IMPERSONATION_URL,
basic_auth_encoding=BASIC_AUTH_ENCODING,
client_id=CLIENT_ID,
client_secret=CLIENT_SECRET,
credential_source=self.CREDENTIAL_SOURCE_TEXT,
quota_project_id=QUOTA_PROJECT_ID,
)

def test_from_info_required_options_only(self):
@mock.patch.object(identity_pool.Credentials, "__init__", return_value=None)
def test_from_info_required_options_only(self, mock_init):
credentials = identity_pool.Credentials.from_info(
{
"audience": AUDIENCE,
Expand All @@ -282,15 +281,19 @@ def test_from_info_required_options_only(self):

# Confirm identity_pool.Credentials instantiated with expected attributes.
assert isinstance(credentials, identity_pool.Credentials)
self.assert_underlying_credentials_refresh(
credentials=credentials,
mock_init.assert_called_once_with(
audience=AUDIENCE,
subject_token=TEXT_FILE_SUBJECT_TOKEN,
subject_token_type=SUBJECT_TOKEN_TYPE,
token_url=TOKEN_URL,
service_account_impersonation_url=None,
client_id=None,
client_secret=None,
credential_source=self.CREDENTIAL_SOURCE_TEXT,
quota_project_id=None,
)

def test_from_file_full_options(self, tmpdir):
@mock.patch.object(identity_pool.Credentials, "__init__", return_value=None)
def test_from_file_full_options(self, mock_init, tmpdir):
info = {
"audience": AUDIENCE,
"subject_token_type": SUBJECT_TOKEN_TYPE,
Expand All @@ -307,18 +310,19 @@ def test_from_file_full_options(self, tmpdir):

# Confirm identity_pool.Credentials instantiated with expected attributes.
assert isinstance(credentials, identity_pool.Credentials)
self.assert_underlying_credentials_refresh(
credentials=credentials,
mock_init.assert_called_once_with(
audience=AUDIENCE,
subject_token=TEXT_FILE_SUBJECT_TOKEN,
subject_token_type=SUBJECT_TOKEN_TYPE,
token_url=TOKEN_URL,
service_account_impersonation_url=SERVICE_ACCOUNT_IMPERSONATION_URL,
basic_auth_encoding=BASIC_AUTH_ENCODING,
client_id=CLIENT_ID,
client_secret=CLIENT_SECRET,
credential_source=self.CREDENTIAL_SOURCE_TEXT,
quota_project_id=QUOTA_PROJECT_ID,
)

def test_from_file_required_options_only(self, tmpdir):
@mock.patch.object(identity_pool.Credentials, "__init__", return_value=None)
def test_from_file_required_options_only(self, mock_init, tmpdir):
info = {
"audience": AUDIENCE,
"subject_token_type": SUBJECT_TOKEN_TYPE,
Expand All @@ -331,12 +335,15 @@ def test_from_file_required_options_only(self, tmpdir):

# Confirm identity_pool.Credentials instantiated with expected attributes.
assert isinstance(credentials, identity_pool.Credentials)
self.assert_underlying_credentials_refresh(
credentials=credentials,
mock_init.assert_called_once_with(
audience=AUDIENCE,
subject_token=TEXT_FILE_SUBJECT_TOKEN,
subject_token_type=SUBJECT_TOKEN_TYPE,
token_url=TOKEN_URL,
service_account_impersonation_url=None,
client_id=None,
client_secret=None,
credential_source=self.CREDENTIAL_SOURCE_TEXT,
quota_project_id=None,
)

def test_constructor_invalid_options(self):
Expand Down
pFad - Phonifier reborn

Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.

Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.


Alternative Proxies:

Alternative Proxy

pFad Proxy

pFad v3 Proxy

pFad v4 Proxy