diff --git a/Makefile b/Makefile index a0e665ba..ec1be44f 100644 --- a/Makefile +++ b/Makefile @@ -59,7 +59,7 @@ jsonschema: docker-image-jsonschema -c "cd defs/gen/jsonschema && ./jsonschema.sh -I ../../protos -I /googleapis/ --jsonschema_out=schemas ../../protos/*.proto" gen/pb-rust/schemas: jsonschema - cp -r gen/jsonschema/schemas $@ + cp -r gen/jsonschema/schemas gen/pb-rust rust: docker-image gen/pb-rust/schemas @echo "Generating rust protobuf files" diff --git a/gen/jsonschema/jsonschema.sh b/gen/jsonschema/jsonschema.sh index f7472f20..a24391be 100755 --- a/gen/jsonschema/jsonschema.sh +++ b/gen/jsonschema/jsonschema.sh @@ -1,4 +1,4 @@ -!/bin/sh +#!/bin/sh set -u set -e @@ -6,7 +6,7 @@ set -e protoc --plugin=/root/go/bin/protoc-gen-jsonschema \ --jsonschema_opt=disallow_additional_properties \ --jsonschema_opt=enforce_oneof \ - --jsonschema_opt=enums_as_strings \ + --jsonschema_opt=enums_as_strings_only \ --jsonschema_opt=file_extension=schema.json \ --jsonschema_opt=json_fieldnames \ "$@" diff --git a/gen/jsonschema/schemas/ArtifactVerificationOptions.schema.json b/gen/jsonschema/schemas/ArtifactVerificationOptions.schema.json index 5618f366..744a374f 100644 --- a/gen/jsonschema/schemas/ArtifactVerificationOptions.schema.json +++ b/gen/jsonschema/schemas/ArtifactVerificationOptions.schema.json @@ -103,30 +103,15 @@ "keyDetails": { "enum": [ "PUBLIC_KEY_DETAILS_UNSPECIFIED", - 0, "PKCS1_RSA_PKCS1V5", - 1, "PKCS1_RSA_PSS", - 2, "PKIX_RSA_PKCS1V5", - 3, "PKIX_RSA_PSS", - 4, "PKIX_ECDSA_P256_SHA_256", - 5, "PKIX_ECDSA_P256_HMAC_SHA_256", - 6, - "PKIX_ED25519", - 7 - ], - "oneOf": [ - { - "type": "string" - }, - { - "type": "integer" - } + "PKIX_ED25519" ], + "type": "string", "title": "Public Key Details", "description": "Details of a specific public key, capturing the the key encoding method, and signature algorithm. To avoid the possibility of contradicting formats such as PKCS1 with ED25519 the valid permutations are listed as a linear set instead of a cartesian set (i.e one combined variable instead of two, one for encoding and one for the signature algorithm)." }, @@ -157,22 +142,11 @@ "type": { "enum": [ "SUBJECT_ALTERNATIVE_NAME_TYPE_UNSPECIFIED", - 0, "EMAIL", - 1, "URI", - 2, - "OTHER_NAME", - 3 - ], - "oneOf": [ - { - "type": "string" - }, - { - "type": "integer" - } + "OTHER_NAME" ], + "type": "string", "title": "Subject Alternative Name Type" }, "regexp": { diff --git a/gen/jsonschema/schemas/Bundle.schema.json b/gen/jsonschema/schemas/Bundle.schema.json index ac66af1c..5ca9e649 100644 --- a/gen/jsonschema/schemas/Bundle.schema.json +++ b/gen/jsonschema/schemas/Bundle.schema.json @@ -101,18 +101,9 @@ "algorithm": { "enum": [ "HASH_ALGORITHM_UNSPECIFIED", - 0, - "SHA2_256", - 1 - ], - "oneOf": [ - { - "type": "string" - }, - { - "type": "integer" - } + "SHA2_256" ], + "type": "string", "title": "This package defines commonly used message types within the Sigstore\n community.", "description": "This package defines commonly used message types within the Sigstore community. Only a subset of the secure hash standard algorithms are supported. See \u003chttps://nvlpubs.nist.gov/nistpubs/FIPS/NIST.FIPS.180-4.pdf\u003e for more details. UNSPECIFIED SHOULD not be used, primary reason for inclusion is to force any proto JSON serialization to emit the used hash algorithm, as default option is to *omit* the default value of an enum (which is the first value, represented by '0'." }, diff --git a/gen/jsonschema/schemas/CertificateIdentities.schema.json b/gen/jsonschema/schemas/CertificateIdentities.schema.json index b00d284a..31a7a32b 100644 --- a/gen/jsonschema/schemas/CertificateIdentities.schema.json +++ b/gen/jsonschema/schemas/CertificateIdentities.schema.json @@ -52,22 +52,11 @@ "type": { "enum": [ "SUBJECT_ALTERNATIVE_NAME_TYPE_UNSPECIFIED", - 0, "EMAIL", - 1, "URI", - 2, - "OTHER_NAME", - 3 - ], - "oneOf": [ - { - "type": "string" - }, - { - "type": "integer" - } + "OTHER_NAME" ], + "type": "string", "title": "Subject Alternative Name Type" }, "regexp": { diff --git a/gen/jsonschema/schemas/CertificateIdentity.schema.json b/gen/jsonschema/schemas/CertificateIdentity.schema.json index 117f4852..14a515f4 100644 --- a/gen/jsonschema/schemas/CertificateIdentity.schema.json +++ b/gen/jsonschema/schemas/CertificateIdentity.schema.json @@ -62,22 +62,11 @@ "type": { "enum": [ "SUBJECT_ALTERNATIVE_NAME_TYPE_UNSPECIFIED", - 0, "EMAIL", - 1, "URI", - 2, - "OTHER_NAME", - 3 - ], - "oneOf": [ - { - "type": "string" - }, - { - "type": "integer" - } + "OTHER_NAME" ], + "type": "string", "title": "Subject Alternative Name Type" }, "regexp": { diff --git a/gen/jsonschema/schemas/HashOutput.schema.json b/gen/jsonschema/schemas/HashOutput.schema.json index 2687ef4f..ff72ba45 100644 --- a/gen/jsonschema/schemas/HashOutput.schema.json +++ b/gen/jsonschema/schemas/HashOutput.schema.json @@ -7,18 +7,9 @@ "algorithm": { "enum": [ "HASH_ALGORITHM_UNSPECIFIED", - 0, - "SHA2_256", - 1 - ], - "oneOf": [ - { - "type": "string" - }, - { - "type": "integer" - } + "SHA2_256" ], + "type": "string", "title": "This package defines commonly used message types within the Sigstore\n community.", "description": "This package defines commonly used message types within the Sigstore community. Only a subset of the secure hash standard algorithms are supported. See \u003chttps://nvlpubs.nist.gov/nistpubs/FIPS/NIST.FIPS.180-4.pdf\u003e for more details. UNSPECIFIED SHOULD not be used, primary reason for inclusion is to force any proto JSON serialization to emit the used hash algorithm, as default option is to *omit* the default value of an enum (which is the first value, represented by '0'." }, diff --git a/gen/jsonschema/schemas/Input.schema.json b/gen/jsonschema/schemas/Input.schema.json index e23bb548..0f190157 100644 --- a/gen/jsonschema/schemas/Input.schema.json +++ b/gen/jsonschema/schemas/Input.schema.json @@ -147,18 +147,9 @@ "algorithm": { "enum": [ "HASH_ALGORITHM_UNSPECIFIED", - 0, - "SHA2_256", - 1 - ], - "oneOf": [ - { - "type": "string" - }, - { - "type": "integer" - } + "SHA2_256" ], + "type": "string", "title": "This package defines commonly used message types within the Sigstore\n community.", "description": "This package defines commonly used message types within the Sigstore community. Only a subset of the secure hash standard algorithms are supported. See \u003chttps://nvlpubs.nist.gov/nistpubs/FIPS/NIST.FIPS.180-4.pdf\u003e for more details. UNSPECIFIED SHOULD not be used, primary reason for inclusion is to force any proto JSON serialization to emit the used hash algorithm, as default option is to *omit* the default value of an enum (which is the first value, represented by '0'." }, @@ -249,30 +240,15 @@ "keyDetails": { "enum": [ "PUBLIC_KEY_DETAILS_UNSPECIFIED", - 0, "PKCS1_RSA_PKCS1V5", - 1, "PKCS1_RSA_PSS", - 2, "PKIX_RSA_PKCS1V5", - 3, "PKIX_RSA_PSS", - 4, "PKIX_ECDSA_P256_SHA_256", - 5, "PKIX_ECDSA_P256_HMAC_SHA_256", - 6, - "PKIX_ED25519", - 7 - ], - "oneOf": [ - { - "type": "string" - }, - { - "type": "integer" - } + "PKIX_ED25519" ], + "type": "string", "title": "Public Key Details", "description": "Details of a specific public key, capturing the the key encoding method, and signature algorithm. To avoid the possibility of contradicting formats such as PKCS1 with ED25519 the valid permutations are listed as a linear set instead of a cartesian set (i.e one combined variable instead of two, one for encoding and one for the signature algorithm)." }, @@ -329,22 +305,11 @@ "type": { "enum": [ "SUBJECT_ALTERNATIVE_NAME_TYPE_UNSPECIFIED", - 0, "EMAIL", - 1, "URI", - 2, - "OTHER_NAME", - 3 - ], - "oneOf": [ - { - "type": "string" - }, - { - "type": "integer" - } + "OTHER_NAME" ], + "type": "string", "title": "Subject Alternative Name Type" }, "regexp": { @@ -578,18 +543,9 @@ "hashAlgorithm": { "enum": [ "HASH_ALGORITHM_UNSPECIFIED", - 0, - "SHA2_256", - 1 - ], - "oneOf": [ - { - "type": "string" - }, - { - "type": "integer" - } + "SHA2_256" ], + "type": "string", "title": "This package defines commonly used message types within the Sigstore\n community.", "description": "This package defines commonly used message types within the Sigstore community. Only a subset of the secure hash standard algorithms are supported. See \u003chttps://nvlpubs.nist.gov/nistpubs/FIPS/NIST.FIPS.180-4.pdf\u003e for more details. UNSPECIFIED SHOULD not be used, primary reason for inclusion is to force any proto JSON serialization to emit the used hash algorithm, as default option is to *omit* the default value of an enum (which is the first value, represented by '0'." }, diff --git a/gen/jsonschema/schemas/MessageSignature.schema.json b/gen/jsonschema/schemas/MessageSignature.schema.json index 603bb83a..37def2f2 100644 --- a/gen/jsonschema/schemas/MessageSignature.schema.json +++ b/gen/jsonschema/schemas/MessageSignature.schema.json @@ -26,18 +26,9 @@ "algorithm": { "enum": [ "HASH_ALGORITHM_UNSPECIFIED", - 0, - "SHA2_256", - 1 - ], - "oneOf": [ - { - "type": "string" - }, - { - "type": "integer" - } + "SHA2_256" ], + "type": "string", "title": "This package defines commonly used message types within the Sigstore\n community.", "description": "This package defines commonly used message types within the Sigstore community. Only a subset of the secure hash standard algorithms are supported. See \u003chttps://nvlpubs.nist.gov/nistpubs/FIPS/NIST.FIPS.180-4.pdf\u003e for more details. UNSPECIFIED SHOULD not be used, primary reason for inclusion is to force any proto JSON serialization to emit the used hash algorithm, as default option is to *omit* the default value of an enum (which is the first value, represented by '0'." }, diff --git a/gen/jsonschema/schemas/PublicKey.schema.json b/gen/jsonschema/schemas/PublicKey.schema.json index 28105b87..b380c3a7 100644 --- a/gen/jsonschema/schemas/PublicKey.schema.json +++ b/gen/jsonschema/schemas/PublicKey.schema.json @@ -13,30 +13,15 @@ "keyDetails": { "enum": [ "PUBLIC_KEY_DETAILS_UNSPECIFIED", - 0, "PKCS1_RSA_PKCS1V5", - 1, "PKCS1_RSA_PSS", - 2, "PKIX_RSA_PKCS1V5", - 3, "PKIX_RSA_PSS", - 4, "PKIX_ECDSA_P256_SHA_256", - 5, "PKIX_ECDSA_P256_HMAC_SHA_256", - 6, - "PKIX_ED25519", - 7 - ], - "oneOf": [ - { - "type": "string" - }, - { - "type": "integer" - } + "PKIX_ED25519" ], + "type": "string", "title": "Public Key Details", "description": "Details of a specific public key, capturing the the key encoding method, and signature algorithm. To avoid the possibility of contradicting formats such as PKCS1 with ED25519 the valid permutations are listed as a linear set instead of a cartesian set (i.e one combined variable instead of two, one for encoding and one for the signature algorithm)." }, diff --git a/gen/jsonschema/schemas/PublicKeyIdentities.schema.json b/gen/jsonschema/schemas/PublicKeyIdentities.schema.json index 05a5864d..72dc4fa4 100644 --- a/gen/jsonschema/schemas/PublicKeyIdentities.schema.json +++ b/gen/jsonschema/schemas/PublicKeyIdentities.schema.json @@ -27,30 +27,15 @@ "keyDetails": { "enum": [ "PUBLIC_KEY_DETAILS_UNSPECIFIED", - 0, "PKCS1_RSA_PKCS1V5", - 1, "PKCS1_RSA_PSS", - 2, "PKIX_RSA_PKCS1V5", - 3, "PKIX_RSA_PSS", - 4, "PKIX_ECDSA_P256_SHA_256", - 5, "PKIX_ECDSA_P256_HMAC_SHA_256", - 6, - "PKIX_ED25519", - 7 - ], - "oneOf": [ - { - "type": "string" - }, - { - "type": "integer" - } + "PKIX_ED25519" ], + "type": "string", "title": "Public Key Details", "description": "Details of a specific public key, capturing the the key encoding method, and signature algorithm. To avoid the possibility of contradicting formats such as PKCS1 with ED25519 the valid permutations are listed as a linear set instead of a cartesian set (i.e one combined variable instead of two, one for encoding and one for the signature algorithm)." }, diff --git a/gen/jsonschema/schemas/SubjectAlternativeName.schema.json b/gen/jsonschema/schemas/SubjectAlternativeName.schema.json index ff25d78f..967cfe61 100644 --- a/gen/jsonschema/schemas/SubjectAlternativeName.schema.json +++ b/gen/jsonschema/schemas/SubjectAlternativeName.schema.json @@ -7,22 +7,11 @@ "type": { "enum": [ "SUBJECT_ALTERNATIVE_NAME_TYPE_UNSPECIFIED", - 0, "EMAIL", - 1, "URI", - 2, - "OTHER_NAME", - 3 - ], - "oneOf": [ - { - "type": "string" - }, - { - "type": "integer" - } + "OTHER_NAME" ], + "type": "string", "title": "Subject Alternative Name Type" }, "regexp": { diff --git a/gen/jsonschema/schemas/TransparencyLogInstance.schema.json b/gen/jsonschema/schemas/TransparencyLogInstance.schema.json index 3d189653..3c7e0d9a 100644 --- a/gen/jsonschema/schemas/TransparencyLogInstance.schema.json +++ b/gen/jsonschema/schemas/TransparencyLogInstance.schema.json @@ -11,18 +11,9 @@ "hashAlgorithm": { "enum": [ "HASH_ALGORITHM_UNSPECIFIED", - 0, - "SHA2_256", - 1 - ], - "oneOf": [ - { - "type": "string" - }, - { - "type": "integer" - } + "SHA2_256" ], + "type": "string", "title": "This package defines commonly used message types within the Sigstore\n community.", "description": "This package defines commonly used message types within the Sigstore community. Only a subset of the secure hash standard algorithms are supported. See \u003chttps://nvlpubs.nist.gov/nistpubs/FIPS/NIST.FIPS.180-4.pdf\u003e for more details. UNSPECIFIED SHOULD not be used, primary reason for inclusion is to force any proto JSON serialization to emit the used hash algorithm, as default option is to *omit* the default value of an enum (which is the first value, represented by '0'." }, @@ -67,30 +58,15 @@ "keyDetails": { "enum": [ "PUBLIC_KEY_DETAILS_UNSPECIFIED", - 0, "PKCS1_RSA_PKCS1V5", - 1, "PKCS1_RSA_PSS", - 2, "PKIX_RSA_PKCS1V5", - 3, "PKIX_RSA_PSS", - 4, "PKIX_ECDSA_P256_SHA_256", - 5, "PKIX_ECDSA_P256_HMAC_SHA_256", - 6, - "PKIX_ED25519", - 7 - ], - "oneOf": [ - { - "type": "string" - }, - { - "type": "integer" - } + "PKIX_ED25519" ], + "type": "string", "title": "Public Key Details", "description": "Details of a specific public key, capturing the the key encoding method, and signature algorithm. To avoid the possibility of contradicting formats such as PKCS1 with ED25519 the valid permutations are listed as a linear set instead of a cartesian set (i.e one combined variable instead of two, one for encoding and one for the signature algorithm)." }, diff --git a/gen/jsonschema/schemas/TrustedRoot.schema.json b/gen/jsonschema/schemas/TrustedRoot.schema.json index f3e53e2d..5b1f2a62 100644 --- a/gen/jsonschema/schemas/TrustedRoot.schema.json +++ b/gen/jsonschema/schemas/TrustedRoot.schema.json @@ -84,30 +84,15 @@ "keyDetails": { "enum": [ "PUBLIC_KEY_DETAILS_UNSPECIFIED", - 0, "PKCS1_RSA_PKCS1V5", - 1, "PKCS1_RSA_PSS", - 2, "PKIX_RSA_PKCS1V5", - 3, "PKIX_RSA_PSS", - 4, "PKIX_ECDSA_P256_SHA_256", - 5, "PKIX_ECDSA_P256_HMAC_SHA_256", - 6, - "PKIX_ED25519", - 7 - ], - "oneOf": [ - { - "type": "string" - }, - { - "type": "integer" - } + "PKIX_ED25519" ], + "type": "string", "title": "Public Key Details", "description": "Details of a specific public key, capturing the the key encoding method, and signature algorithm. To avoid the possibility of contradicting formats such as PKCS1 with ED25519 the valid permutations are listed as a linear set instead of a cartesian set (i.e one combined variable instead of two, one for encoding and one for the signature algorithm)." }, @@ -221,18 +206,9 @@ "hashAlgorithm": { "enum": [ "HASH_ALGORITHM_UNSPECIFIED", - 0, - "SHA2_256", - 1 - ], - "oneOf": [ - { - "type": "string" - }, - { - "type": "integer" - } + "SHA2_256" ], + "type": "string", "title": "This package defines commonly used message types within the Sigstore\n community.", "description": "This package defines commonly used message types within the Sigstore community. Only a subset of the secure hash standard algorithms are supported. See \u003chttps://nvlpubs.nist.gov/nistpubs/FIPS/NIST.FIPS.180-4.pdf\u003e for more details. UNSPECIFIED SHOULD not be used, primary reason for inclusion is to force any proto JSON serialization to emit the used hash algorithm, as default option is to *omit* the default value of an enum (which is the first value, represented by '0'." }, diff --git a/gen/pb-rust/schemas/ArtifactVerificationOptions.schema.json b/gen/pb-rust/schemas/ArtifactVerificationOptions.schema.json index 5618f366..744a374f 100644 --- a/gen/pb-rust/schemas/ArtifactVerificationOptions.schema.json +++ b/gen/pb-rust/schemas/ArtifactVerificationOptions.schema.json @@ -103,30 +103,15 @@ "keyDetails": { "enum": [ "PUBLIC_KEY_DETAILS_UNSPECIFIED", - 0, "PKCS1_RSA_PKCS1V5", - 1, "PKCS1_RSA_PSS", - 2, "PKIX_RSA_PKCS1V5", - 3, "PKIX_RSA_PSS", - 4, "PKIX_ECDSA_P256_SHA_256", - 5, "PKIX_ECDSA_P256_HMAC_SHA_256", - 6, - "PKIX_ED25519", - 7 - ], - "oneOf": [ - { - "type": "string" - }, - { - "type": "integer" - } + "PKIX_ED25519" ], + "type": "string", "title": "Public Key Details", "description": "Details of a specific public key, capturing the the key encoding method, and signature algorithm. To avoid the possibility of contradicting formats such as PKCS1 with ED25519 the valid permutations are listed as a linear set instead of a cartesian set (i.e one combined variable instead of two, one for encoding and one for the signature algorithm)." }, @@ -157,22 +142,11 @@ "type": { "enum": [ "SUBJECT_ALTERNATIVE_NAME_TYPE_UNSPECIFIED", - 0, "EMAIL", - 1, "URI", - 2, - "OTHER_NAME", - 3 - ], - "oneOf": [ - { - "type": "string" - }, - { - "type": "integer" - } + "OTHER_NAME" ], + "type": "string", "title": "Subject Alternative Name Type" }, "regexp": { diff --git a/gen/pb-rust/schemas/Bundle.schema.json b/gen/pb-rust/schemas/Bundle.schema.json index ac66af1c..5ca9e649 100644 --- a/gen/pb-rust/schemas/Bundle.schema.json +++ b/gen/pb-rust/schemas/Bundle.schema.json @@ -101,18 +101,9 @@ "algorithm": { "enum": [ "HASH_ALGORITHM_UNSPECIFIED", - 0, - "SHA2_256", - 1 - ], - "oneOf": [ - { - "type": "string" - }, - { - "type": "integer" - } + "SHA2_256" ], + "type": "string", "title": "This package defines commonly used message types within the Sigstore\n community.", "description": "This package defines commonly used message types within the Sigstore community. Only a subset of the secure hash standard algorithms are supported. See \u003chttps://nvlpubs.nist.gov/nistpubs/FIPS/NIST.FIPS.180-4.pdf\u003e for more details. UNSPECIFIED SHOULD not be used, primary reason for inclusion is to force any proto JSON serialization to emit the used hash algorithm, as default option is to *omit* the default value of an enum (which is the first value, represented by '0'." }, diff --git a/gen/pb-rust/schemas/CertificateIdentities.schema.json b/gen/pb-rust/schemas/CertificateIdentities.schema.json index b00d284a..31a7a32b 100644 --- a/gen/pb-rust/schemas/CertificateIdentities.schema.json +++ b/gen/pb-rust/schemas/CertificateIdentities.schema.json @@ -52,22 +52,11 @@ "type": { "enum": [ "SUBJECT_ALTERNATIVE_NAME_TYPE_UNSPECIFIED", - 0, "EMAIL", - 1, "URI", - 2, - "OTHER_NAME", - 3 - ], - "oneOf": [ - { - "type": "string" - }, - { - "type": "integer" - } + "OTHER_NAME" ], + "type": "string", "title": "Subject Alternative Name Type" }, "regexp": { diff --git a/gen/pb-rust/schemas/CertificateIdentity.schema.json b/gen/pb-rust/schemas/CertificateIdentity.schema.json index 117f4852..14a515f4 100644 --- a/gen/pb-rust/schemas/CertificateIdentity.schema.json +++ b/gen/pb-rust/schemas/CertificateIdentity.schema.json @@ -62,22 +62,11 @@ "type": { "enum": [ "SUBJECT_ALTERNATIVE_NAME_TYPE_UNSPECIFIED", - 0, "EMAIL", - 1, "URI", - 2, - "OTHER_NAME", - 3 - ], - "oneOf": [ - { - "type": "string" - }, - { - "type": "integer" - } + "OTHER_NAME" ], + "type": "string", "title": "Subject Alternative Name Type" }, "regexp": { diff --git a/gen/pb-rust/schemas/HashOutput.schema.json b/gen/pb-rust/schemas/HashOutput.schema.json index 2687ef4f..ff72ba45 100644 --- a/gen/pb-rust/schemas/HashOutput.schema.json +++ b/gen/pb-rust/schemas/HashOutput.schema.json @@ -7,18 +7,9 @@ "algorithm": { "enum": [ "HASH_ALGORITHM_UNSPECIFIED", - 0, - "SHA2_256", - 1 - ], - "oneOf": [ - { - "type": "string" - }, - { - "type": "integer" - } + "SHA2_256" ], + "type": "string", "title": "This package defines commonly used message types within the Sigstore\n community.", "description": "This package defines commonly used message types within the Sigstore community. Only a subset of the secure hash standard algorithms are supported. See \u003chttps://nvlpubs.nist.gov/nistpubs/FIPS/NIST.FIPS.180-4.pdf\u003e for more details. UNSPECIFIED SHOULD not be used, primary reason for inclusion is to force any proto JSON serialization to emit the used hash algorithm, as default option is to *omit* the default value of an enum (which is the first value, represented by '0'." }, diff --git a/gen/pb-rust/schemas/Input.schema.json b/gen/pb-rust/schemas/Input.schema.json index e23bb548..0f190157 100644 --- a/gen/pb-rust/schemas/Input.schema.json +++ b/gen/pb-rust/schemas/Input.schema.json @@ -147,18 +147,9 @@ "algorithm": { "enum": [ "HASH_ALGORITHM_UNSPECIFIED", - 0, - "SHA2_256", - 1 - ], - "oneOf": [ - { - "type": "string" - }, - { - "type": "integer" - } + "SHA2_256" ], + "type": "string", "title": "This package defines commonly used message types within the Sigstore\n community.", "description": "This package defines commonly used message types within the Sigstore community. Only a subset of the secure hash standard algorithms are supported. See \u003chttps://nvlpubs.nist.gov/nistpubs/FIPS/NIST.FIPS.180-4.pdf\u003e for more details. UNSPECIFIED SHOULD not be used, primary reason for inclusion is to force any proto JSON serialization to emit the used hash algorithm, as default option is to *omit* the default value of an enum (which is the first value, represented by '0'." }, @@ -249,30 +240,15 @@ "keyDetails": { "enum": [ "PUBLIC_KEY_DETAILS_UNSPECIFIED", - 0, "PKCS1_RSA_PKCS1V5", - 1, "PKCS1_RSA_PSS", - 2, "PKIX_RSA_PKCS1V5", - 3, "PKIX_RSA_PSS", - 4, "PKIX_ECDSA_P256_SHA_256", - 5, "PKIX_ECDSA_P256_HMAC_SHA_256", - 6, - "PKIX_ED25519", - 7 - ], - "oneOf": [ - { - "type": "string" - }, - { - "type": "integer" - } + "PKIX_ED25519" ], + "type": "string", "title": "Public Key Details", "description": "Details of a specific public key, capturing the the key encoding method, and signature algorithm. To avoid the possibility of contradicting formats such as PKCS1 with ED25519 the valid permutations are listed as a linear set instead of a cartesian set (i.e one combined variable instead of two, one for encoding and one for the signature algorithm)." }, @@ -329,22 +305,11 @@ "type": { "enum": [ "SUBJECT_ALTERNATIVE_NAME_TYPE_UNSPECIFIED", - 0, "EMAIL", - 1, "URI", - 2, - "OTHER_NAME", - 3 - ], - "oneOf": [ - { - "type": "string" - }, - { - "type": "integer" - } + "OTHER_NAME" ], + "type": "string", "title": "Subject Alternative Name Type" }, "regexp": { @@ -578,18 +543,9 @@ "hashAlgorithm": { "enum": [ "HASH_ALGORITHM_UNSPECIFIED", - 0, - "SHA2_256", - 1 - ], - "oneOf": [ - { - "type": "string" - }, - { - "type": "integer" - } + "SHA2_256" ], + "type": "string", "title": "This package defines commonly used message types within the Sigstore\n community.", "description": "This package defines commonly used message types within the Sigstore community. Only a subset of the secure hash standard algorithms are supported. See \u003chttps://nvlpubs.nist.gov/nistpubs/FIPS/NIST.FIPS.180-4.pdf\u003e for more details. UNSPECIFIED SHOULD not be used, primary reason for inclusion is to force any proto JSON serialization to emit the used hash algorithm, as default option is to *omit* the default value of an enum (which is the first value, represented by '0'." }, diff --git a/gen/pb-rust/schemas/MessageSignature.schema.json b/gen/pb-rust/schemas/MessageSignature.schema.json index 603bb83a..37def2f2 100644 --- a/gen/pb-rust/schemas/MessageSignature.schema.json +++ b/gen/pb-rust/schemas/MessageSignature.schema.json @@ -26,18 +26,9 @@ "algorithm": { "enum": [ "HASH_ALGORITHM_UNSPECIFIED", - 0, - "SHA2_256", - 1 - ], - "oneOf": [ - { - "type": "string" - }, - { - "type": "integer" - } + "SHA2_256" ], + "type": "string", "title": "This package defines commonly used message types within the Sigstore\n community.", "description": "This package defines commonly used message types within the Sigstore community. Only a subset of the secure hash standard algorithms are supported. See \u003chttps://nvlpubs.nist.gov/nistpubs/FIPS/NIST.FIPS.180-4.pdf\u003e for more details. UNSPECIFIED SHOULD not be used, primary reason for inclusion is to force any proto JSON serialization to emit the used hash algorithm, as default option is to *omit* the default value of an enum (which is the first value, represented by '0'." }, diff --git a/gen/pb-rust/schemas/PublicKey.schema.json b/gen/pb-rust/schemas/PublicKey.schema.json index 28105b87..b380c3a7 100644 --- a/gen/pb-rust/schemas/PublicKey.schema.json +++ b/gen/pb-rust/schemas/PublicKey.schema.json @@ -13,30 +13,15 @@ "keyDetails": { "enum": [ "PUBLIC_KEY_DETAILS_UNSPECIFIED", - 0, "PKCS1_RSA_PKCS1V5", - 1, "PKCS1_RSA_PSS", - 2, "PKIX_RSA_PKCS1V5", - 3, "PKIX_RSA_PSS", - 4, "PKIX_ECDSA_P256_SHA_256", - 5, "PKIX_ECDSA_P256_HMAC_SHA_256", - 6, - "PKIX_ED25519", - 7 - ], - "oneOf": [ - { - "type": "string" - }, - { - "type": "integer" - } + "PKIX_ED25519" ], + "type": "string", "title": "Public Key Details", "description": "Details of a specific public key, capturing the the key encoding method, and signature algorithm. To avoid the possibility of contradicting formats such as PKCS1 with ED25519 the valid permutations are listed as a linear set instead of a cartesian set (i.e one combined variable instead of two, one for encoding and one for the signature algorithm)." }, diff --git a/gen/pb-rust/schemas/PublicKeyIdentities.schema.json b/gen/pb-rust/schemas/PublicKeyIdentities.schema.json index 05a5864d..72dc4fa4 100644 --- a/gen/pb-rust/schemas/PublicKeyIdentities.schema.json +++ b/gen/pb-rust/schemas/PublicKeyIdentities.schema.json @@ -27,30 +27,15 @@ "keyDetails": { "enum": [ "PUBLIC_KEY_DETAILS_UNSPECIFIED", - 0, "PKCS1_RSA_PKCS1V5", - 1, "PKCS1_RSA_PSS", - 2, "PKIX_RSA_PKCS1V5", - 3, "PKIX_RSA_PSS", - 4, "PKIX_ECDSA_P256_SHA_256", - 5, "PKIX_ECDSA_P256_HMAC_SHA_256", - 6, - "PKIX_ED25519", - 7 - ], - "oneOf": [ - { - "type": "string" - }, - { - "type": "integer" - } + "PKIX_ED25519" ], + "type": "string", "title": "Public Key Details", "description": "Details of a specific public key, capturing the the key encoding method, and signature algorithm. To avoid the possibility of contradicting formats such as PKCS1 with ED25519 the valid permutations are listed as a linear set instead of a cartesian set (i.e one combined variable instead of two, one for encoding and one for the signature algorithm)." }, diff --git a/gen/pb-rust/schemas/SubjectAlternativeName.schema.json b/gen/pb-rust/schemas/SubjectAlternativeName.schema.json index ff25d78f..967cfe61 100644 --- a/gen/pb-rust/schemas/SubjectAlternativeName.schema.json +++ b/gen/pb-rust/schemas/SubjectAlternativeName.schema.json @@ -7,22 +7,11 @@ "type": { "enum": [ "SUBJECT_ALTERNATIVE_NAME_TYPE_UNSPECIFIED", - 0, "EMAIL", - 1, "URI", - 2, - "OTHER_NAME", - 3 - ], - "oneOf": [ - { - "type": "string" - }, - { - "type": "integer" - } + "OTHER_NAME" ], + "type": "string", "title": "Subject Alternative Name Type" }, "regexp": { diff --git a/gen/pb-rust/schemas/TransparencyLogInstance.schema.json b/gen/pb-rust/schemas/TransparencyLogInstance.schema.json index 3d189653..3c7e0d9a 100644 --- a/gen/pb-rust/schemas/TransparencyLogInstance.schema.json +++ b/gen/pb-rust/schemas/TransparencyLogInstance.schema.json @@ -11,18 +11,9 @@ "hashAlgorithm": { "enum": [ "HASH_ALGORITHM_UNSPECIFIED", - 0, - "SHA2_256", - 1 - ], - "oneOf": [ - { - "type": "string" - }, - { - "type": "integer" - } + "SHA2_256" ], + "type": "string", "title": "This package defines commonly used message types within the Sigstore\n community.", "description": "This package defines commonly used message types within the Sigstore community. Only a subset of the secure hash standard algorithms are supported. See \u003chttps://nvlpubs.nist.gov/nistpubs/FIPS/NIST.FIPS.180-4.pdf\u003e for more details. UNSPECIFIED SHOULD not be used, primary reason for inclusion is to force any proto JSON serialization to emit the used hash algorithm, as default option is to *omit* the default value of an enum (which is the first value, represented by '0'." }, @@ -67,30 +58,15 @@ "keyDetails": { "enum": [ "PUBLIC_KEY_DETAILS_UNSPECIFIED", - 0, "PKCS1_RSA_PKCS1V5", - 1, "PKCS1_RSA_PSS", - 2, "PKIX_RSA_PKCS1V5", - 3, "PKIX_RSA_PSS", - 4, "PKIX_ECDSA_P256_SHA_256", - 5, "PKIX_ECDSA_P256_HMAC_SHA_256", - 6, - "PKIX_ED25519", - 7 - ], - "oneOf": [ - { - "type": "string" - }, - { - "type": "integer" - } + "PKIX_ED25519" ], + "type": "string", "title": "Public Key Details", "description": "Details of a specific public key, capturing the the key encoding method, and signature algorithm. To avoid the possibility of contradicting formats such as PKCS1 with ED25519 the valid permutations are listed as a linear set instead of a cartesian set (i.e one combined variable instead of two, one for encoding and one for the signature algorithm)." }, diff --git a/gen/pb-rust/schemas/TrustedRoot.schema.json b/gen/pb-rust/schemas/TrustedRoot.schema.json index f3e53e2d..5b1f2a62 100644 --- a/gen/pb-rust/schemas/TrustedRoot.schema.json +++ b/gen/pb-rust/schemas/TrustedRoot.schema.json @@ -84,30 +84,15 @@ "keyDetails": { "enum": [ "PUBLIC_KEY_DETAILS_UNSPECIFIED", - 0, "PKCS1_RSA_PKCS1V5", - 1, "PKCS1_RSA_PSS", - 2, "PKIX_RSA_PKCS1V5", - 3, "PKIX_RSA_PSS", - 4, "PKIX_ECDSA_P256_SHA_256", - 5, "PKIX_ECDSA_P256_HMAC_SHA_256", - 6, - "PKIX_ED25519", - 7 - ], - "oneOf": [ - { - "type": "string" - }, - { - "type": "integer" - } + "PKIX_ED25519" ], + "type": "string", "title": "Public Key Details", "description": "Details of a specific public key, capturing the the key encoding method, and signature algorithm. To avoid the possibility of contradicting formats such as PKCS1 with ED25519 the valid permutations are listed as a linear set instead of a cartesian set (i.e one combined variable instead of two, one for encoding and one for the signature algorithm)." }, @@ -221,18 +206,9 @@ "hashAlgorithm": { "enum": [ "HASH_ALGORITHM_UNSPECIFIED", - 0, - "SHA2_256", - 1 - ], - "oneOf": [ - { - "type": "string" - }, - { - "type": "integer" - } + "SHA2_256" ], + "type": "string", "title": "This package defines commonly used message types within the Sigstore\n community.", "description": "This package defines commonly used message types within the Sigstore community. Only a subset of the secure hash standard algorithms are supported. See \u003chttps://nvlpubs.nist.gov/nistpubs/FIPS/NIST.FIPS.180-4.pdf\u003e for more details. UNSPECIFIED SHOULD not be used, primary reason for inclusion is to force any proto JSON serialization to emit the used hash algorithm, as default option is to *omit* the default value of an enum (which is the first value, represented by '0'." },