-
Notifications
You must be signed in to change notification settings - Fork 6.4k
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.
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
Pub/Sub: update how to test with mock #2555
Merged
Merged
Changes from all commits
Commits
Show all changes
26 commits
Select commit
Hold shift + click to select a range
1a85239
Update test with mock
anguillanneuf 1abf3c9
Merge branch 'master' into pubsub_mock
anguillanneuf 666b6bd
clean up resources after tests
anguillanneuf 0cccbf8
update test for async message reception
anguillanneuf 96c66fe
clean up resources for all tests
anguillanneuf 3acf66a
use unique resource names avoid test failures
anguillanneuf 5eba4fa
also delete subscriptions in cleanup phase
anguillanneuf 83bbf39
Merge branch 'master' into pubsub_mock
leahecole 475a57d
tim's suggestions
anguillanneuf 6617f22
Merge branch 'pubsub_mock' of github.com:GoogleCloudPlatform/python-d…
anguillanneuf bca6eef
unique topic name
anguillanneuf a3b9de3
Merge branch 'master' into pubsub_mock
anguillanneuf 06d0ce6
reformat
anguillanneuf 3242686
lint
anguillanneuf 8670eff
lint
anguillanneuf ffa76bb
update assert to remove bytestring notation
anguillanneuf e877d54
move cleanup code in fixture
anguillanneuf 6fb596c
rewrite PubSubToGCS test using dataflow testing module
anguillanneuf 85a3d98
lint
anguillanneuf 9ef38f5
missing import
anguillanneuf a4d9a26
redundant import
anguillanneuf b4a0120
david's suggestions
anguillanneuf 4fadbfc
update requirements.txt
anguillanneuf fffd0fd
Merge branch 'master' into pubsub_mock
busunkim96 7cf5693
black -l 79
anguillanneuf d2afe6a
Merge branch 'pubsub_mock' of github.com:GoogleCloudPlatform/python-d…
anguillanneuf File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -34,9 +34,9 @@ def get_topic_policy(project, topic_name): | |
|
||
policy = client.get_iam_policy(topic_path) | ||
|
||
print('Policy for topic {}:'.format(topic_path)) | ||
print("Policy for topic {}:".format(topic_path)) | ||
for binding in policy.bindings: | ||
print('Role: {}, Members: {}'.format(binding.role, binding.members)) | ||
print("Role: {}, Members: {}".format(binding.role, binding.members)) | ||
# [END pubsub_get_topic_policy] | ||
|
||
|
||
|
@@ -48,9 +48,9 @@ def get_subscription_policy(project, subscription_name): | |
|
||
policy = client.get_iam_policy(subscription_path) | ||
|
||
print('Policy for subscription {}:'.format(subscription_path)) | ||
print("Policy for subscription {}:".format(subscription_path)) | ||
for binding in policy.bindings: | ||
print('Role: {}, Members: {}'.format(binding.role, binding.members)) | ||
print("Role: {}, Members: {}".format(binding.role, binding.members)) | ||
# [END pubsub_get_subscription_policy] | ||
|
||
|
||
|
@@ -63,20 +63,17 @@ def set_topic_policy(project, topic_name): | |
policy = client.get_iam_policy(topic_path) | ||
|
||
# Add all users as viewers. | ||
policy.bindings.add( | ||
role='roles/pubsub.viewer', | ||
members=['allUsers']) | ||
policy.bindings.add(role="roles/pubsub.viewer", members=["allUsers"]) | ||
|
||
# Add a group as a publisher. | ||
policy.bindings.add( | ||
role='roles/pubsub.publisher', | ||
members=['group:[email protected]']) | ||
role="roles/pubsub.publisher", members=["group:[email protected]"] | ||
) | ||
|
||
# Set the policy | ||
policy = client.set_iam_policy(topic_path, policy) | ||
|
||
print('IAM policy for topic {} set: {}'.format( | ||
topic_name, policy)) | ||
print("IAM policy for topic {} set: {}".format(topic_name, policy)) | ||
# [END pubsub_set_topic_policy] | ||
|
||
|
||
|
@@ -89,20 +86,21 @@ def set_subscription_policy(project, subscription_name): | |
policy = client.get_iam_policy(subscription_path) | ||
|
||
# Add all users as viewers. | ||
policy.bindings.add( | ||
role='roles/pubsub.viewer', | ||
members=['allUsers']) | ||
policy.bindings.add(role="roles/pubsub.viewer", members=["allUsers"]) | ||
|
||
# Add a group as an editor. | ||
policy.bindings.add( | ||
role='roles/editor', | ||
members=['group:[email protected]']) | ||
role="roles/editor", members=["group:[email protected]"] | ||
) | ||
|
||
# Set the policy | ||
policy = client.set_iam_policy(subscription_path, policy) | ||
|
||
print('IAM policy for subscription {} set: {}'.format( | ||
subscription_name, policy)) | ||
print( | ||
"IAM policy for subscription {} set: {}".format( | ||
subscription_name, policy | ||
) | ||
) | ||
# [END pubsub_set_subscription_policy] | ||
|
||
|
||
|
@@ -112,16 +110,17 @@ def check_topic_permissions(project, topic_name): | |
client = pubsub_v1.PublisherClient() | ||
topic_path = client.topic_path(project, topic_name) | ||
|
||
permissions_to_check = [ | ||
'pubsub.topics.publish', | ||
'pubsub.topics.update' | ||
] | ||
permissions_to_check = ["pubsub.topics.publish", "pubsub.topics.update"] | ||
|
||
allowed_permissions = client.test_iam_permissions( | ||
topic_path, permissions_to_check) | ||
topic_path, permissions_to_check | ||
) | ||
|
||
print('Allowed permissions for topic {}: {}'.format( | ||
topic_path, allowed_permissions)) | ||
print( | ||
"Allowed permissions for topic {}: {}".format( | ||
topic_path, allowed_permissions | ||
) | ||
) | ||
# [END pubsub_test_topic_permissions] | ||
|
||
|
||
|
@@ -132,63 +131,73 @@ def check_subscription_permissions(project, subscription_name): | |
subscription_path = client.subscription_path(project, subscription_name) | ||
|
||
permissions_to_check = [ | ||
'pubsub.subscriptions.consume', | ||
'pubsub.subscriptions.update' | ||
"pubsub.subscriptions.consume", | ||
"pubsub.subscriptions.update", | ||
] | ||
|
||
allowed_permissions = client.test_iam_permissions( | ||
subscription_path, permissions_to_check) | ||
subscription_path, permissions_to_check | ||
) | ||
|
||
print('Allowed permissions for subscription {}: {}'.format( | ||
subscription_path, allowed_permissions)) | ||
print( | ||
"Allowed permissions for subscription {}: {}".format( | ||
subscription_path, allowed_permissions | ||
) | ||
) | ||
# [END pubsub_test_subscription_permissions] | ||
|
||
|
||
if __name__ == '__main__': | ||
if __name__ == "__main__": | ||
parser = argparse.ArgumentParser( | ||
description=__doc__, | ||
formatter_class=argparse.RawDescriptionHelpFormatter | ||
formatter_class=argparse.RawDescriptionHelpFormatter, | ||
) | ||
parser.add_argument('project', help='Your Google Cloud project ID') | ||
parser.add_argument("project", help="Your Google Cloud project ID") | ||
|
||
subparsers = parser.add_subparsers(dest='command') | ||
subparsers = parser.add_subparsers(dest="command") | ||
|
||
get_topic_policy_parser = subparsers.add_parser( | ||
'get-topic-policy', help=get_topic_policy.__doc__) | ||
get_topic_policy_parser.add_argument('topic_name') | ||
"get-topic-policy", help=get_topic_policy.__doc__ | ||
) | ||
get_topic_policy_parser.add_argument("topic_name") | ||
|
||
get_subscription_policy_parser = subparsers.add_parser( | ||
'get-subscription-policy', help=get_subscription_policy.__doc__) | ||
get_subscription_policy_parser.add_argument('subscription_name') | ||
"get-subscription-policy", help=get_subscription_policy.__doc__ | ||
) | ||
get_subscription_policy_parser.add_argument("subscription_name") | ||
|
||
set_topic_policy_parser = subparsers.add_parser( | ||
'set-topic-policy', help=set_topic_policy.__doc__) | ||
set_topic_policy_parser.add_argument('topic_name') | ||
"set-topic-policy", help=set_topic_policy.__doc__ | ||
) | ||
set_topic_policy_parser.add_argument("topic_name") | ||
|
||
set_subscription_policy_parser = subparsers.add_parser( | ||
'set-subscription-policy', help=set_subscription_policy.__doc__) | ||
set_subscription_policy_parser.add_argument('subscription_name') | ||
"set-subscription-policy", help=set_subscription_policy.__doc__ | ||
) | ||
set_subscription_policy_parser.add_argument("subscription_name") | ||
|
||
check_topic_permissions_parser = subparsers.add_parser( | ||
'check-topic-permissions', help=check_topic_permissions.__doc__) | ||
check_topic_permissions_parser.add_argument('topic_name') | ||
"check-topic-permissions", help=check_topic_permissions.__doc__ | ||
) | ||
check_topic_permissions_parser.add_argument("topic_name") | ||
|
||
check_subscription_permissions_parser = subparsers.add_parser( | ||
'check-subscription-permissions', | ||
help=check_subscription_permissions.__doc__) | ||
check_subscription_permissions_parser.add_argument('subscription_name') | ||
"check-subscription-permissions", | ||
help=check_subscription_permissions.__doc__, | ||
) | ||
check_subscription_permissions_parser.add_argument("subscription_name") | ||
|
||
args = parser.parse_args() | ||
|
||
if args.command == 'get-topic-policy': | ||
if args.command == "get-topic-policy": | ||
get_topic_policy(args.project, args.topic_name) | ||
elif args.command == 'get-subscription-policy': | ||
elif args.command == "get-subscription-policy": | ||
get_subscription_policy(args.project, args.subscription_name) | ||
elif args.command == 'set-topic-policy': | ||
elif args.command == "set-topic-policy": | ||
set_topic_policy(args.project, args.topic_name) | ||
elif args.command == 'set-subscription-policy': | ||
elif args.command == "set-subscription-policy": | ||
set_subscription_policy(args.project, args.subscription_name) | ||
elif args.command == 'check-topic-permissions': | ||
elif args.command == "check-topic-permissions": | ||
check_topic_permissions(args.project, args.topic_name) | ||
elif args.command == 'check-subscription-permissions': | ||
elif args.command == "check-subscription-permissions": | ||
check_subscription_permissions(args.project, args.subscription_name) |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Did we change the style for Python?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@busunkim96 I used
black
which automatically changed single quotes to double. Should I change back?