From 20a315d156ae3f43c0f110d9cbcb38e955e0fb9f Mon Sep 17 00:00:00 2001 From: HemangChothani Date: Wed, 5 Feb 2020 11:18:04 +0530 Subject: [PATCH 1/4] fix(storage): change scope for iam access token --- tests/system.py | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/tests/system.py b/tests/system.py index 66c565cdf..35ca421b5 100644 --- a/tests/system.py +++ b/tests/system.py @@ -977,8 +977,8 @@ def _create_signed_read_url_helper( method=method, client=Config.CLIENT, version=version, - service_account_email=None, - access_token=None, + service_account_email=service_account_email, + access_token=access_token, ) headers = {} @@ -1055,8 +1055,9 @@ def test_create_signed_read_url_v2_w_access_token(self): client = iam_credentials_v1.IAMCredentialsClient() service_account_email = Config.CLIENT._credentials.service_account_email name = client.service_account_path("-", service_account_email) - scope = ["https://www.googleapis.com/auth/devstorage.read_write"] + scope = ["https://www.googleapis.com/auth/cloud-platform"] response = client.generate_access_token(name, scope) + print(response.access_token) self._create_signed_read_url_helper( service_account_email=service_account_email, access_token=response.access_token, @@ -1066,7 +1067,7 @@ def test_create_signed_read_url_v4_w_access_token(self): client = iam_credentials_v1.IAMCredentialsClient() service_account_email = Config.CLIENT._credentials.service_account_email name = client.service_account_path("-", service_account_email) - scope = ["https://www.googleapis.com/auth/devstorage.read_write"] + scope = ["https://www.googleapis.com/auth/cloud-platform"] response = client.generate_access_token(name, scope) self._create_signed_read_url_helper( version="v4", From 2a52b97f91d01fe7900ad846bac53a7caf2ca096 Mon Sep 17 00:00:00 2001 From: Christopher Wilcox Date: Tue, 11 Feb 2020 14:27:23 -0800 Subject: [PATCH 2/4] fix: narrow scope --- tests/system.py | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/tests/system.py b/tests/system.py index 35ca421b5..3638852da 100644 --- a/tests/system.py +++ b/tests/system.py @@ -1055,9 +1055,11 @@ def test_create_signed_read_url_v2_w_access_token(self): client = iam_credentials_v1.IAMCredentialsClient() service_account_email = Config.CLIENT._credentials.service_account_email name = client.service_account_path("-", service_account_email) - scope = ["https://www.googleapis.com/auth/cloud-platform"] + scope = [ + 'https://www.googleapis.com/auth/devstorage.read_write', + 'https://www.googleapis.com/auth/iam' + ] response = client.generate_access_token(name, scope) - print(response.access_token) self._create_signed_read_url_helper( service_account_email=service_account_email, access_token=response.access_token, @@ -1067,7 +1069,10 @@ def test_create_signed_read_url_v4_w_access_token(self): client = iam_credentials_v1.IAMCredentialsClient() service_account_email = Config.CLIENT._credentials.service_account_email name = client.service_account_path("-", service_account_email) - scope = ["https://www.googleapis.com/auth/cloud-platform"] + scope = [ + 'https://www.googleapis.com/auth/devstorage.read_write', + 'https://www.googleapis.com/auth/iam' + ] response = client.generate_access_token(name, scope) self._create_signed_read_url_helper( version="v4", From 10adc53ef5e0c23a92580b89081fa7f763687b03 Mon Sep 17 00:00:00 2001 From: Christopher Wilcox Date: Tue, 11 Feb 2020 15:39:32 -0800 Subject: [PATCH 3/4] fix: trailing commas --- tests/system.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/system.py b/tests/system.py index 3638852da..5178b63e7 100644 --- a/tests/system.py +++ b/tests/system.py @@ -1057,7 +1057,7 @@ def test_create_signed_read_url_v2_w_access_token(self): name = client.service_account_path("-", service_account_email) scope = [ 'https://www.googleapis.com/auth/devstorage.read_write', - 'https://www.googleapis.com/auth/iam' + 'https://www.googleapis.com/auth/iam', ] response = client.generate_access_token(name, scope) self._create_signed_read_url_helper( @@ -1071,7 +1071,7 @@ def test_create_signed_read_url_v4_w_access_token(self): name = client.service_account_path("-", service_account_email) scope = [ 'https://www.googleapis.com/auth/devstorage.read_write', - 'https://www.googleapis.com/auth/iam' + 'https://www.googleapis.com/auth/iam', ] response = client.generate_access_token(name, scope) self._create_signed_read_url_helper( From 90854a92defd94385d7467874d12b887d2a048f2 Mon Sep 17 00:00:00 2001 From: Christopher Wilcox Date: Tue, 11 Feb 2020 15:54:14 -0800 Subject: [PATCH 4/4] chore: blacken --- tests/system.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/tests/system.py b/tests/system.py index 5178b63e7..7e29f5791 100644 --- a/tests/system.py +++ b/tests/system.py @@ -1056,8 +1056,8 @@ def test_create_signed_read_url_v2_w_access_token(self): service_account_email = Config.CLIENT._credentials.service_account_email name = client.service_account_path("-", service_account_email) scope = [ - 'https://www.googleapis.com/auth/devstorage.read_write', - 'https://www.googleapis.com/auth/iam', + "https://www.googleapis.com/auth/devstorage.read_write", + "https://www.googleapis.com/auth/iam", ] response = client.generate_access_token(name, scope) self._create_signed_read_url_helper( @@ -1070,8 +1070,8 @@ def test_create_signed_read_url_v4_w_access_token(self): service_account_email = Config.CLIENT._credentials.service_account_email name = client.service_account_path("-", service_account_email) scope = [ - 'https://www.googleapis.com/auth/devstorage.read_write', - 'https://www.googleapis.com/auth/iam', + "https://www.googleapis.com/auth/devstorage.read_write", + "https://www.googleapis.com/auth/iam", ] response = client.generate_access_token(name, scope) self._create_signed_read_url_helper(