From 2318a0963bd274333447cd366b718b7f1ee39b52 Mon Sep 17 00:00:00 2001 From: Larittic-GG Date: Thu, 23 Jul 2020 23:37:22 -0700 Subject: [PATCH 1/4] Add sample code for Cloud Assets Inventory ListAssets v1p5beta1 APIs. --- .../com/example/asset/ListAssetsExample.java | 64 +++++++++++++++++++ .../java/com/example/asset/ListAssets.java | 58 +++++++++++++++++ 2 files changed, 122 insertions(+) create mode 100644 asset/cloud-client/src/main/java/com/example/asset/ListAssetsExample.java create mode 100644 asset/cloud-client/src/test/java/com/example/asset/ListAssets.java diff --git a/asset/cloud-client/src/main/java/com/example/asset/ListAssetsExample.java b/asset/cloud-client/src/main/java/com/example/asset/ListAssetsExample.java new file mode 100644 index 00000000000..8d938023866 --- /dev/null +++ b/asset/cloud-client/src/main/java/com/example/asset/ListAssetsExample.java @@ -0,0 +1,64 @@ +/* + * Copyright 2020 Google LLC + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package com.example.asset; + +// [START asset_quickstart_list_assets] +// Imports the Google Cloud client library + +import com.google.cloud.ServiceOptions; +import com.google.cloud.asset.v1p5beta1.AssetServiceClient; +import com.google.cloud.asset.v1p5beta1.AssetServiceClient.ListAssetsPagedResponse; +import com.google.cloud.asset.v1p5beta1.ListAssetsRequest; +import com.google.cloud.asset.v1p5beta1.ContentType; +import com.google.cloud.asset.v1.ProjectName; +import java.util.Arrays; + +public class ListAssetsExample { + + // Use the default project Id (configure it by setting environment variable + // "GOOGLE_CLOUD_PROJECT"). + private static final String projectId = ServiceOptions.getDefaultProjectId(); + + // List assets of a project. + // @param args types of the assets to list. + public static void main(String... args) throws Exception { + // Asset types, e.g.: + // "storage.googleapis.com/Bucket,bigquery.googleapis.com/Table". + // See full list of supported asset types at + // https://cloud.google.com/asset-inventory/docs/supported-asset-types. + String[] assetTypes = args[0].split(","); + try (AssetServiceClient client = AssetServiceClient.create()) { + ProjectName parent = ProjectName.of(projectId); + ContentType contentType = ContentType.CONTENT_TYPE_UNSPECIFIED; + ListAssetsRequest request = ListAssetsRequest.newBuilder() + .setParent(parent.toString()) + .addAllAssetTypes(Arrays.asList(assetTypes)) + .setContentType(contentType) + .build(); + // Repeatedly call ListAssets until page token is empty. + ListAssetsPagedResponse response = client.listAssets(request); + System.out.println(response); + while (!response.getNextPageToken().isEmpty()) { + request = request.toBuilder() + .setPageToken(response.getNextPageToken()).build(); + response = client.listAssets(request); + System.out.println(response); + } + } + } +} +// [END asset_quickstart_list_assets] diff --git a/asset/cloud-client/src/test/java/com/example/asset/ListAssets.java b/asset/cloud-client/src/test/java/com/example/asset/ListAssets.java new file mode 100644 index 00000000000..b0c9d14161d --- /dev/null +++ b/asset/cloud-client/src/test/java/com/example/asset/ListAssets.java @@ -0,0 +1,58 @@ +/* + * Copyright 2020 Google LLC + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package com.example.asset; + +import static com.google.common.truth.Truth.assertThat; + +import com.google.cloud.ServiceOptions; +import java.io.ByteArrayOutputStream; +import java.io.PrintStream; +import java.util.UUID; +import org.junit.After; +import org.junit.Before; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.junit.runners.JUnit4; + +/** Tests for list assets sample. */ +@RunWith(JUnit4.class) +@SuppressWarnings("checkstyle:abbreviationaswordinname") +public class ListAssets { + private ByteArrayOutputStream bout; + + @Before + public void setUp() { + bout = new ByteArrayOutputStream(); + System.setOut(new PrintStream(bout)); + } + + @After + public void tearDown() { + System.setOut(null); + bout.reset(); + } + + @Test + public void testListAssetsExample() throws Exception { + String assetTypes = "storage.googleapis.com/Bucket,bigquery.googleapis.com/Table"; + ListAssetsExample.main(assetTypes); + String got = bout.toString(); + if (!got.isEmpty()) { + assertThat(got).contains("asset"); + } + } +} From 5f35d80265d4e8d2a10875830b6badb82aa3c4c6 Mon Sep 17 00:00:00 2001 From: Larittic-GG Date: Thu, 23 Jul 2020 23:42:46 -0700 Subject: [PATCH 2/4] Fix lint. --- .../src/main/java/com/example/asset/ListAssetsExample.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/asset/cloud-client/src/main/java/com/example/asset/ListAssetsExample.java b/asset/cloud-client/src/main/java/com/example/asset/ListAssetsExample.java index 8d938023866..810180aa313 100644 --- a/asset/cloud-client/src/main/java/com/example/asset/ListAssetsExample.java +++ b/asset/cloud-client/src/main/java/com/example/asset/ListAssetsExample.java @@ -20,11 +20,11 @@ // Imports the Google Cloud client library import com.google.cloud.ServiceOptions; +import com.google.cloud.asset.v1.ProjectName; import com.google.cloud.asset.v1p5beta1.AssetServiceClient; import com.google.cloud.asset.v1p5beta1.AssetServiceClient.ListAssetsPagedResponse; -import com.google.cloud.asset.v1p5beta1.ListAssetsRequest; import com.google.cloud.asset.v1p5beta1.ContentType; -import com.google.cloud.asset.v1.ProjectName; +import com.google.cloud.asset.v1p5beta1.ListAssetsRequest; import java.util.Arrays; public class ListAssetsExample { From 48a05518fdfcb2fb67956e303673bbcfd615a6d3 Mon Sep 17 00:00:00 2001 From: Larittic-GG Date: Fri, 31 Jul 2020 10:11:42 -0700 Subject: [PATCH 3/4] Revamped according to style guide. --- .../com/example/asset/ListAssetsExample.java | 28 +++++++++++-------- .../java/com/example/asset/ListAssets.java | 9 ++++-- 2 files changed, 24 insertions(+), 13 deletions(-) diff --git a/asset/cloud-client/src/main/java/com/example/asset/ListAssetsExample.java b/asset/cloud-client/src/main/java/com/example/asset/ListAssetsExample.java index 810180aa313..6a1623b9399 100644 --- a/asset/cloud-client/src/main/java/com/example/asset/ListAssetsExample.java +++ b/asset/cloud-client/src/main/java/com/example/asset/ListAssetsExample.java @@ -29,26 +29,32 @@ public class ListAssetsExample { - // Use the default project Id (configure it by setting environment variable - // "GOOGLE_CLOUD_PROJECT"). - private static final String projectId = ServiceOptions.getDefaultProjectId(); - - // List assets of a project. - // @param args types of the assets to list. - public static void main(String... args) throws Exception { - // Asset types, e.g.: - // "storage.googleapis.com/Bucket,bigquery.googleapis.com/Table". + public static void listAssets() throws Exception { + // The project id of the asset parent to list. + String projectId = "YOUR_PROJECT_ID"; + // The asset types to list. E.g., + // ["storage.googleapis.com/Bucket", "bigquery.googleapis.com/Table"]. // See full list of supported asset types at // https://cloud.google.com/asset-inventory/docs/supported-asset-types. - String[] assetTypes = args[0].split(","); + String[] assetTypes = {"YOUR_ASSET_TYPES_TO_LIST"}; + // The asset content type to list. E.g., ContentType.CONTENT_TYPE_UNSPECIFIED. + // See full list of content types at + // https://cloud.google.com/asset-inventory/docs/reference/rpc/google.cloud.asset.v1p5beta1#contenttype + ContentType contentType = ContentType.CONTENT_TYPE_UNSPECIFIED; + } + + public static void listAssets(String projectId, String[] assetTypes, ContentType contentType) + throws Exception { try (AssetServiceClient client = AssetServiceClient.create()) { ProjectName parent = ProjectName.of(projectId); - ContentType contentType = ContentType.CONTENT_TYPE_UNSPECIFIED; + + // Build initial ListAssetsRequest without setting page token. ListAssetsRequest request = ListAssetsRequest.newBuilder() .setParent(parent.toString()) .addAllAssetTypes(Arrays.asList(assetTypes)) .setContentType(contentType) .build(); + // Repeatedly call ListAssets until page token is empty. ListAssetsPagedResponse response = client.listAssets(request); System.out.println(response); diff --git a/asset/cloud-client/src/test/java/com/example/asset/ListAssets.java b/asset/cloud-client/src/test/java/com/example/asset/ListAssets.java index b0c9d14161d..5a2d2d31301 100644 --- a/asset/cloud-client/src/test/java/com/example/asset/ListAssets.java +++ b/asset/cloud-client/src/test/java/com/example/asset/ListAssets.java @@ -19,6 +19,7 @@ import static com.google.common.truth.Truth.assertThat; import com.google.cloud.ServiceOptions; +import com.google.cloud.asset.v1p5beta1.ContentType; import java.io.ByteArrayOutputStream; import java.io.PrintStream; import java.util.UUID; @@ -48,8 +49,12 @@ public void tearDown() { @Test public void testListAssetsExample() throws Exception { - String assetTypes = "storage.googleapis.com/Bucket,bigquery.googleapis.com/Table"; - ListAssetsExample.main(assetTypes); + // Use the default project Id (configure it by setting environment variable + // "GOOGLE_CLOUD_PROJECT"). + String projectId = ServiceOptions.getDefaultProjectId(); + String[] assetTypes = {"storage.googleapis.com/Bucket", "bigquery.googleapis.com/Table"}; + ContentType contentType = ContentType.CONTENT_TYPE_UNSPECIFIED; + ListAssetsExample.listAssets(projectId, assetTypes, contentType); String got = bout.toString(); if (!got.isEmpty()) { assertThat(got).contains("asset"); From fc5070b096136a4d07b74b34b192126fa2ace3f3 Mon Sep 17 00:00:00 2001 From: Larittic-GG Date: Fri, 31 Jul 2020 10:14:08 -0700 Subject: [PATCH 4/4] Add a missing function call in listAssets(). --- .../src/main/java/com/example/asset/ListAssetsExample.java | 1 + 1 file changed, 1 insertion(+) diff --git a/asset/cloud-client/src/main/java/com/example/asset/ListAssetsExample.java b/asset/cloud-client/src/main/java/com/example/asset/ListAssetsExample.java index 6a1623b9399..96e3d994aa9 100644 --- a/asset/cloud-client/src/main/java/com/example/asset/ListAssetsExample.java +++ b/asset/cloud-client/src/main/java/com/example/asset/ListAssetsExample.java @@ -41,6 +41,7 @@ public static void listAssets() throws Exception { // See full list of content types at // https://cloud.google.com/asset-inventory/docs/reference/rpc/google.cloud.asset.v1p5beta1#contenttype ContentType contentType = ContentType.CONTENT_TYPE_UNSPECIFIED; + listAssets(projectId, assetTypes, contentType); } public static void listAssets(String projectId, String[] assetTypes, ContentType contentType)