Skip to content
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

Catch PermissionDenied from create_subscription and continue to try t… #263

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Catch PermissionDenied from create_subscription and continue to try t… #263

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion rele/client.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@ def update_or_create_subscription(self, subscription):
topic = self._create_topic(topic_path)
logger.info(f"Topic {topic.name} created.")
self._create_subscription(subscription_path, topic_path, subscription)
except exceptions.AlreadyExists:
except (exceptions.AlreadyExists, exceptions.PermissionDenied):
self._update_subscription(subscription_path, topic_path, subscription)

def _create_topic(self, topic_path):
Expand Down
51 changes: 51 additions & 0 deletions tests/test_subscriber.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -266,6 +266,57 @@ def test_subscription_is_updated_with_retry_policy_when_already_exists(
request={"subscription": subscription, "update_mask": update_mask}
)

@patch.object(SubscriberClient, "create_subscription")
@patch.object(SubscriberClient, "update_subscription")
def test_updates_subscription_when_create_raises_permission_denied(
self,
client_update_subscription,
client_create_subscription,
project_id,
subscriber,
):
subscription_path = (
f"projects/{project_id}/subscriptions/{project_id}-test-topic"
)
topic_path = f"projects/{project_id}/topics/{project_id}-test-topic"
retry_policy = pubsub_v1.types.RetryPolicy(
minimum_backoff=duration_pb2.Duration(seconds=10),
maximum_backoff=duration_pb2.Duration(seconds=50),
)
update_mask = FieldMask(paths=["retry_policy"])
client_create_subscription.side_effect = exceptions.PermissionDenied(
message="Permission denied to create subscription"
)

expected_subscription = pubsub_v1.types.Subscription(
name=subscription_path,
topic=topic_path,
retry_policy=retry_policy,
)

subscriber.update_or_create_subscription(
Subscription(
None,
topic=f"{project_id}-test-topic",
retry_policy=RetryPolicy(10, 50),
)
)

client_create_subscription.assert_called_once_with(
request={
"name": subscription_path,
"topic": topic_path,
"ack_deadline_seconds": 60,
"retry_policy": retry_policy,
}
)
client_update_subscription.assert_called_once_with(
request={
"subscription": expected_subscription,
"update_mask": update_mask,
}
)

@patch.object(
SubscriberClient,
"create_subscription",
Expand Down