feat!: move to microgenerator (#58)

* feat!: move to microgenerator

* update UPGRADING.md

* rebase after the samples are moved

* update sample

* update sample

* update sample

* update sample

* fix linter

* fix linter

Author: arithmetic1728

asset/snippets/snippets/conftest.py

@@ -27,12 +27,12 @@
 import quickstart_deletefeed
 
 
-PROJECT = os.environ['GOOGLE_CLOUD_PROJECT']
+PROJECT = os.environ["GOOGLE_CLOUD_PROJECT"]
 
 
 @pytest.fixture(scope="module")
 def test_topic():
-    topic_id = f'topic-{uuid.uuid4().hex}'
+    topic_id = f"topic-{uuid.uuid4().hex}"
     publisher = pubsub_v1.PublisherClient()
     topic_path = publisher.topic_path(PROJECT, topic_id)
     topic = publisher.create_topic(topic_path)
@@ -44,7 +44,7 @@ def test_topic():
 
 @pytest.fixture(scope="module")
 def another_topic():
-    topic_id = f'topic-{uuid.uuid4().hex}'
+    topic_id = f"topic-{uuid.uuid4().hex}"
     publisher = pubsub_v1.PublisherClient()
     topic_path = publisher.topic_path(PROJECT, topic_id)
     topic = publisher.create_topic(topic_path)
@@ -56,13 +56,14 @@ def another_topic():
 
 @pytest.fixture(scope="module")
 def test_feed(test_topic):
-    feed_id = f'feed-{uuid.uuid4().hex}'
-    asset_name = f'assets-{uuid.uuid4().hex}'
+    feed_id = f"feed-{uuid.uuid4().hex}"
+    asset_name = f"assets-{uuid.uuid4().hex}"
 
     @backoff.on_exception(backoff.expo, InternalServerError, max_time=60)
     def create_feed():
         return quickstart_createfeed.create_feed(
-            PROJECT, feed_id, [asset_name, ], test_topic.name)
+            PROJECT, feed_id, [asset_name], test_topic.name
+        )
 
     feed = create_feed()
 

asset/snippets/snippets/noxfile.py

@@ -37,24 +37,22 @@
 
 TEST_CONFIG = {
     # You can opt out from the test for specific Python versions.
-    'ignored_versions': ["2.7"],
-
+    "ignored_versions": ["2.7"],
     # An envvar key for determining the project id to use. Change it
     # to 'BUILD_SPECIFIC_GCLOUD_PROJECT' if you want to opt in using a
     # build specific Cloud project. You can also use your own string
     # to use your own Cloud project.
-    'gcloud_project_env': 'GOOGLE_CLOUD_PROJECT',
+    "gcloud_project_env": "GOOGLE_CLOUD_PROJECT",
     # 'gcloud_project_env': 'BUILD_SPECIFIC_GCLOUD_PROJECT',
-
     # A dictionary you want to inject into your test. Don't put any
     # secrets here. These values will override predefined values.
-    'envs': {},
+    "envs": {},
 }
 
 
 try:
     # Ensure we can import noxfile_config in the project's directory.
-    sys.path.append('.')
+    sys.path.append(".")
     from noxfile_config import TEST_CONFIG_OVERRIDE
 except ImportError as e:
     print("No user noxfile_config found: detail: {}".format(e))
@@ -69,12 +67,12 @@ def get_pytest_env_vars():
     ret = {}
 
     # Override the GCLOUD_PROJECT and the alias.
-    env_key = TEST_CONFIG['gcloud_project_env']
+    env_key = TEST_CONFIG["gcloud_project_env"]
     # This should error out if not set.
-    ret['GOOGLE_CLOUD_PROJECT'] = os.environ[env_key]
+    ret["GOOGLE_CLOUD_PROJECT"] = os.environ[env_key]
 
     # Apply user supplied envs.
-    ret.update(TEST_CONFIG['envs'])
+    ret.update(TEST_CONFIG["envs"])
     return ret
 
 
@@ -83,7 +81,7 @@ def get_pytest_env_vars():
 ALL_VERSIONS = ["2.7", "3.6", "3.7", "3.8"]
 
 # Any default versions that should be ignored.
