diff --git a/google-api-grpc/proto-google-cloud-asset-v1beta1/src/main/java/com/google/cloud/asset/v1beta1/Asset.java b/google-api-grpc/proto-google-cloud-asset-v1beta1/src/main/java/com/google/cloud/asset/v1beta1/Asset.java index 78ef2bc864c4..4d7d7e62c94f 100644 --- a/google-api-grpc/proto-google-cloud-asset-v1beta1/src/main/java/com/google/cloud/asset/v1beta1/Asset.java +++ b/google-api-grpc/proto-google-cloud-asset-v1beta1/src/main/java/com/google/cloud/asset/v1beta1/Asset.java @@ -183,7 +183,7 @@ public com.google.protobuf.ByteString getNameBytes() { * * *
- * Type of the asset. Example: "google.compute.disk". + * Type of the asset. Example: "google.compute.Disk". ** *
string asset_type = 2;
@@ -203,7 +203,7 @@ public java.lang.String getAssetType() {
*
*
* - * Type of the asset. Example: "google.compute.disk". + * Type of the asset. Example: "google.compute.Disk". ** *
string asset_type = 2;
@@ -799,7 +799,7 @@ public Builder setNameBytes(com.google.protobuf.ByteString value) {
*
*
* - * Type of the asset. Example: "google.compute.disk". + * Type of the asset. Example: "google.compute.Disk". ** *
string asset_type = 2;
@@ -819,7 +819,7 @@ public java.lang.String getAssetType() {
*
*
* - * Type of the asset. Example: "google.compute.disk". + * Type of the asset. Example: "google.compute.Disk". ** *
string asset_type = 2;
@@ -839,7 +839,7 @@ public com.google.protobuf.ByteString getAssetTypeBytes() {
*
*
* - * Type of the asset. Example: "google.compute.disk". + * Type of the asset. Example: "google.compute.Disk". ** *
string asset_type = 2;
@@ -857,7 +857,7 @@ public Builder setAssetType(java.lang.String value) {
*
*
* - * Type of the asset. Example: "google.compute.disk". + * Type of the asset. Example: "google.compute.Disk". ** *
string asset_type = 2;
@@ -872,7 +872,7 @@ public Builder clearAssetType() {
*
*
* - * Type of the asset. Example: "google.compute.disk". + * Type of the asset. Example: "google.compute.Disk". ** *
string asset_type = 2;
diff --git a/google-api-grpc/proto-google-cloud-asset-v1beta1/src/main/java/com/google/cloud/asset/v1beta1/AssetOrBuilder.java b/google-api-grpc/proto-google-cloud-asset-v1beta1/src/main/java/com/google/cloud/asset/v1beta1/AssetOrBuilder.java
index 3556a5505d43..7e86bd0fb721 100644
--- a/google-api-grpc/proto-google-cloud-asset-v1beta1/src/main/java/com/google/cloud/asset/v1beta1/AssetOrBuilder.java
+++ b/google-api-grpc/proto-google-cloud-asset-v1beta1/src/main/java/com/google/cloud/asset/v1beta1/AssetOrBuilder.java
@@ -37,7 +37,7 @@ public interface AssetOrBuilder
*
*
* - * Type of the asset. Example: "google.compute.disk". + * Type of the asset. Example: "google.compute.Disk". ** *
string asset_type = 2;
@@ -47,7 +47,7 @@ public interface AssetOrBuilder
*
*
* - * Type of the asset. Example: "google.compute.disk". + * Type of the asset. Example: "google.compute.Disk". ** *
string asset_type = 2;
diff --git a/google-api-grpc/proto-google-cloud-asset-v1beta1/src/main/java/com/google/cloud/asset/v1beta1/AssetServiceProto.java b/google-api-grpc/proto-google-cloud-asset-v1beta1/src/main/java/com/google/cloud/asset/v1beta1/AssetServiceProto.java
index e9f12a371d44..d3d321770ae5 100644
--- a/google-api-grpc/proto-google-cloud-asset-v1beta1/src/main/java/com/google/cloud/asset/v1beta1/AssetServiceProto.java
+++ b/google-api-grpc/proto-google-cloud-asset-v1beta1/src/main/java/com/google/cloud/asset/v1beta1/AssetServiceProto.java
@@ -69,26 +69,28 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() {
+ ".google.cloud.asset.v1beta1.TemporalAsse"
+ "t\"d\n\014OutputConfig\022E\n\017gcs_destination\030\001 \001"
+ "(\0132*.google.cloud.asset.v1beta1.GcsDesti"
- + "nationH\000B\r\n\013destination\"\035\n\016GcsDestinatio"
- + "n\022\013\n\003uri\030\001 \001(\t*I\n\013ContentType\022\034\n\030CONTENT"
- + "_TYPE_UNSPECIFIED\020\000\022\014\n\010RESOURCE\020\001\022\016\n\nIAM"
- + "_POLICY\020\0022\340\003\n\014AssetService\022\311\001\n\014ExportAss"
- + "ets\022/.google.cloud.asset.v1beta1.ExportA"
- + "ssetsRequest\032\035.google.longrunning.Operat"
- + "ion\"i\202\323\344\223\002c\")/v1beta1/{parent=projects/*"
- + "}:exportAssets:\001*Z3\"./v1beta1/{parent=or"
- + "ganizations/*}:exportAssets:\001*\022\203\002\n\025Batch"
- + "GetAssetsHistory\0228.google.cloud.asset.v1"
- + "beta1.BatchGetAssetsHistoryRequest\0329.goo"
- + "gle.cloud.asset.v1beta1.BatchGetAssetsHi"
- + "storyResponse\"u\202\323\344\223\002o\0222/v1beta1/{parent="
- + "projects/*}:batchGetAssetsHistoryZ9\0227/v1"
- + "beta1/{parent=organizations/*}:batchGetA"
- + "ssetsHistoryB\260\001\n\036com.google.cloud.asset."
- + "v1beta1B\021AssetServiceProtoP\001Z?google.gol"
- + "ang.org/genproto/googleapis/cloud/asset/"
- + "v1beta1;asset\252\002\032Google.Cloud.Asset.V1Bet"
- + "a1\312\002\032Google\\Cloud\\Asset\\V1beta1b\006proto3"
+ + "nationH\000B\r\n\013destination\"-\n\016GcsDestinatio"
+ + "n\022\r\n\003uri\030\001 \001(\tH\000B\014\n\nobject_uri*I\n\013Conten"
+ + "tType\022\034\n\030CONTENT_TYPE_UNSPECIFIED\020\000\022\014\n\010R"
+ + "ESOURCE\020\001\022\016\n\nIAM_POLICY\020\0022\221\004\n\014AssetServi"
+ + "ce\022\372\001\n\014ExportAssets\022/.google.cloud.asset"
+ + ".v1beta1.ExportAssetsRequest\032\035.google.lo"
+ + "ngrunning.Operation\"\231\001\202\323\344\223\002\222\001\")/v1beta1/"
+ + "{parent=projects/*}:exportAssets:\001*Z-\"(/"
+ + "v1beta1/{parent=folders/*}:exportAssets:"
+ + "\001*Z3\"./v1beta1/{parent=organizations/*}:"
+ + "exportAssets:\001*\022\203\002\n\025BatchGetAssetsHistor"
+ + "y\0228.google.cloud.asset.v1beta1.BatchGetA"
+ + "ssetsHistoryRequest\0329.google.cloud.asset"
+ + ".v1beta1.BatchGetAssetsHistoryResponse\"u"
+ + "\202\323\344\223\002o\0222/v1beta1/{parent=projects/*}:bat"
+ + "chGetAssetsHistoryZ9\0227/v1beta1/{parent=o"
+ + "rganizations/*}:batchGetAssetsHistoryB\260\001"
+ + "\n\036com.google.cloud.asset.v1beta1B\021AssetS"
+ + "erviceProtoP\001Z?google.golang.org/genprot"
+ + "o/googleapis/cloud/asset/v1beta1;asset\252\002"
+ + "\032Google.Cloud.Asset.V1Beta1\312\002\032Google\\Clo"
+ + "ud\\Asset\\V1beta1b\006proto3"
};
com.google.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner assigner =
new com.google.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner() {
@@ -153,7 +155,7 @@ public com.google.protobuf.ExtensionRegistry assignDescriptors(
new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
internal_static_google_cloud_asset_v1beta1_GcsDestination_descriptor,
new java.lang.String[] {
- "Uri",
+ "Uri", "ObjectUri",
});
com.google.protobuf.ExtensionRegistry registry =
com.google.protobuf.ExtensionRegistry.newInstance();
diff --git a/google-api-grpc/proto-google-cloud-asset-v1beta1/src/main/java/com/google/cloud/asset/v1beta1/BatchGetAssetsHistoryRequest.java b/google-api-grpc/proto-google-cloud-asset-v1beta1/src/main/java/com/google/cloud/asset/v1beta1/BatchGetAssetsHistoryRequest.java
index 359cedba639d..c30011557a27 100644
--- a/google-api-grpc/proto-google-cloud-asset-v1beta1/src/main/java/com/google/cloud/asset/v1beta1/BatchGetAssetsHistoryRequest.java
+++ b/google-api-grpc/proto-google-cloud-asset-v1beta1/src/main/java/com/google/cloud/asset/v1beta1/BatchGetAssetsHistoryRequest.java
@@ -284,9 +284,12 @@ public com.google.cloud.asset.v1beta1.ContentType getContentType() {
*
*
* - * Required. The time window for the asset history. The start time is - * required. The returned results contain all temporal assets whose time - * window overlap with read_time_window. + * Optional. The time window for the asset history. Both start_time and + * end_time are optional and if set, it must be after 2018-10-02 UTC. If + * end_time is not set, it is default to current timestamp. If start_time is + * not set, the snapshot of the assets at end_time will be returned. The + * returned results contain all temporal assets whose time window overlap with + * read_time_window. ** *
.google.cloud.asset.v1beta1.TimeWindow read_time_window = 4;
@@ -298,9 +301,12 @@ public boolean hasReadTimeWindow() {
*
*
* - * Required. The time window for the asset history. The start time is - * required. The returned results contain all temporal assets whose time - * window overlap with read_time_window. + * Optional. The time window for the asset history. Both start_time and + * end_time are optional and if set, it must be after 2018-10-02 UTC. If + * end_time is not set, it is default to current timestamp. If start_time is + * not set, the snapshot of the assets at end_time will be returned. The + * returned results contain all temporal assets whose time window overlap with + * read_time_window. ** *
.google.cloud.asset.v1beta1.TimeWindow read_time_window = 4;
@@ -314,9 +320,12 @@ public com.google.cloud.asset.v1beta1.TimeWindow getReadTimeWindow() {
*
*
* - * Required. The time window for the asset history. The start time is - * required. The returned results contain all temporal assets whose time - * window overlap with read_time_window. + * Optional. The time window for the asset history. Both start_time and + * end_time are optional and if set, it must be after 2018-10-02 UTC. If + * end_time is not set, it is default to current timestamp. If start_time is + * not set, the snapshot of the assets at end_time will be returned. The + * returned results contain all temporal assets whose time window overlap with + * read_time_window. ** *
.google.cloud.asset.v1beta1.TimeWindow read_time_window = 4;
@@ -1106,9 +1115,12 @@ public Builder clearContentType() {
*
*
* - * Required. The time window for the asset history. The start time is - * required. The returned results contain all temporal assets whose time - * window overlap with read_time_window. + * Optional. The time window for the asset history. Both start_time and + * end_time are optional and if set, it must be after 2018-10-02 UTC. If + * end_time is not set, it is default to current timestamp. If start_time is + * not set, the snapshot of the assets at end_time will be returned. The + * returned results contain all temporal assets whose time window overlap with + * read_time_window. ** *
.google.cloud.asset.v1beta1.TimeWindow read_time_window = 4;
@@ -1120,9 +1132,12 @@ public boolean hasReadTimeWindow() {
*
*
* - * Required. The time window for the asset history. The start time is - * required. The returned results contain all temporal assets whose time - * window overlap with read_time_window. + * Optional. The time window for the asset history. Both start_time and + * end_time are optional and if set, it must be after 2018-10-02 UTC. If + * end_time is not set, it is default to current timestamp. If start_time is + * not set, the snapshot of the assets at end_time will be returned. The + * returned results contain all temporal assets whose time window overlap with + * read_time_window. ** *
.google.cloud.asset.v1beta1.TimeWindow read_time_window = 4;
@@ -1140,9 +1155,12 @@ public com.google.cloud.asset.v1beta1.TimeWindow getReadTimeWindow() {
*
*
* - * Required. The time window for the asset history. The start time is - * required. The returned results contain all temporal assets whose time - * window overlap with read_time_window. + * Optional. The time window for the asset history. Both start_time and + * end_time are optional and if set, it must be after 2018-10-02 UTC. If + * end_time is not set, it is default to current timestamp. If start_time is + * not set, the snapshot of the assets at end_time will be returned. The + * returned results contain all temporal assets whose time window overlap with + * read_time_window. ** *
.google.cloud.asset.v1beta1.TimeWindow read_time_window = 4;
@@ -1164,9 +1182,12 @@ public Builder setReadTimeWindow(com.google.cloud.asset.v1beta1.TimeWindow value
*
*
* - * Required. The time window for the asset history. The start time is - * required. The returned results contain all temporal assets whose time - * window overlap with read_time_window. + * Optional. The time window for the asset history. Both start_time and + * end_time are optional and if set, it must be after 2018-10-02 UTC. If + * end_time is not set, it is default to current timestamp. If start_time is + * not set, the snapshot of the assets at end_time will be returned. The + * returned results contain all temporal assets whose time window overlap with + * read_time_window. ** *
.google.cloud.asset.v1beta1.TimeWindow read_time_window = 4;
@@ -1186,9 +1207,12 @@ public Builder setReadTimeWindow(
*
*
* - * Required. The time window for the asset history. The start time is - * required. The returned results contain all temporal assets whose time - * window overlap with read_time_window. + * Optional. The time window for the asset history. Both start_time and + * end_time are optional and if set, it must be after 2018-10-02 UTC. If + * end_time is not set, it is default to current timestamp. If start_time is + * not set, the snapshot of the assets at end_time will be returned. The + * returned results contain all temporal assets whose time window overlap with + * read_time_window. ** *
.google.cloud.asset.v1beta1.TimeWindow read_time_window = 4;
@@ -1214,9 +1238,12 @@ public Builder mergeReadTimeWindow(com.google.cloud.asset.v1beta1.TimeWindow val
*
*
* - * Required. The time window for the asset history. The start time is - * required. The returned results contain all temporal assets whose time - * window overlap with read_time_window. + * Optional. The time window for the asset history. Both start_time and + * end_time are optional and if set, it must be after 2018-10-02 UTC. If + * end_time is not set, it is default to current timestamp. If start_time is + * not set, the snapshot of the assets at end_time will be returned. The + * returned results contain all temporal assets whose time window overlap with + * read_time_window. ** *
.google.cloud.asset.v1beta1.TimeWindow read_time_window = 4;
@@ -1236,9 +1263,12 @@ public Builder clearReadTimeWindow() {
*
*
* - * Required. The time window for the asset history. The start time is - * required. The returned results contain all temporal assets whose time - * window overlap with read_time_window. + * Optional. The time window for the asset history. Both start_time and + * end_time are optional and if set, it must be after 2018-10-02 UTC. If + * end_time is not set, it is default to current timestamp. If start_time is + * not set, the snapshot of the assets at end_time will be returned. The + * returned results contain all temporal assets whose time window overlap with + * read_time_window. ** *
.google.cloud.asset.v1beta1.TimeWindow read_time_window = 4;
@@ -1252,9 +1282,12 @@ public com.google.cloud.asset.v1beta1.TimeWindow.Builder getReadTimeWindowBuilde
*
*
* - * Required. The time window for the asset history. The start time is - * required. The returned results contain all temporal assets whose time - * window overlap with read_time_window. + * Optional. The time window for the asset history. Both start_time and + * end_time are optional and if set, it must be after 2018-10-02 UTC. If + * end_time is not set, it is default to current timestamp. If start_time is + * not set, the snapshot of the assets at end_time will be returned. The + * returned results contain all temporal assets whose time window overlap with + * read_time_window. ** *
.google.cloud.asset.v1beta1.TimeWindow read_time_window = 4;
@@ -1272,9 +1305,12 @@ public com.google.cloud.asset.v1beta1.TimeWindowOrBuilder getReadTimeWindowOrBui
*
*
* - * Required. The time window for the asset history. The start time is - * required. The returned results contain all temporal assets whose time - * window overlap with read_time_window. + * Optional. The time window for the asset history. Both start_time and + * end_time are optional and if set, it must be after 2018-10-02 UTC. If + * end_time is not set, it is default to current timestamp. If start_time is + * not set, the snapshot of the assets at end_time will be returned. The + * returned results contain all temporal assets whose time window overlap with + * read_time_window. ** *
.google.cloud.asset.v1beta1.TimeWindow read_time_window = 4;
diff --git a/google-api-grpc/proto-google-cloud-asset-v1beta1/src/main/java/com/google/cloud/asset/v1beta1/BatchGetAssetsHistoryRequestOrBuilder.java b/google-api-grpc/proto-google-cloud-asset-v1beta1/src/main/java/com/google/cloud/asset/v1beta1/BatchGetAssetsHistoryRequestOrBuilder.java
index dd6cbd0dd85b..49e72a7c3390 100644
--- a/google-api-grpc/proto-google-cloud-asset-v1beta1/src/main/java/com/google/cloud/asset/v1beta1/BatchGetAssetsHistoryRequestOrBuilder.java
+++ b/google-api-grpc/proto-google-cloud-asset-v1beta1/src/main/java/com/google/cloud/asset/v1beta1/BatchGetAssetsHistoryRequestOrBuilder.java
@@ -119,9 +119,12 @@ public interface BatchGetAssetsHistoryRequestOrBuilder
*
*
* - * Required. The time window for the asset history. The start time is - * required. The returned results contain all temporal assets whose time - * window overlap with read_time_window. + * Optional. The time window for the asset history. Both start_time and + * end_time are optional and if set, it must be after 2018-10-02 UTC. If + * end_time is not set, it is default to current timestamp. If start_time is + * not set, the snapshot of the assets at end_time will be returned. The + * returned results contain all temporal assets whose time window overlap with + * read_time_window. ** *
.google.cloud.asset.v1beta1.TimeWindow read_time_window = 4;
@@ -131,9 +134,12 @@ public interface BatchGetAssetsHistoryRequestOrBuilder
*
*
* - * Required. The time window for the asset history. The start time is - * required. The returned results contain all temporal assets whose time - * window overlap with read_time_window. + * Optional. The time window for the asset history. Both start_time and + * end_time are optional and if set, it must be after 2018-10-02 UTC. If + * end_time is not set, it is default to current timestamp. If start_time is + * not set, the snapshot of the assets at end_time will be returned. The + * returned results contain all temporal assets whose time window overlap with + * read_time_window. ** *
.google.cloud.asset.v1beta1.TimeWindow read_time_window = 4;
@@ -143,9 +149,12 @@ public interface BatchGetAssetsHistoryRequestOrBuilder
*
*
* - * Required. The time window for the asset history. The start time is - * required. The returned results contain all temporal assets whose time - * window overlap with read_time_window. + * Optional. The time window for the asset history. Both start_time and + * end_time are optional and if set, it must be after 2018-10-02 UTC. If + * end_time is not set, it is default to current timestamp. If start_time is + * not set, the snapshot of the assets at end_time will be returned. The + * returned results contain all temporal assets whose time window overlap with + * read_time_window. ** *
.google.cloud.asset.v1beta1.TimeWindow read_time_window = 4;
diff --git a/google-api-grpc/proto-google-cloud-asset-v1beta1/src/main/java/com/google/cloud/asset/v1beta1/ExportAssetsRequest.java b/google-api-grpc/proto-google-cloud-asset-v1beta1/src/main/java/com/google/cloud/asset/v1beta1/ExportAssetsRequest.java
index 4f781b18da37..dd6c8196d24d 100644
--- a/google-api-grpc/proto-google-cloud-asset-v1beta1/src/main/java/com/google/cloud/asset/v1beta1/ExportAssetsRequest.java
+++ b/google-api-grpc/proto-google-cloud-asset-v1beta1/src/main/java/com/google/cloud/asset/v1beta1/ExportAssetsRequest.java
@@ -151,9 +151,10 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
*
*
* - * Required. The relative name of the root asset. This can only be an organization - * number (such as "organizations/123"), a project ID (such as - * "projects/my-project-id"), or a project number (such as "projects/12345"). + * Required. The relative name of the root asset. This can only be an + * organization number (such as "organizations/123"), a project ID (such as + * "projects/my-project-id"), a project number (such as "projects/12345"), or + * a folder number (such as "folders/123"). ** *
string parent = 1;
@@ -173,9 +174,10 @@ public java.lang.String getParent() {
*
*
* - * Required. The relative name of the root asset. This can only be an organization - * number (such as "organizations/123"), a project ID (such as - * "projects/my-project-id"), or a project number (such as "projects/12345"). + * Required. The relative name of the root asset. This can only be an + * organization number (such as "organizations/123"), a project ID (such as + * "projects/my-project-id"), a project number (such as "projects/12345"), or + * a folder number (such as "folders/123"). ** *
string parent = 1;
@@ -198,11 +200,11 @@ public com.google.protobuf.ByteString getParentBytes() {
*
*
* - * Timestamp to take an asset snapshot. This can only be set to a timestamp in - * the past or of the current time. If not specified, the current time will be - * used. Due to delays in resource data collection and indexing, there is a - * volatile window during which running the same query may get different - * results. + * Timestamp to take an asset snapshot. This can only be set to a timestamp + * between 2018-10-02 UTC (inclusive) and the current time. If not specified, + * the current time will be used. Due to delays in resource data collection + * and indexing, there is a volatile window during which running the same + * query may get different results. ** *
.google.protobuf.Timestamp read_time = 2;
@@ -214,11 +216,11 @@ public boolean hasReadTime() {
*
*
* - * Timestamp to take an asset snapshot. This can only be set to a timestamp in - * the past or of the current time. If not specified, the current time will be - * used. Due to delays in resource data collection and indexing, there is a - * volatile window during which running the same query may get different - * results. + * Timestamp to take an asset snapshot. This can only be set to a timestamp + * between 2018-10-02 UTC (inclusive) and the current time. If not specified, + * the current time will be used. Due to delays in resource data collection + * and indexing, there is a volatile window during which running the same + * query may get different results. ** *
.google.protobuf.Timestamp read_time = 2;
@@ -230,11 +232,11 @@ public com.google.protobuf.Timestamp getReadTime() {
*
*
* - * Timestamp to take an asset snapshot. This can only be set to a timestamp in - * the past or of the current time. If not specified, the current time will be - * used. Due to delays in resource data collection and indexing, there is a - * volatile window during which running the same query may get different - * results. + * Timestamp to take an asset snapshot. This can only be set to a timestamp + * between 2018-10-02 UTC (inclusive) and the current time. If not specified, + * the current time will be used. Due to delays in resource data collection + * and indexing, there is a volatile window during which running the same + * query may get different results. ** *
.google.protobuf.Timestamp read_time = 2;
@@ -250,7 +252,10 @@ public com.google.protobuf.TimestampOrBuilder getReadTimeOrBuilder() {
*
* * A list of asset types of which to take a snapshot for. For example: - * "google.compute.disk". If specified, only matching assets will be returned. + * "google.compute.Disk". If specified, only matching assets will be returned. + * See [Introduction to Cloud Asset + * Inventory](https://cloud.google.com/resource-manager/docs/cloud-asset-inventory/overview) + * for all supported asset types. ** *
repeated string asset_types = 3;
@@ -263,7 +268,10 @@ public com.google.protobuf.ProtocolStringList getAssetTypesList() {
*
* * A list of asset types of which to take a snapshot for. For example: - * "google.compute.disk". If specified, only matching assets will be returned. + * "google.compute.Disk". If specified, only matching assets will be returned. + * See [Introduction to Cloud Asset + * Inventory](https://cloud.google.com/resource-manager/docs/cloud-asset-inventory/overview) + * for all supported asset types. ** *
repeated string asset_types = 3;
@@ -276,7 +284,10 @@ public int getAssetTypesCount() {
*
* * A list of asset types of which to take a snapshot for. For example: - * "google.compute.disk". If specified, only matching assets will be returned. + * "google.compute.Disk". If specified, only matching assets will be returned. + * See [Introduction to Cloud Asset + * Inventory](https://cloud.google.com/resource-manager/docs/cloud-asset-inventory/overview) + * for all supported asset types. ** *
repeated string asset_types = 3;
@@ -289,7 +300,10 @@ public java.lang.String getAssetTypes(int index) {
*
* * A list of asset types of which to take a snapshot for. For example: - * "google.compute.disk". If specified, only matching assets will be returned. + * "google.compute.Disk". If specified, only matching assets will be returned. + * See [Introduction to Cloud Asset + * Inventory](https://cloud.google.com/resource-manager/docs/cloud-asset-inventory/overview) + * for all supported asset types. ** *
repeated string asset_types = 3;
@@ -809,9 +823,10 @@ public Builder mergeFrom(
*
*
* - * Required. The relative name of the root asset. This can only be an organization - * number (such as "organizations/123"), a project ID (such as - * "projects/my-project-id"), or a project number (such as "projects/12345"). + * Required. The relative name of the root asset. This can only be an + * organization number (such as "organizations/123"), a project ID (such as + * "projects/my-project-id"), a project number (such as "projects/12345"), or + * a folder number (such as "folders/123"). ** *
string parent = 1;
@@ -831,9 +846,10 @@ public java.lang.String getParent() {
*
*
* - * Required. The relative name of the root asset. This can only be an organization - * number (such as "organizations/123"), a project ID (such as - * "projects/my-project-id"), or a project number (such as "projects/12345"). + * Required. The relative name of the root asset. This can only be an + * organization number (such as "organizations/123"), a project ID (such as + * "projects/my-project-id"), a project number (such as "projects/12345"), or + * a folder number (such as "folders/123"). ** *
string parent = 1;
@@ -853,9 +869,10 @@ public com.google.protobuf.ByteString getParentBytes() {
*
*
* - * Required. The relative name of the root asset. This can only be an organization - * number (such as "organizations/123"), a project ID (such as - * "projects/my-project-id"), or a project number (such as "projects/12345"). + * Required. The relative name of the root asset. This can only be an + * organization number (such as "organizations/123"), a project ID (such as + * "projects/my-project-id"), a project number (such as "projects/12345"), or + * a folder number (such as "folders/123"). ** *
string parent = 1;
@@ -873,9 +890,10 @@ public Builder setParent(java.lang.String value) {
*
*
* - * Required. The relative name of the root asset. This can only be an organization - * number (such as "organizations/123"), a project ID (such as - * "projects/my-project-id"), or a project number (such as "projects/12345"). + * Required. The relative name of the root asset. This can only be an + * organization number (such as "organizations/123"), a project ID (such as + * "projects/my-project-id"), a project number (such as "projects/12345"), or + * a folder number (such as "folders/123"). ** *
string parent = 1;
@@ -890,9 +908,10 @@ public Builder clearParent() {
*
*
* - * Required. The relative name of the root asset. This can only be an organization - * number (such as "organizations/123"), a project ID (such as - * "projects/my-project-id"), or a project number (such as "projects/12345"). + * Required. The relative name of the root asset. This can only be an + * organization number (such as "organizations/123"), a project ID (such as + * "projects/my-project-id"), a project number (such as "projects/12345"), or + * a folder number (such as "folders/123"). ** *
string parent = 1;
@@ -918,11 +937,11 @@ public Builder setParentBytes(com.google.protobuf.ByteString value) {
*
*
* - * Timestamp to take an asset snapshot. This can only be set to a timestamp in - * the past or of the current time. If not specified, the current time will be - * used. Due to delays in resource data collection and indexing, there is a - * volatile window during which running the same query may get different - * results. + * Timestamp to take an asset snapshot. This can only be set to a timestamp + * between 2018-10-02 UTC (inclusive) and the current time. If not specified, + * the current time will be used. Due to delays in resource data collection + * and indexing, there is a volatile window during which running the same + * query may get different results. ** *
.google.protobuf.Timestamp read_time = 2;
@@ -934,11 +953,11 @@ public boolean hasReadTime() {
*
*
* - * Timestamp to take an asset snapshot. This can only be set to a timestamp in - * the past or of the current time. If not specified, the current time will be - * used. Due to delays in resource data collection and indexing, there is a - * volatile window during which running the same query may get different - * results. + * Timestamp to take an asset snapshot. This can only be set to a timestamp + * between 2018-10-02 UTC (inclusive) and the current time. If not specified, + * the current time will be used. Due to delays in resource data collection + * and indexing, there is a volatile window during which running the same + * query may get different results. ** *
.google.protobuf.Timestamp read_time = 2;
@@ -954,11 +973,11 @@ public com.google.protobuf.Timestamp getReadTime() {
*
*
* - * Timestamp to take an asset snapshot. This can only be set to a timestamp in - * the past or of the current time. If not specified, the current time will be - * used. Due to delays in resource data collection and indexing, there is a - * volatile window during which running the same query may get different - * results. + * Timestamp to take an asset snapshot. This can only be set to a timestamp + * between 2018-10-02 UTC (inclusive) and the current time. If not specified, + * the current time will be used. Due to delays in resource data collection + * and indexing, there is a volatile window during which running the same + * query may get different results. ** *
.google.protobuf.Timestamp read_time = 2;
@@ -980,11 +999,11 @@ public Builder setReadTime(com.google.protobuf.Timestamp value) {
*
*
* - * Timestamp to take an asset snapshot. This can only be set to a timestamp in - * the past or of the current time. If not specified, the current time will be - * used. Due to delays in resource data collection and indexing, there is a - * volatile window during which running the same query may get different - * results. + * Timestamp to take an asset snapshot. This can only be set to a timestamp + * between 2018-10-02 UTC (inclusive) and the current time. If not specified, + * the current time will be used. Due to delays in resource data collection + * and indexing, there is a volatile window during which running the same + * query may get different results. ** *
.google.protobuf.Timestamp read_time = 2;
@@ -1003,11 +1022,11 @@ public Builder setReadTime(com.google.protobuf.Timestamp.Builder builderForValue
*
*
* - * Timestamp to take an asset snapshot. This can only be set to a timestamp in - * the past or of the current time. If not specified, the current time will be - * used. Due to delays in resource data collection and indexing, there is a - * volatile window during which running the same query may get different - * results. + * Timestamp to take an asset snapshot. This can only be set to a timestamp + * between 2018-10-02 UTC (inclusive) and the current time. If not specified, + * the current time will be used. Due to delays in resource data collection + * and indexing, there is a volatile window during which running the same + * query may get different results. ** *
.google.protobuf.Timestamp read_time = 2;
@@ -1031,11 +1050,11 @@ public Builder mergeReadTime(com.google.protobuf.Timestamp value) {
*
*
* - * Timestamp to take an asset snapshot. This can only be set to a timestamp in - * the past or of the current time. If not specified, the current time will be - * used. Due to delays in resource data collection and indexing, there is a - * volatile window during which running the same query may get different - * results. + * Timestamp to take an asset snapshot. This can only be set to a timestamp + * between 2018-10-02 UTC (inclusive) and the current time. If not specified, + * the current time will be used. Due to delays in resource data collection + * and indexing, there is a volatile window during which running the same + * query may get different results. ** *
.google.protobuf.Timestamp read_time = 2;
@@ -1055,11 +1074,11 @@ public Builder clearReadTime() {
*
*
* - * Timestamp to take an asset snapshot. This can only be set to a timestamp in - * the past or of the current time. If not specified, the current time will be - * used. Due to delays in resource data collection and indexing, there is a - * volatile window during which running the same query may get different - * results. + * Timestamp to take an asset snapshot. This can only be set to a timestamp + * between 2018-10-02 UTC (inclusive) and the current time. If not specified, + * the current time will be used. Due to delays in resource data collection + * and indexing, there is a volatile window during which running the same + * query may get different results. ** *
.google.protobuf.Timestamp read_time = 2;
@@ -1073,11 +1092,11 @@ public com.google.protobuf.Timestamp.Builder getReadTimeBuilder() {
*
*
* - * Timestamp to take an asset snapshot. This can only be set to a timestamp in - * the past or of the current time. If not specified, the current time will be - * used. Due to delays in resource data collection and indexing, there is a - * volatile window during which running the same query may get different - * results. + * Timestamp to take an asset snapshot. This can only be set to a timestamp + * between 2018-10-02 UTC (inclusive) and the current time. If not specified, + * the current time will be used. Due to delays in resource data collection + * and indexing, there is a volatile window during which running the same + * query may get different results. ** *
.google.protobuf.Timestamp read_time = 2;
@@ -1093,11 +1112,11 @@ public com.google.protobuf.TimestampOrBuilder getReadTimeOrBuilder() {
*
*
* - * Timestamp to take an asset snapshot. This can only be set to a timestamp in - * the past or of the current time. If not specified, the current time will be - * used. Due to delays in resource data collection and indexing, there is a - * volatile window during which running the same query may get different - * results. + * Timestamp to take an asset snapshot. This can only be set to a timestamp + * between 2018-10-02 UTC (inclusive) and the current time. If not specified, + * the current time will be used. Due to delays in resource data collection + * and indexing, there is a volatile window during which running the same + * query may get different results. ** *
.google.protobuf.Timestamp read_time = 2;
@@ -1133,7 +1152,10 @@ private void ensureAssetTypesIsMutable() {
*
* * A list of asset types of which to take a snapshot for. For example: - * "google.compute.disk". If specified, only matching assets will be returned. + * "google.compute.Disk". If specified, only matching assets will be returned. + * See [Introduction to Cloud Asset + * Inventory](https://cloud.google.com/resource-manager/docs/cloud-asset-inventory/overview) + * for all supported asset types. ** *
repeated string asset_types = 3;
@@ -1146,7 +1168,10 @@ public com.google.protobuf.ProtocolStringList getAssetTypesList() {
*
* * A list of asset types of which to take a snapshot for. For example: - * "google.compute.disk". If specified, only matching assets will be returned. + * "google.compute.Disk". If specified, only matching assets will be returned. + * See [Introduction to Cloud Asset + * Inventory](https://cloud.google.com/resource-manager/docs/cloud-asset-inventory/overview) + * for all supported asset types. ** *
repeated string asset_types = 3;
@@ -1159,7 +1184,10 @@ public int getAssetTypesCount() {
*
* * A list of asset types of which to take a snapshot for. For example: - * "google.compute.disk". If specified, only matching assets will be returned. + * "google.compute.Disk". If specified, only matching assets will be returned. + * See [Introduction to Cloud Asset + * Inventory](https://cloud.google.com/resource-manager/docs/cloud-asset-inventory/overview) + * for all supported asset types. ** *
repeated string asset_types = 3;
@@ -1172,7 +1200,10 @@ public java.lang.String getAssetTypes(int index) {
*
* * A list of asset types of which to take a snapshot for. For example: - * "google.compute.disk". If specified, only matching assets will be returned. + * "google.compute.Disk". If specified, only matching assets will be returned. + * See [Introduction to Cloud Asset + * Inventory](https://cloud.google.com/resource-manager/docs/cloud-asset-inventory/overview) + * for all supported asset types. ** *
repeated string asset_types = 3;
@@ -1185,7 +1216,10 @@ public com.google.protobuf.ByteString getAssetTypesBytes(int index) {
*
* * A list of asset types of which to take a snapshot for. For example: - * "google.compute.disk". If specified, only matching assets will be returned. + * "google.compute.Disk". If specified, only matching assets will be returned. + * See [Introduction to Cloud Asset + * Inventory](https://cloud.google.com/resource-manager/docs/cloud-asset-inventory/overview) + * for all supported asset types. ** *
repeated string asset_types = 3;
@@ -1204,7 +1238,10 @@ public Builder setAssetTypes(int index, java.lang.String value) {
*
* * A list of asset types of which to take a snapshot for. For example: - * "google.compute.disk". If specified, only matching assets will be returned. + * "google.compute.Disk". If specified, only matching assets will be returned. + * See [Introduction to Cloud Asset + * Inventory](https://cloud.google.com/resource-manager/docs/cloud-asset-inventory/overview) + * for all supported asset types. ** *
repeated string asset_types = 3;
@@ -1223,7 +1260,10 @@ public Builder addAssetTypes(java.lang.String value) {
*
* * A list of asset types of which to take a snapshot for. For example: - * "google.compute.disk". If specified, only matching assets will be returned. + * "google.compute.Disk". If specified, only matching assets will be returned. + * See [Introduction to Cloud Asset + * Inventory](https://cloud.google.com/resource-manager/docs/cloud-asset-inventory/overview) + * for all supported asset types. ** *
repeated string asset_types = 3;
@@ -1239,7 +1279,10 @@ public Builder addAllAssetTypes(java.lang.Iterable* A list of asset types of which to take a snapshot for. For example: - * "google.compute.disk". If specified, only matching assets will be returned. + * "google.compute.Disk". If specified, only matching assets will be returned. + * See [Introduction to Cloud Asset + * Inventory](https://cloud.google.com/resource-manager/docs/cloud-asset-inventory/overview) + * for all supported asset types. ** *
repeated string asset_types = 3;
@@ -1255,7 +1298,10 @@ public Builder clearAssetTypes() {
*
* * A list of asset types of which to take a snapshot for. For example: - * "google.compute.disk". If specified, only matching assets will be returned. + * "google.compute.Disk". If specified, only matching assets will be returned. + * See [Introduction to Cloud Asset + * Inventory](https://cloud.google.com/resource-manager/docs/cloud-asset-inventory/overview) + * for all supported asset types. ** *
repeated string asset_types = 3;
diff --git a/google-api-grpc/proto-google-cloud-asset-v1beta1/src/main/java/com/google/cloud/asset/v1beta1/ExportAssetsRequestOrBuilder.java b/google-api-grpc/proto-google-cloud-asset-v1beta1/src/main/java/com/google/cloud/asset/v1beta1/ExportAssetsRequestOrBuilder.java
index 0d2db5c47253..aeab0fa8ef40 100644
--- a/google-api-grpc/proto-google-cloud-asset-v1beta1/src/main/java/com/google/cloud/asset/v1beta1/ExportAssetsRequestOrBuilder.java
+++ b/google-api-grpc/proto-google-cloud-asset-v1beta1/src/main/java/com/google/cloud/asset/v1beta1/ExportAssetsRequestOrBuilder.java
@@ -12,9 +12,10 @@ public interface ExportAssetsRequestOrBuilder
*
*
* - * Required. The relative name of the root asset. This can only be an organization - * number (such as "organizations/123"), a project ID (such as - * "projects/my-project-id"), or a project number (such as "projects/12345"). + * Required. The relative name of the root asset. This can only be an + * organization number (such as "organizations/123"), a project ID (such as + * "projects/my-project-id"), a project number (such as "projects/12345"), or + * a folder number (such as "folders/123"). ** *
string parent = 1;
@@ -24,9 +25,10 @@ public interface ExportAssetsRequestOrBuilder
*
*
* - * Required. The relative name of the root asset. This can only be an organization - * number (such as "organizations/123"), a project ID (such as - * "projects/my-project-id"), or a project number (such as "projects/12345"). + * Required. The relative name of the root asset. This can only be an + * organization number (such as "organizations/123"), a project ID (such as + * "projects/my-project-id"), a project number (such as "projects/12345"), or + * a folder number (such as "folders/123"). ** *
string parent = 1;
@@ -37,11 +39,11 @@ public interface ExportAssetsRequestOrBuilder
*
*
* - * Timestamp to take an asset snapshot. This can only be set to a timestamp in - * the past or of the current time. If not specified, the current time will be - * used. Due to delays in resource data collection and indexing, there is a - * volatile window during which running the same query may get different - * results. + * Timestamp to take an asset snapshot. This can only be set to a timestamp + * between 2018-10-02 UTC (inclusive) and the current time. If not specified, + * the current time will be used. Due to delays in resource data collection + * and indexing, there is a volatile window during which running the same + * query may get different results. ** *
.google.protobuf.Timestamp read_time = 2;
@@ -51,11 +53,11 @@ public interface ExportAssetsRequestOrBuilder
*
*
* - * Timestamp to take an asset snapshot. This can only be set to a timestamp in - * the past or of the current time. If not specified, the current time will be - * used. Due to delays in resource data collection and indexing, there is a - * volatile window during which running the same query may get different - * results. + * Timestamp to take an asset snapshot. This can only be set to a timestamp + * between 2018-10-02 UTC (inclusive) and the current time. If not specified, + * the current time will be used. Due to delays in resource data collection + * and indexing, there is a volatile window during which running the same + * query may get different results. ** *
.google.protobuf.Timestamp read_time = 2;
@@ -65,11 +67,11 @@ public interface ExportAssetsRequestOrBuilder
*
*
* - * Timestamp to take an asset snapshot. This can only be set to a timestamp in - * the past or of the current time. If not specified, the current time will be - * used. Due to delays in resource data collection and indexing, there is a - * volatile window during which running the same query may get different - * results. + * Timestamp to take an asset snapshot. This can only be set to a timestamp + * between 2018-10-02 UTC (inclusive) and the current time. If not specified, + * the current time will be used. Due to delays in resource data collection + * and indexing, there is a volatile window during which running the same + * query may get different results. ** *
.google.protobuf.Timestamp read_time = 2;
@@ -81,7 +83,10 @@ public interface ExportAssetsRequestOrBuilder
*
* * A list of asset types of which to take a snapshot for. For example: - * "google.compute.disk". If specified, only matching assets will be returned. + * "google.compute.Disk". If specified, only matching assets will be returned. + * See [Introduction to Cloud Asset + * Inventory](https://cloud.google.com/resource-manager/docs/cloud-asset-inventory/overview) + * for all supported asset types. ** *
repeated string asset_types = 3;
@@ -92,7 +97,10 @@ public interface ExportAssetsRequestOrBuilder
*
* * A list of asset types of which to take a snapshot for. For example: - * "google.compute.disk". If specified, only matching assets will be returned. + * "google.compute.Disk". If specified, only matching assets will be returned. + * See [Introduction to Cloud Asset + * Inventory](https://cloud.google.com/resource-manager/docs/cloud-asset-inventory/overview) + * for all supported asset types. ** *
repeated string asset_types = 3;
@@ -103,7 +111,10 @@ public interface ExportAssetsRequestOrBuilder
*
* * A list of asset types of which to take a snapshot for. For example: - * "google.compute.disk". If specified, only matching assets will be returned. + * "google.compute.Disk". If specified, only matching assets will be returned. + * See [Introduction to Cloud Asset + * Inventory](https://cloud.google.com/resource-manager/docs/cloud-asset-inventory/overview) + * for all supported asset types. ** *
repeated string asset_types = 3;
@@ -114,7 +125,10 @@ public interface ExportAssetsRequestOrBuilder
*
* * A list of asset types of which to take a snapshot for. For example: - * "google.compute.disk". If specified, only matching assets will be returned. + * "google.compute.Disk". If specified, only matching assets will be returned. + * See [Introduction to Cloud Asset + * Inventory](https://cloud.google.com/resource-manager/docs/cloud-asset-inventory/overview) + * for all supported asset types. ** *
repeated string asset_types = 3;
diff --git a/google-api-grpc/proto-google-cloud-asset-v1beta1/src/main/java/com/google/cloud/asset/v1beta1/GcsDestination.java b/google-api-grpc/proto-google-cloud-asset-v1beta1/src/main/java/com/google/cloud/asset/v1beta1/GcsDestination.java
index 62cae057f8e8..ea5bae07f52c 100644
--- a/google-api-grpc/proto-google-cloud-asset-v1beta1/src/main/java/com/google/cloud/asset/v1beta1/GcsDestination.java
+++ b/google-api-grpc/proto-google-cloud-asset-v1beta1/src/main/java/com/google/cloud/asset/v1beta1/GcsDestination.java
@@ -22,9 +22,7 @@ private GcsDestination(com.google.protobuf.GeneratedMessageV3.Builder> builder
super(builder);
}
- private GcsDestination() {
- uri_ = "";
- }
+ private GcsDestination() {}
@java.lang.Override
public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
@@ -53,8 +51,8 @@ private GcsDestination(
case 10:
{
java.lang.String s = input.readStringRequireUtf8();
-
- uri_ = s;
+ objectUriCase_ = 1;
+ objectUri_ = s;
break;
}
default:
@@ -91,27 +89,70 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
com.google.cloud.asset.v1beta1.GcsDestination.Builder.class);
}
+ private int objectUriCase_ = 0;
+ private java.lang.Object objectUri_;
+
+ public enum ObjectUriCase implements com.google.protobuf.Internal.EnumLite {
+ URI(1),
+ OBJECTURI_NOT_SET(0);
+ private final int value;
+
+ private ObjectUriCase(int value) {
+ this.value = value;
+ }
+ /** @deprecated Use {@link #forNumber(int)} instead. */
+ @java.lang.Deprecated
+ public static ObjectUriCase valueOf(int value) {
+ return forNumber(value);
+ }
+
+ public static ObjectUriCase forNumber(int value) {
+ switch (value) {
+ case 1:
+ return URI;
+ case 0:
+ return OBJECTURI_NOT_SET;
+ default:
+ return null;
+ }
+ }
+
+ public int getNumber() {
+ return this.value;
+ }
+ };
+
+ public ObjectUriCase getObjectUriCase() {
+ return ObjectUriCase.forNumber(objectUriCase_);
+ }
+
public static final int URI_FIELD_NUMBER = 1;
- private volatile java.lang.Object uri_;
/**
*
*
* - * The path of the Cloud Storage objects. It's the same path that is used by - * gsutil. For example: "gs://bucket_name/object_path". See [Viewing and Editing Object Metadata](https://cloud.google.com/storage/docs/viewing-editing-metadata) + * The uri of the Cloud Storage object. It's the same uri that is used by + * gsutil. For example: "gs://bucket_name/object_name". See [Viewing and + * Editing Object + * Metadata](https://cloud.google.com/storage/docs/viewing-editing-metadata) * for more information. ** *
string uri = 1;
*/
public java.lang.String getUri() {
- java.lang.Object ref = uri_;
+ java.lang.Object ref = "";
+ if (objectUriCase_ == 1) {
+ ref = objectUri_;
+ }
if (ref instanceof java.lang.String) {
return (java.lang.String) ref;
} else {
com.google.protobuf.ByteString bs = (com.google.protobuf.ByteString) ref;
java.lang.String s = bs.toStringUtf8();
- uri_ = s;
+ if (objectUriCase_ == 1) {
+ objectUri_ = s;
+ }
return s;
}
}
@@ -119,19 +160,26 @@ public java.lang.String getUri() {
*
*
* - * The path of the Cloud Storage objects. It's the same path that is used by - * gsutil. For example: "gs://bucket_name/object_path". See [Viewing and Editing Object Metadata](https://cloud.google.com/storage/docs/viewing-editing-metadata) + * The uri of the Cloud Storage object. It's the same uri that is used by + * gsutil. For example: "gs://bucket_name/object_name". See [Viewing and + * Editing Object + * Metadata](https://cloud.google.com/storage/docs/viewing-editing-metadata) * for more information. ** *
string uri = 1;
*/
public com.google.protobuf.ByteString getUriBytes() {
- java.lang.Object ref = uri_;
+ java.lang.Object ref = "";
+ if (objectUriCase_ == 1) {
+ ref = objectUri_;
+ }
if (ref instanceof java.lang.String) {
com.google.protobuf.ByteString b =
com.google.protobuf.ByteString.copyFromUtf8((java.lang.String) ref);
- uri_ = b;
+ if (objectUriCase_ == 1) {
+ objectUri_ = b;
+ }
return b;
} else {
return (com.google.protobuf.ByteString) ref;
@@ -152,8 +200,8 @@ public final boolean isInitialized() {
@java.lang.Override
public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException {
- if (!getUriBytes().isEmpty()) {
- com.google.protobuf.GeneratedMessageV3.writeString(output, 1, uri_);
+ if (objectUriCase_ == 1) {
+ com.google.protobuf.GeneratedMessageV3.writeString(output, 1, objectUri_);
}
unknownFields.writeTo(output);
}
@@ -164,8 +212,8 @@ public int getSerializedSize() {
if (size != -1) return size;
size = 0;
- if (!getUriBytes().isEmpty()) {
- size += com.google.protobuf.GeneratedMessageV3.computeStringSize(1, uri_);
+ if (objectUriCase_ == 1) {
+ size += com.google.protobuf.GeneratedMessageV3.computeStringSize(1, objectUri_);
}
size += unknownFields.getSerializedSize();
memoizedSize = size;
@@ -184,7 +232,15 @@ public boolean equals(final java.lang.Object obj) {
(com.google.cloud.asset.v1beta1.GcsDestination) obj;
boolean result = true;
- result = result && getUri().equals(other.getUri());
+ result = result && getObjectUriCase().equals(other.getObjectUriCase());
+ if (!result) return false;
+ switch (objectUriCase_) {
+ case 1:
+ result = result && getUri().equals(other.getUri());
+ break;
+ case 0:
+ default:
+ }
result = result && unknownFields.equals(other.unknownFields);
return result;
}
@@ -196,8 +252,14 @@ public int hashCode() {
}
int hash = 41;
hash = (19 * hash) + getDescriptor().hashCode();
- hash = (37 * hash) + URI_FIELD_NUMBER;
- hash = (53 * hash) + getUri().hashCode();
+ switch (objectUriCase_) {
+ case 1:
+ hash = (37 * hash) + URI_FIELD_NUMBER;
+ hash = (53 * hash) + getUri().hashCode();
+ break;
+ case 0:
+ default:
+ }
hash = (29 * hash) + unknownFields.hashCode();
memoizedHashCode = hash;
return hash;
@@ -343,8 +405,8 @@ private void maybeForceBuilderInitialization() {
@java.lang.Override
public Builder clear() {
super.clear();
- uri_ = "";
-
+ objectUriCase_ = 0;
+ objectUri_ = null;
return this;
}
@@ -372,7 +434,10 @@ public com.google.cloud.asset.v1beta1.GcsDestination build() {
public com.google.cloud.asset.v1beta1.GcsDestination buildPartial() {
com.google.cloud.asset.v1beta1.GcsDestination result =
new com.google.cloud.asset.v1beta1.GcsDestination(this);
- result.uri_ = uri_;
+ if (objectUriCase_ == 1) {
+ result.objectUri_ = objectUri_;
+ }
+ result.objectUriCase_ = objectUriCase_;
onBuilt();
return result;
}
@@ -422,9 +487,18 @@ public Builder mergeFrom(com.google.protobuf.Message other) {
public Builder mergeFrom(com.google.cloud.asset.v1beta1.GcsDestination other) {
if (other == com.google.cloud.asset.v1beta1.GcsDestination.getDefaultInstance()) return this;
- if (!other.getUri().isEmpty()) {
- uri_ = other.uri_;
- onChanged();
+ switch (other.getObjectUriCase()) {
+ case URI:
+ {
+ objectUriCase_ = 1;
+ objectUri_ = other.objectUri_;
+ onChanged();
+ break;
+ }
+ case OBJECTURI_NOT_SET:
+ {
+ break;
+ }
}
this.mergeUnknownFields(other.unknownFields);
onChanged();
@@ -455,24 +529,44 @@ public Builder mergeFrom(
return this;
}
- private java.lang.Object uri_ = "";
+ private int objectUriCase_ = 0;
+ private java.lang.Object objectUri_;
+
+ public ObjectUriCase getObjectUriCase() {
+ return ObjectUriCase.forNumber(objectUriCase_);
+ }
+
+ public Builder clearObjectUri() {
+ objectUriCase_ = 0;
+ objectUri_ = null;
+ onChanged();
+ return this;
+ }
+
/**
*
*
* - * The path of the Cloud Storage objects. It's the same path that is used by - * gsutil. For example: "gs://bucket_name/object_path". See [Viewing and Editing Object Metadata](https://cloud.google.com/storage/docs/viewing-editing-metadata) + * The uri of the Cloud Storage object. It's the same uri that is used by + * gsutil. For example: "gs://bucket_name/object_name". See [Viewing and + * Editing Object + * Metadata](https://cloud.google.com/storage/docs/viewing-editing-metadata) * for more information. ** *
string uri = 1;
*/
public java.lang.String getUri() {
- java.lang.Object ref = uri_;
+ java.lang.Object ref = "";
+ if (objectUriCase_ == 1) {
+ ref = objectUri_;
+ }
if (!(ref instanceof java.lang.String)) {
com.google.protobuf.ByteString bs = (com.google.protobuf.ByteString) ref;
java.lang.String s = bs.toStringUtf8();
- uri_ = s;
+ if (objectUriCase_ == 1) {
+ objectUri_ = s;
+ }
return s;
} else {
return (java.lang.String) ref;
@@ -482,19 +576,26 @@ public java.lang.String getUri() {
*
*
* - * The path of the Cloud Storage objects. It's the same path that is used by - * gsutil. For example: "gs://bucket_name/object_path". See [Viewing and Editing Object Metadata](https://cloud.google.com/storage/docs/viewing-editing-metadata) + * The uri of the Cloud Storage object. It's the same uri that is used by + * gsutil. For example: "gs://bucket_name/object_name". See [Viewing and + * Editing Object + * Metadata](https://cloud.google.com/storage/docs/viewing-editing-metadata) * for more information. ** *
string uri = 1;
*/
public com.google.protobuf.ByteString getUriBytes() {
- java.lang.Object ref = uri_;
+ java.lang.Object ref = "";
+ if (objectUriCase_ == 1) {
+ ref = objectUri_;
+ }
if (ref instanceof String) {
com.google.protobuf.ByteString b =
com.google.protobuf.ByteString.copyFromUtf8((java.lang.String) ref);
- uri_ = b;
+ if (objectUriCase_ == 1) {
+ objectUri_ = b;
+ }
return b;
} else {
return (com.google.protobuf.ByteString) ref;
@@ -504,8 +605,10 @@ public com.google.protobuf.ByteString getUriBytes() {
*
*
* - * The path of the Cloud Storage objects. It's the same path that is used by - * gsutil. For example: "gs://bucket_name/object_path". See [Viewing and Editing Object Metadata](https://cloud.google.com/storage/docs/viewing-editing-metadata) + * The uri of the Cloud Storage object. It's the same uri that is used by + * gsutil. For example: "gs://bucket_name/object_name". See [Viewing and + * Editing Object + * Metadata](https://cloud.google.com/storage/docs/viewing-editing-metadata) * for more information. ** @@ -515,8 +618,8 @@ public Builder setUri(java.lang.String value) { if (value == null) { throw new NullPointerException(); } - - uri_ = value; + objectUriCase_ = 1; + objectUri_ = value; onChanged(); return this; } @@ -524,25 +627,31 @@ public Builder setUri(java.lang.String value) { * * *
- * The path of the Cloud Storage objects. It's the same path that is used by - * gsutil. For example: "gs://bucket_name/object_path". See [Viewing and Editing Object Metadata](https://cloud.google.com/storage/docs/viewing-editing-metadata) + * The uri of the Cloud Storage object. It's the same uri that is used by + * gsutil. For example: "gs://bucket_name/object_name". See [Viewing and + * Editing Object + * Metadata](https://cloud.google.com/storage/docs/viewing-editing-metadata) * for more information. ** *
string uri = 1;
*/
public Builder clearUri() {
-
- uri_ = getDefaultInstance().getUri();
- onChanged();
+ if (objectUriCase_ == 1) {
+ objectUriCase_ = 0;
+ objectUri_ = null;
+ onChanged();
+ }
return this;
}
/**
*
*
* - * The path of the Cloud Storage objects. It's the same path that is used by - * gsutil. For example: "gs://bucket_name/object_path". See [Viewing and Editing Object Metadata](https://cloud.google.com/storage/docs/viewing-editing-metadata) + * The uri of the Cloud Storage object. It's the same uri that is used by + * gsutil. For example: "gs://bucket_name/object_name". See [Viewing and + * Editing Object + * Metadata](https://cloud.google.com/storage/docs/viewing-editing-metadata) * for more information. ** @@ -553,8 +662,8 @@ public Builder setUriBytes(com.google.protobuf.ByteString value) { throw new NullPointerException(); } checkByteStringIsUtf8(value); - - uri_ = value; + objectUriCase_ = 1; + objectUri_ = value; onChanged(); return this; } diff --git a/google-api-grpc/proto-google-cloud-asset-v1beta1/src/main/java/com/google/cloud/asset/v1beta1/GcsDestinationOrBuilder.java b/google-api-grpc/proto-google-cloud-asset-v1beta1/src/main/java/com/google/cloud/asset/v1beta1/GcsDestinationOrBuilder.java index 65b54d40b70c..5f04fe37e7f0 100644 --- a/google-api-grpc/proto-google-cloud-asset-v1beta1/src/main/java/com/google/cloud/asset/v1beta1/GcsDestinationOrBuilder.java +++ b/google-api-grpc/proto-google-cloud-asset-v1beta1/src/main/java/com/google/cloud/asset/v1beta1/GcsDestinationOrBuilder.java @@ -12,8 +12,10 @@ public interface GcsDestinationOrBuilder * * *
- * The path of the Cloud Storage objects. It's the same path that is used by - * gsutil. For example: "gs://bucket_name/object_path". See [Viewing and Editing Object Metadata](https://cloud.google.com/storage/docs/viewing-editing-metadata) + * The uri of the Cloud Storage object. It's the same uri that is used by + * gsutil. For example: "gs://bucket_name/object_name". See [Viewing and + * Editing Object + * Metadata](https://cloud.google.com/storage/docs/viewing-editing-metadata) * for more information. ** @@ -24,12 +26,16 @@ public interface GcsDestinationOrBuilder * * *
- * The path of the Cloud Storage objects. It's the same path that is used by - * gsutil. For example: "gs://bucket_name/object_path". See [Viewing and Editing Object Metadata](https://cloud.google.com/storage/docs/viewing-editing-metadata) + * The uri of the Cloud Storage object. It's the same uri that is used by + * gsutil. For example: "gs://bucket_name/object_name". See [Viewing and + * Editing Object + * Metadata](https://cloud.google.com/storage/docs/viewing-editing-metadata) * for more information. ** *
string uri = 1;
*/
com.google.protobuf.ByteString getUriBytes();
+
+ public com.google.cloud.asset.v1beta1.GcsDestination.ObjectUriCase getObjectUriCase();
}
diff --git a/google-api-grpc/proto-google-cloud-asset-v1beta1/src/main/java/com/google/cloud/asset/v1beta1/TimeWindow.java b/google-api-grpc/proto-google-cloud-asset-v1beta1/src/main/java/com/google/cloud/asset/v1beta1/TimeWindow.java
index 08fb8afa53d1..ad48d08e1971 100644
--- a/google-api-grpc/proto-google-cloud-asset-v1beta1/src/main/java/com/google/cloud/asset/v1beta1/TimeWindow.java
+++ b/google-api-grpc/proto-google-cloud-asset-v1beta1/src/main/java/com/google/cloud/asset/v1beta1/TimeWindow.java
@@ -7,7 +7,7 @@
*
*
* - * A time window of [start_time, end_time). + * A time window of (start_time, end_time]. ** * Protobuf type {@code google.cloud.asset.v1beta1.TimeWindow} @@ -118,7 +118,7 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { * * *
- * Start time of the time window (inclusive). + * Start time of the time window (exclusive). ** *
.google.protobuf.Timestamp start_time = 1;
@@ -130,7 +130,7 @@ public boolean hasStartTime() {
*
*
* - * Start time of the time window (inclusive). + * Start time of the time window (exclusive). ** *
.google.protobuf.Timestamp start_time = 1;
@@ -142,7 +142,7 @@ public com.google.protobuf.Timestamp getStartTime() {
*
*
* - * Start time of the time window (inclusive). + * Start time of the time window (exclusive). ** *
.google.protobuf.Timestamp start_time = 1;
@@ -157,7 +157,7 @@ public com.google.protobuf.TimestampOrBuilder getStartTimeOrBuilder() {
*
*
* - * End time of the time window (exclusive). + * End time of the time window (inclusive). * Current timestamp if not specified. ** @@ -170,7 +170,7 @@ public boolean hasEndTime() { * * *
- * End time of the time window (exclusive). + * End time of the time window (inclusive). * Current timestamp if not specified. ** @@ -183,7 +183,7 @@ public com.google.protobuf.Timestamp getEndTime() { * * *
- * End time of the time window (exclusive). + * End time of the time window (inclusive). * Current timestamp if not specified. ** @@ -376,7 +376,7 @@ protected Builder newBuilderForType(com.google.protobuf.GeneratedMessageV3.Build * * *
- * A time window of [start_time, end_time). + * A time window of (start_time, end_time]. ** * Protobuf type {@code google.cloud.asset.v1beta1.TimeWindow} @@ -560,7 +560,7 @@ public Builder mergeFrom( * * *
- * Start time of the time window (inclusive). + * Start time of the time window (exclusive). ** *
.google.protobuf.Timestamp start_time = 1;
@@ -572,7 +572,7 @@ public boolean hasStartTime() {
*
*
* - * Start time of the time window (inclusive). + * Start time of the time window (exclusive). ** *
.google.protobuf.Timestamp start_time = 1;
@@ -588,7 +588,7 @@ public com.google.protobuf.Timestamp getStartTime() {
*
*
* - * Start time of the time window (inclusive). + * Start time of the time window (exclusive). ** *
.google.protobuf.Timestamp start_time = 1;
@@ -610,7 +610,7 @@ public Builder setStartTime(com.google.protobuf.Timestamp value) {
*
*
* - * Start time of the time window (inclusive). + * Start time of the time window (exclusive). ** *
.google.protobuf.Timestamp start_time = 1;
@@ -629,7 +629,7 @@ public Builder setStartTime(com.google.protobuf.Timestamp.Builder builderForValu
*
*
* - * Start time of the time window (inclusive). + * Start time of the time window (exclusive). ** *
.google.protobuf.Timestamp start_time = 1;
@@ -653,7 +653,7 @@ public Builder mergeStartTime(com.google.protobuf.Timestamp value) {
*
*
* - * Start time of the time window (inclusive). + * Start time of the time window (exclusive). ** *
.google.protobuf.Timestamp start_time = 1;
@@ -673,7 +673,7 @@ public Builder clearStartTime() {
*
*
* - * Start time of the time window (inclusive). + * Start time of the time window (exclusive). ** *
.google.protobuf.Timestamp start_time = 1;
@@ -687,7 +687,7 @@ public com.google.protobuf.Timestamp.Builder getStartTimeBuilder() {
*
*
* - * Start time of the time window (inclusive). + * Start time of the time window (exclusive). ** *
.google.protobuf.Timestamp start_time = 1;
@@ -703,7 +703,7 @@ public com.google.protobuf.TimestampOrBuilder getStartTimeOrBuilder() {
*
*
* - * Start time of the time window (inclusive). + * Start time of the time window (exclusive). ** *
.google.protobuf.Timestamp start_time = 1;
@@ -735,7 +735,7 @@ public com.google.protobuf.TimestampOrBuilder getStartTimeOrBuilder() {
*
*
* - * End time of the time window (exclusive). + * End time of the time window (inclusive). * Current timestamp if not specified. ** @@ -748,7 +748,7 @@ public boolean hasEndTime() { * * *
- * End time of the time window (exclusive). + * End time of the time window (inclusive). * Current timestamp if not specified. ** @@ -765,7 +765,7 @@ public com.google.protobuf.Timestamp getEndTime() { * * *
- * End time of the time window (exclusive). + * End time of the time window (inclusive). * Current timestamp if not specified. ** @@ -788,7 +788,7 @@ public Builder setEndTime(com.google.protobuf.Timestamp value) { * * *
- * End time of the time window (exclusive). + * End time of the time window (inclusive). * Current timestamp if not specified. ** @@ -808,7 +808,7 @@ public Builder setEndTime(com.google.protobuf.Timestamp.Builder builderForValue) * * *
- * End time of the time window (exclusive). + * End time of the time window (inclusive). * Current timestamp if not specified. ** @@ -833,7 +833,7 @@ public Builder mergeEndTime(com.google.protobuf.Timestamp value) { * * *
- * End time of the time window (exclusive). + * End time of the time window (inclusive). * Current timestamp if not specified. ** @@ -854,7 +854,7 @@ public Builder clearEndTime() { * * *
- * End time of the time window (exclusive). + * End time of the time window (inclusive). * Current timestamp if not specified. ** @@ -869,7 +869,7 @@ public com.google.protobuf.Timestamp.Builder getEndTimeBuilder() { * * *
- * End time of the time window (exclusive). + * End time of the time window (inclusive). * Current timestamp if not specified. ** @@ -886,7 +886,7 @@ public com.google.protobuf.TimestampOrBuilder getEndTimeOrBuilder() { * * *
- * End time of the time window (exclusive). + * End time of the time window (inclusive). * Current timestamp if not specified. ** diff --git a/google-api-grpc/proto-google-cloud-asset-v1beta1/src/main/java/com/google/cloud/asset/v1beta1/TimeWindowOrBuilder.java b/google-api-grpc/proto-google-cloud-asset-v1beta1/src/main/java/com/google/cloud/asset/v1beta1/TimeWindowOrBuilder.java index 9ac0b5367a64..2d310d2df98a 100644 --- a/google-api-grpc/proto-google-cloud-asset-v1beta1/src/main/java/com/google/cloud/asset/v1beta1/TimeWindowOrBuilder.java +++ b/google-api-grpc/proto-google-cloud-asset-v1beta1/src/main/java/com/google/cloud/asset/v1beta1/TimeWindowOrBuilder.java @@ -12,7 +12,7 @@ public interface TimeWindowOrBuilder * * *
- * Start time of the time window (inclusive). + * Start time of the time window (exclusive). ** *
.google.protobuf.Timestamp start_time = 1;
@@ -22,7 +22,7 @@ public interface TimeWindowOrBuilder
*
*
* - * Start time of the time window (inclusive). + * Start time of the time window (exclusive). ** *
.google.protobuf.Timestamp start_time = 1;
@@ -32,7 +32,7 @@ public interface TimeWindowOrBuilder
*
*
* - * Start time of the time window (inclusive). + * Start time of the time window (exclusive). ** *
.google.protobuf.Timestamp start_time = 1;
@@ -43,7 +43,7 @@ public interface TimeWindowOrBuilder
*
*
* - * End time of the time window (exclusive). + * End time of the time window (inclusive). * Current timestamp if not specified. ** @@ -54,7 +54,7 @@ public interface TimeWindowOrBuilder * * *
- * End time of the time window (exclusive). + * End time of the time window (inclusive). * Current timestamp if not specified. ** @@ -65,7 +65,7 @@ public interface TimeWindowOrBuilder * * *
- * End time of the time window (exclusive). + * End time of the time window (inclusive). * Current timestamp if not specified. ** diff --git a/google-api-grpc/proto-google-cloud-asset-v1beta1/src/main/proto/google/cloud/asset/v1beta1/asset_service.proto b/google-api-grpc/proto-google-cloud-asset-v1beta1/src/main/proto/google/cloud/asset/v1beta1/asset_service.proto index aaaa0ba223b4..16e0789ebc46 100644 --- a/google-api-grpc/proto-google-cloud-asset-v1beta1/src/main/proto/google/cloud/asset/v1beta1/asset_service.proto +++ b/google-api-grpc/proto-google-cloud-asset-v1beta1/src/main/proto/google/cloud/asset/v1beta1/asset_service.proto @@ -40,6 +40,10 @@ service AssetService { option (google.api.http) = { post: "/v1beta1/{parent=projects/*}:exportAssets" body: "*" + additional_bindings { + post: "/v1beta1/{parent=folders/*}:exportAssets" + body: "*" + } additional_bindings { post: "/v1beta1/{parent=organizations/*}:exportAssets" body: "*" @@ -64,20 +68,24 @@ service AssetService { // Export asset request. message ExportAssetsRequest { - // Required. The relative name of the root asset. This can only be an organization - // number (such as "organizations/123"), a project ID (such as - // "projects/my-project-id"), or a project number (such as "projects/12345"). + // Required. The relative name of the root asset. This can only be an + // organization number (such as "organizations/123"), a project ID (such as + // "projects/my-project-id"), a project number (such as "projects/12345"), or + // a folder number (such as "folders/123"). string parent = 1; - // Timestamp to take an asset snapshot. This can only be set to a timestamp in - // the past or of the current time. If not specified, the current time will be - // used. Due to delays in resource data collection and indexing, there is a - // volatile window during which running the same query may get different - // results. + // Timestamp to take an asset snapshot. This can only be set to a timestamp + // between 2018-10-02 UTC (inclusive) and the current time. If not specified, + // the current time will be used. Due to delays in resource data collection + // and indexing, there is a volatile window during which running the same + // query may get different results. google.protobuf.Timestamp read_time = 2; // A list of asset types of which to take a snapshot for. For example: - // "google.compute.disk". If specified, only matching assets will be returned. + // "google.compute.Disk". If specified, only matching assets will be returned. + // See [Introduction to Cloud Asset + // Inventory](https://cloud.google.com/resource-manager/docs/cloud-asset-inventory/overview) + // for all supported asset types. repeated string asset_types = 3; // Asset content type. If not specified, no content but the asset name will be @@ -120,9 +128,12 @@ message BatchGetAssetsHistoryRequest { // Required. The content type. ContentType content_type = 3; - // Required. The time window for the asset history. The start time is - // required. The returned results contain all temporal assets whose time - // window overlap with read_time_window. + // Optional. The time window for the asset history. Both start_time and + // end_time are optional and if set, it must be after 2018-10-02 UTC. If + // end_time is not set, it is default to current timestamp. If start_time is + // not set, the snapshot of the assets at end_time will be returned. The + // returned results contain all temporal assets whose time window overlap with + // read_time_window. TimeWindow read_time_window = 4; } @@ -143,10 +154,15 @@ message OutputConfig { // A Cloud Storage location. message GcsDestination { - // The path of the Cloud Storage objects. It's the same path that is used by - // gsutil. For example: "gs://bucket_name/object_path". See [Viewing and Editing Object Metadata](https://cloud.google.com/storage/docs/viewing-editing-metadata) - // for more information. - string uri = 1; + // Required. + oneof object_uri { + // The uri of the Cloud Storage object. It's the same uri that is used by + // gsutil. For example: "gs://bucket_name/object_name". See [Viewing and + // Editing Object + // Metadata](https://cloud.google.com/storage/docs/viewing-editing-metadata) + // for more information. + string uri = 1; + } } // Asset content type. diff --git a/google-api-grpc/proto-google-cloud-asset-v1beta1/src/main/proto/google/cloud/asset/v1beta1/assets.proto b/google-api-grpc/proto-google-cloud-asset-v1beta1/src/main/proto/google/cloud/asset/v1beta1/assets.proto index 5d339a20f007..cde70cddfc0b 100644 --- a/google-api-grpc/proto-google-cloud-asset-v1beta1/src/main/proto/google/cloud/asset/v1beta1/assets.proto +++ b/google-api-grpc/proto-google-cloud-asset-v1beta1/src/main/proto/google/cloud/asset/v1beta1/assets.proto @@ -44,12 +44,12 @@ message TemporalAsset { Asset asset = 3; } -// A time window of [start_time, end_time). +// A time window of (start_time, end_time]. message TimeWindow { - // Start time of the time window (inclusive). + // Start time of the time window (exclusive). google.protobuf.Timestamp start_time = 1; - // End time of the time window (exclusive). + // End time of the time window (inclusive). // Current timestamp if not specified. google.protobuf.Timestamp end_time = 2; } @@ -62,7 +62,7 @@ message Asset { // for more information. string name = 1; - // Type of the asset. Example: "google.compute.disk". + // Type of the asset. Example: "google.compute.Disk". string asset_type = 2; // Representation of the resource. diff --git a/google-cloud-clients/google-cloud-asset/synth.metadata b/google-cloud-clients/google-cloud-asset/synth.metadata index 991df3e55add..536e87aa7375 100644 --- a/google-cloud-clients/google-cloud-asset/synth.metadata +++ b/google-cloud-clients/google-cloud-asset/synth.metadata @@ -1,19 +1,19 @@ { - "updateTime": "2019-01-17T08:33:36.590398Z", + "updateTime": "2019-01-19T08:33:18.886065Z", "sources": [ { "generator": { "name": "artman", - "version": "0.16.6", - "dockerImage": "googleapis/artman@sha256:12722f2ca3fbc3b53cc6aa5f0e569d7d221b46bd876a2136497089dec5e3634e" + "version": "0.16.7", + "dockerImage": "googleapis/artman@sha256:d6c8ced606eb49973ca95d2af7c55a681acc042db0f87d135968349e7bf6dd80" } }, { "git": { "name": "googleapis", "remote": "https://github.com/googleapis/googleapis.git", - "sha": "0ac60e21a1aa86c07c1836865b35308ba8178b05", - "internalRef": "229626798" + "sha": "96adaf6de4fa2cabbdd5de560a367bb488e0639b", + "internalRef": "229998977" } } ],