diff --git a/google-api-grpc/proto-google-cloud-kms-v1/src/main/java/com/google/cloud/kms/v1/KeyOperationAttestation.java b/google-api-grpc/proto-google-cloud-kms-v1/src/main/java/com/google/cloud/kms/v1/KeyOperationAttestation.java index 2991620aafc0..a2f9179d1cd5 100644 --- a/google-api-grpc/proto-google-cloud-kms-v1/src/main/java/com/google/cloud/kms/v1/KeyOperationAttestation.java +++ b/google-api-grpc/proto-google-cloud-kms-v1/src/main/java/com/google/cloud/kms/v1/KeyOperationAttestation.java @@ -120,6 +120,17 @@ public enum AttestationFormat implements com.google.protobuf.ProtocolMessageEnum * CAVIUM_V1_COMPRESSED = 3; */ CAVIUM_V1_COMPRESSED(3), + /** + * + * + *
+     * Cavium HSM attestation V2 compressed with gzip. This is a new format
+     * Introduced in Cavium's version 3.2-08
+     * 
+ * + * CAVIUM_V2_COMPRESSED = 4; + */ + CAVIUM_V2_COMPRESSED(4), UNRECOGNIZED(-1), ; @@ -136,6 +147,17 @@ public enum AttestationFormat implements com.google.protobuf.ProtocolMessageEnum * CAVIUM_V1_COMPRESSED = 3; */ public static final int CAVIUM_V1_COMPRESSED_VALUE = 3; + /** + * + * + *
+     * Cavium HSM attestation V2 compressed with gzip. This is a new format
+     * Introduced in Cavium's version 3.2-08
+     * 
+ * + * CAVIUM_V2_COMPRESSED = 4; + */ + public static final int CAVIUM_V2_COMPRESSED_VALUE = 4; public final int getNumber() { if (this == UNRECOGNIZED) { @@ -157,6 +179,8 @@ public static AttestationFormat forNumber(int value) { return ATTESTATION_FORMAT_UNSPECIFIED; case 3: return CAVIUM_V1_COMPRESSED; + case 4: + return CAVIUM_V2_COMPRESSED; default: return null; } diff --git a/google-api-grpc/proto-google-cloud-kms-v1/src/main/java/com/google/cloud/kms/v1/KmsResourcesProto.java b/google-api-grpc/proto-google-cloud-kms-v1/src/main/java/com/google/cloud/kms/v1/KmsResourcesProto.java index f8dafcf0b5be..ba0aa7371c3d 100644 --- a/google-api-grpc/proto-google-cloud-kms-v1/src/main/java/com/google/cloud/kms/v1/KmsResourcesProto.java +++ b/google-api-grpc/proto-google-cloud-kms-v1/src/main/java/com/google/cloud/kms/v1/KmsResourcesProto.java @@ -74,52 +74,52 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() { + "Template\022>\n\020protection_level\030\001 \001(\0162$.goo" + "gle.cloud.kms.v1.ProtectionLevel\022R\n\talgo" + "rithm\030\003 \001(\0162?.google.cloud.kms.v1.Crypto" - + "KeyVersion.CryptoKeyVersionAlgorithm\"\315\001\n" + + "KeyVersion.CryptoKeyVersionAlgorithm\"\347\001\n" + "\027KeyOperationAttestation\022N\n\006format\030\004 \001(\016" + "2>.google.cloud.kms.v1.KeyOperationAttes" + "tation.AttestationFormat\022\017\n\007content\030\005 \001(" - + "\014\"Q\n\021AttestationFormat\022\"\n\036ATTESTATION_FO" + + "\014\"k\n\021AttestationFormat\022\"\n\036ATTESTATION_FO" + "RMAT_UNSPECIFIED\020\000\022\030\n\024CAVIUM_V1_COMPRESS" - + "ED\020\003\"\270\t\n\020CryptoKeyVersion\022\014\n\004name\030\001 \001(\t\022" - + "J\n\005state\030\003 \001(\0162;.google.cloud.kms.v1.Cry" - + "ptoKeyVersion.CryptoKeyVersionState\022>\n\020p" - + "rotection_level\030\007 \001(\0162$.google.cloud.kms" - + ".v1.ProtectionLevel\022R\n\talgorithm\030\n \001(\0162?" - + ".google.cloud.kms.v1.CryptoKeyVersion.Cr" - + "yptoKeyVersionAlgorithm\022A\n\013attestation\030\010" - + " \001(\0132,.google.cloud.kms.v1.KeyOperationA" - + "ttestation\022/\n\013create_time\030\004 \001(\0132\032.google" - + ".protobuf.Timestamp\0221\n\rgenerate_time\030\013 \001" - + "(\0132\032.google.protobuf.Timestamp\0220\n\014destro" - + "y_time\030\005 \001(\0132\032.google.protobuf.Timestamp" - + "\0226\n\022destroy_event_time\030\006 \001(\0132\032.google.pr" - + "otobuf.Timestamp\"\274\003\n\031CryptoKeyVersionAlg" - + "orithm\022,\n(CRYPTO_KEY_VERSION_ALGORITHM_U" - + "NSPECIFIED\020\000\022\037\n\033GOOGLE_SYMMETRIC_ENCRYPT" - + "ION\020\001\022\034\n\030RSA_SIGN_PSS_2048_SHA256\020\002\022\034\n\030R" - + "SA_SIGN_PSS_3072_SHA256\020\003\022\034\n\030RSA_SIGN_PS" - + "S_4096_SHA256\020\004\022\036\n\032RSA_SIGN_PKCS1_2048_S" - + "HA256\020\005\022\036\n\032RSA_SIGN_PKCS1_3072_SHA256\020\006\022" - + "\036\n\032RSA_SIGN_PKCS1_4096_SHA256\020\007\022 \n\034RSA_D" - + "ECRYPT_OAEP_2048_SHA256\020\010\022 \n\034RSA_DECRYPT" - + "_OAEP_3072_SHA256\020\t\022 \n\034RSA_DECRYPT_OAEP_" - + "4096_SHA256\020\n\022\027\n\023EC_SIGN_P256_SHA256\020\014\022\027" - + "\n\023EC_SIGN_P384_SHA384\020\r\"\232\001\n\025CryptoKeyVer" - + "sionState\022(\n$CRYPTO_KEY_VERSION_STATE_UN" - + "SPECIFIED\020\000\022\026\n\022PENDING_GENERATION\020\005\022\013\n\007E" - + "NABLED\020\001\022\014\n\010DISABLED\020\002\022\r\n\tDESTROYED\020\003\022\025\n" - + "\021DESTROY_SCHEDULED\020\004\"I\n\024CryptoKeyVersion" - + "View\022\'\n#CRYPTO_KEY_VERSION_VIEW_UNSPECIF" - + "IED\020\000\022\010\n\004FULL\020\001\"l\n\tPublicKey\022\013\n\003pem\030\001 \001(" - + "\t\022R\n\talgorithm\030\002 \001(\0162?.google.cloud.kms." - + "v1.CryptoKeyVersion.CryptoKeyVersionAlgo" - + "rithm*J\n\017ProtectionLevel\022 \n\034PROTECTION_L" - + "EVEL_UNSPECIFIED\020\000\022\014\n\010SOFTWARE\020\001\022\007\n\003HSM\020" - + "\002B\225\001\n\027com.google.cloud.kms.v1B\021KmsResour" - + "cesProtoP\001Z6google.golang.org/genproto/g" - + "oogleapis/cloud/kms/v1;kms\370\001\001\252\002\023Google.C" - + "loud.Kms.V1\312\002\023Google\\Cloud\\Kms\\V1b\006proto" - + "3" + + "ED\020\003\022\030\n\024CAVIUM_V2_COMPRESSED\020\004\"\270\t\n\020Crypt" + + "oKeyVersion\022\014\n\004name\030\001 \001(\t\022J\n\005state\030\003 \001(\016" + + "2;.google.cloud.kms.v1.CryptoKeyVersion." + + "CryptoKeyVersionState\022>\n\020protection_leve" + + "l\030\007 \001(\0162$.google.cloud.kms.v1.Protection" + + "Level\022R\n\talgorithm\030\n \001(\0162?.google.cloud." + + "kms.v1.CryptoKeyVersion.CryptoKeyVersion" + + "Algorithm\022A\n\013attestation\030\010 \001(\0132,.google." + + "cloud.kms.v1.KeyOperationAttestation\022/\n\013" + + "create_time\030\004 \001(\0132\032.google.protobuf.Time" + + "stamp\0221\n\rgenerate_time\030\013 \001(\0132\032.google.pr" + + "otobuf.Timestamp\0220\n\014destroy_time\030\005 \001(\0132\032" + + ".google.protobuf.Timestamp\0226\n\022destroy_ev" + + "ent_time\030\006 \001(\0132\032.google.protobuf.Timesta" + + "mp\"\274\003\n\031CryptoKeyVersionAlgorithm\022,\n(CRYP" + + "TO_KEY_VERSION_ALGORITHM_UNSPECIFIED\020\000\022\037" + + "\n\033GOOGLE_SYMMETRIC_ENCRYPTION\020\001\022\034\n\030RSA_S" + + "IGN_PSS_2048_SHA256\020\002\022\034\n\030RSA_SIGN_PSS_30" + + "72_SHA256\020\003\022\034\n\030RSA_SIGN_PSS_4096_SHA256\020" + + "\004\022\036\n\032RSA_SIGN_PKCS1_2048_SHA256\020\005\022\036\n\032RSA" + + "_SIGN_PKCS1_3072_SHA256\020\006\022\036\n\032RSA_SIGN_PK" + + "CS1_4096_SHA256\020\007\022 \n\034RSA_DECRYPT_OAEP_20" + + "48_SHA256\020\010\022 \n\034RSA_DECRYPT_OAEP_3072_SHA" + + "256\020\t\022 \n\034RSA_DECRYPT_OAEP_4096_SHA256\020\n\022" + + "\027\n\023EC_SIGN_P256_SHA256\020\014\022\027\n\023EC_SIGN_P384" + + "_SHA384\020\r\"\232\001\n\025CryptoKeyVersionState\022(\n$C" + + "RYPTO_KEY_VERSION_STATE_UNSPECIFIED\020\000\022\026\n" + + "\022PENDING_GENERATION\020\005\022\013\n\007ENABLED\020\001\022\014\n\010DI" + + "SABLED\020\002\022\r\n\tDESTROYED\020\003\022\025\n\021DESTROY_SCHED" + + "ULED\020\004\"I\n\024CryptoKeyVersionView\022\'\n#CRYPTO" + + "_KEY_VERSION_VIEW_UNSPECIFIED\020\000\022\010\n\004FULL\020" + + "\001\"l\n\tPublicKey\022\013\n\003pem\030\001 \001(\t\022R\n\talgorithm" + + "\030\002 \001(\0162?.google.cloud.kms.v1.CryptoKeyVe" + + "rsion.CryptoKeyVersionAlgorithm*J\n\017Prote" + + "ctionLevel\022 \n\034PROTECTION_LEVEL_UNSPECIFI" + + "ED\020\000\022\014\n\010SOFTWARE\020\001\022\007\n\003HSM\020\002B\225\001\n\027com.goog" + + "le.cloud.kms.v1B\021KmsResourcesProtoP\001Z6go" + + "ogle.golang.org/genproto/googleapis/clou" + + "d/kms/v1;kms\370\001\001\252\002\023Google.Cloud.Kms.V1\312\002\023" + + "Google\\Cloud\\Kms\\V1b\006proto3" }; com.google.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner assigner = new com.google.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner() { diff --git a/google-api-grpc/proto-google-cloud-kms-v1/src/main/proto/google/cloud/kms/v1/resources.proto b/google-api-grpc/proto-google-cloud-kms-v1/src/main/proto/google/cloud/kms/v1/resources.proto index 0bd39ef2678c..f85b618e732f 100644 --- a/google-api-grpc/proto-google-cloud-kms-v1/src/main/proto/google/cloud/kms/v1/resources.proto +++ b/google-api-grpc/proto-google-cloud-kms-v1/src/main/proto/google/cloud/kms/v1/resources.proto @@ -157,6 +157,10 @@ message KeyOperationAttestation { // Cavium HSM attestation compressed with gzip. Note that this format is // defined by Cavium and subject to change at any time. CAVIUM_V1_COMPRESSED = 3; + + // Cavium HSM attestation V2 compressed with gzip. This is a new format + // Introduced in Cavium's version 3.2-08 + CAVIUM_V2_COMPRESSED = 4; } // Output only. The format of the attestation data. diff --git a/google-cloud-clients/google-cloud-kms/synth.metadata b/google-cloud-clients/google-cloud-kms/synth.metadata index af2fb47b3210..be869afff31b 100644 --- a/google-cloud-clients/google-cloud-kms/synth.metadata +++ b/google-cloud-clients/google-cloud-kms/synth.metadata @@ -1,19 +1,19 @@ { - "updateTime": "2019-01-17T08:45:26.677473Z", + "updateTime": "2019-02-16T08:46:53.347663Z", "sources": [ { "generator": { "name": "artman", - "version": "0.16.6", - "dockerImage": "googleapis/artman@sha256:12722f2ca3fbc3b53cc6aa5f0e569d7d221b46bd876a2136497089dec5e3634e" + "version": "0.16.13", + "dockerImage": "googleapis/artman@sha256:5fd9aee1d82a00cebf425c8fa431f5457539562f5867ad9c54370f0ec9a7ccaa" } }, { "git": { "name": "googleapis", "remote": "https://github.com/googleapis/googleapis.git", - "sha": "0ac60e21a1aa86c07c1836865b35308ba8178b05", - "internalRef": "229626798" + "sha": "1a4f0f12777dc2f8bf2c2ce84438329639c75e29", + "internalRef": "234149430" } } ],