diff --git a/java-binary-authorization/README.md b/java-binary-authorization/README.md index 9b333b6c7eba..9c3a26081df0 100644 --- a/java-binary-authorization/README.md +++ b/java-binary-authorization/README.md @@ -20,7 +20,7 @@ If you are using Maven with [BOM][libraries-bom], add this to your pom.xml file: com.google.cloud libraries-bom - 26.23.0 + 26.27.0 pom import @@ -195,7 +195,7 @@ Java is a registered trademark of Oracle and/or its affiliates. [kokoro-badge-link-5]: http://storage.googleapis.com/cloud-devrel-public/java/badges/google-cloud-java/java11.html [stability-image]: https://img.shields.io/badge/stability-stable-green [maven-version-image]: https://img.shields.io/maven-central/v/com.google.cloud/google-cloud-binary-authorization.svg -[maven-version-link]: https://central.sonatype.com/artifact/com.google.cloud/google-cloud-binary-authorization/1.23.0 +[maven-version-link]: https://central.sonatype.com/artifact/com.google.cloud/google-cloud-binary-authorization/1.29.0 [authentication]: https://github.com/googleapis/google-cloud-java#authentication [auth-scopes]: https://developers.google.com/identity/protocols/oauth2/scopes [predefined-iam-roles]: https://cloud.google.com/iam/docs/understanding-roles#predefined_roles diff --git a/java-binary-authorization/google-cloud-binary-authorization/src/main/resources/META-INF/native-image/com.google.cloud.binaryauthorization.v1beta1/reflect-config.json b/java-binary-authorization/google-cloud-binary-authorization/src/main/resources/META-INF/native-image/com.google.cloud.binaryauthorization.v1beta1/reflect-config.json index 5987de56d56b..9e0c7e43acbb 100644 --- a/java-binary-authorization/google-cloud-binary-authorization/src/main/resources/META-INF/native-image/com.google.cloud.binaryauthorization.v1beta1/reflect-config.json +++ b/java-binary-authorization/google-cloud-binary-authorization/src/main/resources/META-INF/native-image/com.google.cloud.binaryauthorization.v1beta1/reflect-config.json @@ -593,6 +593,15 @@ "allDeclaredClasses": true, "allPublicClasses": true }, + { + "name": "com.google.cloud.binaryauthorization.v1beta1.ContinuousValidationEvent$ContinuousValidationPodEvent$ImageDetails$ContainerType", + "queryAllDeclaredConstructors": true, + "queryAllPublicConstructors": true, + "queryAllDeclaredMethods": true, + "allPublicMethods": true, + "allDeclaredClasses": true, + "allPublicClasses": true + }, { "name": "com.google.cloud.binaryauthorization.v1beta1.ContinuousValidationEvent$ContinuousValidationPodEvent$PolicyConformanceVerdict", "queryAllDeclaredConstructors": true, diff --git a/java-binary-authorization/proto-google-cloud-binary-authorization-v1beta1/src/main/java/com/google/cloud/binaryauthorization/v1beta1/ContinuousValidationEvent.java b/java-binary-authorization/proto-google-cloud-binary-authorization-v1beta1/src/main/java/com/google/cloud/binaryauthorization/v1beta1/ContinuousValidationEvent.java index 3ea74d07eefe..b2b46279bef6 100644 --- a/java-binary-authorization/proto-google-cloud-binary-authorization-v1beta1/src/main/java/com/google/cloud/binaryauthorization/v1beta1/ContinuousValidationEvent.java +++ b/java-binary-authorization/proto-google-cloud-binary-authorization-v1beta1/src/main/java/com/google/cloud/binaryauthorization/v1beta1/ContinuousValidationEvent.java @@ -538,6 +538,62 @@ public interface ImageDetailsOrBuilder */ com.google.protobuf.ByteString getImageBytes(); + /** + * + * + *
+       * The name of the container.
+       * 
+ * + * string container_name = 5; + * + * @return The containerName. + */ + java.lang.String getContainerName(); + /** + * + * + *
+       * The name of the container.
+       * 
+ * + * string container_name = 5; + * + * @return The bytes for containerName. + */ + com.google.protobuf.ByteString getContainerNameBytes(); + + /** + * + * + *
+       * The container type that this image belongs to.
+       * 
+ * + * + * .google.cloud.binaryauthorization.v1beta1.ContinuousValidationEvent.ContinuousValidationPodEvent.ImageDetails.ContainerType container_type = 6; + * + * + * @return The enum numeric value on the wire for containerType. + */ + int getContainerTypeValue(); + /** + * + * + *
+       * The container type that this image belongs to.
+       * 
+ * + * + * .google.cloud.binaryauthorization.v1beta1.ContinuousValidationEvent.ContinuousValidationPodEvent.ImageDetails.ContainerType container_type = 6; + * + * + * @return The containerType. + */ + com.google.cloud.binaryauthorization.v1beta1.ContinuousValidationEvent + .ContinuousValidationPodEvent.ImageDetails.ContainerType + getContainerType(); + /** * * @@ -688,6 +744,8 @@ private ImageDetails(com.google.protobuf.GeneratedMessageV3.Builder builder) private ImageDetails() { image_ = ""; + containerName_ = ""; + containerType_ = 0; result_ = 0; description_ = ""; checkResults_ = java.util.Collections.emptyList(); @@ -716,6 +774,197 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { .ContinuousValidationPodEvent.ImageDetails.Builder.class); } + /** + * + * + *
+       * The container type.
+       * 
+ * + * Protobuf enum {@code + * google.cloud.binaryauthorization.v1beta1.ContinuousValidationEvent.ContinuousValidationPodEvent.ImageDetails.ContainerType} + */ + public enum ContainerType implements com.google.protobuf.ProtocolMessageEnum { + /** + * + * + *
+         * The container type should always be specified. This is an error.
+         * 
+ * + * CONTAINER_TYPE_UNSPECIFIED = 0; + */ + CONTAINER_TYPE_UNSPECIFIED(0), + /** + * + * + *
+         * A regular deployment.
+         * 
+ * + * CONTAINER = 1; + */ + CONTAINER(1), + /** + * + * + *
+         * Init container defined as specified at
+         * https://kubernetes.io/docs/concepts/workloads/pods/init-containers/
+         * 
+ * + * INIT_CONTAINER = 2; + */ + INIT_CONTAINER(2), + /** + * + * + *
+         * Ephemeral container defined as specified at
+         * https://kubernetes.io/docs/concepts/workloads/pods/ephemeral-containers/
+         * 
+ * + * EPHEMERAL_CONTAINER = 3; + */ + EPHEMERAL_CONTAINER(3), + UNRECOGNIZED(-1), + ; + + /** + * + * + *
+         * The container type should always be specified. This is an error.
+         * 
+ * + * CONTAINER_TYPE_UNSPECIFIED = 0; + */ + public static final int CONTAINER_TYPE_UNSPECIFIED_VALUE = 0; + /** + * + * + *
+         * A regular deployment.
+         * 
+ * + * CONTAINER = 1; + */ + public static final int CONTAINER_VALUE = 1; + /** + * + * + *
+         * Init container defined as specified at
+         * https://kubernetes.io/docs/concepts/workloads/pods/init-containers/
+         * 
+ * + * INIT_CONTAINER = 2; + */ + public static final int INIT_CONTAINER_VALUE = 2; + /** + * + * + *
+         * Ephemeral container defined as specified at
+         * https://kubernetes.io/docs/concepts/workloads/pods/ephemeral-containers/
+         * 
+ * + * EPHEMERAL_CONTAINER = 3; + */ + public static final int EPHEMERAL_CONTAINER_VALUE = 3; + + public final int getNumber() { + if (this == UNRECOGNIZED) { + throw new java.lang.IllegalArgumentException( + "Can't get the number of an unknown enum value."); + } + return value; + } + + /** + * @param value The numeric wire value of the corresponding enum entry. + * @return The enum associated with the given numeric wire value. + * @deprecated Use {@link #forNumber(int)} instead. + */ + @java.lang.Deprecated + public static ContainerType valueOf(int value) { + return forNumber(value); + } + + /** + * @param value The numeric wire value of the corresponding enum entry. + * @return The enum associated with the given numeric wire value. + */ + public static ContainerType forNumber(int value) { + switch (value) { + case 0: + return CONTAINER_TYPE_UNSPECIFIED; + case 1: + return CONTAINER; + case 2: + return INIT_CONTAINER; + case 3: + return EPHEMERAL_CONTAINER; + default: + return null; + } + } + + public static com.google.protobuf.Internal.EnumLiteMap + internalGetValueMap() { + return internalValueMap; + } + + private static final com.google.protobuf.Internal.EnumLiteMap + internalValueMap = + new com.google.protobuf.Internal.EnumLiteMap() { + public ContainerType findValueByNumber(int number) { + return ContainerType.forNumber(number); + } + }; + + public final com.google.protobuf.Descriptors.EnumValueDescriptor getValueDescriptor() { + if (this == UNRECOGNIZED) { + throw new java.lang.IllegalStateException( + "Can't get the descriptor of an unrecognized enum value."); + } + return getDescriptor().getValues().get(ordinal()); + } + + public final com.google.protobuf.Descriptors.EnumDescriptor getDescriptorForType() { + return getDescriptor(); + } + + public static final com.google.protobuf.Descriptors.EnumDescriptor getDescriptor() { + return com.google.cloud.binaryauthorization.v1beta1.ContinuousValidationEvent + .ContinuousValidationPodEvent.ImageDetails.getDescriptor() + .getEnumTypes() + .get(0); + } + + private static final ContainerType[] VALUES = values(); + + public static ContainerType valueOf( + com.google.protobuf.Descriptors.EnumValueDescriptor desc) { + if (desc.getType() != getDescriptor()) { + throw new java.lang.IllegalArgumentException( + "EnumValueDescriptor is not for this type."); + } + if (desc.getIndex() == -1) { + return UNRECOGNIZED; + } + return VALUES[desc.getIndex()]; + } + + private final int value; + + private ContainerType(int value) { + this.value = value; + } + + // @@protoc_insertion_point(enum_scope:google.cloud.binaryauthorization.v1beta1.ContinuousValidationEvent.ContinuousValidationPodEvent.ImageDetails.ContainerType) + } + /** * * @@ -854,7 +1103,7 @@ public static final com.google.protobuf.Descriptors.EnumDescriptor getDescriptor return com.google.cloud.binaryauthorization.v1beta1.ContinuousValidationEvent .ContinuousValidationPodEvent.ImageDetails.getDescriptor() .getEnumTypes() - .get(0); + .get(1); } private static final AuditResult[] VALUES = values(); @@ -4621,6 +4870,105 @@ public com.google.protobuf.ByteString getImageBytes() { } } + public static final int CONTAINER_NAME_FIELD_NUMBER = 5; + + @SuppressWarnings("serial") + private volatile java.lang.Object containerName_ = ""; + /** + * + * + *
+       * The name of the container.
+       * 
+ * + * string container_name = 5; + * + * @return The containerName. + */ + @java.lang.Override + public java.lang.String getContainerName() { + java.lang.Object ref = containerName_; + 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(); + containerName_ = s; + return s; + } + } + /** + * + * + *
+       * The name of the container.
+       * 
+ * + * string container_name = 5; + * + * @return The bytes for containerName. + */ + @java.lang.Override + public com.google.protobuf.ByteString getContainerNameBytes() { + java.lang.Object ref = containerName_; + if (ref instanceof java.lang.String) { + com.google.protobuf.ByteString b = + com.google.protobuf.ByteString.copyFromUtf8((java.lang.String) ref); + containerName_ = b; + return b; + } else { + return (com.google.protobuf.ByteString) ref; + } + } + + public static final int CONTAINER_TYPE_FIELD_NUMBER = 6; + private int containerType_ = 0; + /** + * + * + *
+       * The container type that this image belongs to.
+       * 
+ * + * + * .google.cloud.binaryauthorization.v1beta1.ContinuousValidationEvent.ContinuousValidationPodEvent.ImageDetails.ContainerType container_type = 6; + * + * + * @return The enum numeric value on the wire for containerType. + */ + @java.lang.Override + public int getContainerTypeValue() { + return containerType_; + } + /** + * + * + *
+       * The container type that this image belongs to.
+       * 
+ * + * + * .google.cloud.binaryauthorization.v1beta1.ContinuousValidationEvent.ContinuousValidationPodEvent.ImageDetails.ContainerType container_type = 6; + * + * + * @return The containerType. + */ + @java.lang.Override + public com.google.cloud.binaryauthorization.v1beta1.ContinuousValidationEvent + .ContinuousValidationPodEvent.ImageDetails.ContainerType + getContainerType() { + com.google.cloud.binaryauthorization.v1beta1.ContinuousValidationEvent + .ContinuousValidationPodEvent.ImageDetails.ContainerType + result = + com.google.cloud.binaryauthorization.v1beta1.ContinuousValidationEvent + .ContinuousValidationPodEvent.ImageDetails.ContainerType.forNumber( + containerType_); + return result == null + ? com.google.cloud.binaryauthorization.v1beta1.ContinuousValidationEvent + .ContinuousValidationPodEvent.ImageDetails.ContainerType.UNRECOGNIZED + : result; + } + public static final int RESULT_FIELD_NUMBER = 2; private int result_ = 0; /** @@ -4842,6 +5190,15 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io for (int i = 0; i < checkResults_.size(); i++) { output.writeMessage(4, checkResults_.get(i)); } + if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(containerName_)) { + com.google.protobuf.GeneratedMessageV3.writeString(output, 5, containerName_); + } + if (containerType_ + != com.google.cloud.binaryauthorization.v1beta1.ContinuousValidationEvent + .ContinuousValidationPodEvent.ImageDetails.ContainerType.CONTAINER_TYPE_UNSPECIFIED + .getNumber()) { + output.writeEnum(6, containerType_); + } getUnknownFields().writeTo(output); } @@ -4866,6 +5223,15 @@ public int getSerializedSize() { for (int i = 0; i < checkResults_.size(); i++) { size += com.google.protobuf.CodedOutputStream.computeMessageSize(4, checkResults_.get(i)); } + if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(containerName_)) { + size += com.google.protobuf.GeneratedMessageV3.computeStringSize(5, containerName_); + } + if (containerType_ + != com.google.cloud.binaryauthorization.v1beta1.ContinuousValidationEvent + .ContinuousValidationPodEvent.ImageDetails.ContainerType.CONTAINER_TYPE_UNSPECIFIED + .getNumber()) { + size += com.google.protobuf.CodedOutputStream.computeEnumSize(6, containerType_); + } size += getUnknownFields().getSerializedSize(); memoizedSize = size; return size; @@ -4890,6 +5256,8 @@ public boolean equals(final java.lang.Object obj) { obj; if (!getImage().equals(other.getImage())) return false; + if (!getContainerName().equals(other.getContainerName())) return false; + if (containerType_ != other.containerType_) return false; if (result_ != other.result_) return false; if (!getDescription().equals(other.getDescription())) return false; if (!getCheckResultsList().equals(other.getCheckResultsList())) return false; @@ -4906,6 +5274,10 @@ public int hashCode() { hash = (19 * hash) + getDescriptor().hashCode(); hash = (37 * hash) + IMAGE_FIELD_NUMBER; hash = (53 * hash) + getImage().hashCode(); + hash = (37 * hash) + CONTAINER_NAME_FIELD_NUMBER; + hash = (53 * hash) + getContainerName().hashCode(); + hash = (37 * hash) + CONTAINER_TYPE_FIELD_NUMBER; + hash = (53 * hash) + containerType_; hash = (37 * hash) + RESULT_FIELD_NUMBER; hash = (53 * hash) + result_; hash = (37 * hash) + DESCRIPTION_FIELD_NUMBER; @@ -5084,6 +5456,8 @@ public Builder clear() { super.clear(); bitField0_ = 0; image_ = ""; + containerName_ = ""; + containerType_ = 0; result_ = 0; description_ = ""; if (checkResultsBuilder_ == null) { @@ -5092,7 +5466,7 @@ public Builder clear() { checkResults_ = null; checkResultsBuilder_.clear(); } - bitField0_ = (bitField0_ & ~0x00000008); + bitField0_ = (bitField0_ & ~0x00000020); return this; } @@ -5145,9 +5519,9 @@ private void buildPartialRepeatedFields( .ContinuousValidationPodEvent.ImageDetails result) { if (checkResultsBuilder_ == null) { - if (((bitField0_ & 0x00000008) != 0)) { + if (((bitField0_ & 0x00000020) != 0)) { checkResults_ = java.util.Collections.unmodifiableList(checkResults_); - bitField0_ = (bitField0_ & ~0x00000008); + bitField0_ = (bitField0_ & ~0x00000020); } result.checkResults_ = checkResults_; } else { @@ -5164,9 +5538,15 @@ private void buildPartial0( result.image_ = image_; } if (((from_bitField0_ & 0x00000002) != 0)) { - result.result_ = result_; + result.containerName_ = containerName_; } if (((from_bitField0_ & 0x00000004) != 0)) { + result.containerType_ = containerType_; + } + if (((from_bitField0_ & 0x00000008) != 0)) { + result.result_ = result_; + } + if (((from_bitField0_ & 0x00000010) != 0)) { result.description_ = description_; } } @@ -5234,19 +5614,27 @@ public Builder mergeFrom( bitField0_ |= 0x00000001; onChanged(); } + if (!other.getContainerName().isEmpty()) { + containerName_ = other.containerName_; + bitField0_ |= 0x00000002; + onChanged(); + } + if (other.containerType_ != 0) { + setContainerTypeValue(other.getContainerTypeValue()); + } if (other.result_ != 0) { setResultValue(other.getResultValue()); } if (!other.getDescription().isEmpty()) { description_ = other.description_; - bitField0_ |= 0x00000004; + bitField0_ |= 0x00000010; onChanged(); } if (checkResultsBuilder_ == null) { if (!other.checkResults_.isEmpty()) { if (checkResults_.isEmpty()) { checkResults_ = other.checkResults_; - bitField0_ = (bitField0_ & ~0x00000008); + bitField0_ = (bitField0_ & ~0x00000020); } else { ensureCheckResultsIsMutable(); checkResults_.addAll(other.checkResults_); @@ -5259,7 +5647,7 @@ public Builder mergeFrom( checkResultsBuilder_.dispose(); checkResultsBuilder_ = null; checkResults_ = other.checkResults_; - bitField0_ = (bitField0_ & ~0x00000008); + bitField0_ = (bitField0_ & ~0x00000020); checkResultsBuilder_ = com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders ? getCheckResultsFieldBuilder() @@ -5304,13 +5692,13 @@ public Builder mergeFrom( case 16: { result_ = input.readEnum(); - bitField0_ |= 0x00000002; + bitField0_ |= 0x00000008; break; } // case 16 case 26: { description_ = input.readStringRequireUtf8(); - bitField0_ |= 0x00000004; + bitField0_ |= 0x00000010; break; } // case 26 case 34: @@ -5331,6 +5719,18 @@ public Builder mergeFrom( } break; } // case 34 + case 42: + { + containerName_ = input.readStringRequireUtf8(); + bitField0_ |= 0x00000002; + break; + } // case 42 + case 48: + { + containerType_ = input.readEnum(); + bitField0_ |= 0x00000004; + break; + } // case 48 default: { if (!super.parseUnknownField(input, extensionRegistry, tag)) { @@ -5456,6 +5856,224 @@ public Builder setImageBytes(com.google.protobuf.ByteString value) { return this; } + private java.lang.Object containerName_ = ""; + /** + * + * + *
+         * The name of the container.
+         * 
+ * + * string container_name = 5; + * + * @return The containerName. + */ + public java.lang.String getContainerName() { + java.lang.Object ref = containerName_; + if (!(ref instanceof java.lang.String)) { + com.google.protobuf.ByteString bs = (com.google.protobuf.ByteString) ref; + java.lang.String s = bs.toStringUtf8(); + containerName_ = s; + return s; + } else { + return (java.lang.String) ref; + } + } + /** + * + * + *
+         * The name of the container.
+         * 
+ * + * string container_name = 5; + * + * @return The bytes for containerName. + */ + public com.google.protobuf.ByteString getContainerNameBytes() { + java.lang.Object ref = containerName_; + if (ref instanceof String) { + com.google.protobuf.ByteString b = + com.google.protobuf.ByteString.copyFromUtf8((java.lang.String) ref); + containerName_ = b; + return b; + } else { + return (com.google.protobuf.ByteString) ref; + } + } + /** + * + * + *
+         * The name of the container.
+         * 
+ * + * string container_name = 5; + * + * @param value The containerName to set. + * @return This builder for chaining. + */ + public Builder setContainerName(java.lang.String value) { + if (value == null) { + throw new NullPointerException(); + } + containerName_ = value; + bitField0_ |= 0x00000002; + onChanged(); + return this; + } + /** + * + * + *
+         * The name of the container.
+         * 
+ * + * string container_name = 5; + * + * @return This builder for chaining. + */ + public Builder clearContainerName() { + containerName_ = getDefaultInstance().getContainerName(); + bitField0_ = (bitField0_ & ~0x00000002); + onChanged(); + return this; + } + /** + * + * + *
+         * The name of the container.
+         * 
+ * + * string container_name = 5; + * + * @param value The bytes for containerName to set. + * @return This builder for chaining. + */ + public Builder setContainerNameBytes(com.google.protobuf.ByteString value) { + if (value == null) { + throw new NullPointerException(); + } + checkByteStringIsUtf8(value); + containerName_ = value; + bitField0_ |= 0x00000002; + onChanged(); + return this; + } + + private int containerType_ = 0; + /** + * + * + *
+         * The container type that this image belongs to.
+         * 
+ * + * + * .google.cloud.binaryauthorization.v1beta1.ContinuousValidationEvent.ContinuousValidationPodEvent.ImageDetails.ContainerType container_type = 6; + * + * + * @return The enum numeric value on the wire for containerType. + */ + @java.lang.Override + public int getContainerTypeValue() { + return containerType_; + } + /** + * + * + *
+         * The container type that this image belongs to.
+         * 
+ * + * + * .google.cloud.binaryauthorization.v1beta1.ContinuousValidationEvent.ContinuousValidationPodEvent.ImageDetails.ContainerType container_type = 6; + * + * + * @param value The enum numeric value on the wire for containerType to set. + * @return This builder for chaining. + */ + public Builder setContainerTypeValue(int value) { + containerType_ = value; + bitField0_ |= 0x00000004; + onChanged(); + return this; + } + /** + * + * + *
+         * The container type that this image belongs to.
+         * 
+ * + * + * .google.cloud.binaryauthorization.v1beta1.ContinuousValidationEvent.ContinuousValidationPodEvent.ImageDetails.ContainerType container_type = 6; + * + * + * @return The containerType. + */ + @java.lang.Override + public com.google.cloud.binaryauthorization.v1beta1.ContinuousValidationEvent + .ContinuousValidationPodEvent.ImageDetails.ContainerType + getContainerType() { + com.google.cloud.binaryauthorization.v1beta1.ContinuousValidationEvent + .ContinuousValidationPodEvent.ImageDetails.ContainerType + result = + com.google.cloud.binaryauthorization.v1beta1.ContinuousValidationEvent + .ContinuousValidationPodEvent.ImageDetails.ContainerType.forNumber( + containerType_); + return result == null + ? com.google.cloud.binaryauthorization.v1beta1.ContinuousValidationEvent + .ContinuousValidationPodEvent.ImageDetails.ContainerType.UNRECOGNIZED + : result; + } + /** + * + * + *
+         * The container type that this image belongs to.
+         * 
+ * + * + * .google.cloud.binaryauthorization.v1beta1.ContinuousValidationEvent.ContinuousValidationPodEvent.ImageDetails.ContainerType container_type = 6; + * + * + * @param value The containerType to set. + * @return This builder for chaining. + */ + public Builder setContainerType( + com.google.cloud.binaryauthorization.v1beta1.ContinuousValidationEvent + .ContinuousValidationPodEvent.ImageDetails.ContainerType + value) { + if (value == null) { + throw new NullPointerException(); + } + bitField0_ |= 0x00000004; + containerType_ = value.getNumber(); + onChanged(); + return this; + } + /** + * + * + *
+         * The container type that this image belongs to.
+         * 
+ * + * + * .google.cloud.binaryauthorization.v1beta1.ContinuousValidationEvent.ContinuousValidationPodEvent.ImageDetails.ContainerType container_type = 6; + * + * + * @return This builder for chaining. + */ + public Builder clearContainerType() { + bitField0_ = (bitField0_ & ~0x00000004); + containerType_ = 0; + onChanged(); + return this; + } + private int result_ = 0; /** * @@ -5490,7 +6108,7 @@ public int getResultValue() { */ public Builder setResultValue(int value) { result_ = value; - bitField0_ |= 0x00000002; + bitField0_ |= 0x00000008; onChanged(); return this; } @@ -5542,7 +6160,7 @@ public Builder setResult( if (value == null) { throw new NullPointerException(); } - bitField0_ |= 0x00000002; + bitField0_ |= 0x00000008; result_ = value.getNumber(); onChanged(); return this; @@ -5561,7 +6179,7 @@ public Builder setResult( * @return This builder for chaining. */ public Builder clearResult() { - bitField0_ = (bitField0_ & ~0x00000002); + bitField0_ = (bitField0_ & ~0x00000008); result_ = 0; onChanged(); return this; @@ -5629,7 +6247,7 @@ public Builder setDescription(java.lang.String value) { throw new NullPointerException(); } description_ = value; - bitField0_ |= 0x00000004; + bitField0_ |= 0x00000010; onChanged(); return this; } @@ -5646,7 +6264,7 @@ public Builder setDescription(java.lang.String value) { */ public Builder clearDescription() { description_ = getDefaultInstance().getDescription(); - bitField0_ = (bitField0_ & ~0x00000004); + bitField0_ = (bitField0_ & ~0x00000010); onChanged(); return this; } @@ -5668,7 +6286,7 @@ public Builder setDescriptionBytes(com.google.protobuf.ByteString value) { } checkByteStringIsUtf8(value); description_ = value; - bitField0_ |= 0x00000004; + bitField0_ |= 0x00000010; onChanged(); return this; } @@ -5679,12 +6297,12 @@ public Builder setDescriptionBytes(com.google.protobuf.ByteString value) { checkResults_ = java.util.Collections.emptyList(); private void ensureCheckResultsIsMutable() { - if (!((bitField0_ & 0x00000008) != 0)) { + if (!((bitField0_ & 0x00000020) != 0)) { checkResults_ = new java.util.ArrayList< com.google.cloud.binaryauthorization.v1beta1.ContinuousValidationEvent .ContinuousValidationPodEvent.ImageDetails.CheckResult>(checkResults_); - bitField0_ |= 0x00000008; + bitField0_ |= 0x00000020; } } @@ -5953,7 +6571,7 @@ public Builder addAllCheckResults( public Builder clearCheckResults() { if (checkResultsBuilder_ == null) { checkResults_ = java.util.Collections.emptyList(); - bitField0_ = (bitField0_ & ~0x00000008); + bitField0_ = (bitField0_ & ~0x00000020); onChanged(); } else { checkResultsBuilder_.clear(); @@ -6114,7 +6732,7 @@ public Builder removeCheckResults(int index) { com.google.cloud.binaryauthorization.v1beta1.ContinuousValidationEvent .ContinuousValidationPodEvent.ImageDetails.CheckResultOrBuilder>( checkResults_, - ((bitField0_ & 0x00000008) != 0), + ((bitField0_ & 0x00000020) != 0), getParentForChildren(), isClean()); checkResults_ = null; diff --git a/java-binary-authorization/proto-google-cloud-binary-authorization-v1beta1/src/main/java/com/google/cloud/binaryauthorization/v1beta1/ContinuousValidationLoggingProto.java b/java-binary-authorization/proto-google-cloud-binary-authorization-v1beta1/src/main/java/com/google/cloud/binaryauthorization/v1beta1/ContinuousValidationLoggingProto.java index 0911381b6100..2f9686c17706 100644 --- a/java-binary-authorization/proto-google-cloud-binary-authorization-v1beta1/src/main/java/com/google/cloud/binaryauthorization/v1beta1/ContinuousValidationLoggingProto.java +++ b/java-binary-authorization/proto-google-cloud-binary-authorization-v1beta1/src/main/java/com/google/cloud/binaryauthorization/v1beta1/ContinuousValidationLoggingProto.java @@ -63,14 +63,14 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() { "\nLgoogle/cloud/binaryauthorization/v1bet" + "a1/continuous_validation_logging.proto\022(" + "google.cloud.binaryauthorization.v1beta1" - + "\032\037google/protobuf/timestamp.proto\"\352\016\n\031Co" + + "\032\037google/protobuf/timestamp.proto\"\205\021\n\031Co" + "ntinuousValidationEvent\022u\n\tpod_event\030\001 \001" + "(\0132`.google.cloud.binaryauthorization.v1" + "beta1.ContinuousValidationEvent.Continuo" + "usValidationPodEventH\000\022r\n\022config_error_e" + "vent\030\004 \001(\0132T.google.cloud.binaryauthoriz" + "ation.v1beta1.ContinuousValidationEvent." - + "ConfigErrorEventH\000\032\252\014\n\034ContinuousValidat" + + "ConfigErrorEventH\000\032\305\016\n\034ContinuousValidat" + "ionPodEvent\022\025\n\rpod_namespace\030\007 \001(\t\022\013\n\003po" + "d\030\001 \001(\t\022\023\n\013policy_name\030\010 \001(\t\022/\n\013deploy_t" + "ime\030\002 \001(\0132\032.google.protobuf.Timestamp\022,\n" @@ -81,45 +81,52 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() { + "PolicyConformanceVerdict\022}\n\006images\030\005 \003(\013" + "2m.google.cloud.binaryauthorization.v1be" + "ta1.ContinuousValidationEvent.Continuous" - + "ValidationPodEvent.ImageDetails\032\210\010\n\014Imag" - + "eDetails\022\r\n\005image\030\001 \001(\t\022\211\001\n\006result\030\002 \001(\016" - + "2y.google.cloud.binaryauthorization.v1be" - + "ta1.ContinuousValidationEvent.Continuous" - + "ValidationPodEvent.ImageDetails.AuditRes" - + "ult\022\023\n\013description\030\003 \001(\t\022\220\001\n\rcheck_resul" - + "ts\030\004 \003(\0132y.google.cloud.binaryauthorizat" - + "ion.v1beta1.ContinuousValidationEvent.Co" - + "ntinuousValidationPodEvent.ImageDetails." - + "CheckResult\032\362\004\n\013CheckResult\022\027\n\017check_set" - + "_index\030\001 \001(\t\022\026\n\016check_set_name\030\002 \001(\t\022\241\001\n" - + "\017check_set_scope\030\003 \001(\0132\207\001.google.cloud.b" - + "inaryauthorization.v1beta1.ContinuousVal" - + "idationEvent.ContinuousValidationPodEven" - + "t.ImageDetails.CheckResult.CheckSetScope" - + "\022\023\n\013check_index\030\004 \001(\t\022\022\n\ncheck_name\030\005 \001(" - + "\t\022\022\n\ncheck_type\030\006 \001(\t\022\230\001\n\007verdict\030\007 \001(\0162" - + "\206\001.google.cloud.binaryauthorization.v1be" - + "ta1.ContinuousValidationEvent.Continuous" - + "ValidationPodEvent.ImageDetails.CheckRes" - + "ult.CheckVerdict\022\023\n\013explanation\030\010 \001(\t\032^\n" - + "\rCheckSetScope\022$\n\032kubernetes_service_acc" - + "ount\030\001 \001(\tH\000\022\036\n\024kubernetes_namespace\030\002 \001" - + "(\tH\000B\007\n\005scope\"A\n\014CheckVerdict\022\035\n\031CHECK_V" - + "ERDICT_UNSPECIFIED\020\000\022\022\n\016NON_CONFORMANT\020\001" - + "\"@\n\013AuditResult\022\034\n\030AUDIT_RESULT_UNSPECIF" - + "IED\020\000\022\t\n\005ALLOW\020\001\022\010\n\004DENY\020\002\"[\n\030PolicyConf" - + "ormanceVerdict\022*\n&POLICY_CONFORMANCE_VER" - + "DICT_UNSPECIFIED\020\000\022\023\n\017VIOLATES_POLICY\020\001\032" - + "\'\n\020ConfigErrorEvent\022\023\n\013description\030\001 \001(\t" - + "B\014\n\nevent_typeB\271\002\n,com.google.cloud.bina" - + "ryauthorization.v1beta1B ContinuousValid" - + "ationLoggingProtoP\001Z^cloud.google.com/go" - + "/binaryauthorization/apiv1beta1/binaryau" - + "thorizationpb;binaryauthorizationpb\370\001\001\252\002" - + "(Google.Cloud.BinaryAuthorization.V1Beta" - + "1\312\002(Google\\Cloud\\BinaryAuthorization\\V1b" - + "eta1\352\002+Google::Cloud::BinaryAuthorizatio" - + "n::V1beta1b\006proto3" + + "ValidationPodEvent.ImageDetails\032\243\n\n\014Imag" + + "eDetails\022\r\n\005image\030\001 \001(\t\022\026\n\016container_nam" + + "e\030\005 \001(\t\022\223\001\n\016container_type\030\006 \001(\0162{.googl" + + "e.cloud.binaryauthorization.v1beta1.Cont" + + "inuousValidationEvent.ContinuousValidati" + + "onPodEvent.ImageDetails.ContainerType\022\211\001" + + "\n\006result\030\002 \001(\0162y.google.cloud.binaryauth" + + "orization.v1beta1.ContinuousValidationEv" + + "ent.ContinuousValidationPodEvent.ImageDe" + + "tails.AuditResult\022\023\n\013description\030\003 \001(\t\022\220" + + "\001\n\rcheck_results\030\004 \003(\0132y.google.cloud.bi" + + "naryauthorization.v1beta1.ContinuousVali" + + "dationEvent.ContinuousValidationPodEvent" + + ".ImageDetails.CheckResult\032\362\004\n\013CheckResul" + + "t\022\027\n\017check_set_index\030\001 \001(\t\022\026\n\016check_set_" + + "name\030\002 \001(\t\022\241\001\n\017check_set_scope\030\003 \001(\0132\207\001." + + "google.cloud.binaryauthorization.v1beta1" + + ".ContinuousValidationEvent.ContinuousVal" + + "idationPodEvent.ImageDetails.CheckResult" + + ".CheckSetScope\022\023\n\013check_index\030\004 \001(\t\022\022\n\nc" + + "heck_name\030\005 \001(\t\022\022\n\ncheck_type\030\006 \001(\t\022\230\001\n\007" + + "verdict\030\007 \001(\0162\206\001.google.cloud.binaryauth" + + "orization.v1beta1.ContinuousValidationEv" + + "ent.ContinuousValidationPodEvent.ImageDe" + + "tails.CheckResult.CheckVerdict\022\023\n\013explan" + + "ation\030\010 \001(\t\032^\n\rCheckSetScope\022$\n\032kubernet" + + "es_service_account\030\001 \001(\tH\000\022\036\n\024kubernetes" + + "_namespace\030\002 \001(\tH\000B\007\n\005scope\"A\n\014CheckVerd" + + "ict\022\035\n\031CHECK_VERDICT_UNSPECIFIED\020\000\022\022\n\016NO" + + "N_CONFORMANT\020\001\"k\n\rContainerType\022\036\n\032CONTA" + + "INER_TYPE_UNSPECIFIED\020\000\022\r\n\tCONTAINER\020\001\022\022" + + "\n\016INIT_CONTAINER\020\002\022\027\n\023EPHEMERAL_CONTAINE" + + "R\020\003\"@\n\013AuditResult\022\034\n\030AUDIT_RESULT_UNSPE" + + "CIFIED\020\000\022\t\n\005ALLOW\020\001\022\010\n\004DENY\020\002\"[\n\030PolicyC" + + "onformanceVerdict\022*\n&POLICY_CONFORMANCE_" + + "VERDICT_UNSPECIFIED\020\000\022\023\n\017VIOLATES_POLICY" + + "\020\001\032\'\n\020ConfigErrorEvent\022\023\n\013description\030\001 " + + "\001(\tB\014\n\nevent_typeB\271\002\n,com.google.cloud.b" + + "inaryauthorization.v1beta1B ContinuousVa" + + "lidationLoggingProtoP\001Z^cloud.google.com" + + "/go/binaryauthorization/apiv1beta1/binar" + + "yauthorizationpb;binaryauthorizationpb\370\001" + + "\001\252\002(Google.Cloud.BinaryAuthorization.V1B" + + "eta1\312\002(Google\\Cloud\\BinaryAuthorization\\" + + "V1beta1\352\002+Google::Cloud::BinaryAuthoriza" + + "tion::V1beta1b\006proto3" }; descriptor = com.google.protobuf.Descriptors.FileDescriptor.internalBuildGeneratedFileFrom( @@ -153,7 +160,7 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() { new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( internal_static_google_cloud_binaryauthorization_v1beta1_ContinuousValidationEvent_ContinuousValidationPodEvent_ImageDetails_descriptor, new java.lang.String[] { - "Image", "Result", "Description", "CheckResults", + "Image", "ContainerName", "ContainerType", "Result", "Description", "CheckResults", }); internal_static_google_cloud_binaryauthorization_v1beta1_ContinuousValidationEvent_ContinuousValidationPodEvent_ImageDetails_CheckResult_descriptor = internal_static_google_cloud_binaryauthorization_v1beta1_ContinuousValidationEvent_ContinuousValidationPodEvent_ImageDetails_descriptor diff --git a/java-binary-authorization/proto-google-cloud-binary-authorization-v1beta1/src/main/proto/google/cloud/binaryauthorization/v1beta1/continuous_validation_logging.proto b/java-binary-authorization/proto-google-cloud-binary-authorization-v1beta1/src/main/proto/google/cloud/binaryauthorization/v1beta1/continuous_validation_logging.proto index 97286fdef784..87bb5dba4c98 100644 --- a/java-binary-authorization/proto-google-cloud-binary-authorization-v1beta1/src/main/proto/google/cloud/binaryauthorization/v1beta1/continuous_validation_logging.proto +++ b/java-binary-authorization/proto-google-cloud-binary-authorization-v1beta1/src/main/proto/google/cloud/binaryauthorization/v1beta1/continuous_validation_logging.proto @@ -42,6 +42,23 @@ message ContinuousValidationEvent { // Container image with auditing details. message ImageDetails { + // The container type. + enum ContainerType { + // The container type should always be specified. This is an error. + CONTAINER_TYPE_UNSPECIFIED = 0; + + // A regular deployment. + CONTAINER = 1; + + // Init container defined as specified at + // https://kubernetes.io/docs/concepts/workloads/pods/init-containers/ + INIT_CONTAINER = 2; + + // Ephemeral container defined as specified at + // https://kubernetes.io/docs/concepts/workloads/pods/ephemeral-containers/ + EPHEMERAL_CONTAINER = 3; + } + // Result of the audit. enum AuditResult { // Unspecified result. This is an error. @@ -109,6 +126,12 @@ message ContinuousValidationEvent { // The name of the image. string image = 1; + // The name of the container. + string container_name = 5; + + // The container type that this image belongs to. + ContainerType container_type = 6; + // The result of the audit for this image. AuditResult result = 2;