[cli] migrate delete command to google-cloud-pubsub 2.0.0

luischaparroc · Dec 15, 2020 · 3c955c0 · 3c955c0
1 parent aa57000
commit 3c955c0
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 4 deletions.
diff --git a/cli/src/klio_cli/commands/job/delete.py b/cli/src/klio_cli/commands/job/delete.py
@@ -103,7 +103,9 @@ def _delete_subscriptions(self, subscriptions):
         for subscription in subscriptions:
             logging.info("Deleting subscription {}".format(subscription))
             try:
-                client.delete_subscription(subscription)
+                client.delete_subscription(
+                    request={"subscription": subscription}
+                )
             except Exception:
                 logging.error(
                     "Failed to delete subscription {}".format(subscription),
@@ -118,7 +120,7 @@ def _delete_topics(self, topics):
         for topic in topics:
             logging.info("Deleting topic {}".format(topic))
             try:
-                client.delete_topic(topic)
+                client.delete_topic(request={"topic": topic})
             except Exception:
                 logging.error(
                     "Failed to delete topic {}".format(topic), exc_info=True

diff --git a/cli/tests/commands/job/test_delete.py b/cli/tests/commands/job/test_delete.py
@@ -207,7 +207,11 @@ def test_delete_subscription(
     mock_subscriber.return_value.delete_subscription.side_effect = effect
     delete_job_inst._delete_subscriptions(["a", "b", "c"])
     mock_subscriber.return_value.delete_subscription.assert_has_calls(
-        [mocker.call("a"), mocker.call("b"), mocker.call("c")]
+        [
+            mocker.call(request={"subscription": "a"}),
+            mocker.call(request={"subscription": "b"}),
+            mocker.call(request={"subscription": "c"}),
+        ]
     )
     assert 3 == mock_subscriber.return_value.delete_subscription.call_count
     assert record_count == len(caplog.records)
@@ -220,7 +224,11 @@ def test_delete_topic(
     mock_publisher.return_value.delete_topic.side_effect = effect
     delete_job_inst._delete_topics(["a", "b", "c"])
     mock_publisher.return_value.delete_topic.assert_has_calls(
-        [mocker.call("a"), mocker.call("b"), mocker.call("c")]
+        [
+            mocker.call(request={"topic": "a"}),
+            mocker.call(request={"topic": "b"}),
+            mocker.call(request={"topic": "c"}),
+        ]
     )
     assert 3 == mock_publisher.return_value.delete_topic.call_count
     assert record_count == len(caplog.records)