8000 remove unused region tags (#2615) · pardeep-tm/python-docs-samples@dcb1632 · GitHub
[go: up one dir, main page]

Skip to content

Commit dcb1632

Browse files
authored
remove unused region tags (GoogleCloudPlatform#2615)
* remove unused region tags * lint
1 parent 9e37c6f commit dcb1632

File tree

1 file changed

+1
-29
lines changed

1 file changed

+1
-29
lines changed

storage/signed_urls/generate_signed_urls.py

Lines changed: 1 addition & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@
2222
"""
2323

2424
# [START storage_signed_url_all]
25-
# [START storage_signed_url_dependencies]
2625
import binascii
2726
import collections
2827
import datetime
@@ -33,13 +32,9 @@
3332
import six
3433
from six.moves.urllib.parse import quote
3534

36-
# [START storage_signed_url_signer]
3735
# pip install google-auth
3836
from google.oauth2 import service_account
3937

40-
# [END storage_signed_url_signer]
41-
# [END storage_signed_url_dependencies]
42-
4338

4439
def generate_signed_url(service_account_file, bucket_name, object_name,
4540
subresource=None, expiration=604800, http_method='GET',
@@ -49,30 +44,21 @@ def generate_signed_url(service_account_file, bucket_name, object_name,
4944
print('Expiration Time can\'t be longer than 604800 seconds (7 days).')
5045
sys.exit(1)
5146

52-
# [START storage_signed_url_canonical_uri]
5347
escaped_object_name = quote(six.ensure_binary(object_name), safe=b'/~')
5448
canonical_uri = '/{}'.format(escaped_object_name)
55-
# [END storage_signed_url_canonical_uri]
5649

57-
# [START storage_signed_url_canonical_datetime]
5850
datetime_now = datetime.datetime.utcnow()
5951
request_timestamp = datetime_now.strftime('%Y%m%dT%H%M%SZ')
6052
datestamp = datetime_now.strftime('%Y%m%d')
61-
# [END storage_signed_url_canonical_datetime]
6253

63-
# [START storage_signed_url_credentials]
64-
# [START storage_signed_url_signer]
6554
google_credentials = service_account.Credentials.from_service_account_file(
6655
service_account_file)
67-
# [END storage_signed_url_signer]
6856
client_email = google_credentials.service_account_email
6957
credential_scope = '{}/auto/storage/goog4_request'.format(datestamp)
7058
credential = '{}/{}'.format(client_email, credential_scope)
71-
# [END storage_signed_url_credentials]
7259

7360
if headers is None:
7461
headers = dict()
75-
# [START storage_signed_url_canonical_headers]
7662
host = '{}.storage.googleapis.com'.format(bucket_name)
7763
headers['host'] = host
7864

@@ -82,19 +68,15 @@ def generate_signed_url(service_account_file, bucket_name, object_name,
8268
lower_k = str(k).lower()
8369
strip_v = str(v).lower()
8470
canonical_headers += '{}:{}\n'.format(lower_k, strip_v)
85-
# [END storage_signed_url_canonical_headers]
8671

87-
# [START storage_signed_url_signed_headers]
8872
signed_headers = ''
8973
for k, _ in ordered_headers.items():
9074
lower_k = str(k).lower()
9175
signed_headers += '{};'.format(lower_k)
9276
signed_headers = signed_headers[:-1] # remove trailing ';'
93-
# [END storage_signed_url_signed_headers]
9477

9578
if query_parameters is None:
9679
query_parameters = dict()
97-
# [START storage_signed_url_canonical_query_parameters]
9880
query_parameters['X-Goog-Algorithm'] = 'GOOG4-RSA-SHA256'
9981
query_parameters['X-Goog-Credential'] = credential
10082
query_parameters['X-Goog-Date'] = request_timestamp
@@ -111,40 +93,30 @@ def generate_signed_url(service_account_file, bucket_name, object_name,
11193
encoded_v = quote(str(v), safe='')
11294
canonical_query_string += '{}={}&'.format(encoded_k, encoded_v)
11395
canonical_query_string = canonical_query_string[:-1] # remove trailing '&'
114-
# [END storage_signed_url_canonical_query_parameters]
11596

116-
# [START storage_signed_url_canonical_request]
11797
canonical_request = '\n'.join([http_method,
11898
canonical_uri,
11999
canonical_query_string,
120100
canonical_headers,
121101
signed_headers,
122102
'UNSIGNED-PAYLOAD'])
123-
# [END storage_signed_url_canonical_request]
124103

125-
# [START storage_signed_url_hash]
126104
canonical_request_hash = hashlib.sha256(
127105
canonical_request.encode()).hexdigest()
128-
# [END storage_signed_url_hash]
129106

130-
# [START storage_signed_url_string_to_sign]
131107
string_to_sign = '\n'.join(['GOOG4-RSA-SHA256',
132108
request_timestamp,
133109
credential_scope,
134110
canonical_request_hash])
135-
# [END storage_signed_url_string_to_sign]
136111

137-
# [START storage_signed_url_signer]
138112
signature = binascii.hexlify(
139113
google_credentials.signer.sign(string_to_sign)
140114
).decode()
141-
# [END storage_signed_url_signer]
142115

143-
# [START storage_signed_url_construction]
144116
scheme_and_host = '{}://{}'.format('https', host)
145117
signed_url = '{}{}?{}&x-goog-signature={}'.format(
146118
scheme_and_host, canonical_uri, canonical_query_string, signature)
147-
# [END storage_signed_url_construction]
119+
148120
return signed_url
149121
# [END storage_signed_url_all]
150122

0 commit comments

Comments
 (0)
0