Skip to content

Commit 047fefd

Browse files
committed
fix(spiffe-proto): generate proto bindings without embedding package definition
Signed-off-by: Zahari Dichev <[email protected]>
1 parent b7410b0 commit 047fefd

File tree

3 files changed

+10
-9
lines changed

3 files changed

+10
-9
lines changed

spiffe-proto/spiffe/proto/workload.proto

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
11
syntax = "proto3";
22

3-
package spiffe.workloadapi;
4-
53
service SpiffeWorkloadAPI {
64
// Fetch X.509-SVIDs for all SPIFFE identities the workload is entitled to,
75
// as well as related information like trust bundles and CRLs. As this

spiffe-proto/src/gen/spiffe.workloadapi.rs

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -143,16 +143,11 @@ pub mod spiffe_workload_api_client {
143143
})?;
144144
let codec = tonic_prost::ProstCodec::default();
145145
let path = http::uri::PathAndQuery::from_static(
146-
"/spiffe.workloadapi.SpiffeWorkloadAPI/FetchX509SVID",
146+
"/SpiffeWorkloadAPI/FetchX509SVID",
147147
);
148148
let mut req = request.into_request();
149149
req.extensions_mut()
150-
.insert(
151-
GrpcMethod::new(
152-
"spiffe.workloadapi.SpiffeWorkloadAPI",
153-
"FetchX509SVID",
154-
),
155-
);
150+
.insert(GrpcMethod::new("SpiffeWorkloadAPI", "FetchX509SVID"));
156151
self.inner.server_streaming(req, path, codec).await
157152
}
158153
}

spiffe-proto/tests/bootstrap.rs

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,14 @@ fn generate(out_dir: &std::path::Path) {
3232
{
3333
panic!("failed to compile protobuf: {error}")
3434
}
35+
36+
// Post-process the generated file to rename it
37+
let generated_file = out_dir.join("_.rs");
38+
if generated_file.exists() {
39+
let target_file = out_dir.join("spiffe.workloadapi.rs");
40+
std::fs::rename(&generated_file, &target_file)
41+
.expect("failed to rename generated file");
42+
}
3543
}
3644

3745
/// Returns true if the given path contains files that have changed since the

0 commit comments

Comments
 (0)