-IGNORED_VERSIONS = TEST_CONFIG['ignored_versions']
+IGNORED_VERSIONS = TEST_CONFIG["ignored_versions"]
 
 TESTED_VERSIONS = sorted([v for v in ALL_VERSIONS if v not in IGNORED_VERSIONS])
 
@@ -138,7 +136,7 @@ def lint(session):
     args = FLAKE8_COMMON_ARGS + [
         "--application-import-names",
         ",".join(local_names),
-        "."
+        ".",
     ]
     session.run("flake8", *args)
 
@@ -182,9 +180,9 @@ def py(session):
     if session.python in TESTED_VERSIONS:
         _session_tests(session)
     else:
-        session.skip("SKIPPED: {} tests are disabled for this sample.".format(
-            session.python
-        ))
+        session.skip(
+            "SKIPPED: {} tests are disabled for this sample.".format(session.python)
+        )
 
 
 #

asset/snippets/snippets/quickstart_batchgetassetshistory.py

@@ -21,36 +21,40 @@
 def batch_get_assets_history(project_id, asset_names):
     # [START asset_quickstart_batch_get_assets_history]
     from google.cloud import asset_v1
-    from google.cloud.asset_v1.proto import assets_pb2
-    from google.cloud.asset_v1 import enums
 
     # TODO project_id = 'Your Google Cloud Project ID'
     # TODO asset_names = 'Your asset names list, e.g.:
     # ["//storage.googleapis.com/[BUCKET_NAME]",]'
 
     client = asset_v1.AssetServiceClient()
-    parent = client.project_path(project_id)
-    content_type = enums.ContentType.RESOURCE
-    read_time_window = assets_pb2.TimeWindow()
+    parent = "projects/{}".format(project_id)
+    content_type = asset_v1.ContentType.RESOURCE
+    read_time_window = asset_v1.TimeWindow()
     response = client.batch_get_assets_history(
-        parent, content_type, read_time_window, asset_names)
-    print('assets: {}'.format(response.assets))
+        request={
+            "parent": parent,
+            "asset_names": asset_names,
+            "content_type": content_type,
+            "read_time_window": read_time_window,
+        }
+    )
+    print("assets: {}".format(response.assets))
     # [END asset_quickstart_batch_get_assets_history]
 
 
-if __name__ == '__main__':
+if __name__ == "__main__":
     parser = argparse.ArgumentParser(
-        description=__doc__,
-        formatter_class=argparse.RawDescriptionHelpFormatter
+        description=__doc__, formatter_class=argparse.RawDescriptionHelpFormatter
     )
-    parser.add_argument('project_id', help='Your Google Cloud project ID')
+    parser.add_argument("project_id", help="Your Google Cloud project ID")
     parser.add_argument(
-        'asset_names',
-        help='The asset names for which history will be fetched, comma '
-        'delimited, e.g.: //storage.googleapis.com/[BUCKET_NAME]')
+        "asset_names",
+        help="The asset names for which history will be fetched, comma "
+        "delimited, e.g.: //storage.googleapis.com/[BUCKET_NAME]",
+    )
 
     args = parser.parse_args()
 
-    asset_name_list = args.asset_names.split(',')
+    asset_name_list = args.asset_names.split(",")
 
     batch_get_assets_history(args.project_id, asset_name_list)

asset/snippets/snippets/quickstart_batchgetassetshistory_test.py

@@ -24,16 +24,16 @@
 
 import quickstart_batchgetassetshistory
 
-PROJECT = os.environ['GOOGLE_CLOUD_PROJECT']
-BUCKET = 'assets-{}'.format(uuid.uuid4().hex)
+PROJECT = os.environ["GOOGLE_CLOUD_PROJECT"]
+BUCKET = "assets-{}".format(uuid.uuid4().hex)
 
 
-@pytest.fixture(scope='module')
+@pytest.fixture(scope="module")
 def storage_client():
     yield storage.Client()
 
 
-@pytest.fixture(scope='module')
+@pytest.fixture(scope="module")
 def asset_bucket(storage_client):
     bucket = storage_client.create_bucket(BUCKET)
 
@@ -42,20 +42,19 @@ def asset_bucket(storage_client):
     try:
         bucket.delete(force=True)
     except Exception as e:
-        print('Failed to delete bucket{}'.format(BUCKET))
+        print("Failed to delete bucket{}".format(BUCKET))
         raise e
 
 
 def test_batch_get_assets_history(asset_bucket, capsys):
