feat(v1p1beta1): add orderBy to SearchAllResourcesRequest, explanation to IamPolicySearchResults, location, labels, networkTags to StandardResourceMetadata

google-cloud-asset/src/main/java/com/google/cloud/asset/v1p1beta1/AssetServiceClient.java

@@ -180,7 +180,7 @@ public AssetServiceStub getStub() {
    * @param scope Required. The relative name of an asset. The search is limited to the resources
    *     within the `scope`. The allowed value must be: * Organization number (such as
    *     "organizations/123") * Folder number(such as "folders/1234") * Project number (such
-   *     as "projects/12345")
+   *     as "projects/12345") * Project id (such as "projects/abc")
    * @param query Optional. The query statement.
    * @param assetTypes Optional. A list of asset types that this request searches for. If empty, it
    *     will search all the supported asset types.
@@ -315,7 +315,7 @@ public final SearchAllResourcesPagedResponse searchAllResources(
    * @param scope Required. The relative name of an asset. The search is limited to the resources
    *     within the `scope`. The allowed value must be: * Organization number (such as
    *     "organizations/123") * Folder number(such as "folders/1234") * Project number (such
-   *     as "projects/12345")
+   *     as "projects/12345") * Project id (such as "projects/abc")
    * @param query Optional. The query statement. Examples: *
    *     "policy:myuser{@literal @}mydomain.com" * "policy:(myuser{@literal @}mydomain.com
    *     viewer)"

proto-google-cloud-asset-v1beta1/clirr-ignored-differences.xml

