Asset: Update Real Time Feed API unit tests (GoogleCloudPlatform#2467)

cwxie-google · gguuss · commit c24be571ed70 · 2019-10-10T13:21:00.000-07:00
* Add Real Time Feed API Sample Code
* Update Real Time Feed API unit tests
diff --git a/asset/cloud-client/quickstart_createfeed_test.py b/asset/cloud-client/quickstart_createfeed_test.py
@@ -21,6 +21,7 @@
 import quickstart_createfeed
 import quickstart_deletefeed
 from google.cloud import resource_manager
+from google.cloud import pubsub_v1
 
 json_data = open(os.environ["GOOGLE_APPLICATION_CREDENTIALS"]).read()
 data = json.loads(json_data)
@@ -34,6 +35,9 @@ def test_create_feed(capsys):
     client = resource_manager.Client()
     project_number = client.fetch_project(PROJECT).number
     full_topic_name = "projects/{}/topics/{}".format(PROJECT, TOPIC)
+    publisher = pubsub_v1.PublisherClient()
+    topic_path = publisher.topic_path(PROJECT, TOPIC)
+    publisher.create_topic(topic_path)
     quickstart_createfeed.create_feed(
         PROJECT, FEED_ID, [ASSET_NAME, ], full_topic_name)
     out, _ = capsys.readouterr()
@@ -42,3 +46,4 @@ def test_create_feed(capsys):
     # Clean up, delete the feed
     feed_name = "projects/{}/feeds/{}".format(project_number, FEED_ID)
     quickstart_deletefeed.delete_feed(feed_name)
+    publisher.delete_topic(topic_path)
diff --git a/asset/cloud-client/quickstart_deletefeed_test.py b/asset/cloud-client/quickstart_deletefeed_test.py
@@ -20,6 +20,7 @@
 import quickstart_createfeed
 import quickstart_deletefeed
 from google.cloud import resource_manager
+from google.cloud import pubsub_v1
 
 PROJECT = os.environ['GCLOUD_PROJECT']
 ASSET_NAME = 'assets-{}'.format(int(time.time()))
@@ -32,6 +33,9 @@ def test_delete_feed(capsys):
     project_number = client.fetch_project(PROJECT).number
     # First create the feed, which will be deleted later
     full_topic_name = "projects/{}/topics/{}".format(PROJECT, TOPIC)
+    publisher = pubsub_v1.PublisherClient()
+    topic_path = publisher.topic_path(PROJECT, TOPIC)
+    publisher.create_topic(topic_path)
     quickstart_createfeed.create_feed(
         PROJECT, FEED_ID, [ASSET_NAME, ], full_topic_name)
 
@@ -40,3 +44,4 @@ def test_delete_feed(capsys):
 
     out, _ = capsys.readouterr()
     assert "deleted_feed" in out
+    publisher.delete_topic(topic_path)
diff --git a/asset/cloud-client/quickstart_getfeed_test.py b/asset/cloud-client/quickstart_getfeed_test.py
@@ -21,6 +21,7 @@
 import quickstart_deletefeed
 import quickstart_getfeed
 from google.cloud import resource_manager
+from google.cloud import pubsub_v1
 
 PROJECT = os.environ['GCLOUD_PROJECT']
 ASSET_NAME = 'assets-{}'.format(int(time.time()))
@@ -33,6 +34,9 @@ def test_get_feed(capsys):
     project_number = client.fetch_project(PROJECT).number
     # First create the feed, which will be gotten later
     full_topic_name = "projects/{}/topics/{}".format(PROJECT, TOPIC)
+    publisher = pubsub_v1.PublisherClient()
+    topic_path = publisher.topic_path(PROJECT, TOPIC)
+    publisher.create_topic(topic_path)
     quickstart_createfeed.create_feed(
         PROJECT, FEED_ID, [ASSET_NAME, ], full_topic_name)
 
@@ -43,3 +47,4 @@ def test_get_feed(capsys):
     assert "gotten_feed" in out
     # Clean up and delete the feed
     quickstart_deletefeed.delete_feed(feed_name)
+    publisher.delete_topic(topic_path)
diff --git a/asset/cloud-client/quickstart_updatefeed_test.py b/asset/cloud-client/quickstart_updatefeed_test.py
@@ -21,6 +21,7 @@
 import quickstart_deletefeed
 import quickstart_updatefeed
 from google.cloud import resource_manager
+from google.cloud import pubsub_v1
 
 PROJECT = os.environ['GCLOUD_PROJECT']
 ASSET_NAME = 'assets-{}'.format(int(time.time()))
@@ -34,14 +35,21 @@ def test_update_feed(capsys):
     project_number = client.fetch_project(PROJECT).number
     # First create the feed, which will be updated later
     full_topic_name = "projects/{}/topics/{}".format(PROJECT, TOPIC)
+    publisher = pubsub_v1.PublisherClient()
+    topic_path = publisher.topic_path(PROJECT, TOPIC)
+    publisher.create_topic(topic_path)
     quickstart_createfeed.create_feed(
         PROJECT, FEED_ID, [ASSET_NAME, ], full_topic_name)
 
     feed_name = "projects/{}/feeds/{}".format(project_number, FEED_ID)
     new_full_topic_name = "projects/" + PROJECT + "/topics/" + NEW_TOPIC
+    new_topic_path = publisher.topic_path(PROJECT, NEW_TOPIC)
+    publisher.create_topic(new_topic_path)
     quickstart_updatefeed.update_feed(feed_name, new_full_topic_name)
     out, _ = capsys.readouterr()
 
     assert "updated_feed" in out
     # Clean up and delete the feed
     quickstart_deletefeed.delete_feed(feed_name)
+    publisher.delete_topic(topic_path)
+    publisher.delete_topic(new_topic_path)
diff --git a/asset/cloud-client/requirements.txt b/asset/cloud-client/requirements.txt
@@ -1,3 +1,4 @@
 google-cloud-storage==1.18.0
 google-cloud-asset==0.4.1
-google-cloud-resource-manager==0.29.2
+google-cloud-resource-manager==0.29.2
+google-cloud-pubsub=1.0.2