-    bucket_asset_name = '//storage.googleapis.com/{}'.format(BUCKET)
-    asset_names = [bucket_asset_name, ]
+    bucket_asset_name = "//storage.googleapis.com/{}".format(BUCKET)
+    asset_names = [
+        bucket_asset_name,
+    ]
 
-    @backoff.on_exception(
-        backoff.expo, (AssertionError, InvalidArgument), max_time=30
-    )
+    @backoff.on_exception(backoff.expo, (AssertionError, InvalidArgument), max_time=30)
     def eventually_consistent_test():
-        quickstart_batchgetassetshistory.batch_get_assets_history(
-            PROJECT, asset_names)
+        quickstart_batchgetassetshistory.batch_get_assets_history(PROJECT, asset_names)
         out, _ = capsys.readouterr()
 
         assert bucket_asset_name in out

asset/snippets/snippets/quickstart_createfeed.py

@@ -21,7 +21,6 @@
 def create_feed(project_id, feed_id, asset_names, topic):
     # [START asset_quickstart_create_feed]
     from google.cloud import asset_v1
-    from google.cloud.asset_v1.proto import asset_service_pb2
 
     # TODO project_id = 'Your Google Cloud Project ID'
     # TODO feed_id = 'Feed ID you want to create'
@@ -30,23 +29,24 @@ def create_feed(project_id, feed_id, asset_names, topic):
 
     client = asset_v1.AssetServiceClient()
     parent = "projects/{}".format(project_id)
-    feed = asset_service_pb2.Feed()
+    feed = asset_v1.Feed()
     feed.asset_names.extend(asset_names)
     feed.feed_output_config.pubsub_destination.topic = topic
-    response = client.create_feed(parent, feed_id, feed)
-    print('feed: {}'.format(response))
+    response = client.create_feed(
+        request={"parent": parent, "feed_id": feed_id, "feed": feed}
+    )
+    print("feed: {}".format(response))
     # [END asset_quickstart_create_feed]
     return response
 
 
-if __name__ == '__main__':
+if __name__ == "__main__":
     parser = argparse.ArgumentParser(
-        description=__doc__,
-        formatter_class=argparse.RawDescriptionHelpFormatter)
-    parser.add_argument('project_id', help='Your Google Cloud project ID')
-    parser.add_argument('feed_id', help='Feed ID you want to create')
-    parser.add_argument('asset_names',
-                        help='List of asset names the feed listen to')
-    parser.add_argument('topic', help='Topic name of the feed')
+        description=__doc__, formatter_class=argparse.RawDescriptionHelpFormatter
+    )
+    parser.add_argument("project_id", help="Your Google Cloud project ID")
+    parser.add_argument("feed_id", help="Feed ID you want to create")
+    parser.add_argument("asset_names", help="List of asset names the feed listen to")
+    parser.add_argument("topic", help="Topic name of the feed")
     args = parser.parse_args()
     create_feed(args.project_id, args.feed_id, args.asset_names, args.topic)

asset/snippets/snippets/quickstart_createfeed_test.py

@@ -20,14 +20,15 @@
 import quickstart_createfeed
 
 
-PROJECT = os.environ['GOOGLE_CLOUD_PROJECT']
-ASSET_NAME = 'assets-{}'.format(uuid.uuid4().hex)
-FEED_ID = 'feed-{}'.format(uuid.uuid4().hex)
+PROJECT = os.environ["GOOGLE_CLOUD_PROJECT"]
+ASSET_NAME = "assets-{}".format(uuid.uuid4().hex)
+FEED_ID = "feed-{}".format(uuid.uuid4().hex)
 
 
 def test_create_feed(capsys, test_topic, deleter):
     feed = quickstart_createfeed.create_feed(
-        PROJECT, FEED_ID, [ASSET_NAME, ], test_topic.name)
+        PROJECT, FEED_ID, [ASSET_NAME], test_topic.name
+    )
     deleter.append(feed.name)
     out, _ = capsys.readouterr()
     assert "feed" in out

asset/snippets/snippets/quickstart_deletefeed.py

@@ -25,15 +25,15 @@ def delete_feed(feed_name):
     # TODO feed_name = 'Feed name you want to delete'
 
     client = asset_v1.AssetServiceClient()
