pb-rust: schemafy only Bundles

Signed-off-by: Jack Leightcap <[email protected]>

Makefile

@@ -50,15 +50,6 @@ ruby: docker-image
 		--entrypoint bash ${PROTOC_IMAGE} \
 		-c "cd ./gen/pb-ruby && protoc -I/opt/include -I../../protos/ --ruby_out=lib ../../protos/*.proto"
 
-rust: docker-image
-	@echo "Generating rust protobuf files"
-	docker run \
-		--platform linux/amd64 \
-		-v ${PWD}:/defs \
-		-e "RUST_BACKTRACE=1" \
-		--entrypoint bash ${PROTOC_IMAGE} \
-		-c "cd gen/pb-rust/codegen && cargo run && rm -rf target/"
-
 jsonschema: docker-image-jsonschema
 	@echo "Generating JSON schema files"
 	docker run \
@@ -68,6 +59,18 @@ jsonschema: docker-image-jsonschema
 	       ${JSONSCHEMA_IMAGE} \
 	       -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 $@
+
+rust: docker-image gen/pb-rust/schemas
+	@echo "Generating rust protobuf files"
+	docker run \
+		--platform linux/amd64 \
+		-v ${PWD}:/defs \
+		-e "RUST_BACKTRACE=1" \
+		--entrypoint bash ${PROTOC_IMAGE} \
+		-c "cd gen/pb-rust && cargo build"
+
 # docker already does its own caching so we can attempt a build every time
 .PHONY: docker-image
 docker-image:
@@ -93,7 +96,7 @@ clean:
 		gen/pb-typescript/src/__generated__ \
 		gen/pb-python/sigstore_protobuf_specs/dev \
 		gen/pb-python/sigstore_protobuf_specs/io \
-		gen/pb-rust/codegen/target \
+		gen/pb-rust/schemas \
 		gen/pb-rust/target
 	docker rmi -f ${PROTOC_IMAGE}
 

gen/pb-rust/src/lib.rs

@@ -1,14 +1,27 @@
-use schemafy_core;
-use serde;
-use serde_json;
-
 use serde::{Deserialize, Serialize};
 
-pub mod sigstore {
-    pub mod verification {
-        pub mod v1 {
-            use super::super::super::*;
-            schemafy::schemafy!("schema/Artifact.schema.json");
-        }
-    }
-}
+/// NOTE(jleightcap): a method to include all JSON schemas is not immediately obvious to me:
+///
+/// - `schemafy!` is a direct 1:1 compilation to Rust structures of each definition in "defintions",
+/// - each schema is 'standalone': including definitions of all it's dependencies,
+/// as a result, the Rust generated structures have name collisions if included in the same module scope.
+///
+/// prefixing works,
+///
+/// ```rust
+/// mod CertificateIdentity {
+///   schemafy::schemafy!("schemas/CertificateIdentity.shema.json")
+/// }
+/// mod CertificateIdentities {
+///   schemafy::schemafy!("schemas/CertificateIdentities.schema.json")
+/// }
+/// ```
+/// but is clunky to use and manual to generate.
+///
+/// a more general approach is to 'flatten' each JSON Schema,
+/// unioning all of the "defintions" fields.
+///
+/// Since standardized bundles is the singular motiviation for these Rust bindings,
+/// for now we're punting this issue.
+
+schemafy::schemafy!("schemas/Bundle.schema.json");