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

Jump to bottom

New snippet to delete notification channel #1920

Merged
merged 10 commits into from
Dec 11, 2018
Merged

New snippet to delete notification channel #1920

Show file tree
Hide file tree
Changes from 9 commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
3cdec0d
New snippet to delete notification channel
engelke Dec 10, 2018
ee19cde
Restored inadvertently deleted line.
engelke Dec 10, 2018
926b8a1
Show message from exception
engelke Dec 10, 2018
9a66ef7
Force deletion for test
engelke Dec 10, 2018
17377ac
Reordered tests
engelke Dec 10, 2018
35e6f9a
Avoid teardown of deleted channel
engelke Dec 10, 2018
e0478e7
Typo fixed
engelke Dec 10, 2018
3686fe5
Another typo
engelke Dec 10, 2018
6d33fb2
Type compatibility
engelke Dec 10, 2018
7bec38e
Okay, no more than 79 characters
engelke Dec 10, 2018
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
15 changes: 15 additions & 0 deletions monitoring/api/v3/alerts-client/snippets.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,6 +90,21 @@ def replace_notification_channels(project_name, alert_policy_id, channel_ids):
# [END monitoring_alert_replace_channels]


# [START monitoring_alert_delete_channel]
def delete_notification_channels(project_name, channel_ids, force=None):
channel_client = monitoring_v3.NotificationChannelServiceClient()
for channel_id in channel_ids:
channel_name = '{}/notificationChannels/{}'.format(project_name, channel_id)
try:
channel_client.delete_notification_channel(channel_name, force=force)
print('Channel {} deleted'.format(channel_name))
except ValueError:
print('The parameters are invalid')
except Exception as e:
print('API call failed: {}'.format(e))
# [END monitoring_alert_delete_channel]


# [START monitoring_alert_backup_policies]
def backup(project_name):
alert_client = monitoring_v3.AlertPolicyServiceClient()
Expand Down
14 changes: 12 additions & 2 deletions monitoring/api/v3/alerts-client/snippets_test.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,8 +63,9 @@ def __enter__(self):
def __exit__(self, type, value, traceback):
# Delete the policy and channel we created.
self.alert_policy_client.delete_alert_policy(self.alert_policy.name)
self.notification_channel_client.delete_notification_channel(
self.notification_channel.name)
if self.notification_channel.name:
self.notification_channel_client.delete_notification_channel(
self.notification_channel.name)


@pytest.fixture(scope='session')
Expand Down Expand Up @@ -114,3 +115,12 @@ def test_backup_and_restore(capsys, pochan):
assert "Updated {0}".format(pochan.alert_policy.name) in out
assert "Updating channel {0}".format(
pochan.notification_channel.display_name) in out


def test_delete_channels(capsys, pochan):
notification_channel_id = pochan.notification_channel.name.split('/')[-1]
snippets.delete_notification_channels(
pochan.project_name, [notification_channel_id], force=True)
out, _ = capsys.readouterr()
assert "{0} deleted".format(notification_channel_id) in out
pochan.notification_channel.name = '' # So teardown is not tried