-    client.delete_feed(feed_name)
-    print('deleted_feed')
+    client.delete_feed(request={"name": feed_name})
+    print("deleted_feed")
     # [END asset_quickstart_delete_feed]
 
 
-if __name__ == '__main__':
+if __name__ == "__main__":
     parser = argparse.ArgumentParser(
-        description=__doc__,
-        formatter_class=argparse.RawDescriptionHelpFormatter)
-    parser.add_argument('feed_name', help='Feed name you want to delete')
+        description=__doc__, formatter_class=argparse.RawDescriptionHelpFormatter
+    )
+    parser.add_argument("feed_name", help="Feed name you want to delete")
     args = parser.parse_args()
     delete_feed(args.feed_name)

asset/snippets/snippets/quickstart_deletefeed_test.py

@@ -19,7 +19,7 @@
 import quickstart_deletefeed
 
 
-PROJECT = os.environ['GOOGLE_CLOUD_PROJECT']
+PROJECT = os.environ["GOOGLE_CLOUD_PROJECT"]
 
 
 def test_delete_feed(capsys, test_feed):

asset/snippets/snippets/quickstart_exportassets.py

@@ -21,31 +21,32 @@
 def export_assets(project_id, dump_file_path):
     # [START asset_quickstart_export_assets]
     from google.cloud import asset_v1
-    from google.cloud.asset_v1.proto import asset_service_pb2
 
     # TODO project_id = 'Your Google Cloud Project ID'
     # TODO dump_file_path = 'Your asset dump file path'
 
     client = asset_v1.AssetServiceClient()
-    parent = client.project_path(project_id)
-    output_config = asset_service_pb2.OutputConfig()
+    parent = "projects/{}".format(project_id)
+    output_config = asset_v1.OutputConfig()
     output_config.gcs_destination.uri = dump_file_path
-    response = client.export_assets(parent, output_config)
+    response = client.export_assets(
+        request={"parent": parent, "output_config": output_config}
+    )
     print(response.result())
     # [END asset_quickstart_export_assets]
 
 
-if __name__ == '__main__':
+if __name__ == "__main__":
 
     parser = argparse.ArgumentParser(
-        description=__doc__,
-        formatter_class=argparse.RawDescriptionHelpFormatter
+        description=__doc__, formatter_class=argparse.RawDescriptionHelpFormatter
     )
-    parser.add_argument('project_id', help='Your Google Cloud project ID')
+    parser.add_argument("project_id", help="Your Google Cloud project ID")
     parser.add_argument(
-        'dump_file_path',
-        help='The file ExportAssets API will dump assets to, '
-        'e.g.: gs://<bucket-name>/asset_dump_file')
+        "dump_file_path",
+        help="The file ExportAssets API will dump assets to, "
+        "e.g.: gs://<bucket-name>/asset_dump_file",
+    )
 
     args = parser.parse_args()
 

asset/snippets/snippets/quickstart_exportassets_test.py

@@ -22,16 +22,16 @@
 
 import quickstart_exportassets
 
-PROJECT = os.environ['GOOGLE_CLOUD_PROJECT']
-BUCKET = 'assets-{}'.format(uuid.uuid4().hex)
+PROJECT = os.environ["GOOGLE_CLOUD_PROJECT"]
+BUCKET = "assets-{}".format(uuid.uuid4().hex)
 
 
-@pytest.fixture(scope='module')
+@pytest.fixture(scope="module")
 def storage_client():
     yield storage.Client()
 
 
-@pytest.fixture(scope='module')
+@pytest.fixture(scope="module")
 def asset_bucket(storage_client):
     bucket = storage_client.create_bucket(BUCKET)
 
@@ -40,12 +40,12 @@ def asset_bucket(storage_client):
     try:
         bucket.delete(force=True)
     except Exception as e:
-        print('Failed to delete bucket{}'.format(BUCKET))
+        print("Failed to delete bucket{}".format(BUCKET))
         raise e
 
 
 def test_export_assets(asset_bucket, capsys):
-    dump_file_path = 'gs://{}/assets-dump.txt'.format(asset_bucket)
+    dump_file_path = "gs://{}/assets-dump.txt".format(asset_bucket)
     quickstart_exportassets.export_assets(PROJECT, dump_file_path)
     out, _ = capsys.readouterr()