From 2651bb67771378da6ed25d12570e579698eed439 Mon Sep 17 00:00:00 2001 From: yoshi-automation Date: Thu, 30 Jan 2020 00:36:52 -0800 Subject: [PATCH 1/2] [CHANGE ME] Re-generated to pick up changes in the API or client library generator. --- .../asset/v1beta1/AssetServiceClient.java | 6 +- .../cloud/asset/v1beta1/AssetServiceGrpc.java | 8 + .../cloud/asset/v1beta1/AssetProto.java | 53 +-- .../asset/v1beta1/AssetServiceProto.java | 111 ++++--- .../v1beta1/BatchGetAssetsHistoryRequest.java | 118 +++++-- ...BatchGetAssetsHistoryRequestOrBuilder.java | 32 +- .../asset/v1beta1/ExportAssetsRequest.java | 76 +++-- .../v1beta1/ExportAssetsRequestOrBuilder.java | 20 +- .../cloud/asset/v1beta1/GcsDestination.java | 255 +++++++++++++++ .../v1beta1/GcsDestinationOrBuilder.java | 39 +++ .../cloud/asset/v1beta1/asset_service.proto | 47 ++- .../google/cloud/asset/v1beta1/assets.proto | 9 +- .../cloud/asset/v1p1beta1/AssetProto.java | 25 +- .../asset/v1p1beta1/AssetServiceProto.java | 43 +-- .../v1p1beta1/StandardResourceMetadata.java | 307 ++++++++++++++++++ .../StandardResourceMetadataOrBuilder.java | 59 ++++ .../cloud/asset/v1p1beta1/asset_service.proto | 6 +- .../google/cloud/asset/v1p1beta1/assets.proto | 5 + synth.metadata | 99 ++++-- 19 files changed, 1122 insertions(+), 196 deletions(-) diff --git a/google-cloud-asset/src/main/java/com/google/cloud/asset/v1beta1/AssetServiceClient.java b/google-cloud-asset/src/main/java/com/google/cloud/asset/v1beta1/AssetServiceClient.java index f735bd986..aa4ee82e0 100644 --- a/google-cloud-asset/src/main/java/com/google/cloud/asset/v1beta1/AssetServiceClient.java +++ b/google-cloud-asset/src/main/java/com/google/cloud/asset/v1beta1/AssetServiceClient.java @@ -259,7 +259,8 @@ public final UnaryCallable exportAssetsCallable( * Batch gets the update history of assets that overlap a time window. For RESOURCE content, this * API outputs history with asset in both non-delete or deleted status. For IAM_POLICY content, * this API outputs history when the asset and its attached IAM POLICY both exist. This can create - * gaps in the output history. + * gaps in the output history. If a specified asset does not exist, this API returns an + * INVALID_ARGUMENT error. * *

Sample code: * @@ -290,7 +291,8 @@ public final BatchGetAssetsHistoryResponse batchGetAssetsHistory( * Batch gets the update history of assets that overlap a time window. For RESOURCE content, this * API outputs history with asset in both non-delete or deleted status. For IAM_POLICY content, * this API outputs history when the asset and its attached IAM POLICY both exist. This can create - * gaps in the output history. + * gaps in the output history. If a specified asset does not exist, this API returns an + * INVALID_ARGUMENT error. * *

Sample code: * diff --git a/grpc-google-cloud-asset-v1beta1/src/main/java/com/google/cloud/asset/v1beta1/AssetServiceGrpc.java b/grpc-google-cloud-asset-v1beta1/src/main/java/com/google/cloud/asset/v1beta1/AssetServiceGrpc.java index 002139068..0e5994a63 100644 --- a/grpc-google-cloud-asset-v1beta1/src/main/java/com/google/cloud/asset/v1beta1/AssetServiceGrpc.java +++ b/grpc-google-cloud-asset-v1beta1/src/main/java/com/google/cloud/asset/v1beta1/AssetServiceGrpc.java @@ -204,6 +204,8 @@ public void exportAssets( * non-delete or deleted status. * For IAM_POLICY content, this API outputs history when the asset and its * attached IAM POLICY both exist. This can create gaps in the output history. + * If a specified asset does not exist, this API returns an INVALID_ARGUMENT + * error. * */ public void batchGetAssetsHistory( @@ -283,6 +285,8 @@ public void exportAssets( * non-delete or deleted status. * For IAM_POLICY content, this API outputs history when the asset and its * attached IAM POLICY both exist. This can create gaps in the output history. + * If a specified asset does not exist, this API returns an INVALID_ARGUMENT + * error. * */ public void batchGetAssetsHistory( @@ -345,6 +349,8 @@ public com.google.longrunning.Operation exportAssets( * non-delete or deleted status. * For IAM_POLICY content, this API outputs history when the asset and its * attached IAM POLICY both exist. This can create gaps in the output history. + * If a specified asset does not exist, this API returns an INVALID_ARGUMENT + * error. * */ public com.google.cloud.asset.v1beta1.BatchGetAssetsHistoryResponse batchGetAssetsHistory( @@ -403,6 +409,8 @@ protected AssetServiceFutureStub build( * non-delete or deleted status. * For IAM_POLICY content, this API outputs history when the asset and its * attached IAM POLICY both exist. This can create gaps in the output history. + * If a specified asset does not exist, this API returns an INVALID_ARGUMENT + * error. * */ public com.google.common.util.concurrent.ListenableFuture< diff --git a/proto-google-cloud-asset-v1beta1/src/main/java/com/google/cloud/asset/v1beta1/AssetProto.java b/proto-google-cloud-asset-v1beta1/src/main/java/com/google/cloud/asset/v1beta1/AssetProto.java index 7e0cbfc2d..8244ae3f2 100644 --- a/proto-google-cloud-asset-v1beta1/src/main/java/com/google/cloud/asset/v1beta1/AssetProto.java +++ b/proto-google-cloud-asset-v1beta1/src/main/java/com/google/cloud/asset/v1beta1/AssetProto.java @@ -54,34 +54,37 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() { java.lang.String[] descriptorData = { "\n\'google/cloud/asset/v1beta1/assets.prot" + "o\022\032google.cloud.asset.v1beta1\032\034google/ap" - + "i/annotations.proto\032\032google/iam/v1/polic" - + "y.proto\032\031google/protobuf/any.proto\032\034goog" - + "le/protobuf/struct.proto\032\037google/protobu" - + "f/timestamp.proto\"\212\001\n\rTemporalAsset\0226\n\006w" - + "indow\030\001 \001(\0132&.google.cloud.asset.v1beta1" - + ".TimeWindow\022\017\n\007deleted\030\002 \001(\010\0220\n\005asset\030\003 " - + "\001(\0132!.google.cloud.asset.v1beta1.Asset\"j" - + "\n\nTimeWindow\022.\n\nstart_time\030\001 \001(\0132\032.googl" - + "e.protobuf.Timestamp\022,\n\010end_time\030\002 \001(\0132\032" - + ".google.protobuf.Timestamp\"\214\001\n\005Asset\022\014\n\004" - + "name\030\001 \001(\t\022\022\n\nasset_type\030\002 \001(\t\0226\n\010resour" - + "ce\030\003 \001(\0132$.google.cloud.asset.v1beta1.Re" - + "source\022)\n\niam_policy\030\004 \001(\0132\025.google.iam." - + "v1.Policy\"\240\001\n\010Resource\022\017\n\007version\030\001 \001(\t\022" - + "\036\n\026discovery_document_uri\030\002 \001(\t\022\026\n\016disco" - + "very_name\030\003 \001(\t\022\024\n\014resource_url\030\004 \001(\t\022\016\n" - + "\006parent\030\005 \001(\t\022%\n\004data\030\006 \001(\0132\027.google.pro" - + "tobuf.StructB\251\001\n\036com.google.cloud.asset." - + "v1beta1B\nAssetProtoP\001Z?google.golang.org" - + "/genproto/googleapis/cloud/asset/v1beta1" - + ";asset\252\002\032Google.Cloud.Asset.V1Beta1\312\002\032Go" - + "ogle\\Cloud\\Asset\\V1beta1b\006proto3" + + "i/annotations.proto\032\031google/api/resource" + + ".proto\032\032google/iam/v1/policy.proto\032\031goog" + + "le/protobuf/any.proto\032\034google/protobuf/s" + + "truct.proto\032\037google/protobuf/timestamp.p" + + "roto\"\212\001\n\rTemporalAsset\0226\n\006window\030\001 \001(\0132&" + + ".google.cloud.asset.v1beta1.TimeWindow\022\017" + + "\n\007deleted\030\002 \001(\010\0220\n\005asset\030\003 \001(\0132!.google." + + "cloud.asset.v1beta1.Asset\"j\n\nTimeWindow\022" + + ".\n\nstart_time\030\001 \001(\0132\032.google.protobuf.Ti" + + "mestamp\022,\n\010end_time\030\002 \001(\0132\032.google.proto" + + "buf.Timestamp\"\265\001\n\005Asset\022\014\n\004name\030\001 \001(\t\022\022\n" + + "\nasset_type\030\002 \001(\t\0226\n\010resource\030\003 \001(\0132$.go" + + "ogle.cloud.asset.v1beta1.Resource\022)\n\niam" + + "_policy\030\004 \001(\0132\025.google.iam.v1.Policy:\'\352A" + + "$\n\037cloudasset.googleapis.com/Asset\022\001*\"\240\001" + + "\n\010Resource\022\017\n\007version\030\001 \001(\t\022\036\n\026discovery" + + "_document_uri\030\002 \001(\t\022\026\n\016discovery_name\030\003 " + + "\001(\t\022\024\n\014resource_url\030\004 \001(\t\022\016\n\006parent\030\005 \001(" + + "\t\022%\n\004data\030\006 \001(\0132\027.google.protobuf.Struct" + + "B\254\001\n\036com.google.cloud.asset.v1beta1B\nAss" + + "etProtoP\001Z?google.golang.org/genproto/go" + + "ogleapis/cloud/asset/v1beta1;asset\370\001\001\252\002\032" + + "Google.Cloud.Asset.V1Beta1\312\002\032Google\\Clou" + + "d\\Asset\\V1beta1b\006proto3" }; descriptor = com.google.protobuf.Descriptors.FileDescriptor.internalBuildGeneratedFileFrom( descriptorData, new com.google.protobuf.Descriptors.FileDescriptor[] { com.google.api.AnnotationsProto.getDescriptor(), + com.google.api.ResourceProto.getDescriptor(), com.google.iam.v1.PolicyProto.getDescriptor(), com.google.protobuf.AnyProto.getDescriptor(), com.google.protobuf.StructProto.getDescriptor(), @@ -119,7 +122,13 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() { new java.lang.String[] { "Version", "DiscoveryDocumentUri", "DiscoveryName", "ResourceUrl", "Parent", "Data", }); + com.google.protobuf.ExtensionRegistry registry = + com.google.protobuf.ExtensionRegistry.newInstance(); + registry.add(com.google.api.ResourceProto.resource); + com.google.protobuf.Descriptors.FileDescriptor.internalUpdateFileDescriptor( + descriptor, registry); com.google.api.AnnotationsProto.getDescriptor(); + com.google.api.ResourceProto.getDescriptor(); com.google.iam.v1.PolicyProto.getDescriptor(); com.google.protobuf.AnyProto.getDescriptor(); com.google.protobuf.StructProto.getDescriptor(); diff --git a/proto-google-cloud-asset-v1beta1/src/main/java/com/google/cloud/asset/v1beta1/AssetServiceProto.java b/proto-google-cloud-asset-v1beta1/src/main/java/com/google/cloud/asset/v1beta1/AssetServiceProto.java index 8423e3a8a..e7dab8b80 100644 --- a/proto-google-cloud-asset-v1beta1/src/main/java/com/google/cloud/asset/v1beta1/AssetServiceProto.java +++ b/proto-google-cloud-asset-v1beta1/src/main/java/com/google/cloud/asset/v1beta1/AssetServiceProto.java @@ -62,56 +62,69 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() { java.lang.String[] descriptorData = { "\n.google/cloud/asset/v1beta1/asset_servi" + "ce.proto\022\032google.cloud.asset.v1beta1\032\034go" - + "ogle/api/annotations.proto\032\'google/cloud" - + "/asset/v1beta1/assets.proto\032#google/long" - + "running/operations.proto\032\037google/protobu" - + "f/timestamp.proto\"\351\001\n\023ExportAssetsReques" - + "t\022\016\n\006parent\030\001 \001(\t\022-\n\tread_time\030\002 \001(\0132\032.g" - + "oogle.protobuf.Timestamp\022\023\n\013asset_types\030" - + "\003 \003(\t\022=\n\014content_type\030\004 \001(\0162\'.google.clo" - + "ud.asset.v1beta1.ContentType\022?\n\routput_c" - + "onfig\030\005 \001(\0132(.google.cloud.asset.v1beta1" - + ".OutputConfig\"\206\001\n\024ExportAssetsResponse\022-" - + "\n\tread_time\030\001 \001(\0132\032.google.protobuf.Time" - + "stamp\022?\n\routput_config\030\002 \001(\0132(.google.cl" - + "oud.asset.v1beta1.OutputConfig\"\304\001\n\034Batch" - + "GetAssetsHistoryRequest\022\016\n\006parent\030\001 \001(\t\022" - + "\023\n\013asset_names\030\002 \003(\t\022=\n\014content_type\030\003 \001" - + "(\0162\'.google.cloud.asset.v1beta1.ContentT" - + "ype\022@\n\020read_time_window\030\004 \001(\0132&.google.c" - + "loud.asset.v1beta1.TimeWindow\"Z\n\035BatchGe" - + "tAssetsHistoryResponse\0229\n\006assets\030\001 \003(\0132)" - + ".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\"-\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" + + "ogle/api/annotations.proto\032\027google/api/c" + + "lient.proto\032\037google/api/field_behavior.p" + + "roto\032\031google/api/resource.proto\032\'google/" + + "cloud/asset/v1beta1/assets.proto\032#google" + + "/longrunning/operations.proto\032\037google/pr" + + "otobuf/timestamp.proto\"\227\002\n\023ExportAssetsR" + + "equest\0227\n\006parent\030\001 \001(\tB\'\340A\002\372A!\022\037cloudass" + + "et.googleapis.com/Asset\022-\n\tread_time\030\002 \001" + + "(\0132\032.google.protobuf.Timestamp\022\023\n\013asset_" + + "types\030\003 \003(\t\022=\n\014content_type\030\004 \001(\0162\'.goog" + + "le.cloud.asset.v1beta1.ContentType\022D\n\rou" + + "tput_config\030\005 \001(\0132(.google.cloud.asset.v" + + "1beta1.OutputConfigB\003\340A\002\"\206\001\n\024ExportAsset" + + "sResponse\022-\n\tread_time\030\001 \001(\0132\032.google.pr" + + "otobuf.Timestamp\022?\n\routput_config\030\002 \001(\0132" + + "(.google.cloud.asset.v1beta1.OutputConfi" + + "g\"\367\001\n\034BatchGetAssetsHistoryRequest\0227\n\006pa" + + "rent\030\001 \001(\tB\'\340A\002\372A!\022\037cloudasset.googleapi" + + "s.com/Asset\022\023\n\013asset_names\030\002 \003(\t\022B\n\014cont" + + "ent_type\030\003 \001(\0162\'.google.cloud.asset.v1be" + + "ta1.ContentTypeB\003\340A\001\022E\n\020read_time_window" + + "\030\004 \001(\0132&.google.cloud.asset.v1beta1.Time" + + "WindowB\003\340A\001\"Z\n\035BatchGetAssetsHistoryResp" + + "onse\0229\n\006assets\030\001 \003(\0132).google.cloud.asse" + + "t.v1beta1.TemporalAsset\"d\n\014OutputConfig\022" + + "E\n\017gcs_destination\030\001 \001(\0132*.google.cloud." + + "asset.v1beta1.GcsDestinationH\000B\r\n\013destin" + + "ation\"C\n\016GcsDestination\022\r\n\003uri\030\001 \001(\tH\000\022\024" + + "\n\nuri_prefix\030\002 \001(\tH\000B\014\n\nobject_uri*I\n\013Co" + + "ntentType\022\034\n\030CONTENT_TYPE_UNSPECIFIED\020\000\022" + + "\014\n\010RESOURCE\020\001\022\016\n\nIAM_POLICY\020\0022\304\005\n\014AssetS" + + "ervice\022\336\002\n\014ExportAssets\022/.google.cloud.a" + + "sset.v1beta1.ExportAssetsRequest\032\035.googl" + + "e.longrunning.Operation\"\375\001\202\323\344\223\002\222\001\")/v1be" + + "ta1/{parent=projects/*}:exportAssets:\001*Z" + + "-\"(/v1beta1/{parent=folders/*}:exportAss" + + "ets:\001*Z3\"./v1beta1/{parent=organizations" + + "/*}:exportAssets:\001*\312Aa\n/google.cloud.ass" + + "et.v1beta1.ExportAssetsResponse\022.google." + + "cloud.asset.v1beta1.ExportAssetsRequest\022" + + "\203\002\n\025BatchGetAssetsHistory\0228.google.cloud" + + ".asset.v1beta1.BatchGetAssetsHistoryRequ" + + "est\0329.google.cloud.asset.v1beta1.BatchGe" + + "tAssetsHistoryResponse\"u\202\323\344\223\002o\0222/v1beta1" + + "/{parent=projects/*}:batchGetAssetsHisto" + + "ryZ9\0227/v1beta1/{parent=organizations/*}:" + + "batchGetAssetsHistory\032M\312A\031cloudasset.goo" + + "gleapis.com\322A.https://www.googleapis.com" + + "/auth/cloud-platformB\260\001\n\036com.google.clou" + + "d.asset.v1beta1B\021AssetServiceProtoP\001Z?go" + + "ogle.golang.org/genproto/googleapis/clou" + + "d/asset/v1beta1;asset\252\002\032Google.Cloud.Ass" + + "et.V1Beta1\312\002\032Google\\Cloud\\Asset\\V1beta1b" + + "\006proto3" }; descriptor = com.google.protobuf.Descriptors.FileDescriptor.internalBuildGeneratedFileFrom( descriptorData, new com.google.protobuf.Descriptors.FileDescriptor[] { com.google.api.AnnotationsProto.getDescriptor(), + com.google.api.ClientProto.getDescriptor(), + com.google.api.FieldBehaviorProto.getDescriptor(), + com.google.api.ResourceProto.getDescriptor(), com.google.cloud.asset.v1beta1.AssetProto.getDescriptor(), com.google.longrunning.OperationsProto.getDescriptor(), com.google.protobuf.TimestampProto.getDescriptor(), @@ -162,14 +175,22 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() { new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( internal_static_google_cloud_asset_v1beta1_GcsDestination_descriptor, new java.lang.String[] { - "Uri", "ObjectUri", + "Uri", "UriPrefix", "ObjectUri", }); com.google.protobuf.ExtensionRegistry registry = com.google.protobuf.ExtensionRegistry.newInstance(); + registry.add(com.google.api.ClientProto.defaultHost); + registry.add(com.google.api.FieldBehaviorProto.fieldBehavior); registry.add(com.google.api.AnnotationsProto.http); + registry.add(com.google.api.ClientProto.oauthScopes); + registry.add(com.google.api.ResourceProto.resourceReference); + registry.add(com.google.longrunning.OperationsProto.operationInfo); com.google.protobuf.Descriptors.FileDescriptor.internalUpdateFileDescriptor( descriptor, registry); com.google.api.AnnotationsProto.getDescriptor(); + com.google.api.ClientProto.getDescriptor(); + com.google.api.FieldBehaviorProto.getDescriptor(); + com.google.api.ResourceProto.getDescriptor(); com.google.cloud.asset.v1beta1.AssetProto.getDescriptor(); com.google.longrunning.OperationsProto.getDescriptor(); com.google.protobuf.TimestampProto.getDescriptor(); diff --git a/proto-google-cloud-asset-v1beta1/src/main/java/com/google/cloud/asset/v1beta1/BatchGetAssetsHistoryRequest.java b/proto-google-cloud-asset-v1beta1/src/main/java/com/google/cloud/asset/v1beta1/BatchGetAssetsHistoryRequest.java index 5311e0f39..06b62bab7 100644 --- a/proto-google-cloud-asset-v1beta1/src/main/java/com/google/cloud/asset/v1beta1/BatchGetAssetsHistoryRequest.java +++ b/proto-google-cloud-asset-v1beta1/src/main/java/com/google/cloud/asset/v1beta1/BatchGetAssetsHistoryRequest.java @@ -161,7 +161,9 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { * "projects/my-project-id")", or a project number (such as "projects/12345"). * * - * string parent = 1; + * + * string parent = 1 [(.google.api.field_behavior) = REQUIRED, (.google.api.resource_reference) = { ... } + * * * @return The parent. */ @@ -185,7 +187,9 @@ public java.lang.String getParent() { * "projects/my-project-id")", or a project number (such as "projects/12345"). * * - * string parent = 1; + * + * string parent = 1 [(.google.api.field_behavior) = REQUIRED, (.google.api.resource_reference) = { ... } + * * * @return The bytes for parent. */ @@ -292,10 +296,12 @@ public com.google.protobuf.ByteString getAssetNamesBytes(int index) { * * * 

-   * Required. The content type.
+   * Optional. The content type.
    *
* - * .google.cloud.asset.v1beta1.ContentType content_type = 3; + * + * .google.cloud.asset.v1beta1.ContentType content_type = 3 [(.google.api.field_behavior) = OPTIONAL]; + * * * @return The enum numeric value on the wire for contentType. */ @@ -306,10 +312,12 @@ public int getContentTypeValue() { * * * 
-   * Required. The content type.
+   * Optional. The content type.
    *
* - * .google.cloud.asset.v1beta1.ContentType content_type = 3; + * + * .google.cloud.asset.v1beta1.ContentType content_type = 3 [(.google.api.field_behavior) = OPTIONAL]; + * * * @return The contentType. */ @@ -334,7 +342,9 @@ public com.google.cloud.asset.v1beta1.ContentType getContentType() { * read_time_window. * * - * .google.cloud.asset.v1beta1.TimeWindow read_time_window = 4; + * + * .google.cloud.asset.v1beta1.TimeWindow read_time_window = 4 [(.google.api.field_behavior) = OPTIONAL]; + * * * @return Whether the readTimeWindow field is set. */ @@ -353,7 +363,9 @@ public boolean hasReadTimeWindow() { * read_time_window. * * - * .google.cloud.asset.v1beta1.TimeWindow read_time_window = 4; + * + * .google.cloud.asset.v1beta1.TimeWindow read_time_window = 4 [(.google.api.field_behavior) = OPTIONAL]; + * * * @return The readTimeWindow. */ @@ -374,7 +386,9 @@ public com.google.cloud.asset.v1beta1.TimeWindow getReadTimeWindow() { * read_time_window. * * - * .google.cloud.asset.v1beta1.TimeWindow read_time_window = 4; + * + * .google.cloud.asset.v1beta1.TimeWindow read_time_window = 4 [(.google.api.field_behavior) = OPTIONAL]; + * */ public com.google.cloud.asset.v1beta1.TimeWindowOrBuilder getReadTimeWindowOrBuilder() { return getReadTimeWindow(); @@ -790,7 +804,9 @@ public Builder mergeFrom( * "projects/my-project-id")", or a project number (such as "projects/12345"). * * - * string parent = 1; + * + * string parent = 1 [(.google.api.field_behavior) = REQUIRED, (.google.api.resource_reference) = { ... } + * * * @return The parent. */ @@ -814,7 +830,9 @@ public java.lang.String getParent() { * "projects/my-project-id")", or a project number (such as "projects/12345"). * * - * string parent = 1; + * + * string parent = 1 [(.google.api.field_behavior) = REQUIRED, (.google.api.resource_reference) = { ... } + * * * @return The bytes for parent. */ @@ -838,7 +856,9 @@ public com.google.protobuf.ByteString getParentBytes() { * "projects/my-project-id")", or a project number (such as "projects/12345"). * * - * string parent = 1; + * + * string parent = 1 [(.google.api.field_behavior) = REQUIRED, (.google.api.resource_reference) = { ... } + * * * @param value The parent to set. * @return This builder for chaining. @@ -861,7 +881,9 @@ public Builder setParent(java.lang.String value) { * "projects/my-project-id")", or a project number (such as "projects/12345"). * * - * string parent = 1; + * + * string parent = 1 [(.google.api.field_behavior) = REQUIRED, (.google.api.resource_reference) = { ... } + * * * @return This builder for chaining. */ @@ -880,7 +902,9 @@ public Builder clearParent() { * "projects/my-project-id")", or a project number (such as "projects/12345"). * * - * string parent = 1; + * + * string parent = 1 [(.google.api.field_behavior) = REQUIRED, (.google.api.resource_reference) = { ... } + * * * @param value The bytes for parent to set. * @return This builder for chaining. @@ -1123,10 +1147,12 @@ public Builder addAssetNamesBytes(com.google.protobuf.ByteString value) { * * * 
-     * Required. The content type.
+     * Optional. The content type.
      *
* - * .google.cloud.asset.v1beta1.ContentType content_type = 3; + * + * .google.cloud.asset.v1beta1.ContentType content_type = 3 [(.google.api.field_behavior) = OPTIONAL]; + * * * @return The enum numeric value on the wire for contentType. */ @@ -1137,10 +1163,12 @@ public int getContentTypeValue() { * * * 
-     * Required. The content type.
+     * Optional. The content type.
      *
* - * .google.cloud.asset.v1beta1.ContentType content_type = 3; + * + * .google.cloud.asset.v1beta1.ContentType content_type = 3 [(.google.api.field_behavior) = OPTIONAL]; + * * * @param value The enum numeric value on the wire for contentType to set. * @return This builder for chaining. @@ -1154,10 +1182,12 @@ public Builder setContentTypeValue(int value) { * * * 
-     * Required. The content type.
+     * Optional. The content type.
      *
* - * .google.cloud.asset.v1beta1.ContentType content_type = 3; + * + * .google.cloud.asset.v1beta1.ContentType content_type = 3 [(.google.api.field_behavior) = OPTIONAL]; + * * * @return The contentType. */ @@ -1171,10 +1201,12 @@ public com.google.cloud.asset.v1beta1.ContentType getContentType() { * * * 
-     * Required. The content type.
+     * Optional. The content type.
      *
* - * .google.cloud.asset.v1beta1.ContentType content_type = 3; + * + * .google.cloud.asset.v1beta1.ContentType content_type = 3 [(.google.api.field_behavior) = OPTIONAL]; + * * * @param value The contentType to set. * @return This builder for chaining. @@ -1192,10 +1224,12 @@ public Builder setContentType(com.google.cloud.asset.v1beta1.ContentType value) * * * 
-     * Required. The content type.
+     * Optional. The content type.
      *
* - * .google.cloud.asset.v1beta1.ContentType content_type = 3; + * + * .google.cloud.asset.v1beta1.ContentType content_type = 3 [(.google.api.field_behavior) = OPTIONAL]; + * * * @return This builder for chaining. */ @@ -1224,7 +1258,9 @@ public Builder clearContentType() { * read_time_window. * * - * .google.cloud.asset.v1beta1.TimeWindow read_time_window = 4; + * + * .google.cloud.asset.v1beta1.TimeWindow read_time_window = 4 [(.google.api.field_behavior) = OPTIONAL]; + * * * @return Whether the readTimeWindow field is set. */ @@ -1243,7 +1279,9 @@ public boolean hasReadTimeWindow() { * read_time_window. * * - * .google.cloud.asset.v1beta1.TimeWindow read_time_window = 4; + * + * .google.cloud.asset.v1beta1.TimeWindow read_time_window = 4 [(.google.api.field_behavior) = OPTIONAL]; + * * * @return The readTimeWindow. */ @@ -1268,7 +1306,9 @@ public com.google.cloud.asset.v1beta1.TimeWindow getReadTimeWindow() { * read_time_window. * * - * .google.cloud.asset.v1beta1.TimeWindow read_time_window = 4; + * + * .google.cloud.asset.v1beta1.TimeWindow read_time_window = 4 [(.google.api.field_behavior) = OPTIONAL]; + * */ public Builder setReadTimeWindow(com.google.cloud.asset.v1beta1.TimeWindow value) { if (readTimeWindowBuilder_ == null) { @@ -1295,7 +1335,9 @@ public Builder setReadTimeWindow(com.google.cloud.asset.v1beta1.TimeWindow value * read_time_window. * * - * .google.cloud.asset.v1beta1.TimeWindow read_time_window = 4; + * + * .google.cloud.asset.v1beta1.TimeWindow read_time_window = 4 [(.google.api.field_behavior) = OPTIONAL]; + * */ public Builder setReadTimeWindow( com.google.cloud.asset.v1beta1.TimeWindow.Builder builderForValue) { @@ -1320,7 +1362,9 @@ public Builder setReadTimeWindow( * read_time_window. * * - * .google.cloud.asset.v1beta1.TimeWindow read_time_window = 4; + * + * .google.cloud.asset.v1beta1.TimeWindow read_time_window = 4 [(.google.api.field_behavior) = OPTIONAL]; + * */ public Builder mergeReadTimeWindow(com.google.cloud.asset.v1beta1.TimeWindow value) { if (readTimeWindowBuilder_ == null) { @@ -1351,7 +1395,9 @@ public Builder mergeReadTimeWindow(com.google.cloud.asset.v1beta1.TimeWindow val * read_time_window. * * - * .google.cloud.asset.v1beta1.TimeWindow read_time_window = 4; + * + * .google.cloud.asset.v1beta1.TimeWindow read_time_window = 4 [(.google.api.field_behavior) = OPTIONAL]; + * */ public Builder clearReadTimeWindow() { if (readTimeWindowBuilder_ == null) { @@ -1376,7 +1422,9 @@ public Builder clearReadTimeWindow() { * read_time_window. * * - * .google.cloud.asset.v1beta1.TimeWindow read_time_window = 4; + * + * .google.cloud.asset.v1beta1.TimeWindow read_time_window = 4 [(.google.api.field_behavior) = OPTIONAL]; + * */ public com.google.cloud.asset.v1beta1.TimeWindow.Builder getReadTimeWindowBuilder() { @@ -1395,7 +1443,9 @@ public com.google.cloud.asset.v1beta1.TimeWindow.Builder getReadTimeWindowBuilde * read_time_window. * * - * .google.cloud.asset.v1beta1.TimeWindow read_time_window = 4; + * + * .google.cloud.asset.v1beta1.TimeWindow read_time_window = 4 [(.google.api.field_behavior) = OPTIONAL]; + * */ public com.google.cloud.asset.v1beta1.TimeWindowOrBuilder getReadTimeWindowOrBuilder() { if (readTimeWindowBuilder_ != null) { @@ -1418,7 +1468,9 @@ public com.google.cloud.asset.v1beta1.TimeWindowOrBuilder getReadTimeWindowOrBui * read_time_window. * * - * .google.cloud.asset.v1beta1.TimeWindow read_time_window = 4; + * + * .google.cloud.asset.v1beta1.TimeWindow read_time_window = 4 [(.google.api.field_behavior) = OPTIONAL]; + * */ private com.google.protobuf.SingleFieldBuilderV3< com.google.cloud.asset.v1beta1.TimeWindow, diff --git a/proto-google-cloud-asset-v1beta1/src/main/java/com/google/cloud/asset/v1beta1/BatchGetAssetsHistoryRequestOrBuilder.java b/proto-google-cloud-asset-v1beta1/src/main/java/com/google/cloud/asset/v1beta1/BatchGetAssetsHistoryRequestOrBuilder.java index 6fbf2a1d2..00c60e565 100644 --- a/proto-google-cloud-asset-v1beta1/src/main/java/com/google/cloud/asset/v1beta1/BatchGetAssetsHistoryRequestOrBuilder.java +++ b/proto-google-cloud-asset-v1beta1/src/main/java/com/google/cloud/asset/v1beta1/BatchGetAssetsHistoryRequestOrBuilder.java @@ -32,7 +32,9 @@ public interface BatchGetAssetsHistoryRequestOrBuilder * "projects/my-project-id")", or a project number (such as "projects/12345"). * * - * string parent = 1; + * + * string parent = 1 [(.google.api.field_behavior) = REQUIRED, (.google.api.resource_reference) = { ... } + * * * @return The parent. */ @@ -46,7 +48,9 @@ public interface BatchGetAssetsHistoryRequestOrBuilder * "projects/my-project-id")", or a project number (such as "projects/12345"). * * - * string parent = 1; + * + * string parent = 1 [(.google.api.field_behavior) = REQUIRED, (.google.api.resource_reference) = { ... } + * * * @return The bytes for parent. */ @@ -131,10 +135,12 @@ public interface BatchGetAssetsHistoryRequestOrBuilder * * * 
-   * Required. The content type.
+   * Optional. The content type.
    *
* - * .google.cloud.asset.v1beta1.ContentType content_type = 3; + * + * .google.cloud.asset.v1beta1.ContentType content_type = 3 [(.google.api.field_behavior) = OPTIONAL]; + * * * @return The enum numeric value on the wire for contentType. */ @@ -143,10 +149,12 @@ public interface BatchGetAssetsHistoryRequestOrBuilder * * * 
-   * Required. The content type.
+   * Optional. The content type.
    *
* - * .google.cloud.asset.v1beta1.ContentType content_type = 3; + * + * .google.cloud.asset.v1beta1.ContentType content_type = 3 [(.google.api.field_behavior) = OPTIONAL]; + * * * @return The contentType. */ @@ -164,7 +172,9 @@ public interface BatchGetAssetsHistoryRequestOrBuilder * read_time_window. * * - * .google.cloud.asset.v1beta1.TimeWindow read_time_window = 4; + * + * .google.cloud.asset.v1beta1.TimeWindow read_time_window = 4 [(.google.api.field_behavior) = OPTIONAL]; + * * * @return Whether the readTimeWindow field is set. */ @@ -181,7 +191,9 @@ public interface BatchGetAssetsHistoryRequestOrBuilder * read_time_window. * * - * .google.cloud.asset.v1beta1.TimeWindow read_time_window = 4; + * + * .google.cloud.asset.v1beta1.TimeWindow read_time_window = 4 [(.google.api.field_behavior) = OPTIONAL]; + * * * @return The readTimeWindow. */ @@ -198,7 +210,9 @@ public interface BatchGetAssetsHistoryRequestOrBuilder * read_time_window. * * - * .google.cloud.asset.v1beta1.TimeWindow read_time_window = 4; + * + * .google.cloud.asset.v1beta1.TimeWindow read_time_window = 4 [(.google.api.field_behavior) = OPTIONAL]; + * */ com.google.cloud.asset.v1beta1.TimeWindowOrBuilder getReadTimeWindowOrBuilder(); } diff --git a/proto-google-cloud-asset-v1beta1/src/main/java/com/google/cloud/asset/v1beta1/ExportAssetsRequest.java b/proto-google-cloud-asset-v1beta1/src/main/java/com/google/cloud/asset/v1beta1/ExportAssetsRequest.java index 39dbddd31..c4744af14 100644 --- a/proto-google-cloud-asset-v1beta1/src/main/java/com/google/cloud/asset/v1beta1/ExportAssetsRequest.java +++ b/proto-google-cloud-asset-v1beta1/src/main/java/com/google/cloud/asset/v1beta1/ExportAssetsRequest.java @@ -177,7 +177,9 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { * a folder number (such as "folders/123"). * * - * string parent = 1; + * + * string parent = 1 [(.google.api.field_behavior) = REQUIRED, (.google.api.resource_reference) = { ... } + * * * @return The parent. */ @@ -202,7 +204,9 @@ public java.lang.String getParent() { * a folder number (such as "folders/123"). * * - * string parent = 1; + * + * string parent = 1 [(.google.api.field_behavior) = REQUIRED, (.google.api.resource_reference) = { ... } + * * * @return The bytes for parent. */ @@ -396,7 +400,9 @@ public com.google.cloud.asset.v1beta1.ContentType getContentType() { * to. All results will be in newline delimited JSON format. * * - * .google.cloud.asset.v1beta1.OutputConfig output_config = 5; + * + * .google.cloud.asset.v1beta1.OutputConfig output_config = 5 [(.google.api.field_behavior) = REQUIRED]; + * * * @return Whether the outputConfig field is set. */ @@ -411,7 +417,9 @@ public boolean hasOutputConfig() { * to. All results will be in newline delimited JSON format. * * - * .google.cloud.asset.v1beta1.OutputConfig output_config = 5; + * + * .google.cloud.asset.v1beta1.OutputConfig output_config = 5 [(.google.api.field_behavior) = REQUIRED]; + * * * @return The outputConfig. */ @@ -428,7 +436,9 @@ public com.google.cloud.asset.v1beta1.OutputConfig getOutputConfig() { * to. All results will be in newline delimited JSON format. * * - * .google.cloud.asset.v1beta1.OutputConfig output_config = 5; + * + * .google.cloud.asset.v1beta1.OutputConfig output_config = 5 [(.google.api.field_behavior) = REQUIRED]; + * */ public com.google.cloud.asset.v1beta1.OutputConfigOrBuilder getOutputConfigOrBuilder() { return getOutputConfig(); @@ -872,7 +882,9 @@ public Builder mergeFrom( * a folder number (such as "folders/123"). * * - * string parent = 1; + * + * string parent = 1 [(.google.api.field_behavior) = REQUIRED, (.google.api.resource_reference) = { ... } + * * * @return The parent. */ @@ -897,7 +909,9 @@ public java.lang.String getParent() { * a folder number (such as "folders/123"). * * - * string parent = 1; + * + * string parent = 1 [(.google.api.field_behavior) = REQUIRED, (.google.api.resource_reference) = { ... } + * * * @return The bytes for parent. */ @@ -922,7 +936,9 @@ public com.google.protobuf.ByteString getParentBytes() { * a folder number (such as "folders/123"). * * - * string parent = 1; + * + * string parent = 1 [(.google.api.field_behavior) = REQUIRED, (.google.api.resource_reference) = { ... } + * * * @param value The parent to set. * @return This builder for chaining. @@ -946,7 +962,9 @@ public Builder setParent(java.lang.String value) { * a folder number (such as "folders/123"). * * - * string parent = 1; + * + * string parent = 1 [(.google.api.field_behavior) = REQUIRED, (.google.api.resource_reference) = { ... } + * * * @return This builder for chaining. */ @@ -966,7 +984,9 @@ public Builder clearParent() { * a folder number (such as "folders/123"). * * - * string parent = 1; + * + * string parent = 1 [(.google.api.field_behavior) = REQUIRED, (.google.api.resource_reference) = { ... } + * * * @param value The bytes for parent to set. * @return This builder for chaining. @@ -1508,7 +1528,9 @@ public Builder clearContentType() { * to. All results will be in newline delimited JSON format. * * - * .google.cloud.asset.v1beta1.OutputConfig output_config = 5; + * + * .google.cloud.asset.v1beta1.OutputConfig output_config = 5 [(.google.api.field_behavior) = REQUIRED]; + * * * @return Whether the outputConfig field is set. */ @@ -1523,7 +1545,9 @@ public boolean hasOutputConfig() { * to. All results will be in newline delimited JSON format. * * - * .google.cloud.asset.v1beta1.OutputConfig output_config = 5; + * + * .google.cloud.asset.v1beta1.OutputConfig output_config = 5 [(.google.api.field_behavior) = REQUIRED]; + * * * @return The outputConfig. */ @@ -1544,7 +1568,9 @@ public com.google.cloud.asset.v1beta1.OutputConfig getOutputConfig() { * to. All results will be in newline delimited JSON format. * * - * .google.cloud.asset.v1beta1.OutputConfig output_config = 5; + * + * .google.cloud.asset.v1beta1.OutputConfig output_config = 5 [(.google.api.field_behavior) = REQUIRED]; + * */ public Builder setOutputConfig(com.google.cloud.asset.v1beta1.OutputConfig value) { if (outputConfigBuilder_ == null) { @@ -1567,7 +1593,9 @@ public Builder setOutputConfig(com.google.cloud.asset.v1beta1.OutputConfig value * to. All results will be in newline delimited JSON format. * * - * .google.cloud.asset.v1beta1.OutputConfig output_config = 5; + * + * .google.cloud.asset.v1beta1.OutputConfig output_config = 5 [(.google.api.field_behavior) = REQUIRED]; + * */ public Builder setOutputConfig( com.google.cloud.asset.v1beta1.OutputConfig.Builder builderForValue) { @@ -1588,7 +1616,9 @@ public Builder setOutputConfig( * to. All results will be in newline delimited JSON format. * * - * .google.cloud.asset.v1beta1.OutputConfig output_config = 5; + * + * .google.cloud.asset.v1beta1.OutputConfig output_config = 5 [(.google.api.field_behavior) = REQUIRED]; + * */ public Builder mergeOutputConfig(com.google.cloud.asset.v1beta1.OutputConfig value) { if (outputConfigBuilder_ == null) { @@ -1615,7 +1645,9 @@ public Builder mergeOutputConfig(com.google.cloud.asset.v1beta1.OutputConfig val * to. All results will be in newline delimited JSON format. * * - * .google.cloud.asset.v1beta1.OutputConfig output_config = 5; + * + * .google.cloud.asset.v1beta1.OutputConfig output_config = 5 [(.google.api.field_behavior) = REQUIRED]; + * */ public Builder clearOutputConfig() { if (outputConfigBuilder_ == null) { @@ -1636,7 +1668,9 @@ public Builder clearOutputConfig() { * to. All results will be in newline delimited JSON format. * * - * .google.cloud.asset.v1beta1.OutputConfig output_config = 5; + * + * .google.cloud.asset.v1beta1.OutputConfig output_config = 5 [(.google.api.field_behavior) = REQUIRED]; + * */ public com.google.cloud.asset.v1beta1.OutputConfig.Builder getOutputConfigBuilder() { @@ -1651,7 +1685,9 @@ public com.google.cloud.asset.v1beta1.OutputConfig.Builder getOutputConfigBuilde * to. All results will be in newline delimited JSON format. * * - * .google.cloud.asset.v1beta1.OutputConfig output_config = 5; + * + * .google.cloud.asset.v1beta1.OutputConfig output_config = 5 [(.google.api.field_behavior) = REQUIRED]; + * */ public com.google.cloud.asset.v1beta1.OutputConfigOrBuilder getOutputConfigOrBuilder() { if (outputConfigBuilder_ != null) { @@ -1670,7 +1706,9 @@ public com.google.cloud.asset.v1beta1.OutputConfigOrBuilder getOutputConfigOrBui * to. All results will be in newline delimited JSON format. * * - * .google.cloud.asset.v1beta1.OutputConfig output_config = 5; + * + * .google.cloud.asset.v1beta1.OutputConfig output_config = 5 [(.google.api.field_behavior) = REQUIRED]; + * */ private com.google.protobuf.SingleFieldBuilderV3< com.google.cloud.asset.v1beta1.OutputConfig, diff --git a/proto-google-cloud-asset-v1beta1/src/main/java/com/google/cloud/asset/v1beta1/ExportAssetsRequestOrBuilder.java b/proto-google-cloud-asset-v1beta1/src/main/java/com/google/cloud/asset/v1beta1/ExportAssetsRequestOrBuilder.java index 3e3966f3f..8c460c775 100644 --- a/proto-google-cloud-asset-v1beta1/src/main/java/com/google/cloud/asset/v1beta1/ExportAssetsRequestOrBuilder.java +++ b/proto-google-cloud-asset-v1beta1/src/main/java/com/google/cloud/asset/v1beta1/ExportAssetsRequestOrBuilder.java @@ -33,7 +33,9 @@ public interface ExportAssetsRequestOrBuilder * a folder number (such as "folders/123"). * * - * string parent = 1; + * + * string parent = 1 [(.google.api.field_behavior) = REQUIRED, (.google.api.resource_reference) = { ... } + * * * @return The parent. */ @@ -48,7 +50,9 @@ public interface ExportAssetsRequestOrBuilder * a folder number (such as "folders/123"). * * - * string parent = 1; + * + * string parent = 1 [(.google.api.field_behavior) = REQUIRED, (.google.api.resource_reference) = { ... } + * * * @return The bytes for parent. */ @@ -203,7 +207,9 @@ public interface ExportAssetsRequestOrBuilder * to. All results will be in newline delimited JSON format. * * - * .google.cloud.asset.v1beta1.OutputConfig output_config = 5; + * + * .google.cloud.asset.v1beta1.OutputConfig output_config = 5 [(.google.api.field_behavior) = REQUIRED]; + * * * @return Whether the outputConfig field is set. */ @@ -216,7 +222,9 @@ public interface ExportAssetsRequestOrBuilder * to. All results will be in newline delimited JSON format. * * - * .google.cloud.asset.v1beta1.OutputConfig output_config = 5; + * + * .google.cloud.asset.v1beta1.OutputConfig output_config = 5 [(.google.api.field_behavior) = REQUIRED]; + * * * @return The outputConfig. */ @@ -229,7 +237,9 @@ public interface ExportAssetsRequestOrBuilder * to. All results will be in newline delimited JSON format. * * - * .google.cloud.asset.v1beta1.OutputConfig output_config = 5; + * + * .google.cloud.asset.v1beta1.OutputConfig output_config = 5 [(.google.api.field_behavior) = REQUIRED]; + * */ com.google.cloud.asset.v1beta1.OutputConfigOrBuilder getOutputConfigOrBuilder(); } diff --git a/proto-google-cloud-asset-v1beta1/src/main/java/com/google/cloud/asset/v1beta1/GcsDestination.java b/proto-google-cloud-asset-v1beta1/src/main/java/com/google/cloud/asset/v1beta1/GcsDestination.java index bad1d8c16..8b011f02f 100644 --- a/proto-google-cloud-asset-v1beta1/src/main/java/com/google/cloud/asset/v1beta1/GcsDestination.java +++ b/proto-google-cloud-asset-v1beta1/src/main/java/com/google/cloud/asset/v1beta1/GcsDestination.java @@ -75,6 +75,13 @@ private GcsDestination( objectUri_ = s; break; } + case 18: + { + java.lang.String s = input.readStringRequireUtf8(); + objectUriCase_ = 2; + objectUri_ = s; + break; + } default: { if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { @@ -117,6 +124,7 @@ public enum ObjectUriCase com.google.protobuf.Internal.EnumLite, com.google.protobuf.AbstractMessage.InternalOneOfEnum { URI(1), + URI_PREFIX(2), OBJECTURI_NOT_SET(0); private final int value; @@ -137,6 +145,8 @@ public static ObjectUriCase forNumber(int value) { switch (value) { case 1: return URI; + case 2: + return URI_PREFIX; case 0: return OBJECTURI_NOT_SET; default: @@ -217,6 +227,76 @@ public com.google.protobuf.ByteString getUriBytes() { } } + public static final int URI_PREFIX_FIELD_NUMBER = 2; + /** + * + * + * 
+   * The uri prefix of all generated Cloud Storage objects. For example:
+   * "gs://bucket_name/object_name_prefix". Each object uri is in format:
+   * "gs://bucket_name/object_name_prefix/<asset type>/<shard number> and only
+   * contains assets for that type. <shard number> starts from 0. For example:
+   * "gs://bucket_name/object_name_prefix/google.compute.disk/0" is the first
+   * shard of output objects containing all google.compute.disk assets.
+   * An INVALID_ARGUMENT error will be returned if file with the same name
+   * "gs://bucket_name/object_name_prefix" already exists.
+   *
+ * + * string uri_prefix = 2; + * + * @return The uriPrefix. + */ + public java.lang.String getUriPrefix() { + java.lang.Object ref = ""; + if (objectUriCase_ == 2) { + 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(); + if (objectUriCase_ == 2) { + objectUri_ = s; + } + return s; + } + } + /** + * + * + * 
+   * The uri prefix of all generated Cloud Storage objects. For example:
+   * "gs://bucket_name/object_name_prefix". Each object uri is in format:
+   * "gs://bucket_name/object_name_prefix/<asset type>/<shard number> and only
+   * contains assets for that type. <shard number> starts from 0. For example:
+   * "gs://bucket_name/object_name_prefix/google.compute.disk/0" is the first
+   * shard of output objects containing all google.compute.disk assets.
+   * An INVALID_ARGUMENT error will be returned if file with the same name
+   * "gs://bucket_name/object_name_prefix" already exists.
+   *
+ * + * string uri_prefix = 2; + * + * @return The bytes for uriPrefix. + */ + public com.google.protobuf.ByteString getUriPrefixBytes() { + java.lang.Object ref = ""; + if (objectUriCase_ == 2) { + ref = objectUri_; + } + if (ref instanceof java.lang.String) { + com.google.protobuf.ByteString b = + com.google.protobuf.ByteString.copyFromUtf8((java.lang.String) ref); + if (objectUriCase_ == 2) { + objectUri_ = b; + } + return b; + } else { + return (com.google.protobuf.ByteString) ref; + } + } + private byte memoizedIsInitialized = -1; @java.lang.Override @@ -234,6 +314,9 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io if (objectUriCase_ == 1) { com.google.protobuf.GeneratedMessageV3.writeString(output, 1, objectUri_); } + if (objectUriCase_ == 2) { + com.google.protobuf.GeneratedMessageV3.writeString(output, 2, objectUri_); + } unknownFields.writeTo(output); } @@ -246,6 +329,9 @@ public int getSerializedSize() { if (objectUriCase_ == 1) { size += com.google.protobuf.GeneratedMessageV3.computeStringSize(1, objectUri_); } + if (objectUriCase_ == 2) { + size += com.google.protobuf.GeneratedMessageV3.computeStringSize(2, objectUri_); + } size += unknownFields.getSerializedSize(); memoizedSize = size; return size; @@ -267,6 +353,9 @@ public boolean equals(final java.lang.Object obj) { case 1: if (!getUri().equals(other.getUri())) return false; break; + case 2: + if (!getUriPrefix().equals(other.getUriPrefix())) return false; + break; case 0: default: } @@ -286,6 +375,10 @@ public int hashCode() { hash = (37 * hash) + URI_FIELD_NUMBER; hash = (53 * hash) + getUri().hashCode(); break; + case 2: + hash = (37 * hash) + URI_PREFIX_FIELD_NUMBER; + hash = (53 * hash) + getUriPrefix().hashCode(); + break; case 0: default: } @@ -466,6 +559,9 @@ public com.google.cloud.asset.v1beta1.GcsDestination buildPartial() { if (objectUriCase_ == 1) { result.objectUri_ = objectUri_; } + if (objectUriCase_ == 2) { + result.objectUri_ = objectUri_; + } result.objectUriCase_ = objectUriCase_; onBuilt(); return result; @@ -524,6 +620,13 @@ public Builder mergeFrom(com.google.cloud.asset.v1beta1.GcsDestination other) { onChanged(); break; } + case URI_PREFIX: + { + objectUriCase_ = 2; + objectUri_ = other.objectUri_; + onChanged(); + break; + } case OBJECTURI_NOT_SET: { break; @@ -709,6 +812,158 @@ public Builder setUriBytes(com.google.protobuf.ByteString value) { return this; } + /** + * + * + * 
+     * The uri prefix of all generated Cloud Storage objects. For example:
+     * "gs://bucket_name/object_name_prefix". Each object uri is in format:
+     * "gs://bucket_name/object_name_prefix/<asset type>/<shard number> and only
+     * contains assets for that type. <shard number> starts from 0. For example:
+     * "gs://bucket_name/object_name_prefix/google.compute.disk/0" is the first
+     * shard of output objects containing all google.compute.disk assets.
+     * An INVALID_ARGUMENT error will be returned if file with the same name
+     * "gs://bucket_name/object_name_prefix" already exists.
+     *
+ * + * string uri_prefix = 2; + * + * @return The uriPrefix. + */ + public java.lang.String getUriPrefix() { + java.lang.Object ref = ""; + if (objectUriCase_ == 2) { + ref = objectUri_; + } + if (!(ref instanceof java.lang.String)) { + com.google.protobuf.ByteString bs = (com.google.protobuf.ByteString) ref; + java.lang.String s = bs.toStringUtf8(); + if (objectUriCase_ == 2) { + objectUri_ = s; + } + return s; + } else { + return (java.lang.String) ref; + } + } + /** + * + * + * 
+     * The uri prefix of all generated Cloud Storage objects. For example:
+     * "gs://bucket_name/object_name_prefix". Each object uri is in format:
+     * "gs://bucket_name/object_name_prefix/<asset type>/<shard number> and only
+     * contains assets for that type. <shard number> starts from 0. For example:
+     * "gs://bucket_name/object_name_prefix/google.compute.disk/0" is the first
+     * shard of output objects containing all google.compute.disk assets.
+     * An INVALID_ARGUMENT error will be returned if file with the same name
+     * "gs://bucket_name/object_name_prefix" already exists.
+     *
+ * + * string uri_prefix = 2; + * + * @return The bytes for uriPrefix. + */ + public com.google.protobuf.ByteString getUriPrefixBytes() { + java.lang.Object ref = ""; + if (objectUriCase_ == 2) { + ref = objectUri_; + } + if (ref instanceof String) { + com.google.protobuf.ByteString b = + com.google.protobuf.ByteString.copyFromUtf8((java.lang.String) ref); + if (objectUriCase_ == 2) { + objectUri_ = b; + } + return b; + } else { + return (com.google.protobuf.ByteString) ref; + } + } + /** + * + * + * 
+     * The uri prefix of all generated Cloud Storage objects. For example:
+     * "gs://bucket_name/object_name_prefix". Each object uri is in format:
+     * "gs://bucket_name/object_name_prefix/<asset type>/<shard number> and only
+     * contains assets for that type. <shard number> starts from 0. For example:
+     * "gs://bucket_name/object_name_prefix/google.compute.disk/0" is the first
+     * shard of output objects containing all google.compute.disk assets.
+     * An INVALID_ARGUMENT error will be returned if file with the same name
+     * "gs://bucket_name/object_name_prefix" already exists.
+     *
+ * + * string uri_prefix = 2; + * + * @param value The uriPrefix to set. + * @return This builder for chaining. + */ + public Builder setUriPrefix(java.lang.String value) { + if (value == null) { + throw new NullPointerException(); + } + objectUriCase_ = 2; + objectUri_ = value; + onChanged(); + return this; + } + /** + * + * + * 
+     * The uri prefix of all generated Cloud Storage objects. For example:
+     * "gs://bucket_name/object_name_prefix". Each object uri is in format:
+     * "gs://bucket_name/object_name_prefix/<asset type>/<shard number> and only
+     * contains assets for that type. <shard number> starts from 0. For example:
+     * "gs://bucket_name/object_name_prefix/google.compute.disk/0" is the first
+     * shard of output objects containing all google.compute.disk assets.
+     * An INVALID_ARGUMENT error will be returned if file with the same name
+     * "gs://bucket_name/object_name_prefix" already exists.
+     *
+ * + * string uri_prefix = 2; + * + * @return This builder for chaining. + */ + public Builder clearUriPrefix() { + if (objectUriCase_ == 2) { + objectUriCase_ = 0; + objectUri_ = null; + onChanged(); + } + return this; + } + /** + * + * + * 
+     * The uri prefix of all generated Cloud Storage objects. For example:
+     * "gs://bucket_name/object_name_prefix". Each object uri is in format:
+     * "gs://bucket_name/object_name_prefix/<asset type>/<shard number> and only
+     * contains assets for that type. <shard number> starts from 0. For example:
+     * "gs://bucket_name/object_name_prefix/google.compute.disk/0" is the first
+     * shard of output objects containing all google.compute.disk assets.
+     * An INVALID_ARGUMENT error will be returned if file with the same name
+     * "gs://bucket_name/object_name_prefix" already exists.
+     *
+ * + * string uri_prefix = 2; + * + * @param value The bytes for uriPrefix to set. + * @return This builder for chaining. + */ + public Builder setUriPrefixBytes(com.google.protobuf.ByteString value) { + if (value == null) { + throw new NullPointerException(); + } + checkByteStringIsUtf8(value); + objectUriCase_ = 2; + objectUri_ = value; + onChanged(); + return this; + } + @java.lang.Override public final Builder setUnknownFields(final com.google.protobuf.UnknownFieldSet unknownFields) { return super.setUnknownFields(unknownFields); diff --git a/proto-google-cloud-asset-v1beta1/src/main/java/com/google/cloud/asset/v1beta1/GcsDestinationOrBuilder.java b/proto-google-cloud-asset-v1beta1/src/main/java/com/google/cloud/asset/v1beta1/GcsDestinationOrBuilder.java index 562faf0c1..15bd331b8 100644 --- a/proto-google-cloud-asset-v1beta1/src/main/java/com/google/cloud/asset/v1beta1/GcsDestinationOrBuilder.java +++ b/proto-google-cloud-asset-v1beta1/src/main/java/com/google/cloud/asset/v1beta1/GcsDestinationOrBuilder.java @@ -56,5 +56,44 @@ public interface GcsDestinationOrBuilder */ com.google.protobuf.ByteString getUriBytes(); + /** + * + * + * 
+   * The uri prefix of all generated Cloud Storage objects. For example:
+   * "gs://bucket_name/object_name_prefix". Each object uri is in format:
+   * "gs://bucket_name/object_name_prefix/<asset type>/<shard number> and only
+   * contains assets for that type. <shard number> starts from 0. For example:
+   * "gs://bucket_name/object_name_prefix/google.compute.disk/0" is the first
+   * shard of output objects containing all google.compute.disk assets.
+   * An INVALID_ARGUMENT error will be returned if file with the same name
+   * "gs://bucket_name/object_name_prefix" already exists.
+   *
+ * + * string uri_prefix = 2; + * + * @return The uriPrefix. + */ + java.lang.String getUriPrefix(); + /** + * + * + * 
+   * The uri prefix of all generated Cloud Storage objects. For example:
+   * "gs://bucket_name/object_name_prefix". Each object uri is in format:
+   * "gs://bucket_name/object_name_prefix/<asset type>/<shard number> and only
+   * contains assets for that type. <shard number> starts from 0. For example:
+   * "gs://bucket_name/object_name_prefix/google.compute.disk/0" is the first
+   * shard of output objects containing all google.compute.disk assets.
+   * An INVALID_ARGUMENT error will be returned if file with the same name
+   * "gs://bucket_name/object_name_prefix" already exists.
+   *
+ * + * string uri_prefix = 2; + * + * @return The bytes for uriPrefix. + */ + com.google.protobuf.ByteString getUriPrefixBytes(); + public com.google.cloud.asset.v1beta1.GcsDestination.ObjectUriCase getObjectUriCase(); } diff --git a/proto-google-cloud-asset-v1beta1/src/main/proto/google/cloud/asset/v1beta1/asset_service.proto b/proto-google-cloud-asset-v1beta1/src/main/proto/google/cloud/asset/v1beta1/asset_service.proto index 8e2d1b0a3..956c6a767 100644 --- a/proto-google-cloud-asset-v1beta1/src/main/proto/google/cloud/asset/v1beta1/asset_service.proto +++ b/proto-google-cloud-asset-v1beta1/src/main/proto/google/cloud/asset/v1beta1/asset_service.proto @@ -1,4 +1,4 @@ -// Copyright 2018 Google LLC. +// Copyright 2019 Google LLC. // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. @@ -18,6 +18,9 @@ syntax = "proto3"; package google.cloud.asset.v1beta1; import "google/api/annotations.proto"; +import "google/api/client.proto"; +import "google/api/field_behavior.proto"; +import "google/api/resource.proto"; import "google/cloud/asset/v1beta1/assets.proto"; import "google/longrunning/operations.proto"; import "google/protobuf/timestamp.proto"; @@ -31,6 +34,10 @@ option php_namespace = "Google\\Cloud\\Asset\\V1beta1"; // Asset service definition. service AssetService { + option (google.api.default_host) = "cloudasset.googleapis.com"; + option (google.api.oauth_scopes) = + "https://www.googleapis.com/auth/cloud-platform"; + // Exports assets with time and resource types to a given Cloud Storage // location. The output format is newline-delimited JSON. // This API implements the @@ -49,6 +56,10 @@ service AssetService { body: "*" } }; + option (google.longrunning.operation_info) = { + response_type: "google.cloud.asset.v1beta1.ExportAssetsResponse" + metadata_type: "google.cloud.asset.v1beta1.ExportAssetsRequest" + }; } // Batch gets the update history of assets that overlap a time window. @@ -56,6 +67,8 @@ service AssetService { // non-delete or deleted status. // For IAM_POLICY content, this API outputs history when the asset and its // attached IAM POLICY both exist. This can create gaps in the output history. + // If a specified asset does not exist, this API returns an INVALID_ARGUMENT + // error. rpc BatchGetAssetsHistory(BatchGetAssetsHistoryRequest) returns (BatchGetAssetsHistoryResponse) { option (google.api.http) = { @@ -73,7 +86,12 @@ message ExportAssetsRequest { // 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; + string parent = 1 [ + (google.api.field_behavior) = REQUIRED, + (google.api.resource_reference) = { + child_type: "cloudasset.googleapis.com/Asset" + } + ]; // 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, @@ -95,7 +113,7 @@ message ExportAssetsRequest { // Required. Output configuration indicating where the results will be output // to. All results will be in newline delimited JSON format. - OutputConfig output_config = 5; + OutputConfig output_config = 5 [(google.api.field_behavior) = REQUIRED]; } // The export asset response. This message is returned by the @@ -117,7 +135,12 @@ message BatchGetAssetsHistoryRequest { // Required. The relative name of the root asset. It 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"). - string parent = 1; + string parent = 1 [ + (google.api.field_behavior) = REQUIRED, + (google.api.resource_reference) = { + child_type: "cloudasset.googleapis.com/Asset" + } + ]; // A list of the full names of the assets. For example: // `//compute.googleapis.com/projects/my_project_123/zones/zone1/instances/instance1`. @@ -129,8 +152,8 @@ message BatchGetAssetsHistoryRequest { // size of the asset name list is 100 in one request. repeated string asset_names = 2; - // Required. The content type. - ContentType content_type = 3; + // Optional. The content type. + ContentType content_type = 3 [(google.api.field_behavior) = OPTIONAL]; // 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 @@ -138,7 +161,7 @@ message BatchGetAssetsHistoryRequest { // 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; + TimeWindow read_time_window = 4 [(google.api.field_behavior) = OPTIONAL]; } // Batch get assets history response. @@ -166,6 +189,16 @@ message GcsDestination { // Metadata](https://cloud.google.com/storage/docs/viewing-editing-metadata) // for more information. string uri = 1; + + // The uri prefix of all generated Cloud Storage objects. For example: + // "gs://bucket_name/object_name_prefix". Each object uri is in format: + // "gs://bucket_name/object_name_prefix// and only + // contains assets for that type. starts from 0. For example: + // "gs://bucket_name/object_name_prefix/google.compute.disk/0" is the first + // shard of output objects containing all google.compute.disk assets. + // An INVALID_ARGUMENT error will be returned if file with the same name + // "gs://bucket_name/object_name_prefix" already exists. + string uri_prefix = 2; } } diff --git a/proto-google-cloud-asset-v1beta1/src/main/proto/google/cloud/asset/v1beta1/assets.proto b/proto-google-cloud-asset-v1beta1/src/main/proto/google/cloud/asset/v1beta1/assets.proto index 84db977b9..4bb1438c8 100644 --- a/proto-google-cloud-asset-v1beta1/src/main/proto/google/cloud/asset/v1beta1/assets.proto +++ b/proto-google-cloud-asset-v1beta1/src/main/proto/google/cloud/asset/v1beta1/assets.proto @@ -1,4 +1,4 @@ -// Copyright 2018 Google LLC. +// Copyright 2019 Google LLC. // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. @@ -18,11 +18,13 @@ syntax = "proto3"; package google.cloud.asset.v1beta1; import "google/api/annotations.proto"; +import "google/api/resource.proto"; import "google/iam/v1/policy.proto"; import "google/protobuf/any.proto"; import "google/protobuf/struct.proto"; import "google/protobuf/timestamp.proto"; +option cc_enable_arenas = true; option csharp_namespace = "Google.Cloud.Asset.V1Beta1"; option go_package = "google.golang.org/genproto/googleapis/cloud/asset/v1beta1;asset"; option java_multiple_files = true; @@ -56,6 +58,11 @@ message TimeWindow { // Cloud asset. This includes all Google Cloud Platform resources, // Cloud IAM policies, and other non-GCP assets. message Asset { + option (google.api.resource) = { + type: "cloudasset.googleapis.com/Asset" + pattern: "*" + }; + // The full name of the asset. For example: // `//compute.googleapis.com/projects/my_project_123/zones/zone1/instances/instance1`. // See [Resource diff --git a/proto-google-cloud-asset-v1p1beta1/src/main/java/com/google/cloud/asset/v1p1beta1/AssetProto.java b/proto-google-cloud-asset-v1p1beta1/src/main/java/com/google/cloud/asset/v1p1beta1/AssetProto.java index 6f143a98c..15f5d04e4 100644 --- a/proto-google-cloud-asset-v1p1beta1/src/main/java/com/google/cloud/asset/v1p1beta1/AssetProto.java +++ b/proto-google-cloud-asset-v1p1beta1/src/main/java/com/google/cloud/asset/v1p1beta1/AssetProto.java @@ -47,17 +47,18 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() { "\n)google/cloud/asset/v1p1beta1/assets.pr" + "oto\022\034google.cloud.asset.v1p1beta1\032\032googl" + "e/iam/v1/policy.proto\032\034google/api/annota" - + "tions.proto\"x\n\030StandardResourceMetadata\022" - + "\014\n\004name\030\001 \001(\t\022\022\n\nasset_type\030\002 \001(\t\022\017\n\007pro" - + "ject\030\003 \001(\t\022\024\n\014display_name\030\004 \001(\t\022\023\n\013desc" - + "ription\030\005 \001(\t\"a\n\025IamPolicySearchResult\022\020" - + "\n\010resource\030\001 \001(\t\022\017\n\007project\030\003 \001(\t\022%\n\006pol" - + "icy\030\004 \001(\0132\025.google.iam.v1.PolicyB\264\001\n com" - + ".google.cloud.asset.v1p1beta1B\nAssetProt" - + "oP\001ZAgoogle.golang.org/genproto/googleap" - + "is/cloud/asset/v1p1beta1;asset\370\001\001\252\002\034Goog" - + "le.Cloud.Asset.V1P1Beta1\312\002\034Google\\Cloud\\" - + "Asset\\V1p1beta1b\006proto3" + + "tions.proto\"\227\001\n\030StandardResourceMetadata" + + "\022\014\n\004name\030\001 \001(\t\022\022\n\nasset_type\030\002 \001(\t\022\017\n\007pr" + + "oject\030\003 \001(\t\022\024\n\014display_name\030\004 \001(\t\022\023\n\013des" + + "cription\030\005 \001(\t\022\035\n\025additional_attributes\030" + + "\n \003(\t\"a\n\025IamPolicySearchResult\022\020\n\010resour" + + "ce\030\001 \001(\t\022\017\n\007project\030\003 \001(\t\022%\n\006policy\030\004 \001(" + + "\0132\025.google.iam.v1.PolicyB\264\001\n com.google." + + "cloud.asset.v1p1beta1B\nAssetProtoP\001ZAgoo" + + "gle.golang.org/genproto/googleapis/cloud" + + "/asset/v1p1beta1;asset\370\001\001\252\002\034Google.Cloud" + + ".Asset.V1P1Beta1\312\002\034Google\\Cloud\\Asset\\V1" + + "p1beta1b\006proto3" }; descriptor = com.google.protobuf.Descriptors.FileDescriptor.internalBuildGeneratedFileFrom( @@ -72,7 +73,7 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() { new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( internal_static_google_cloud_asset_v1p1beta1_StandardResourceMetadata_descriptor, new java.lang.String[] { - "Name", "AssetType", "Project", "DisplayName", "Description", + "Name", "AssetType", "Project", "DisplayName", "Description", "AdditionalAttributes", }); internal_static_google_cloud_asset_v1p1beta1_IamPolicySearchResult_descriptor = getDescriptor().getMessageTypes().get(1); diff --git a/proto-google-cloud-asset-v1p1beta1/src/main/java/com/google/cloud/asset/v1p1beta1/AssetServiceProto.java b/proto-google-cloud-asset-v1p1beta1/src/main/java/com/google/cloud/asset/v1p1beta1/AssetServiceProto.java index d1c00d749..5f65dc46d 100644 --- a/proto-google-cloud-asset-v1p1beta1/src/main/java/com/google/cloud/asset/v1p1beta1/AssetServiceProto.java +++ b/proto-google-cloud-asset-v1p1beta1/src/main/java/com/google/cloud/asset/v1p1beta1/AssetServiceProto.java @@ -70,10 +70,10 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() { java.lang.String[] descriptorData = { "\n0google/cloud/asset/v1p1beta1/asset_ser" + "vice.proto\022\034google.cloud.asset.v1p1beta1" - + "\032\034google/api/annotations.proto\032\037google/a" - + "pi/field_behavior.proto\032)google/cloud/as" - + "set/v1p1beta1/assets.proto\032\027google/api/c" - + "lient.proto\"\213\001\n\026SearchResourcesRequest\022\022" + + "\032\034google/api/annotations.proto\032\027google/a" + + "pi/client.proto\032\037google/api/field_behavi" + + "or.proto\032)google/cloud/asset/v1p1beta1/a" + + "ssets.proto\"\213\001\n\026SearchResourcesRequest\022\022" + "\n\005scope\030\001 \001(\tB\003\340A\002\022\022\n\005query\030\002 \001(\tB\003\340A\001\022\030" + "\n\013asset_types\030\003 \003(\tB\003\340A\001\022\026\n\tpage_size\030\004 " + "\001(\005B\003\340A\001\022\027\n\npage_token\030\005 \001(\tB\003\340A\001\"{\n\027Sea" @@ -99,25 +99,27 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() { + "chAllIamPoliciesResponse\022D\n\007results\030\001 \003(" + "\01323.google.cloud.asset.v1p1beta1.IamPoli" + "cySearchResult\022\027\n\017next_page_token\030\002 \001(\t2" - + "\265\006\n\014AssetService\022\243\001\n\017SearchResources\0224.g" + + "\205\007\n\014AssetService\022\275\001\n\017SearchResources\0224.g" + "oogle.cloud.asset.v1p1beta1.SearchResour" + "cesRequest\0325.google.cloud.asset.v1p1beta" - + "1.SearchResourcesResponse\"#\202\323\344\223\002\035\022\033/v1p1" - + "beta1/resources:search\022\253\001\n\021SearchIamPoli" - + "cies\0226.google.cloud.asset.v1p1beta1.Sear" - + "chIamPoliciesRequest\0327.google.cloud.asse" - + "t.v1p1beta1.SearchIamPoliciesResponse\"%\202" - + "\323\344\223\002\037\022\035/v1p1beta1/iamPolicies:search\022\273\001\n" + + "1.SearchResourcesResponse\"=\202\323\344\223\002\035\022\033/v1p1" + + "beta1/resources:search\332A\027scope,query,ass" + + "et_types\022\271\001\n\021SearchIamPolicies\0226.google." + + "cloud.asset.v1p1beta1.SearchIamPoliciesR" + + "equest\0327.google.cloud.asset.v1p1beta1.Se" + + "archIamPoliciesResponse\"3\202\323\344\223\002\037\022\035/v1p1be" + + "ta1/iamPolicies:search\332A\013scope,query\022\325\001\n" + "\022SearchAllResources\0227.google.cloud.asset" + ".v1p1beta1.SearchAllResourcesRequest\0328.g" + "oogle.cloud.asset.v1p1beta1.SearchAllRes" - + "ourcesResponse\"2\202\323\344\223\002,\022*/v1p1beta1/{scop" - + "e=*/*}/resources:searchAll\022\303\001\n\024SearchAll" - + "IamPolicies\0229.google.cloud.asset.v1p1bet" - + "a1.SearchAllIamPoliciesRequest\032:.google." - + "cloud.asset.v1p1beta1.SearchAllIamPolici" - + "esResponse\"4\202\323\344\223\002.\022,/v1p1beta1/{scope=*/" - + "*}/iamPolicies:searchAll\032M\312A\031cloudasset." + + "ourcesResponse\"L\202\323\344\223\002,\022*/v1p1beta1/{scop" + + "e=*/*}/resources:searchAll\332A\027scope,query" + + ",asset_types\022\321\001\n\024SearchAllIamPolicies\0229." + + "google.cloud.asset.v1p1beta1.SearchAllIa" + + "mPoliciesRequest\032:.google.cloud.asset.v1" + + "p1beta1.SearchAllIamPoliciesResponse\"B\202\323" + + "\344\223\002.\022,/v1p1beta1/{scope=*/*}/iamPolicies" + + ":searchAll\332A\013scope,query\032M\312A\031cloudasset." + "googleapis.com\322A.https://www.googleapis." + "com/auth/cloud-platformB\270\001\n com.google.c" + "loud.asset.v1p1beta1B\021AssetServiceProtoP" @@ -131,9 +133,9 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() { descriptorData, new com.google.protobuf.Descriptors.FileDescriptor[] { com.google.api.AnnotationsProto.getDescriptor(), + com.google.api.ClientProto.getDescriptor(), com.google.api.FieldBehaviorProto.getDescriptor(), com.google.cloud.asset.v1p1beta1.AssetProto.getDescriptor(), - com.google.api.ClientProto.getDescriptor(), }); internal_static_google_cloud_asset_v1p1beta1_SearchResourcesRequest_descriptor = getDescriptor().getMessageTypes().get(0); @@ -204,13 +206,14 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() { registry.add(com.google.api.ClientProto.defaultHost); registry.add(com.google.api.FieldBehaviorProto.fieldBehavior); registry.add(com.google.api.AnnotationsProto.http); + registry.add(com.google.api.ClientProto.methodSignature); registry.add(com.google.api.ClientProto.oauthScopes); com.google.protobuf.Descriptors.FileDescriptor.internalUpdateFileDescriptor( descriptor, registry); com.google.api.AnnotationsProto.getDescriptor(); + com.google.api.ClientProto.getDescriptor(); com.google.api.FieldBehaviorProto.getDescriptor(); com.google.cloud.asset.v1p1beta1.AssetProto.getDescriptor(); - com.google.api.ClientProto.getDescriptor(); } // @@protoc_insertion_point(outer_class_scope) diff --git a/proto-google-cloud-asset-v1p1beta1/src/main/java/com/google/cloud/asset/v1p1beta1/StandardResourceMetadata.java b/proto-google-cloud-asset-v1p1beta1/src/main/java/com/google/cloud/asset/v1p1beta1/StandardResourceMetadata.java index a9532b812..762584a78 100644 --- a/proto-google-cloud-asset-v1p1beta1/src/main/java/com/google/cloud/asset/v1p1beta1/StandardResourceMetadata.java +++ b/proto-google-cloud-asset-v1p1beta1/src/main/java/com/google/cloud/asset/v1p1beta1/StandardResourceMetadata.java @@ -43,6 +43,7 @@ private StandardResourceMetadata() { project_ = ""; displayName_ = ""; description_ = ""; + additionalAttributes_ = com.google.protobuf.LazyStringArrayList.EMPTY; } @java.lang.Override @@ -64,6 +65,7 @@ private StandardResourceMetadata( if (extensionRegistry == null) { throw new java.lang.NullPointerException(); } + int mutable_bitField0_ = 0; com.google.protobuf.UnknownFieldSet.Builder unknownFields = com.google.protobuf.UnknownFieldSet.newBuilder(); try { @@ -109,6 +111,16 @@ private StandardResourceMetadata( description_ = s; break; } + case 82: + { + java.lang.String s = input.readStringRequireUtf8(); + if (!((mutable_bitField0_ & 0x00000001) != 0)) { + additionalAttributes_ = new com.google.protobuf.LazyStringArrayList(); + mutable_bitField0_ |= 0x00000001; + } + additionalAttributes_.add(s); + break; + } default: { if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { @@ -123,6 +135,9 @@ private StandardResourceMetadata( } catch (java.io.IOException e) { throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this); } finally { + if (((mutable_bitField0_ & 0x00000001) != 0)) { + additionalAttributes_ = additionalAttributes_.getUnmodifiableView(); + } this.unknownFields = unknownFields.build(); makeExtensionsImmutable(); } @@ -392,6 +407,75 @@ public com.google.protobuf.ByteString getDescriptionBytes() { } } + public static final int ADDITIONAL_ATTRIBUTES_FIELD_NUMBER = 10; + private com.google.protobuf.LazyStringList additionalAttributes_; + /** + * + * + * 
+   * Additional searchable attributes of this resource.
+   * Informational only. The exact set of attributes is subject to change.
+   * For example: project id, DNS name etc.
+   *
+ * + * repeated string additional_attributes = 10; + * + * @return A list containing the additionalAttributes. + */ + public com.google.protobuf.ProtocolStringList getAdditionalAttributesList() { + return additionalAttributes_; + } + /** + * + * + * 
+   * Additional searchable attributes of this resource.
+   * Informational only. The exact set of attributes is subject to change.
+   * For example: project id, DNS name etc.
+   *
+ * + * repeated string additional_attributes = 10; + * + * @return The count of additionalAttributes. + */ + public int getAdditionalAttributesCount() { + return additionalAttributes_.size(); + } + /** + * + * + * 
+   * Additional searchable attributes of this resource.
+   * Informational only. The exact set of attributes is subject to change.
+   * For example: project id, DNS name etc.
+   *
+ * + * repeated string additional_attributes = 10; + * + * @param index The index of the element to return. + * @return The additionalAttributes at the given index. + */ + public java.lang.String getAdditionalAttributes(int index) { + return additionalAttributes_.get(index); + } + /** + * + * + * 
+   * Additional searchable attributes of this resource.
+   * Informational only. The exact set of attributes is subject to change.
+   * For example: project id, DNS name etc.
+   *
+ * + * repeated string additional_attributes = 10; + * + * @param index The index of the value to return. + * @return The bytes of the additionalAttributes at the given index. + */ + public com.google.protobuf.ByteString getAdditionalAttributesBytes(int index) { + return additionalAttributes_.getByteString(index); + } + private byte memoizedIsInitialized = -1; @java.lang.Override @@ -421,6 +505,10 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io if (!getDescriptionBytes().isEmpty()) { com.google.protobuf.GeneratedMessageV3.writeString(output, 5, description_); } + for (int i = 0; i < additionalAttributes_.size(); i++) { + com.google.protobuf.GeneratedMessageV3.writeString( + output, 10, additionalAttributes_.getRaw(i)); + } unknownFields.writeTo(output); } @@ -445,6 +533,14 @@ public int getSerializedSize() { if (!getDescriptionBytes().isEmpty()) { size += com.google.protobuf.GeneratedMessageV3.computeStringSize(5, description_); } + { + int dataSize = 0; + for (int i = 0; i < additionalAttributes_.size(); i++) { + dataSize += computeStringSizeNoTag(additionalAttributes_.getRaw(i)); + } + size += dataSize; + size += 1 * getAdditionalAttributesList().size(); + } size += unknownFields.getSerializedSize(); memoizedSize = size; return size; @@ -466,6 +562,7 @@ public boolean equals(final java.lang.Object obj) { if (!getProject().equals(other.getProject())) return false; if (!getDisplayName().equals(other.getDisplayName())) return false; if (!getDescription().equals(other.getDescription())) return false; + if (!getAdditionalAttributesList().equals(other.getAdditionalAttributesList())) return false; if (!unknownFields.equals(other.unknownFields)) return false; return true; } @@ -487,6 +584,10 @@ public int hashCode() { hash = (53 * hash) + getDisplayName().hashCode(); hash = (37 * hash) + DESCRIPTION_FIELD_NUMBER; hash = (53 * hash) + getDescription().hashCode(); + if (getAdditionalAttributesCount() > 0) { + hash = (37 * hash) + ADDITIONAL_ATTRIBUTES_FIELD_NUMBER; + hash = (53 * hash) + getAdditionalAttributesList().hashCode(); + } hash = (29 * hash) + unknownFields.hashCode(); memoizedHashCode = hash; return hash; @@ -643,6 +744,8 @@ public Builder clear() { description_ = ""; + additionalAttributes_ = com.google.protobuf.LazyStringArrayList.EMPTY; + bitField0_ = (bitField0_ & ~0x00000001); return this; } @@ -670,11 +773,17 @@ public com.google.cloud.asset.v1p1beta1.StandardResourceMetadata build() { public com.google.cloud.asset.v1p1beta1.StandardResourceMetadata buildPartial() { com.google.cloud.asset.v1p1beta1.StandardResourceMetadata result = new com.google.cloud.asset.v1p1beta1.StandardResourceMetadata(this); + int from_bitField0_ = bitField0_; result.name_ = name_; result.assetType_ = assetType_; result.project_ = project_; result.displayName_ = displayName_; result.description_ = description_; + if (((bitField0_ & 0x00000001) != 0)) { + additionalAttributes_ = additionalAttributes_.getUnmodifiableView(); + bitField0_ = (bitField0_ & ~0x00000001); + } + result.additionalAttributes_ = additionalAttributes_; onBuilt(); return result; } @@ -745,6 +854,16 @@ public Builder mergeFrom(com.google.cloud.asset.v1p1beta1.StandardResourceMetada description_ = other.description_; onChanged(); } + if (!other.additionalAttributes_.isEmpty()) { + if (additionalAttributes_.isEmpty()) { + additionalAttributes_ = other.additionalAttributes_; + bitField0_ = (bitField0_ & ~0x00000001); + } else { + ensureAdditionalAttributesIsMutable(); + additionalAttributes_.addAll(other.additionalAttributes_); + } + onChanged(); + } this.mergeUnknownFields(other.unknownFields); onChanged(); return this; @@ -775,6 +894,8 @@ public Builder mergeFrom( return this; } + private int bitField0_; + private java.lang.Object name_ = ""; /** * @@ -1340,6 +1461,192 @@ public Builder setDescriptionBytes(com.google.protobuf.ByteString value) { return this; } + private com.google.protobuf.LazyStringList additionalAttributes_ = + com.google.protobuf.LazyStringArrayList.EMPTY; + + private void ensureAdditionalAttributesIsMutable() { + if (!((bitField0_ & 0x00000001) != 0)) { + additionalAttributes_ = new com.google.protobuf.LazyStringArrayList(additionalAttributes_); + bitField0_ |= 0x00000001; + } + } + /** + * + * + * 
+     * Additional searchable attributes of this resource.
+     * Informational only. The exact set of attributes is subject to change.
+     * For example: project id, DNS name etc.
+     *
+ * + * repeated string additional_attributes = 10; + * + * @return A list containing the additionalAttributes. + */ + public com.google.protobuf.ProtocolStringList getAdditionalAttributesList() { + return additionalAttributes_.getUnmodifiableView(); + } + /** + * + * + * 
+     * Additional searchable attributes of this resource.
+     * Informational only. The exact set of attributes is subject to change.
+     * For example: project id, DNS name etc.
+     *
+ * + * repeated string additional_attributes = 10; + * + * @return The count of additionalAttributes. + */ + public int getAdditionalAttributesCount() { + return additionalAttributes_.size(); + } + /** + * + * + * 
+     * Additional searchable attributes of this resource.
+     * Informational only. The exact set of attributes is subject to change.
+     * For example: project id, DNS name etc.
+     *
+ * + * repeated string additional_attributes = 10; + * + * @param index The index of the element to return. + * @return The additionalAttributes at the given index. + */ + public java.lang.String getAdditionalAttributes(int index) { + return additionalAttributes_.get(index); + } + /** + * + * + * 
+     * Additional searchable attributes of this resource.
+     * Informational only. The exact set of attributes is subject to change.
+     * For example: project id, DNS name etc.
+     *
+ * + * repeated string additional_attributes = 10; + * + * @param index The index of the value to return. + * @return The bytes of the additionalAttributes at the given index. + */ + public com.google.protobuf.ByteString getAdditionalAttributesBytes(int index) { + return additionalAttributes_.getByteString(index); + } + /** + * + * + * 
+     * Additional searchable attributes of this resource.
+     * Informational only. The exact set of attributes is subject to change.
+     * For example: project id, DNS name etc.
+     *
+ * + * repeated string additional_attributes = 10; + * + * @param index The index to set the value at. + * @param value The additionalAttributes to set. + * @return This builder for chaining. + */ + public Builder setAdditionalAttributes(int index, java.lang.String value) { + if (value == null) { + throw new NullPointerException(); + } + ensureAdditionalAttributesIsMutable(); + additionalAttributes_.set(index, value); + onChanged(); + return this; + } + /** + * + * + * 
+     * Additional searchable attributes of this resource.
+     * Informational only. The exact set of attributes is subject to change.
+     * For example: project id, DNS name etc.
+     *
+ * + * repeated string additional_attributes = 10; + * + * @param value The additionalAttributes to add. + * @return This builder for chaining. + */ + public Builder addAdditionalAttributes(java.lang.String value) { + if (value == null) { + throw new NullPointerException(); + } + ensureAdditionalAttributesIsMutable(); + additionalAttributes_.add(value); + onChanged(); + return this; + } + /** + * + * + * 
+     * Additional searchable attributes of this resource.
+     * Informational only. The exact set of attributes is subject to change.
+     * For example: project id, DNS name etc.
+     *
+ * + * repeated string additional_attributes = 10; + * + * @param values The additionalAttributes to add. + * @return This builder for chaining. + */ + public Builder addAllAdditionalAttributes(java.lang.Iterable values) { + ensureAdditionalAttributesIsMutable(); + com.google.protobuf.AbstractMessageLite.Builder.addAll(values, additionalAttributes_); + onChanged(); + return this; + } + /** + * + * + * 
+     * Additional searchable attributes of this resource.
+     * Informational only. The exact set of attributes is subject to change.
+     * For example: project id, DNS name etc.
+     *
+ * + * repeated string additional_attributes = 10; + * + * @return This builder for chaining. + */ + public Builder clearAdditionalAttributes() { + additionalAttributes_ = com.google.protobuf.LazyStringArrayList.EMPTY; + bitField0_ = (bitField0_ & ~0x00000001); + onChanged(); + return this; + } + /** + * + * + * 
+     * Additional searchable attributes of this resource.
+     * Informational only. The exact set of attributes is subject to change.
+     * For example: project id, DNS name etc.
+     *
+ * + * repeated string additional_attributes = 10; + * + * @param value The bytes of the additionalAttributes to add. + * @return This builder for chaining. + */ + public Builder addAdditionalAttributesBytes(com.google.protobuf.ByteString value) { + if (value == null) { + throw new NullPointerException(); + } + checkByteStringIsUtf8(value); + ensureAdditionalAttributesIsMutable(); + additionalAttributes_.add(value); + onChanged(); + return this; + } + @java.lang.Override public final Builder setUnknownFields(final com.google.protobuf.UnknownFieldSet unknownFields) { return super.setUnknownFields(unknownFields); diff --git a/proto-google-cloud-asset-v1p1beta1/src/main/java/com/google/cloud/asset/v1p1beta1/StandardResourceMetadataOrBuilder.java b/proto-google-cloud-asset-v1p1beta1/src/main/java/com/google/cloud/asset/v1p1beta1/StandardResourceMetadataOrBuilder.java index 11bd02167..b2a3c040a 100644 --- a/proto-google-cloud-asset-v1p1beta1/src/main/java/com/google/cloud/asset/v1p1beta1/StandardResourceMetadataOrBuilder.java +++ b/proto-google-cloud-asset-v1p1beta1/src/main/java/com/google/cloud/asset/v1p1beta1/StandardResourceMetadataOrBuilder.java @@ -161,4 +161,63 @@ public interface StandardResourceMetadataOrBuilder * @return The bytes for description. */ com.google.protobuf.ByteString getDescriptionBytes(); + + /** + * + * + * 
+   * Additional searchable attributes of this resource.
+   * Informational only. The exact set of attributes is subject to change.
+   * For example: project id, DNS name etc.
+   *
+ * + * repeated string additional_attributes = 10; + * + * @return A list containing the additionalAttributes. + */ + java.util.List getAdditionalAttributesList(); + /** + * + * + * 
+   * Additional searchable attributes of this resource.
+   * Informational only. The exact set of attributes is subject to change.
+   * For example: project id, DNS name etc.
+   *
+ * + * repeated string additional_attributes = 10; + * + * @return The count of additionalAttributes. + */ + int getAdditionalAttributesCount(); + /** + * + * + * 
+   * Additional searchable attributes of this resource.
+   * Informational only. The exact set of attributes is subject to change.
+   * For example: project id, DNS name etc.
+   *
+ * + * repeated string additional_attributes = 10; + * + * @param index The index of the element to return. + * @return The additionalAttributes at the given index. + */ + java.lang.String getAdditionalAttributes(int index); + /** + * + * + * 
+   * Additional searchable attributes of this resource.
+   * Informational only. The exact set of attributes is subject to change.
+   * For example: project id, DNS name etc.
+   *
+ * + * repeated string additional_attributes = 10; + * + * @param index The index of the value to return. + * @return The bytes of the additionalAttributes at the given index. + */ + com.google.protobuf.ByteString getAdditionalAttributesBytes(int index); } diff --git a/proto-google-cloud-asset-v1p1beta1/src/main/proto/google/cloud/asset/v1p1beta1/asset_service.proto b/proto-google-cloud-asset-v1p1beta1/src/main/proto/google/cloud/asset/v1p1beta1/asset_service.proto index f8f42dab9..025adb27f 100644 --- a/proto-google-cloud-asset-v1p1beta1/src/main/proto/google/cloud/asset/v1p1beta1/asset_service.proto +++ b/proto-google-cloud-asset-v1p1beta1/src/main/proto/google/cloud/asset/v1p1beta1/asset_service.proto @@ -18,9 +18,9 @@ syntax = "proto3"; package google.cloud.asset.v1p1beta1; import "google/api/annotations.proto"; +import "google/api/client.proto"; import "google/api/field_behavior.proto"; import "google/cloud/asset/v1p1beta1/assets.proto"; -import "google/api/client.proto"; option csharp_namespace = "Google.Cloud.Asset.V1P1Beta1"; option go_package = "google.golang.org/genproto/googleapis/cloud/asset/v1p1beta1;asset"; @@ -39,6 +39,7 @@ service AssetService { option (google.api.http) = { get: "/v1p1beta1/resources:search" }; + option (google.api.method_signature) = "scope,query,asset_types"; } // Searches IAM policies which are accessible with .getIamPolicy permission. @@ -46,6 +47,7 @@ service AssetService { option (google.api.http) = { get: "/v1p1beta1/iamPolicies:search" }; + option (google.api.method_signature) = "scope,query"; } // Searches all the resources under a given accessible CRM scope @@ -58,6 +60,7 @@ service AssetService { option (google.api.http) = { get: "/v1p1beta1/{scope=*/*}/resources:searchAll" }; + option (google.api.method_signature) = "scope,query,asset_types"; } // Searches all the IAM policies under a given accessible CRM scope @@ -70,6 +73,7 @@ service AssetService { option (google.api.http) = { get: "/v1p1beta1/{scope=*/*}/iamPolicies:searchAll" }; + option (google.api.method_signature) = "scope,query"; } } diff --git a/proto-google-cloud-asset-v1p1beta1/src/main/proto/google/cloud/asset/v1p1beta1/assets.proto b/proto-google-cloud-asset-v1p1beta1/src/main/proto/google/cloud/asset/v1p1beta1/assets.proto index 47ab0c278..ff0b927b1 100644 --- a/proto-google-cloud-asset-v1p1beta1/src/main/proto/google/cloud/asset/v1p1beta1/assets.proto +++ b/proto-google-cloud-asset-v1p1beta1/src/main/proto/google/cloud/asset/v1p1beta1/assets.proto @@ -51,6 +51,11 @@ message StandardResourceMetadata { // One or more paragraphs of text description of this resource. Maximum length // could be up to 1M bytes. string description = 5; + + // Additional searchable attributes of this resource. + // Informational only. The exact set of attributes is subject to change. + // For example: project id, DNS name etc. + repeated string additional_attributes = 10; } // The result for a IAM Policy search. diff --git a/synth.metadata b/synth.metadata index 34e1951bd..8257b5d5b 100644 --- a/synth.metadata +++ b/synth.metadata @@ -1,19 +1,19 @@ { - "updateTime": "2020-01-23T08:33:58.499993Z", + "updateTime": "2020-01-30T08:36:52.538419Z", "sources": [ { "generator": { "name": "artman", - "version": "0.44.1", - "dockerImage": "googleapis/artman@sha256:5599b61e56a372d21b671969ee915fbca0f6c3a0daaeb898d01f8f685f1bbc8b" + "version": "0.44.4", + "dockerImage": "googleapis/artman@sha256:19e945954fc960a4bdfee6cb34695898ab21a8cf0bac063ee39b91f00a1faec8" } }, { "git": { "name": "googleapis", "remote": "https://github.com/googleapis/googleapis.git", - "sha": "fead959b0dcc7b36c6ed74ebf905f5bcb3c0d521", - "log": "fead959b0dcc7b36c6ed74ebf905f5bcb3c0d521\nMerge branch 'master' of github.com:googleapis/googleapis\n\n8d16f76de065f530d395a4c7eabbf766d6a120fd\nGenerate Memcache v1beta2 API protos and gRPC ServiceConfig files\n\nPiperOrigin-RevId: 291008516\n\n3af1dabd93df9a9f17bf3624d3b875c11235360b\ngrafeas: Add containeranalysis default_host to Grafeas service\n\nPiperOrigin-RevId: 290965849\n\nbe2663fa95e31cba67d0cd62611a6674db9f74b7\nfix(google/maps/roads): add missing opening bracket\n\nPiperOrigin-RevId: 290964086\n\nfacc26550a0af0696e0534bc9cae9df14275aa7c\nUpdating v2 protos with the latest inline documentation (in comments) and adding a per-service .yaml file.\n\nPiperOrigin-RevId: 290952261\n\n" + "sha": "b491d07cadaae7cde5608321f913e5ca1459b32d", + "internalRef": "292245373" } }, { @@ -82,6 +82,9 @@ { "path": ".github/release-please.yml" }, + { + "path": ".gitignore" + }, { "path": ".kokoro/build.bat" }, @@ -247,6 +250,12 @@ { "path": ".kokoro/trampoline.sh" }, + { + "path": ".repo-metadata.json" + }, + { + "path": "CHANGELOG.md" + }, { "path": "CODE_OF_CONDUCT.md" }, @@ -256,9 +265,18 @@ { "path": "LICENSE" }, + { + "path": "README.md" + }, { "path": "codecov.yaml" }, + { + "path": "google-cloud-asset-bom/pom.xml" + }, + { + "path": "google-cloud-asset/pom.xml" + }, { "path": "google-cloud-asset/src/main/java/com/google/cloud/asset/v1/AssetServiceClient.java" }, @@ -343,6 +361,9 @@ { "path": "google-cloud-asset/src/main/java/com/google/cloud/asset/v1p2beta1/stub/GrpcAssetServiceStub.java" }, + { + "path": "google-cloud-asset/src/test/java/com/google/cloud/asset/it/ITSystemTest.java" + }, { "path": "google-cloud-asset/src/test/java/com/google/cloud/asset/v1/AssetServiceClientTest.java" }, @@ -352,6 +373,9 @@ { "path": "google-cloud-asset/src/test/java/com/google/cloud/asset/v1/MockAssetServiceImpl.java" }, + { + "path": "google-cloud-asset/src/test/java/com/google/cloud/asset/v1/VPCServiceControlTest.java" + }, { "path": "google-cloud-asset/src/test/java/com/google/cloud/asset/v1beta1/AssetServiceClientTest.java" }, @@ -379,15 +403,27 @@ { "path": "google-cloud-asset/src/test/java/com/google/cloud/asset/v1p2beta1/MockAssetServiceImpl.java" }, + { + "path": "grpc-google-cloud-asset-v1/pom.xml" + }, { "path": "grpc-google-cloud-asset-v1/src/main/java/com/google/cloud/asset/v1/AssetServiceGrpc.java" }, + { + "path": "grpc-google-cloud-asset-v1beta1/pom.xml" + }, { "path": "grpc-google-cloud-asset-v1beta1/src/main/java/com/google/cloud/asset/v1beta1/AssetServiceGrpc.java" }, + { + "path": "grpc-google-cloud-asset-v1p1beta1/pom.xml" + }, { "path": "grpc-google-cloud-asset-v1p1beta1/src/main/java/com/google/cloud/asset/v1p1beta1/AssetServiceGrpc.java" }, + { + "path": "grpc-google-cloud-asset-v1p2beta1/pom.xml" + }, { "path": "grpc-google-cloud-asset-v1p2beta1/src/main/java/com/google/cloud/asset/v1p2beta1/AssetServiceGrpc.java" }, @@ -397,6 +433,15 @@ { "path": "license-checks.xml" }, + { + "path": "pom.xml" + }, + { + "path": "proto-google-cloud-asset-v1/clirr-ignored-differences.xml" + }, + { + "path": "proto-google-cloud-asset-v1/pom.xml" + }, { "path": "proto-google-cloud-asset-v1/src/main/java/com/google/cloud/asset/v1/Asset.java" }, @@ -473,7 +518,7 @@ "path": "proto-google-cloud-asset-v1/src/main/java/com/google/cloud/asset/v1/GcsDestination.java" }, { - "path": "proto-google-cloud-asset-v1/src/main/java/com/google/cloud/asset/v1/ExportAssetsResponse.java" + "path": "proto-google-cloud-asset-v1/src/main/java/com/google/cloud/asset/v1/GcsDestinationOrBuilder.java" }, { "path": "proto-google-cloud-asset-v1/src/main/java/com/google/cloud/asset/v1/GetFeedRequest.java" @@ -516,10 +561,9 @@ }, { "path": "proto-google-cloud-asset-v1/src/main/java/com/google/cloud/asset/v1/TemporalAsset.java" - }, { - "path": "proto-google-cloud-asset-v1/src/main/java/com/google/cloud/asset/v1/ListFeedsResponseOrBuilder.java" + "path": "proto-google-cloud-asset-v1/src/main/java/com/google/cloud/asset/v1/TemporalAssetOrBuilder.java" }, { "path": "proto-google-cloud-asset-v1/src/main/java/com/google/cloud/asset/v1/TimeWindow.java" @@ -539,6 +583,9 @@ { "path": "proto-google-cloud-asset-v1/src/main/proto/google/cloud/asset/v1/assets.proto" }, + { + "path": "proto-google-cloud-asset-v1beta1/pom.xml" + }, { "path": "proto-google-cloud-asset-v1beta1/src/main/java/com/google/cloud/asset/v1beta1/Asset.java" }, @@ -573,7 +620,7 @@ "path": "proto-google-cloud-asset-v1beta1/src/main/java/com/google/cloud/asset/v1beta1/ExportAssetsRequestOrBuilder.java" }, { - "path": "proto-google-cloud-asset-v1beta1/src/main/java/com/google/cloud/asset/v1beta1/AssetOrBuilder.java" + "path": "proto-google-cloud-asset-v1beta1/src/main/java/com/google/cloud/asset/v1beta1/ExportAssetsResponse.java" }, { "path": "proto-google-cloud-asset-v1beta1/src/main/java/com/google/cloud/asset/v1beta1/ExportAssetsResponseOrBuilder.java" @@ -594,7 +641,7 @@ "path": "proto-google-cloud-asset-v1beta1/src/main/java/com/google/cloud/asset/v1beta1/ProjectName.java" }, { - "path": "proto-google-cloud-asset-v1beta1/src/main/java/com/google/cloud/asset/v1beta1/BatchGetAssetsHistoryRequestOrBuilder.java" + "path": "proto-google-cloud-asset-v1beta1/src/main/java/com/google/cloud/asset/v1beta1/Resource.java" }, { "path": "proto-google-cloud-asset-v1beta1/src/main/java/com/google/cloud/asset/v1beta1/ResourceOrBuilder.java" @@ -606,10 +653,10 @@ "path": "proto-google-cloud-asset-v1beta1/src/main/java/com/google/cloud/asset/v1beta1/TemporalAssetOrBuilder.java" }, { - "path": "proto-google-cloud-asset-v1beta1/src/main/java/com/google/cloud/asset/v1beta1/ContentType.java" + "path": "proto-google-cloud-asset-v1beta1/src/main/java/com/google/cloud/asset/v1beta1/TimeWindow.java" }, { - "path": "proto-google-cloud-asset-v1beta1/src/main/java/com/google/cloud/asset/v1beta1/ExportAssetsRequest.java" + "path": "proto-google-cloud-asset-v1beta1/src/main/java/com/google/cloud/asset/v1beta1/TimeWindowOrBuilder.java" }, { "path": "proto-google-cloud-asset-v1beta1/src/main/proto/google/cloud/asset/v1beta1/asset_service.proto" @@ -617,6 +664,9 @@ { "path": "proto-google-cloud-asset-v1beta1/src/main/proto/google/cloud/asset/v1beta1/assets.proto" }, + { + "path": "proto-google-cloud-asset-v1p1beta1/pom.xml" + }, { "path": "proto-google-cloud-asset-v1p1beta1/src/main/java/com/google/cloud/asset/v1p1beta1/AssetProto.java" }, @@ -689,6 +739,9 @@ { "path": "proto-google-cloud-asset-v1p1beta1/src/main/proto/google/cloud/asset/v1p1beta1/assets.proto" }, + { + "path": "proto-google-cloud-asset-v1p2beta1/pom.xml" + }, { "path": "proto-google-cloud-asset-v1p2beta1/src/main/java/com/google/cloud/asset/v1p2beta1/Asset.java" }, @@ -696,7 +749,7 @@ "path": "proto-google-cloud-asset-v1p2beta1/src/main/java/com/google/cloud/asset/v1p2beta1/AssetOrBuilder.java" }, { - "path": "proto-google-cloud-asset-v1p2beta1/src/main/java/com/google/cloud/asset/v1p2beta1/BatchGetAssetsHistoryResponse.java" + "path": "proto-google-cloud-asset-v1p2beta1/src/main/java/com/google/cloud/asset/v1p2beta1/AssetProto.java" }, { "path": "proto-google-cloud-asset-v1p2beta1/src/main/java/com/google/cloud/asset/v1p2beta1/AssetServiceProto.java" @@ -714,10 +767,7 @@ "path": "proto-google-cloud-asset-v1p2beta1/src/main/java/com/google/cloud/asset/v1p2beta1/BatchGetAssetsHistoryResponseOrBuilder.java" }, { - "path": "proto-google-cloud-asset-v1p2beta1/src/main/java/com/google/cloud/asset/v1p2beta1/ContentType.java" - }, - { - "path": "proto-google-cloud-asset-v1p2beta1/src/main/java/com/google/cloud/asset/v1p2beta1/CreateFeedRequest.java" + "path": "proto-google-cloud-asset-v1p2beta1/src/main/java/com/google/cloud/asset/v1p2beta1/BigQueryDestination.java" }, { "path": "proto-google-cloud-asset-v1p2beta1/src/main/java/com/google/cloud/asset/v1p2beta1/BigQueryDestinationOrBuilder.java" @@ -750,7 +800,7 @@ "path": "proto-google-cloud-asset-v1p2beta1/src/main/java/com/google/cloud/asset/v1p2beta1/ExportAssetsResponseOrBuilder.java" }, { - "path": "proto-google-cloud-asset-v1p2beta1/src/main/java/com/google/cloud/asset/v1p2beta1/FeedOutputConfig.java" + "path": "proto-google-cloud-asset-v1p2beta1/src/main/java/com/google/cloud/asset/v1p2beta1/Feed.java" }, { "path": "proto-google-cloud-asset-v1p2beta1/src/main/java/com/google/cloud/asset/v1p2beta1/FeedName.java" @@ -786,7 +836,7 @@ "path": "proto-google-cloud-asset-v1p2beta1/src/main/java/com/google/cloud/asset/v1p2beta1/ListFeedsResponse.java" }, { - "path": "proto-google-cloud-asset-v1p2beta1/src/main/java/com/google/cloud/asset/v1p2beta1/PubsubDestinationOrBuilder.java" + "path": "proto-google-cloud-asset-v1p2beta1/src/main/java/com/google/cloud/asset/v1p2beta1/ListFeedsResponseOrBuilder.java" }, { "path": "proto-google-cloud-asset-v1p2beta1/src/main/java/com/google/cloud/asset/v1p2beta1/OutputConfig.java" @@ -825,13 +875,22 @@ "path": "proto-google-cloud-asset-v1p2beta1/src/main/java/com/google/cloud/asset/v1p2beta1/UpdateFeedRequestOrBuilder.java" }, { - "path": "synth.py" + "path": "proto-google-cloud-asset-v1p2beta1/src/main/proto/google/cloud/asset/v1p2beta1/asset_service.proto" }, { "path": "proto-google-cloud-asset-v1p2beta1/src/main/proto/google/cloud/asset/v1p2beta1/assets.proto" }, { "path": "renovate.json" + }, + { + "path": "synth.metadata" + }, + { + "path": "synth.py" + }, + { + "path": "versions.txt" } ] } \ No newline at end of file From cebdd3608eb4c47a7f017b97d91e6e14b25c0d4c Mon Sep 17 00:00:00 2001 From: Jeff Ching Date: Thu, 30 Jan 2020 09:55:12 -0800 Subject: [PATCH 2/2] allow proto interface changes --- .../clirr-ignored-differences.xml | 14 ++++++++++++++ .../clirr-ignored-differences.xml | 14 ++++++++++++++ 2 files changed, 28 insertions(+) create mode 100644 proto-google-cloud-asset-v1beta1/clirr-ignored-differences.xml create mode 100644 proto-google-cloud-asset-v1p1beta1/clirr-ignored-differences.xml diff --git a/proto-google-cloud-asset-v1beta1/clirr-ignored-differences.xml b/proto-google-cloud-asset-v1beta1/clirr-ignored-differences.xml new file mode 100644 index 000000000..cb68a6b3c --- /dev/null +++ b/proto-google-cloud-asset-v1beta1/clirr-ignored-differences.xml @@ -0,0 +1,14 @@ + + + + + 7012 + com/google/cloud/asset/v1beta1/*OrBuilder + * get*(*) + + + 7012 + com/google/cloud/asset/v1beta1/*OrBuilder + boolean contains*(*) + + diff --git a/proto-google-cloud-asset-v1p1beta1/clirr-ignored-differences.xml b/proto-google-cloud-asset-v1p1beta1/clirr-ignored-differences.xml new file mode 100644 index 000000000..7b6bced8a --- /dev/null +++ b/proto-google-cloud-asset-v1p1beta1/clirr-ignored-differences.xml @@ -0,0 +1,14 @@ + + + + + 7012 + com/google/cloud/asset/v1p1beta1/*OrBuilder + * get*(*) + + + 7012 + com/google/cloud/asset/v1p1beta1/*OrBuilder + boolean contains*(*) + +