From 4928a207a3e356a6a80f1a2a6ad38a896f6a7d6a Mon Sep 17 00:00:00 2001 From: Andrew Gorcester Date: Tue, 2 Apr 2019 10:52:43 -0700 Subject: [PATCH] Revert "[CloudAsset] Update client library version to v1. (#2076)" This reverts commit eef7f5bb0a7f1bc1d00fccf18f15847f4c77757b. --- asset/cloud-client/quickstart_batchgetassetshistory.py | 9 +++++---- asset/cloud-client/quickstart_exportassets.py | 6 +++--- asset/cloud-client/requirements.txt | 2 +- 3 files changed, 9 insertions(+), 8 deletions(-) diff --git a/asset/cloud-client/quickstart_batchgetassetshistory.py b/asset/cloud-client/quickstart_batchgetassetshistory.py index ca6a29ac92c..5bac977176b 100644 --- a/asset/cloud-client/quickstart_batchgetassetshistory.py +++ b/asset/cloud-client/quickstart_batchgetassetshistory.py @@ -20,18 +20,19 @@ 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 + from google.cloud import asset_v1beta1 + from google.cloud.asset_v1beta1.proto import assets_pb2 + from google.cloud.asset_v1beta1 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() + client = asset_v1beta1.AssetServiceClient() parent = client.project_path(project_id) content_type = enums.ContentType.RESOURCE read_time_window = assets_pb2.TimeWindow() + read_time_window.start_time.GetCurrentTime() response = client.batch_get_assets_history( parent, content_type, read_time_window, asset_names) print('assets: {}'.format(response.assets)) diff --git a/asset/cloud-client/quickstart_exportassets.py b/asset/cloud-client/quickstart_exportassets.py index ddc05e5544e..036130dc3cc 100644 --- a/asset/cloud-client/quickstart_exportassets.py +++ b/asset/cloud-client/quickstart_exportassets.py @@ -20,13 +20,13 @@ 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 + from google.cloud import asset_v1beta1 + from google.cloud.asset_v1beta1.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() + client = asset_v1beta1.AssetServiceClient() parent = client.project_path(project_id) output_config = asset_service_pb2.OutputConfig() output_config.gcs_destination.uri = dump_file_path diff --git a/asset/cloud-client/requirements.txt b/asset/cloud-client/requirements.txt index 0e87ed672ee..1fb91cc49c4 100644 --- a/asset/cloud-client/requirements.txt +++ b/asset/cloud-client/requirements.txt @@ -1,2 +1,2 @@ google-cloud-storage==1.13.2 -google-cloud-asset==0.2.0 +google-cloud-asset==0.1.2