diff --git a/pom.xml b/pom.xml index e377a436c..ff654cf9a 100644 --- a/pom.xml +++ b/pom.xml @@ -150,6 +150,11 @@ proto-google-identity-accesscontextmanager-v1 1.0.7 + + com.google.api.grpc + proto-google-cloud-os-config-v1 + 1.1.0 + junit diff --git a/proto-google-cloud-asset-v1/pom.xml b/proto-google-cloud-asset-v1/pom.xml index 72e75b565..41a24d13b 100644 --- a/proto-google-cloud-asset-v1/pom.xml +++ b/proto-google-cloud-asset-v1/pom.xml @@ -41,6 +41,10 @@ com.google.api.grpc proto-google-identity-accesscontextmanager-v1 + + com.google.api.grpc + proto-google-cloud-os-config-v1 + diff --git a/proto-google-cloud-asset-v1/src/main/java/com/google/cloud/asset/v1/Asset.java b/proto-google-cloud-asset-v1/src/main/java/com/google/cloud/asset/v1/Asset.java index bc537d80e..1fed0e91b 100644 --- a/proto-google-cloud-asset-v1/src/main/java/com/google/cloud/asset/v1/Asset.java +++ b/proto-google-cloud-asset-v1/src/main/java/com/google/cloud/asset/v1/Asset.java @@ -223,6 +223,22 @@ private Asset( updateTime_ = subBuilder.buildPartial(); } + break; + } + case 98: + { + com.google.cloud.osconfig.v1.Inventory.Builder subBuilder = null; + if (osInventory_ != null) { + subBuilder = osInventory_.toBuilder(); + } + osInventory_ = + input.readMessage( + com.google.cloud.osconfig.v1.Inventory.parser(), extensionRegistry); + if (subBuilder != null) { + subBuilder.mergeFrom(osInventory_); + osInventory_ = subBuilder.buildPartial(); + } + break; } default: @@ -840,6 +856,60 @@ public com.google.identity.accesscontextmanager.v1.ServicePerimeter getServicePe return com.google.identity.accesscontextmanager.v1.ServicePerimeter.getDefaultInstance(); } + public static final int OS_INVENTORY_FIELD_NUMBER = 12; + private com.google.cloud.osconfig.v1.Inventory osInventory_; + /** + * + * + *
+   * A representation of runtime OS Inventory information. See [this
+   * topic](https://cloud.google.com/compute/docs/instances/os-inventory-management)
+   * for more information.
+   * 
+ * + * .google.cloud.osconfig.v1.Inventory os_inventory = 12; + * + * @return Whether the osInventory field is set. + */ + @java.lang.Override + public boolean hasOsInventory() { + return osInventory_ != null; + } + /** + * + * + *
+   * A representation of runtime OS Inventory information. See [this
+   * topic](https://cloud.google.com/compute/docs/instances/os-inventory-management)
+   * for more information.
+   * 
+ * + * .google.cloud.osconfig.v1.Inventory os_inventory = 12; + * + * @return The osInventory. + */ + @java.lang.Override + public com.google.cloud.osconfig.v1.Inventory getOsInventory() { + return osInventory_ == null + ? com.google.cloud.osconfig.v1.Inventory.getDefaultInstance() + : osInventory_; + } + /** + * + * + *
+   * A representation of runtime OS Inventory information. See [this
+   * topic](https://cloud.google.com/compute/docs/instances/os-inventory-management)
+   * for more information.
+   * 
+ * + * .google.cloud.osconfig.v1.Inventory os_inventory = 12; + */ + @java.lang.Override + public com.google.cloud.osconfig.v1.InventoryOrBuilder getOsInventoryOrBuilder() { + return getOsInventory(); + } + public static final int ANCESTORS_FIELD_NUMBER = 10; private com.google.protobuf.LazyStringList ancestors_; /** @@ -972,6 +1042,9 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io if (updateTime_ != null) { output.writeMessage(11, getUpdateTime()); } + if (osInventory_ != null) { + output.writeMessage(12, getOsInventory()); + } unknownFields.writeTo(output); } @@ -1023,6 +1096,9 @@ public int getSerializedSize() { if (updateTime_ != null) { size += com.google.protobuf.CodedOutputStream.computeMessageSize(11, getUpdateTime()); } + if (osInventory_ != null) { + size += com.google.protobuf.CodedOutputStream.computeMessageSize(12, getOsInventory()); + } size += unknownFields.getSerializedSize(); memoizedSize = size; return size; @@ -1053,6 +1129,10 @@ public boolean equals(final java.lang.Object obj) { if (!getIamPolicy().equals(other.getIamPolicy())) return false; } if (!getOrgPolicyList().equals(other.getOrgPolicyList())) return false; + if (hasOsInventory() != other.hasOsInventory()) return false; + if (hasOsInventory()) { + if (!getOsInventory().equals(other.getOsInventory())) return false; + } if (!getAncestorsList().equals(other.getAncestorsList())) return false; if (!getAccessContextPolicyCase().equals(other.getAccessContextPolicyCase())) return false; switch (accessContextPolicyCase_) { @@ -1099,6 +1179,10 @@ public int hashCode() { hash = (37 * hash) + ORG_POLICY_FIELD_NUMBER; hash = (53 * hash) + getOrgPolicyList().hashCode(); } + if (hasOsInventory()) { + hash = (37 * hash) + OS_INVENTORY_FIELD_NUMBER; + hash = (53 * hash) + getOsInventory().hashCode(); + } if (getAncestorsCount() > 0) { hash = (37 * hash) + ANCESTORS_FIELD_NUMBER; hash = (53 * hash) + getAncestorsList().hashCode(); @@ -1299,6 +1383,12 @@ public Builder clear() { } else { orgPolicyBuilder_.clear(); } + if (osInventoryBuilder_ == null) { + osInventory_ = null; + } else { + osInventory_ = null; + osInventoryBuilder_ = null; + } ancestors_ = com.google.protobuf.LazyStringArrayList.EMPTY; bitField0_ = (bitField0_ & ~0x00000002); accessContextPolicyCase_ = 0; @@ -1377,6 +1467,11 @@ public com.google.cloud.asset.v1.Asset buildPartial() { result.accessContextPolicy_ = servicePerimeterBuilder_.build(); } } + if (osInventoryBuilder_ == null) { + result.osInventory_ = osInventory_; + } else { + result.osInventory_ = osInventoryBuilder_.build(); + } if (((bitField0_ & 0x00000002) != 0)) { ancestors_ = ancestors_.getUnmodifiableView(); bitField0_ = (bitField0_ & ~0x00000002); @@ -1476,6 +1571,9 @@ public Builder mergeFrom(com.google.cloud.asset.v1.Asset other) { } } } + if (other.hasOsInventory()) { + mergeOsInventory(other.getOsInventory()); + } if (!other.ancestors_.isEmpty()) { if (ancestors_.isEmpty()) { ancestors_ = other.ancestors_; @@ -3503,6 +3601,209 @@ public Builder clearServicePerimeter() { return servicePerimeterBuilder_; } + private com.google.cloud.osconfig.v1.Inventory osInventory_; + private com.google.protobuf.SingleFieldBuilderV3< + com.google.cloud.osconfig.v1.Inventory, + com.google.cloud.osconfig.v1.Inventory.Builder, + com.google.cloud.osconfig.v1.InventoryOrBuilder> + osInventoryBuilder_; + /** + * + * + *
+     * A representation of runtime OS Inventory information. See [this
+     * topic](https://cloud.google.com/compute/docs/instances/os-inventory-management)
+     * for more information.
+     * 
+ * + * .google.cloud.osconfig.v1.Inventory os_inventory = 12; + * + * @return Whether the osInventory field is set. + */ + public boolean hasOsInventory() { + return osInventoryBuilder_ != null || osInventory_ != null; + } + /** + * + * + *
+     * A representation of runtime OS Inventory information. See [this
+     * topic](https://cloud.google.com/compute/docs/instances/os-inventory-management)
+     * for more information.
+     * 
+ * + * .google.cloud.osconfig.v1.Inventory os_inventory = 12; + * + * @return The osInventory. + */ + public com.google.cloud.osconfig.v1.Inventory getOsInventory() { + if (osInventoryBuilder_ == null) { + return osInventory_ == null + ? com.google.cloud.osconfig.v1.Inventory.getDefaultInstance() + : osInventory_; + } else { + return osInventoryBuilder_.getMessage(); + } + } + /** + * + * + *
+     * A representation of runtime OS Inventory information. See [this
+     * topic](https://cloud.google.com/compute/docs/instances/os-inventory-management)
+     * for more information.
+     * 
+ * + * .google.cloud.osconfig.v1.Inventory os_inventory = 12; + */ + public Builder setOsInventory(com.google.cloud.osconfig.v1.Inventory value) { + if (osInventoryBuilder_ == null) { + if (value == null) { + throw new NullPointerException(); + } + osInventory_ = value; + onChanged(); + } else { + osInventoryBuilder_.setMessage(value); + } + + return this; + } + /** + * + * + *
+     * A representation of runtime OS Inventory information. See [this
+     * topic](https://cloud.google.com/compute/docs/instances/os-inventory-management)
+     * for more information.
+     * 
+ * + * .google.cloud.osconfig.v1.Inventory os_inventory = 12; + */ + public Builder setOsInventory(com.google.cloud.osconfig.v1.Inventory.Builder builderForValue) { + if (osInventoryBuilder_ == null) { + osInventory_ = builderForValue.build(); + onChanged(); + } else { + osInventoryBuilder_.setMessage(builderForValue.build()); + } + + return this; + } + /** + * + * + *
+     * A representation of runtime OS Inventory information. See [this
+     * topic](https://cloud.google.com/compute/docs/instances/os-inventory-management)
+     * for more information.
+     * 
+ * + * .google.cloud.osconfig.v1.Inventory os_inventory = 12; + */ + public Builder mergeOsInventory(com.google.cloud.osconfig.v1.Inventory value) { + if (osInventoryBuilder_ == null) { + if (osInventory_ != null) { + osInventory_ = + com.google.cloud.osconfig.v1.Inventory.newBuilder(osInventory_) + .mergeFrom(value) + .buildPartial(); + } else { + osInventory_ = value; + } + onChanged(); + } else { + osInventoryBuilder_.mergeFrom(value); + } + + return this; + } + /** + * + * + *
+     * A representation of runtime OS Inventory information. See [this
+     * topic](https://cloud.google.com/compute/docs/instances/os-inventory-management)
+     * for more information.
+     * 
+ * + * .google.cloud.osconfig.v1.Inventory os_inventory = 12; + */ + public Builder clearOsInventory() { + if (osInventoryBuilder_ == null) { + osInventory_ = null; + onChanged(); + } else { + osInventory_ = null; + osInventoryBuilder_ = null; + } + + return this; + } + /** + * + * + *
+     * A representation of runtime OS Inventory information. See [this
+     * topic](https://cloud.google.com/compute/docs/instances/os-inventory-management)
+     * for more information.
+     * 
+ * + * .google.cloud.osconfig.v1.Inventory os_inventory = 12; + */ + public com.google.cloud.osconfig.v1.Inventory.Builder getOsInventoryBuilder() { + + onChanged(); + return getOsInventoryFieldBuilder().getBuilder(); + } + /** + * + * + *
+     * A representation of runtime OS Inventory information. See [this
+     * topic](https://cloud.google.com/compute/docs/instances/os-inventory-management)
+     * for more information.
+     * 
+ * + * .google.cloud.osconfig.v1.Inventory os_inventory = 12; + */ + public com.google.cloud.osconfig.v1.InventoryOrBuilder getOsInventoryOrBuilder() { + if (osInventoryBuilder_ != null) { + return osInventoryBuilder_.getMessageOrBuilder(); + } else { + return osInventory_ == null + ? com.google.cloud.osconfig.v1.Inventory.getDefaultInstance() + : osInventory_; + } + } + /** + * + * + *
+     * A representation of runtime OS Inventory information. See [this
+     * topic](https://cloud.google.com/compute/docs/instances/os-inventory-management)
+     * for more information.
+     * 
+ * + * .google.cloud.osconfig.v1.Inventory os_inventory = 12; + */ + private com.google.protobuf.SingleFieldBuilderV3< + com.google.cloud.osconfig.v1.Inventory, + com.google.cloud.osconfig.v1.Inventory.Builder, + com.google.cloud.osconfig.v1.InventoryOrBuilder> + getOsInventoryFieldBuilder() { + if (osInventoryBuilder_ == null) { + osInventoryBuilder_ = + new com.google.protobuf.SingleFieldBuilderV3< + com.google.cloud.osconfig.v1.Inventory, + com.google.cloud.osconfig.v1.Inventory.Builder, + com.google.cloud.osconfig.v1.InventoryOrBuilder>( + getOsInventory(), getParentForChildren(), isClean()); + osInventory_ = null; + } + return osInventoryBuilder_; + } + private com.google.protobuf.LazyStringList ancestors_ = com.google.protobuf.LazyStringArrayList.EMPTY; diff --git a/proto-google-cloud-asset-v1/src/main/java/com/google/cloud/asset/v1/AssetOrBuilder.java b/proto-google-cloud-asset-v1/src/main/java/com/google/cloud/asset/v1/AssetOrBuilder.java index 487c91a9d..bce5bd96b 100644 --- a/proto-google-cloud-asset-v1/src/main/java/com/google/cloud/asset/v1/AssetOrBuilder.java +++ b/proto-google-cloud-asset-v1/src/main/java/com/google/cloud/asset/v1/AssetOrBuilder.java @@ -401,6 +401,47 @@ public interface AssetOrBuilder com.google.identity.accesscontextmanager.v1.ServicePerimeterOrBuilder getServicePerimeterOrBuilder(); + /** + * + * + *
+   * A representation of runtime OS Inventory information. See [this
+   * topic](https://cloud.google.com/compute/docs/instances/os-inventory-management)
+   * for more information.
+   * 
+ * + * .google.cloud.osconfig.v1.Inventory os_inventory = 12; + * + * @return Whether the osInventory field is set. + */ + boolean hasOsInventory(); + /** + * + * + *
+   * A representation of runtime OS Inventory information. See [this
+   * topic](https://cloud.google.com/compute/docs/instances/os-inventory-management)
+   * for more information.
+   * 
+ * + * .google.cloud.osconfig.v1.Inventory os_inventory = 12; + * + * @return The osInventory. + */ + com.google.cloud.osconfig.v1.Inventory getOsInventory(); + /** + * + * + *
+   * A representation of runtime OS Inventory information. See [this
+   * topic](https://cloud.google.com/compute/docs/instances/os-inventory-management)
+   * for more information.
+   * 
+ * + * .google.cloud.osconfig.v1.Inventory os_inventory = 12; + */ + com.google.cloud.osconfig.v1.InventoryOrBuilder getOsInventoryOrBuilder(); + /** * * diff --git a/proto-google-cloud-asset-v1/src/main/java/com/google/cloud/asset/v1/AssetProto.java b/proto-google-cloud-asset-v1/src/main/java/com/google/cloud/asset/v1/AssetProto.java index e45cca832..129c072b5 100644 --- a/proto-google-cloud-asset-v1/src/main/java/com/google/cloud/asset/v1/AssetProto.java +++ b/proto-google-cloud-asset-v1/src/main/java/com/google/cloud/asset/v1/AssetProto.java @@ -114,98 +114,100 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() { + "icy.proto\032\032google/iam/v1/policy.proto\032:g" + "oogle/identity/accesscontextmanager/v1/a" + "ccess_level.proto\032;google/identity/acces" - + "scontextmanager/v1/access_policy.proto\032?" - + "google/identity/accesscontextmanager/v1/" - + "service_perimeter.proto\032\031google/protobuf" - + "/any.proto\032\034google/protobuf/struct.proto" - + "\032\037google/protobuf/timestamp.proto\032\025googl" - + "e/rpc/code.proto\032\034google/api/annotations" - + ".proto\"\365\002\n\rTemporalAsset\0221\n\006window\030\001 \001(\013" - + "2!.google.cloud.asset.v1.TimeWindow\022\017\n\007d" - + "eleted\030\002 \001(\010\022+\n\005asset\030\003 \001(\0132\034.google.clo" - + "ud.asset.v1.Asset\022O\n\021prior_asset_state\030\004" - + " \001(\01624.google.cloud.asset.v1.TemporalAss" - + "et.PriorAssetState\0221\n\013prior_asset\030\005 \001(\0132" - + "\034.google.cloud.asset.v1.Asset\"o\n\017PriorAs" - + "setState\022!\n\035PRIOR_ASSET_STATE_UNSPECIFIE" - + "D\020\000\022\013\n\007PRESENT\020\001\022\013\n\007INVALID\020\002\022\022\n\016DOES_NO" - + "T_EXIST\020\003\022\013\n\007DELETED\020\004\"j\n\nTimeWindow\022.\n\n" - + "start_time\030\001 \001(\0132\032.google.protobuf.Times" - + "tamp\022,\n\010end_time\030\002 \001(\0132\032.google.protobuf" - + ".Timestamp\"\272\004\n\005Asset\022/\n\013update_time\030\013 \001(" - + "\0132\032.google.protobuf.Timestamp\022\014\n\004name\030\001 " - + "\001(\t\022\022\n\nasset_type\030\002 \001(\t\0221\n\010resource\030\003 \001(" - + "\0132\037.google.cloud.asset.v1.Resource\022)\n\nia" - + "m_policy\030\004 \001(\0132\025.google.iam.v1.Policy\0225\n" - + "\norg_policy\030\006 \003(\0132!.google.cloud.orgpoli" - + "cy.v1.Policy\022N\n\raccess_policy\030\007 \001(\01325.go" - + "ogle.identity.accesscontextmanager.v1.Ac" - + "cessPolicyH\000\022L\n\014access_level\030\010 \001(\01324.goo" - + "gle.identity.accesscontextmanager.v1.Acc" - + "essLevelH\000\022V\n\021service_perimeter\030\t \001(\01329." + + "scontextmanager/v1/access_policy.proto\032(" + + "google/cloud/osconfig/v1/inventory.proto" + + "\032?google/identity/accesscontextmanager/v" + + "1/service_perimeter.proto\032\031google/protob" + + "uf/any.proto\032\034google/protobuf/struct.pro" + + "to\032\037google/protobuf/timestamp.proto\032\025goo" + + "gle/rpc/code.proto\032\034google/api/annotatio" + + "ns.proto\"\365\002\n\rTemporalAsset\0221\n\006window\030\001 \001" + + "(\0132!.google.cloud.asset.v1.TimeWindow\022\017\n" + + "\007deleted\030\002 \001(\010\022+\n\005asset\030\003 \001(\0132\034.google.c" + + "loud.asset.v1.Asset\022O\n\021prior_asset_state" + + "\030\004 \001(\01624.google.cloud.asset.v1.TemporalA" + + "sset.PriorAssetState\0221\n\013prior_asset\030\005 \001(" + + "\0132\034.google.cloud.asset.v1.Asset\"o\n\017Prior" + + "AssetState\022!\n\035PRIOR_ASSET_STATE_UNSPECIF" + + "IED\020\000\022\013\n\007PRESENT\020\001\022\013\n\007INVALID\020\002\022\022\n\016DOES_" + + "NOT_EXIST\020\003\022\013\n\007DELETED\020\004\"j\n\nTimeWindow\022." + + "\n\nstart_time\030\001 \001(\0132\032.google.protobuf.Tim" + + "estamp\022,\n\010end_time\030\002 \001(\0132\032.google.protob" + + "uf.Timestamp\"\365\004\n\005Asset\022/\n\013update_time\030\013 " + + "\001(\0132\032.google.protobuf.Timestamp\022\014\n\004name\030" + + "\001 \001(\t\022\022\n\nasset_type\030\002 \001(\t\0221\n\010resource\030\003 " + + "\001(\0132\037.google.cloud.asset.v1.Resource\022)\n\n" + + "iam_policy\030\004 \001(\0132\025.google.iam.v1.Policy\022" + + "5\n\norg_policy\030\006 \003(\0132!.google.cloud.orgpo" + + "licy.v1.Policy\022N\n\raccess_policy\030\007 \001(\01325." + "google.identity.accesscontextmanager.v1." - + "ServicePerimeterH\000\022\021\n\tancestors\030\n \003(\t:\'\352" - + "A$\n\037cloudasset.googleapis.com/Asset\022\001*B\027" - + "\n\025access_context_policy\"\262\001\n\010Resource\022\017\n\007" - + "version\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\014resourc" - + "e_url\030\004 \001(\t\022\016\n\006parent\030\005 \001(\t\022%\n\004data\030\006 \001(" - + "\0132\027.google.protobuf.Struct\022\020\n\010location\030\010" - + " \001(\t\"\314\002\n\024ResourceSearchResult\022\014\n\004name\030\001 " - + "\001(\t\022\022\n\nasset_type\030\002 \001(\t\022\017\n\007project\030\003 \001(\t" - + "\022\024\n\014display_name\030\004 \001(\t\022\023\n\013description\030\005 " - + "\001(\t\022\020\n\010location\030\006 \001(\t\022G\n\006labels\030\007 \003(\01327." - + "google.cloud.asset.v1.ResourceSearchResu" - + "lt.LabelsEntry\022\024\n\014network_tags\030\010 \003(\t\0226\n\025" - + "additional_attributes\030\t \001(\0132\027.google.pro" - + "tobuf.Struct\032-\n\013LabelsEntry\022\013\n\003key\030\001 \001(\t" - + "\022\r\n\005value\030\002 \001(\t:\0028\001\"\324\003\n\025IamPolicySearchR" - + "esult\022\020\n\010resource\030\001 \001(\t\022\017\n\007project\030\002 \001(\t" - + "\022%\n\006policy\030\003 \001(\0132\025.google.iam.v1.Policy\022" - + "M\n\013explanation\030\004 \001(\01328.google.cloud.asse" - + "t.v1.IamPolicySearchResult.Explanation\032\241" - + "\002\n\013Explanation\022m\n\023matched_permissions\030\001 " - + "\003(\0132P.google.cloud.asset.v1.IamPolicySea" - + "rchResult.Explanation.MatchedPermissions" - + "Entry\032\"\n\013Permissions\022\023\n\013permissions\030\001 \003(" - + "\t\032\177\n\027MatchedPermissionsEntry\022\013\n\003key\030\001 \001(" - + "\t\022S\n\005value\030\002 \001(\0132D.google.cloud.asset.v1" - + ".IamPolicySearchResult.Explanation.Permi" - + "ssions:\0028\001\"G\n\026IamPolicyAnalysisState\022\036\n\004" - + "code\030\001 \001(\0162\020.google.rpc.Code\022\r\n\005cause\030\002 " - + "\001(\t\"\341\010\n\027IamPolicyAnalysisResult\022#\n\033attac" - + "hed_resource_full_name\030\001 \001(\t\022+\n\013iam_bind" - + "ing\030\002 \001(\0132\026.google.iam.v1.Binding\022^\n\024acc" - + "ess_control_lists\030\003 \003(\0132@.google.cloud.a" - + "sset.v1.IamPolicyAnalysisResult.AccessCo" - + "ntrolList\022R\n\ridentity_list\030\004 \001(\0132;.googl" - + "e.cloud.asset.v1.IamPolicyAnalysisResult" - + ".IdentityList\022\026\n\016fully_explored\030\005 \001(\010\032m\n" - + "\010Resource\022\032\n\022full_resource_name\030\001 \001(\t\022E\n" - + "\016analysis_state\030\002 \001(\0132-.google.cloud.ass" - + "et.v1.IamPolicyAnalysisState\032\205\001\n\006Access\022" - + "\016\n\004role\030\001 \001(\tH\000\022\024\n\npermission\030\002 \001(\tH\000\022E\n" - + "\016analysis_state\030\003 \001(\0132-.google.cloud.ass" - + "et.v1.IamPolicyAnalysisStateB\016\n\014oneof_ac" - + "cess\032_\n\010Identity\022\014\n\004name\030\001 \001(\t\022E\n\016analys" - + "is_state\030\002 \001(\0132-.google.cloud.asset.v1.I" - + "amPolicyAnalysisState\0320\n\004Edge\022\023\n\013source_" - + "node\030\001 \001(\t\022\023\n\013target_node\030\002 \001(\t\032\365\001\n\021Acce" - + "ssControlList\022J\n\tresources\030\001 \003(\01327.googl" - + "e.cloud.asset.v1.IamPolicyAnalysisResult" - + ".Resource\022G\n\010accesses\030\002 \003(\01325.google.clo" - + "ud.asset.v1.IamPolicyAnalysisResult.Acce" - + "ss\022K\n\016resource_edges\030\003 \003(\01323.google.clou" - + "d.asset.v1.IamPolicyAnalysisResult.Edge\032" - + "\245\001\n\014IdentityList\022K\n\nidentities\030\001 \003(\01327.g" - + "oogle.cloud.asset.v1.IamPolicyAnalysisRe" - + "sult.Identity\022H\n\013group_edges\030\002 \003(\01323.goo" - + "gle.cloud.asset.v1.IamPolicyAnalysisResu" - + "lt.EdgeB\230\001\n\031com.google.cloud.asset.v1B\nA" - + "ssetProtoP\001Z:google.golang.org/genproto/" - + "googleapis/cloud/asset/v1;asset\370\001\001\252\002\025Goo" - + "gle.Cloud.Asset.V1\312\002\025Google\\Cloud\\Asset\\" - + "V1b\006proto3" + + "AccessPolicyH\000\022L\n\014access_level\030\010 \001(\01324.g" + + "oogle.identity.accesscontextmanager.v1.A" + + "ccessLevelH\000\022V\n\021service_perimeter\030\t \001(\0132" + + "9.google.identity.accesscontextmanager.v" + + "1.ServicePerimeterH\000\0229\n\014os_inventory\030\014 \001" + + "(\0132#.google.cloud.osconfig.v1.Inventory\022" + + "\021\n\tancestors\030\n \003(\t:\'\352A$\n\037cloudasset.goog" + + "leapis.com/Asset\022\001*B\027\n\025access_context_po" + + "licy\"\262\001\n\010Resource\022\017\n\007version\030\001 \001(\t\022\036\n\026di" + + "scovery_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\006pare" + + "nt\030\005 \001(\t\022%\n\004data\030\006 \001(\0132\027.google.protobuf" + + ".Struct\022\020\n\010location\030\010 \001(\t\"\314\002\n\024ResourceSe" + + "archResult\022\014\n\004name\030\001 \001(\t\022\022\n\nasset_type\030\002" + + " \001(\t\022\017\n\007project\030\003 \001(\t\022\024\n\014display_name\030\004 " + + "\001(\t\022\023\n\013description\030\005 \001(\t\022\020\n\010location\030\006 \001" + + "(\t\022G\n\006labels\030\007 \003(\01327.google.cloud.asset." + + "v1.ResourceSearchResult.LabelsEntry\022\024\n\014n" + + "etwork_tags\030\010 \003(\t\0226\n\025additional_attribut" + + "es\030\t \001(\0132\027.google.protobuf.Struct\032-\n\013Lab" + + "elsEntry\022\013\n\003key\030\001 \001(\t\022\r\n\005value\030\002 \001(\t:\0028\001" + + "\"\324\003\n\025IamPolicySearchResult\022\020\n\010resource\030\001" + + " \001(\t\022\017\n\007project\030\002 \001(\t\022%\n\006policy\030\003 \001(\0132\025." + + "google.iam.v1.Policy\022M\n\013explanation\030\004 \001(" + + "\01328.google.cloud.asset.v1.IamPolicySearc" + + "hResult.Explanation\032\241\002\n\013Explanation\022m\n\023m" + + "atched_permissions\030\001 \003(\0132P.google.cloud." + + "asset.v1.IamPolicySearchResult.Explanati" + + "on.MatchedPermissionsEntry\032\"\n\013Permission" + + "s\022\023\n\013permissions\030\001 \003(\t\032\177\n\027MatchedPermiss" + + "ionsEntry\022\013\n\003key\030\001 \001(\t\022S\n\005value\030\002 \001(\0132D." + + "google.cloud.asset.v1.IamPolicySearchRes" + + "ult.Explanation.Permissions:\0028\001\"G\n\026IamPo" + + "licyAnalysisState\022\036\n\004code\030\001 \001(\0162\020.google" + + ".rpc.Code\022\r\n\005cause\030\002 \001(\t\"\341\010\n\027IamPolicyAn" + + "alysisResult\022#\n\033attached_resource_full_n" + + "ame\030\001 \001(\t\022+\n\013iam_binding\030\002 \001(\0132\026.google." + + "iam.v1.Binding\022^\n\024access_control_lists\030\003" + + " \003(\0132@.google.cloud.asset.v1.IamPolicyAn" + + "alysisResult.AccessControlList\022R\n\ridenti" + + "ty_list\030\004 \001(\0132;.google.cloud.asset.v1.Ia" + + "mPolicyAnalysisResult.IdentityList\022\026\n\016fu" + + "lly_explored\030\005 \001(\010\032m\n\010Resource\022\032\n\022full_r" + + "esource_name\030\001 \001(\t\022E\n\016analysis_state\030\002 \001" + + "(\0132-.google.cloud.asset.v1.IamPolicyAnal" + + "ysisState\032\205\001\n\006Access\022\016\n\004role\030\001 \001(\tH\000\022\024\n\n" + + "permission\030\002 \001(\tH\000\022E\n\016analysis_state\030\003 \001" + + "(\0132-.google.cloud.asset.v1.IamPolicyAnal" + + "ysisStateB\016\n\014oneof_access\032_\n\010Identity\022\014\n" + + "\004name\030\001 \001(\t\022E\n\016analysis_state\030\002 \001(\0132-.go" + + "ogle.cloud.asset.v1.IamPolicyAnalysisSta" + + "te\0320\n\004Edge\022\023\n\013source_node\030\001 \001(\t\022\023\n\013targe" + + "t_node\030\002 \001(\t\032\365\001\n\021AccessControlList\022J\n\tre" + + "sources\030\001 \003(\01327.google.cloud.asset.v1.Ia" + + "mPolicyAnalysisResult.Resource\022G\n\010access" + + "es\030\002 \003(\01325.google.cloud.asset.v1.IamPoli" + + "cyAnalysisResult.Access\022K\n\016resource_edge" + + "s\030\003 \003(\01323.google.cloud.asset.v1.IamPolic" + + "yAnalysisResult.Edge\032\245\001\n\014IdentityList\022K\n" + + "\nidentities\030\001 \003(\01327.google.cloud.asset.v" + + "1.IamPolicyAnalysisResult.Identity\022H\n\013gr" + + "oup_edges\030\002 \003(\01323.google.cloud.asset.v1." + + "IamPolicyAnalysisResult.EdgeB\230\001\n\031com.goo" + + "gle.cloud.asset.v1B\nAssetProtoP\001Z:google" + + ".golang.org/genproto/googleapis/cloud/as" + + "set/v1;asset\370\001\001\252\002\025Google.Cloud.Asset.V1\312" + + "\002\025Google\\Cloud\\Asset\\V1b\006proto3" }; descriptor = com.google.protobuf.Descriptors.FileDescriptor.internalBuildGeneratedFileFrom( @@ -216,6 +218,7 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() { com.google.iam.v1.PolicyProto.getDescriptor(), com.google.identity.accesscontextmanager.v1.AccessLevelProto.getDescriptor(), com.google.identity.accesscontextmanager.v1.PolicyProto.getDescriptor(), + com.google.cloud.osconfig.v1.Inventories.getDescriptor(), com.google.identity.accesscontextmanager.v1.ServicePerimeterProto.getDescriptor(), com.google.protobuf.AnyProto.getDescriptor(), com.google.protobuf.StructProto.getDescriptor(), @@ -254,6 +257,7 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() { "AccessPolicy", "AccessLevel", "ServicePerimeter", + "OsInventory", "Ancestors", "AccessContextPolicy", }); @@ -425,6 +429,7 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() { com.google.iam.v1.PolicyProto.getDescriptor(); com.google.identity.accesscontextmanager.v1.AccessLevelProto.getDescriptor(); com.google.identity.accesscontextmanager.v1.PolicyProto.getDescriptor(); + com.google.cloud.osconfig.v1.Inventories.getDescriptor(); com.google.identity.accesscontextmanager.v1.ServicePerimeterProto.getDescriptor(); com.google.protobuf.AnyProto.getDescriptor(); com.google.protobuf.StructProto.getDescriptor(); diff --git a/proto-google-cloud-asset-v1/src/main/java/com/google/cloud/asset/v1/AssetServiceProto.java b/proto-google-cloud-asset-v1/src/main/java/com/google/cloud/asset/v1/AssetServiceProto.java index 2d845fa0b..69ffc3204 100644 --- a/proto-google-cloud-asset-v1/src/main/java/com/google/cloud/asset/v1/AssetServiceProto.java +++ b/proto-google-cloud-asset-v1/src/main/java/com/google/cloud/asset/v1/AssetServiceProto.java @@ -323,64 +323,65 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() { + "nalysisQueryB\003\340A\002\022P\n\routput_config\030\002 \001(\013" + "24.google.cloud.asset.v1.IamPolicyAnalys" + "isOutputConfigB\003\340A\002\"%\n#AnalyzeIamPolicyL" - + "ongrunningResponse*l\n\013ContentType\022\034\n\030CON" + + "ongrunningResponse*~\n\013ContentType\022\034\n\030CON" + "TENT_TYPE_UNSPECIFIED\020\000\022\014\n\010RESOURCE\020\001\022\016\n" + "\nIAM_POLICY\020\002\022\016\n\nORG_POLICY\020\004\022\021\n\rACCESS_" - + "POLICY\020\0052\331\017\n\014AssetService\022\336\001\n\014ExportAsse" - + "ts\022*.google.cloud.asset.v1.ExportAssetsR" - + "equest\032\035.google.longrunning.Operation\"\202\001" - + "\202\323\344\223\002\"\"\035/v1/{parent=*/*}:exportAssets:\001*" - + "\312AW\n*google.cloud.asset.v1.ExportAssetsR" - + "esponse\022)google.cloud.asset.v1.ExportAss" - + "etsRequest\022\262\001\n\025BatchGetAssetsHistory\0223.g" - + "oogle.cloud.asset.v1.BatchGetAssetsHisto" - + "ryRequest\0324.google.cloud.asset.v1.BatchG" - + "etAssetsHistoryResponse\".\202\323\344\223\002(\022&/v1/{pa" - + "rent=*/*}:batchGetAssetsHistory\022\177\n\nCreat" - + "eFeed\022(.google.cloud.asset.v1.CreateFeed" - + "Request\032\033.google.cloud.asset.v1.Feed\"*\202\323" - + "\344\223\002\033\"\026/v1/{parent=*/*}/feeds:\001*\332A\006parent" - + "\022t\n\007GetFeed\022%.google.cloud.asset.v1.GetF" - + "eedRequest\032\033.google.cloud.asset.v1.Feed\"" - + "%\202\323\344\223\002\030\022\026/v1/{name=*/*/feeds/*}\332A\004name\022\207" - + "\001\n\tListFeeds\022\'.google.cloud.asset.v1.Lis" - + "tFeedsRequest\032(.google.cloud.asset.v1.Li" - + "stFeedsResponse\"\'\202\323\344\223\002\030\022\026/v1/{parent=*/*" - + "}/feeds\332A\006parent\022\202\001\n\nUpdateFeed\022(.google" - + ".cloud.asset.v1.UpdateFeedRequest\032\033.goog" - + "le.cloud.asset.v1.Feed\"-\202\323\344\223\002 2\033/v1/{fee" - + "d.name=*/*/feeds/*}:\001*\332A\004feed\022u\n\nDeleteF" - + "eed\022(.google.cloud.asset.v1.DeleteFeedRe" - + "quest\032\026.google.protobuf.Empty\"%\202\323\344\223\002\030*\026/" - + "v1/{name=*/*/feeds/*}\332A\004name\022\277\001\n\022SearchA" - + "llResources\0220.google.cloud.asset.v1.Sear" - + "chAllResourcesRequest\0321.google.cloud.ass" - + "et.v1.SearchAllResourcesResponse\"D\202\323\344\223\002$" - + "\022\"/v1/{scope=*/*}:searchAllResources\332A\027s" - + "cope,query,asset_types\022\273\001\n\024SearchAllIamP" - + "olicies\0222.google.cloud.asset.v1.SearchAl" - + "lIamPoliciesRequest\0323.google.cloud.asset" - + ".v1.SearchAllIamPoliciesResponse\":\202\323\344\223\002&" - + "\022$/v1/{scope=*/*}:searchAllIamPolicies\332A" - + "\013scope,query\022\254\001\n\020AnalyzeIamPolicy\022..goog" - + "le.cloud.asset.v1.AnalyzeIamPolicyReques" - + "t\032/.google.cloud.asset.v1.AnalyzeIamPoli" - + "cyResponse\"7\202\323\344\223\0021\022//v1/{analysis_query." - + "scope=*/*}:analyzeIamPolicy\022\267\002\n\033AnalyzeI" - + "amPolicyLongrunning\0229.google.cloud.asset" - + ".v1.AnalyzeIamPolicyLongrunningRequest\032\035" - + ".google.longrunning.Operation\"\275\001\202\323\344\223\002?\":" - + "/v1/{analysis_query.scope=*/*}:analyzeIa" - + "mPolicyLongrunning:\001*\312Au\n9google.cloud.a" - + "sset.v1.AnalyzeIamPolicyLongrunningRespo" - + "nse\0228google.cloud.asset.v1.AnalyzeIamPol" - + "icyLongrunningRequest\032M\312A\031cloudasset.goo" - + "gleapis.com\322A.https://www.googleapis.com" - + "/auth/cloud-platformB\234\001\n\031com.google.clou" - + "d.asset.v1B\021AssetServiceProtoP\001Z:google." - + "golang.org/genproto/googleapis/cloud/ass" - + "et/v1;asset\252\002\025Google.Cloud.Asset.V1\312\002\025Go" - + "ogle\\Cloud\\Asset\\V1b\006proto3" + + "POLICY\020\005\022\020\n\014OS_INVENTORY\020\0062\331\017\n\014AssetServ" + + "ice\022\336\001\n\014ExportAssets\022*.google.cloud.asse" + + "t.v1.ExportAssetsRequest\032\035.google.longru" + + "nning.Operation\"\202\001\202\323\344\223\002\"\"\035/v1/{parent=*/" + + "*}:exportAssets:\001*\312AW\n*google.cloud.asse" + + "t.v1.ExportAssetsResponse\022)google.cloud." + + "asset.v1.ExportAssetsRequest\022\262\001\n\025BatchGe" + + "tAssetsHistory\0223.google.cloud.asset.v1.B" + + "atchGetAssetsHistoryRequest\0324.google.clo" + + "ud.asset.v1.BatchGetAssetsHistoryRespons" + + "e\".\202\323\344\223\002(\022&/v1/{parent=*/*}:batchGetAsse" + + "tsHistory\022\177\n\nCreateFeed\022(.google.cloud.a" + + "sset.v1.CreateFeedRequest\032\033.google.cloud" + + ".asset.v1.Feed\"*\202\323\344\223\002\033\"\026/v1/{parent=*/*}" + + "/feeds:\001*\332A\006parent\022t\n\007GetFeed\022%.google.c" + + "loud.asset.v1.GetFeedRequest\032\033.google.cl" + + "oud.asset.v1.Feed\"%\202\323\344\223\002\030\022\026/v1/{name=*/*" + + "/feeds/*}\332A\004name\022\207\001\n\tListFeeds\022\'.google." + + "cloud.asset.v1.ListFeedsRequest\032(.google" + + ".cloud.asset.v1.ListFeedsResponse\"\'\202\323\344\223\002" + + "\030\022\026/v1/{parent=*/*}/feeds\332A\006parent\022\202\001\n\nU" + + "pdateFeed\022(.google.cloud.asset.v1.Update" + + "FeedRequest\032\033.google.cloud.asset.v1.Feed" + + "\"-\202\323\344\223\002 2\033/v1/{feed.name=*/*/feeds/*}:\001*" + + "\332A\004feed\022u\n\nDeleteFeed\022(.google.cloud.ass" + + "et.v1.DeleteFeedRequest\032\026.google.protobu" + + "f.Empty\"%\202\323\344\223\002\030*\026/v1/{name=*/*/feeds/*}\332" + + "A\004name\022\277\001\n\022SearchAllResources\0220.google.c" + + "loud.asset.v1.SearchAllResourcesRequest\032" + + "1.google.cloud.asset.v1.SearchAllResourc" + + "esResponse\"D\202\323\344\223\002$\022\"/v1/{scope=*/*}:sear" + + "chAllResources\332A\027scope,query,asset_types" + + "\022\273\001\n\024SearchAllIamPolicies\0222.google.cloud" + + ".asset.v1.SearchAllIamPoliciesRequest\0323." + + "google.cloud.asset.v1.SearchAllIamPolici" + + "esResponse\":\202\323\344\223\002&\022$/v1/{scope=*/*}:sear" + + "chAllIamPolicies\332A\013scope,query\022\254\001\n\020Analy" + + "zeIamPolicy\022..google.cloud.asset.v1.Anal" + + "yzeIamPolicyRequest\032/.google.cloud.asset" + + ".v1.AnalyzeIamPolicyResponse\"7\202\323\344\223\0021\022//v" + + "1/{analysis_query.scope=*/*}:analyzeIamP" + + "olicy\022\267\002\n\033AnalyzeIamPolicyLongrunning\0229." + + "google.cloud.asset.v1.AnalyzeIamPolicyLo" + + "ngrunningRequest\032\035.google.longrunning.Op" + + "eration\"\275\001\202\323\344\223\002?\":/v1/{analysis_query.sc" + + "ope=*/*}:analyzeIamPolicyLongrunning:\001*\312" + + "Au\n9google.cloud.asset.v1.AnalyzeIamPoli" + + "cyLongrunningResponse\0228google.cloud.asse" + + "t.v1.AnalyzeIamPolicyLongrunningRequest\032" + + "M\312A\031cloudasset.googleapis.com\322A.https://" + + "www.googleapis.com/auth/cloud-platformB\234" + + "\001\n\031com.google.cloud.asset.v1B\021AssetServi" + + "ceProtoP\001Z:google.golang.org/genproto/go" + + "ogleapis/cloud/asset/v1;asset\252\002\025Google.C" + + "loud.Asset.V1\312\002\025Google\\Cloud\\Asset\\V1b\006p" + + "roto3" }; descriptor = com.google.protobuf.Descriptors.FileDescriptor.internalBuildGeneratedFileFrom( diff --git a/proto-google-cloud-asset-v1/src/main/java/com/google/cloud/asset/v1/ContentType.java b/proto-google-cloud-asset-v1/src/main/java/com/google/cloud/asset/v1/ContentType.java index 3db66f718..47f841d3e 100644 --- a/proto-google-cloud-asset-v1/src/main/java/com/google/cloud/asset/v1/ContentType.java +++ b/proto-google-cloud-asset-v1/src/main/java/com/google/cloud/asset/v1/ContentType.java @@ -78,6 +78,16 @@ public enum ContentType implements com.google.protobuf.ProtocolMessageEnum { * ACCESS_POLICY = 5; */ ACCESS_POLICY(5), + /** + * + * + *
+   * The runtime OS Inventory information.
+   * 
+ * + * OS_INVENTORY = 6; + */ + OS_INVENTORY(6), UNRECOGNIZED(-1), ; @@ -131,6 +141,16 @@ public enum ContentType implements com.google.protobuf.ProtocolMessageEnum { * ACCESS_POLICY = 5; */ public static final int ACCESS_POLICY_VALUE = 5; + /** + * + * + *
+   * The runtime OS Inventory information.
+   * 
+ * + * OS_INVENTORY = 6; + */ + public static final int OS_INVENTORY_VALUE = 6; public final int getNumber() { if (this == UNRECOGNIZED) { @@ -166,6 +186,8 @@ public static ContentType forNumber(int value) { return ORG_POLICY; case 5: return ACCESS_POLICY; + case 6: + return OS_INVENTORY; default: return null; } diff --git a/proto-google-cloud-asset-v1/src/main/proto/google/cloud/asset/v1/asset_service.proto b/proto-google-cloud-asset-v1/src/main/proto/google/cloud/asset/v1/asset_service.proto index c5873958a..ee8c4129d 100644 --- a/proto-google-cloud-asset-v1/src/main/proto/google/cloud/asset/v1/asset_service.proto +++ b/proto-google-cloud-asset-v1/src/main/proto/google/cloud/asset/v1/asset_service.proto @@ -1046,4 +1046,7 @@ enum ContentType { // The Cloud Access context manager Policy set on an asset. ACCESS_POLICY = 5; + + // The runtime OS Inventory information. + OS_INVENTORY = 6; } diff --git a/proto-google-cloud-asset-v1/src/main/proto/google/cloud/asset/v1/assets.proto b/proto-google-cloud-asset-v1/src/main/proto/google/cloud/asset/v1/assets.proto index c06caf71a..f7e2432fc 100644 --- a/proto-google-cloud-asset-v1/src/main/proto/google/cloud/asset/v1/assets.proto +++ b/proto-google-cloud-asset-v1/src/main/proto/google/cloud/asset/v1/assets.proto @@ -21,6 +21,7 @@ import "google/cloud/orgpolicy/v1/orgpolicy.proto"; import "google/iam/v1/policy.proto"; import "google/identity/accesscontextmanager/v1/access_level.proto"; import "google/identity/accesscontextmanager/v1/access_policy.proto"; +import "google/cloud/osconfig/v1/inventory.proto"; import "google/identity/accesscontextmanager/v1/service_perimeter.proto"; import "google/protobuf/any.proto"; import "google/protobuf/struct.proto"; @@ -153,6 +154,11 @@ message Asset { google.identity.accesscontextmanager.v1.ServicePerimeter service_perimeter = 9; } + // A representation of runtime OS Inventory information. See [this + // topic](https://cloud.google.com/compute/docs/instances/os-inventory-management) + // for more information. + google.cloud.osconfig.v1.Inventory os_inventory = 12; + // The ancestry path of an asset in Google Cloud [resource // hierarchy](https://cloud.google.com/resource-manager/docs/cloud-platform-resource-hierarchy), // represented as a list of relative resource names. An ancestry path starts diff --git a/synth.metadata b/synth.metadata index 575255747..c546b5223 100644 --- a/synth.metadata +++ b/synth.metadata @@ -4,55 +4,55 @@ "git": { "name": ".", "remote": "https://github.com/googleapis/java-asset.git", - "sha": "9f9c558f47614aa67298b729989aac681c8fbe42" + "sha": "ee22030b198e92fff0f2ece768cce6d9a25d3b7b" } }, { "git": { "name": "googleapis", "remote": "https://github.com/googleapis/googleapis.git", - "sha": "00bbad4dfd6633cf4b5f9596c1f93b756bb5c776", - "internalRef": "339708980" + "sha": "1f8a5144b52f7677dc43c55b21ccaf9e1b425ceb", + "internalRef": "342689216" } }, { "git": { "name": "googleapis", "remote": "https://github.com/googleapis/googleapis.git", - "sha": "00bbad4dfd6633cf4b5f9596c1f93b756bb5c776", - "internalRef": "339708980" + "sha": "1f8a5144b52f7677dc43c55b21ccaf9e1b425ceb", + "internalRef": "342689216" } }, { "git": { "name": "googleapis", "remote": "https://github.com/googleapis/googleapis.git", - "sha": "00bbad4dfd6633cf4b5f9596c1f93b756bb5c776", - "internalRef": "339708980" + "sha": "1f8a5144b52f7677dc43c55b21ccaf9e1b425ceb", + "internalRef": "342689216" } }, { "git": { "name": "googleapis", "remote": "https://github.com/googleapis/googleapis.git", - "sha": "00bbad4dfd6633cf4b5f9596c1f93b756bb5c776", - "internalRef": "339708980" + "sha": "1f8a5144b52f7677dc43c55b21ccaf9e1b425ceb", + "internalRef": "342689216" } }, { "git": { "name": "googleapis", "remote": "https://github.com/googleapis/googleapis.git", - "sha": "00bbad4dfd6633cf4b5f9596c1f93b756bb5c776", - "internalRef": "339708980" + "sha": "1f8a5144b52f7677dc43c55b21ccaf9e1b425ceb", + "internalRef": "342689216" } }, { "git": { "name": "googleapis", "remote": "https://github.com/googleapis/googleapis.git", - "sha": "00bbad4dfd6633cf4b5f9596c1f93b756bb5c776", - "internalRef": "339708980" + "sha": "1f8a5144b52f7677dc43c55b21ccaf9e1b425ceb", + "internalRef": "342689216" } }, {