From 52a004fbf60525ae12ee804219bb3d196d2d8a1d Mon Sep 17 00:00:00 2001 From: Brandon Yarbrough Date: Wed, 27 Sep 2017 11:51:06 -0700 Subject: [PATCH 1/3] Add support for overwrite attributes, bug fixes --- storage/cloud-client/notification_polling.py | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/storage/cloud-client/notification_polling.py b/storage/cloud-client/notification_polling.py index 73b921de4c0..e1afc1d3c95 100644 --- a/storage/cloud-client/notification_polling.py +++ b/storage/cloud-client/notification_polling.py @@ -41,7 +41,7 @@ $ gcloud beta pubsub subscriptions create testsubscription --topic=testtopic 6. Run this program: - $ python notification_polling my-project-id testsubscription + $ python notification_polling.py my-project-id testsubscription 7. While the program is running, upload and delete some files in the testbucket bucket (you could use the console or gsutil) and watch as changes scroll by @@ -64,6 +64,8 @@ def summarize(message): bucket_id = attributes['bucketId'] object_id = attributes['objectId'] generation = attributes['objectGeneration'] + overwroteGeneration = attributes['overwroteGeneration'] + overwrittenByGeneration = attributes['overwrittenByGeneration'] description = ( '\tEvent type: {event_type}\n' '\tBucket ID: {bucket_id}\n' @@ -74,6 +76,12 @@ def summarize(message): object_id=object_id, generation=generation) + if overwroteGeneration: + description += '\tOverwrote generation: %s\n' % overwroteGeneration + if overwrittenByGeneration: + description += '\tOverwritten by generation: %s\n' % ( + overwrittenByGeneration) + payload_format = attributes['payloadFormat'] if payload_format == 'JSON_API_V1': object_metadata = json.loads(data) @@ -99,7 +107,7 @@ def poll_notifications(project, subscription_name): project, subscription_name) def callback(message): - print('Received message:\n{1}'.format(summarize(message))) + print('Received message:\n{}'.format(summarize(message))) message.ack() subscriber.subscribe(subscription_path, callback=callback) From 5f94d8e5627d9fe8fd2a772a118a0682ed45d91f Mon Sep 17 00:00:00 2001 From: Brandon Yarbrough Date: Wed, 27 Sep 2017 11:57:40 -0700 Subject: [PATCH 2/3] Lint fix for overwrite line --- storage/cloud-client/notification_polling.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/storage/cloud-client/notification_polling.py b/storage/cloud-client/notification_polling.py index e1afc1d3c95..b5f41fedf27 100644 --- a/storage/cloud-client/notification_polling.py +++ b/storage/cloud-client/notification_polling.py @@ -77,10 +77,10 @@ def summarize(message): generation=generation) if overwroteGeneration: - description += '\tOverwrote generation: %s\n' % overwroteGeneration + description += '\tOverwrote generation: %s\n' % overwroteGeneration if overwrittenByGeneration: - description += '\tOverwritten by generation: %s\n' % ( - overwrittenByGeneration) + description += '\tOverwritten by generation: %s\n' % ( + overwrittenByGeneration) payload_format = attributes['payloadFormat'] if payload_format == 'JSON_API_V1': From 5f75a84db695f0ad8d7ce46f0c9fed10005ae1f9 Mon Sep 17 00:00:00 2001 From: Brandon Yarbrough Date: Wed, 27 Sep 2017 12:10:30 -0700 Subject: [PATCH 3/3] Switch variable to snake_case --- storage/cloud-client/notification_polling.py | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/storage/cloud-client/notification_polling.py b/storage/cloud-client/notification_polling.py index b5f41fedf27..94d249c94ca 100644 --- a/storage/cloud-client/notification_polling.py +++ b/storage/cloud-client/notification_polling.py @@ -64,8 +64,8 @@ def summarize(message): bucket_id = attributes['bucketId'] object_id = attributes['objectId'] generation = attributes['objectGeneration'] - overwroteGeneration = attributes['overwroteGeneration'] - overwrittenByGeneration = attributes['overwrittenByGeneration'] + overwrote_generation = attributes['overwroteGeneration'] + overwritten_by_generation = attributes['overwrittenByGeneration'] description = ( '\tEvent type: {event_type}\n' '\tBucket ID: {bucket_id}\n' @@ -76,11 +76,11 @@ def summarize(message): object_id=object_id, generation=generation) - if overwroteGeneration: - description += '\tOverwrote generation: %s\n' % overwroteGeneration - if overwrittenByGeneration: + if overwrote_generation: + description += '\tOverwrote generation: %s\n' % overwrote_generation + if overwritten_by_generation: description += '\tOverwritten by generation: %s\n' % ( - overwrittenByGeneration) + overwritten_by_generation) payload_format = attributes['payloadFormat'] if payload_format == 'JSON_API_V1':