@@ -11,4 +11,9 @@
     <className>com/google/cloud/asset/v1beta1/*OrBuilder</className>
     <method>boolean contains*(*)</method>
   </difference>
+  <difference>
+    <differenceType>7012</differenceType>
+    <className>com/google/cloud/asset/v1beta1/*OrBuilder</className>
+    <method>boolean has*(*)</method>
+  </difference>
 </differences>

proto-google-cloud-asset-v1p1beta1/clirr-ignored-differences.xml

@@ -11,14 +11,9 @@
     <className>com/google/cloud/asset/v1p1beta1/*OrBuilder</className>
     <method>boolean contains*(*)</method>
   </difference>
-
-  <!-- TODO: remove after 0.119 is released -->
   <difference>
-    <differenceType>8001</differenceType>
-    <className>com/google/cloud/asset/v1p1beta1/SearchIamPolicies*</className>
-  </difference>
-  <difference>
-    <differenceType>8001</differenceType>
-    <className>com/google/cloud/asset/v1p1beta1/SearchResources*</className>
+    <differenceType>7012</differenceType>
+    <className>com/google/cloud/asset/v1p1beta1/*OrBuilder</className>
+    <method>boolean has*(*)</method>
   </difference>
 </differences>

proto-google-cloud-asset-v1p1beta1/src/main/java/com/google/cloud/asset/v1p1beta1/AssetProto.java

@@ -31,10 +31,26 @@ public static void registerAllExtensions(com.google.protobuf.ExtensionRegistry r
       internal_static_google_cloud_asset_v1p1beta1_StandardResourceMetadata_descriptor;
   static final com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internal_static_google_cloud_asset_v1p1beta1_StandardResourceMetadata_fieldAccessorTable;
+  static final com.google.protobuf.Descriptors.Descriptor
+      internal_static_google_cloud_asset_v1p1beta1_StandardResourceMetadata_LabelsEntry_descriptor;
+  static final com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+      internal_static_google_cloud_asset_v1p1beta1_StandardResourceMetadata_LabelsEntry_fieldAccessorTable;
   static final com.google.protobuf.Descriptors.Descriptor
       internal_static_google_cloud_asset_v1p1beta1_IamPolicySearchResult_descriptor;
   static final com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internal_static_google_cloud_asset_v1p1beta1_IamPolicySearchResult_fieldAccessorTable;
+  static final com.google.protobuf.Descriptors.Descriptor
+      internal_static_google_cloud_asset_v1p1beta1_IamPolicySearchResult_Explanation_descriptor;
+  static final com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+      internal_static_google_cloud_asset_v1p1beta1_IamPolicySearchResult_Explanation_fieldAccessorTable;
+  static final com.google.protobuf.Descriptors.Descriptor
+      internal_static_google_cloud_asset_v1p1beta1_IamPolicySearchResult_Explanation_MatchedPermissionsEntry_descriptor;
+  static final com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+      internal_static_google_cloud_asset_v1p1beta1_IamPolicySearchResult_Explanation_MatchedPermissionsEntry_fieldAccessorTable;
+  static final com.google.protobuf.Descriptors.Descriptor
+      internal_static_google_cloud_asset_v1p1beta1_Permissions_descriptor;
+  static final com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+      internal_static_google_cloud_asset_v1p1beta1_Permissions_fieldAccessorTable;
 
   public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() {
     return descriptor;
@@ -47,18 +63,31 @@ 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\"\227\001\n\030StandardResourceMetadata"
+          + "tions.proto\"\302\002\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"
+          + "\n \003(\t\022\020\n\010location\030\013 \001(\t\022R\n\006labels\030\014 \003(\0132"
+          + "B.google.cloud.asset.v1p1beta1.StandardR"
+          + "esourceMetadata.LabelsEntry\022\024\n\014network_t"
+          + "ags\030\r \003(\t\032-\n\013LabelsEntry\022\013\n\003key\030\001 \001(\t\022\r\n"
+          + "\005value\030\002 \001(\t:\0028\001\"\243\003\n\025IamPolicySearchResu"
+          + "lt\022\020\n\010resource\030\001 \001(\t\022\017\n\007project\030\003 \001(\t\022%\n"
+          + "\006policy\030\004 \001(\0132\025.google.iam.v1.Policy\022T\n\013"
+          + "explanation\030\005 \001(\0132?.google.cloud.asset.v"
+          + "1p1beta1.IamPolicySearchResult.Explanati"
+          + "on\032\351\001\n\013Explanation\022t\n\023matched_permission"
+          + "s\030\001 \003(\0132W.google.cloud.asset.v1p1beta1.I"
+          + "amPolicySearchResult.Explanation.Matched"
+          + "PermissionsEntry\032d\n\027MatchedPermissionsEn"
+          + "try\022\013\n\003key\030\001 \001(\t\0228\n\005value\030\002 \001(\0132).google"
+          + ".cloud.asset.v1p1beta1.Permissions:\0028\001\"\""
+          + "\n\013Permissions\022\023\n\013permissions\030\001 \003(\tB\264\001\n c"
+          + "om.google.cloud.asset.v1p1beta1B\nAssetPr"
+          + "otoP\001ZAgoogle.golang.org/genproto/google"
+          + "apis/cloud/asset/v1p1beta1;asset\370\001\001\252\002\034Go"
+          + "ogle.Cloud.Asset.V1P1Beta1\312\002\034Google\\Clou"
+          + "d\\Asset\\V1p1beta1b\006proto3"
     };
     descriptor =
         com.google.protobuf.Descriptors.FileDescriptor.internalBuildGeneratedFileFrom(
@@ -73,15 +102,61 @@ 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", "AdditionalAttributes",
+              "Name",
+              "AssetType",
+              "Project",
+              "DisplayName",
+              "Description",
+              "AdditionalAttributes",
+              "Location",
+              "Labels",
+              "NetworkTags",
+            });
+    internal_static_google_cloud_asset_v1p1beta1_StandardResourceMetadata_LabelsEntry_descriptor =
+        internal_static_google_cloud_asset_v1p1beta1_StandardResourceMetadata_descriptor
+            .getNestedTypes()
+            .get(0);
+    internal_static_google_cloud_asset_v1p1beta1_StandardResourceMetadata_LabelsEntry_fieldAccessorTable =
+        new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
+            internal_static_google_cloud_asset_v1p1beta1_StandardResourceMetadata_LabelsEntry_descriptor,
+            new java.lang.String[] {
+              "Key", "Value",
             });
     internal_static_google_cloud_asset_v1p1beta1_IamPolicySearchResult_descriptor =
         getDescriptor().getMessageTypes().get(1);
     internal_static_google_cloud_asset_v1p1beta1_IamPolicySearchResult_fieldAccessorTable =
         new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
             internal_static_google_cloud_asset_v1p1beta1_IamPolicySearchResult_descriptor,
             new java.lang.String[] {
-              "Resource", "Project", "Policy",
+              "Resource", "Project", "Policy", "Explanation",
+            });
+    internal_static_google_cloud_asset_v1p1beta1_IamPolicySearchResult_Explanation_descriptor =
+        internal_static_google_cloud_asset_v1p1beta1_IamPolicySearchResult_descriptor
+            .getNestedTypes()
+            .get(0);
+    internal_static_google_cloud_asset_v1p1beta1_IamPolicySearchResult_Explanation_fieldAccessorTable =
+        new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
+            internal_static_google_cloud_asset_v1p1beta1_IamPolicySearchResult_Explanation_descriptor,
+            new java.lang.String[] {
+              "MatchedPermissions",
+            });
+    internal_static_google_cloud_asset_v1p1beta1_IamPolicySearchResult_Explanation_MatchedPermissionsEntry_descriptor =
+        internal_static_google_cloud_asset_v1p1beta1_IamPolicySearchResult_Explanation_descriptor
+            .getNestedTypes()
+            .get(0);
+    internal_static_google_cloud_asset_v1p1beta1_IamPolicySearchResult_Explanation_MatchedPermissionsEntry_fieldAccessorTable =
+        new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
+            internal_static_google_cloud_asset_v1p1beta1_IamPolicySearchResult_Explanation_MatchedPermissionsEntry_descriptor,
+            new java.lang.String[] {
+              "Key", "Value",
+            });
+    internal_static_google_cloud_asset_v1p1beta1_Permissions_descriptor =
+        getDescriptor().getMessageTypes().get(2);
+    internal_static_google_cloud_asset_v1p1beta1_Permissions_fieldAccessorTable =
+        new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
+            internal_static_google_cloud_asset_v1p1beta1_Permissions_descriptor,
+            new java.lang.String[] {
+              "Permissions",
             });
     com.google.iam.v1.PolicyProto.getDescriptor();
     com.google.api.AnnotationsProto.getDescriptor();

proto-google-cloud-asset-v1p1beta1/src/main/java/com/google/cloud/asset/v1p1beta1/AssetServiceProto.java

@@ -57,38 +57,38 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() {
           + "\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\"\216\001\n\031SearchAllResourcesReques"
+          + "ssets.proto\"\245\001\n\031SearchAllResourcesReques"
           + "t\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\032"
-          + "SearchAllResourcesResponse\022G\n\007results\030\001 "
-          + "\003(\01326.google.cloud.asset.v1p1beta1.Stand"
-          + "ardResourceMetadata\022\027\n\017next_page_token\030\002"
-          + " \001(\t\"v\n\033SearchAllIamPoliciesRequest\022\022\n\005s"
-          + "cope\030\001 \001(\tB\003\340A\002\022\022\n\005query\030\002 \001(\tB\003\340A\001\022\026\n\tp"
-          + "age_size\030\003 \001(\005B\003\340A\001\022\027\n\npage_token\030\004 \001(\tB"
-          + "\003\340A\001\"}\n\034SearchAllIamPoliciesResponse\022D\n\007"
-          + "results\030\001 \003(\01323.google.cloud.asset.v1p1b"
-          + "eta1.IamPolicySearchResult\022\027\n\017next_page_"
-          + "token\030\002 \001(\t2\211\004\n\014AssetService\022\325\001\n\022SearchA"
-          + "llResources\0227.google.cloud.asset.v1p1bet"
-          + "a1.SearchAllResourcesRequest\0328.google.cl"
-          + "oud.asset.v1p1beta1.SearchAllResourcesRe"
-          + "sponse\"L\202\323\344\223\002,\022*/v1p1beta1/{scope=*/*}/r"
-          + "esources:searchAll\332A\027scope,query,asset_t"
-          + "ypes\022\321\001\n\024SearchAllIamPolicies\0229.google.c"
-          + "loud.asset.v1p1beta1.SearchAllIamPolicie"
-          + "sRequest\032:.google.cloud.asset.v1p1beta1."
-          + "SearchAllIamPoliciesResponse\"B\202\323\344\223\002.\022,/v"
-          + "1p1beta1/{scope=*/*}/iamPolicies:searchA"
-          + "ll\332A\013scope,query\032M\312A\031cloudasset.googleap"
-          + "is.com\322A.https://www.googleapis.com/auth"
-          + "/cloud-platformB\270\001\n com.google.cloud.ass"
-          + "et.v1p1beta1B\021AssetServiceProtoP\001ZAgoogl"
-          + "e.golang.org/genproto/googleapis/cloud/a"
-          + "sset/v1p1beta1;asset\252\002\034Google.Cloud.Asse"
-          + "t.V1P1Beta1\312\002\034Google\\Cloud\\Asset\\V1p1bet"
-          + "a1b\006proto3"
+          + "\030\004 \001(\005B\003\340A\001\022\027\n\npage_token\030\005 \001(\tB\003\340A\001\022\025\n\010"
+          + "order_by\030\n \001(\tB\003\340A\001\"~\n\032SearchAllResource"
+          + "sResponse\022G\n\007results\030\001 \003(\01326.google.clou"
+          + "d.asset.v1p1beta1.StandardResourceMetada"
+          + "ta\022\027\n\017next_page_token\030\002 \001(\t\"v\n\033SearchAll"
+          + "IamPoliciesRequest\022\022\n\005scope\030\001 \001(\tB\003\340A\002\022\022"
+          + "\n\005query\030\002 \001(\tB\003\340A\001\022\026\n\tpage_size\030\003 \001(\005B\003\340"
+          + "A\001\022\027\n\npage_token\030\004 \001(\tB\003\340A\001\"}\n\034SearchAll"
+          + "IamPoliciesResponse\022D\n\007results\030\001 \003(\01323.g"
+          + "oogle.cloud.asset.v1p1beta1.IamPolicySea"
+          + "rchResult\022\027\n\017next_page_token\030\002 \001(\t2\211\004\n\014A"
+          + "ssetService\022\325\001\n\022SearchAllResources\0227.goo"
+          + "gle.cloud.asset.v1p1beta1.SearchAllResou"
+          + "rcesRequest\0328.google.cloud.asset.v1p1bet"
+          + "a1.SearchAllResourcesResponse\"L\202\323\344\223\002,\022*/"
+          + "v1p1beta1/{scope=*/*}/resources:searchAl"
+          + "l\332A\027scope,query,asset_types\022\321\001\n\024SearchAl"
+          + "lIamPolicies\0229.google.cloud.asset.v1p1be"
+          + "ta1.SearchAllIamPoliciesRequest\032:.google"
+          + ".cloud.asset.v1p1beta1.SearchAllIamPolic"
+          + "iesResponse\"B\202\323\344\223\002.\022,/v1p1beta1/{scope=*"
+          + "/*}/iamPolicies:searchAll\332A\013scope,query\032"
+          + "M\312A\031cloudasset.googleapis.com\322A.https://"
+          + "www.googleapis.com/auth/cloud-platformB\270"
+          + "\001\n com.google.cloud.asset.v1p1beta1B\021Ass"
+          + "etServiceProtoP\001ZAgoogle.golang.org/genp"
+          + "roto/googleapis/cloud/asset/v1p1beta1;as"
+          + "set\252\002\034Google.Cloud.Asset.V1P1Beta1\312\002\034Goo"
+          + "gle\\Cloud\\Asset\\V1p1beta1b\006proto3"
     };
     descriptor =
         com.google.protobuf.Descriptors.FileDescriptor.internalBuildGeneratedFileFrom(
@@ -105,7 +105,7 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() {
         new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
             internal_static_google_cloud_asset_v1p1beta1_SearchAllResourcesRequest_descriptor,
             new java.lang.String[] {
-              "Scope", "Query", "AssetTypes", "PageSize", "PageToken",
+              "Scope", "Query", "AssetTypes", "PageSize", "PageToken", "OrderBy",
             });
     internal_static_google_cloud_asset_v1p1beta1_SearchAllResourcesResponse_descriptor =
         getDescriptor().getMessageTypes().get(1);