Skip to content
This repository has been archived by the owner on Sep 16, 2023. It is now read-only.

feat: add uri_prefix to GcsDestination, additional_attributes to StandardResourceMetadata #72

Merged
merged 2 commits into from Jan 30, 2020
Merged

feat: add uri_prefix to GcsDestination, additional_attributes to StandardResourceMetadata #72

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2651bb6
[CHANGE ME] Re-generated to pick up changes in the API or client lib…
yoshi-automation Jan 30, 2020
cebdd36
allow proto interface changes
chingor13 Jan 30, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
6 changes: 4 additions & 2 deletions google-cloud-asset/src/main/java/com/google/cloud/asset/v1beta1/AssetServiceClient.java
View file
Open in desktop
Expand Up @@ -259,7 +259,8 @@ public final UnaryCallable<ExportAssetsRequest, Operation> 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.
*
* <p>Sample code:
*
Expand Down Expand Up @@ -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.
*
* <p>Sample code:
*
Expand Down
8 changes: 8 additions & 0 deletions ...le-cloud-asset-v1beta1/src/main/java/com/google/cloud/asset/v1beta1/AssetServiceGrpc.java
View file
Open in desktop
Expand Up @@ -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.
* </pre>
*/
public void batchGetAssetsHistory(
Expand Down Expand Up @@ -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.
* </pre>
*/
public void batchGetAssetsHistory(
Expand Down Expand Up @@ -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.
* </pre>
*/
public com.google.cloud.asset.v1beta1.BatchGetAssetsHistoryResponse batchGetAssetsHistory(
Expand Down Expand Up @@ -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.
* </pre>
*/
public com.google.common.util.concurrent.ListenableFuture<
Expand Down
14 changes: 14 additions & 0 deletions proto-google-cloud-asset-v1beta1/clirr-ignored-differences.xml
View file
Open in desktop
@@ -0,0 +1,14 @@
<?xml version="1.0" encoding="UTF-8"?>
<!-- see http://www.mojohaus.org/clirr-maven-plugin/examples/ignored-differences.html -->
<differences>
<difference>
<differenceType>7012</differenceType>
<className>com/google/cloud/asset/v1beta1/*OrBuilder</className>
<method>* get*(*)</method>
</difference>
<difference>
<differenceType>7012</differenceType>
<className>com/google/cloud/asset/v1beta1/*OrBuilder</className>
<method>boolean contains*(*)</method>
</difference>
</differences>
53 changes: 31 additions & 22 deletions ...o-google-cloud-asset-v1beta1/src/main/java/com/google/cloud/asset/v1beta1/AssetProto.java
View file
Open in desktop
Expand Up @@ -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(),
Expand Down Expand Up @@ -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();
Expand Down
111 changes: 66 additions & 45 deletions ...e-cloud-asset-v1beta1/src/main/java/com/google/cloud/asset/v1beta1/AssetServiceProto.java
View file
Open in desktop
Expand Up @@ -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(),
Expand Down Expand Up @@ -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();
Expand Down