Skip to content

Commit 88ddfd3

Browse files
smolkajsmolkaj
committed
Redesign the Rust crates.
See rust/README.md for more details. Signed-off-by: Steffen Smolka <[email protected]>
1 parent f5187a2 commit 88ddfd3

File tree

21 files changed

+1168
-4181
lines changed

21 files changed

+1168
-4181
lines changed

‎.github/workflows/ci-build-proto.yml‎ renamed to ‎.github/workflows/bazel-build.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
name: "build protobufs"
1+
name: "Bazel build of protobufs"
22

33
on:
44
push:

‎.github/workflows/google-rpc-status-synced.yml‎

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
name: Ensure google/rpc/status.proto is synced with upstream.
2+
3+
on:
4+
pull_request:
5+
6+
jobs:
7+
check-google-rpc-status-synced:
8+
runs-on: [ubuntu-latest]
9+
steps:
10+
- uses: actions/checkout@v5
11+
- run: ./proto/update_google_rpc_status.sh
12+
- run: |
13+
if git diff --exit-code proto/google/rpc/status.proto; then
14+
exit 0
15+
fi
16+
echo "Error: google/rpc/status.proto is not synced with upstream."
17+
echo "Please run `./proto/update_google_rpc_status.sh` to fix it."
18+
exit 1

‎.github/workflows/rust-build.yml‎

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
name: "Rust build"
2+
3+
on:
4+
push:
5+
branches: [ main ]
6+
pull_request:
7+
8+
jobs:
9+
build:
10+
runs-on: [ubuntu-latest]
11+
steps:
12+
- uses: actions/checkout@v5
13+
- run: cd rust && cargo build
14+
- run: cd rust && cargo test

‎codegen/compile_protos.sh‎

Lines changed: 2 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -33,27 +33,18 @@ set -e
3333
THIS_DIR="$(cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd)"
3434
PROTO_DIR="$THIS_DIR/../proto"
3535

36-
tmpdir="$(mktemp -d)"
37-
pushd "$tmpdir" > /dev/null
38-
git clone --depth 1 https://github.com/googleapis/googleapis.git
39-
popd > /dev/null
40-
GOOGLE_PROTO_DIR="$tmpdir/googleapis"
41-
4236
PROTOS="\
4337
$PROTO_DIR/p4/v1/p4data.proto \
4438
$PROTO_DIR/p4/v1/p4runtime.proto \
4539
$PROTO_DIR/p4/config/v1/p4info.proto \
46-
$PROTO_DIR/p4/config/v1/p4types.proto \
47-
$GOOGLE_PROTO_DIR/google/rpc/status.proto \
48-
$GOOGLE_PROTO_DIR/google/rpc/code.proto"
40+
$PROTO_DIR/p4/config/v1/p4types.proto"
4941

50-
PROTOFLAGS="-I$GOOGLE_PROTO_DIR -I$PROTO_DIR"
42+
PROTOFLAGS="-I$PROTO_DIR"
5143

5244
mkdir -p "$BUILD_DIR/cpp_out"
5345
mkdir -p "$BUILD_DIR/grpc_out"
5446
mkdir -p "$BUILD_DIR/py_out"
5547
mkdir -p "$BUILD_DIR/go_out"
56-
mkdir -p "$BUILD_DIR/rust_out"
5748

5849
set -o xtrace
5950
$PROTOC $PROTOS --cpp_out "$BUILD_DIR/cpp_out" $PROTOFLAGS
@@ -66,18 +57,4 @@ $PROTOC $PROTOS --python_out "$BUILD_DIR/py_out" $PROTOFLAGS --grpc_out "$BUILD_
6657

6758
$PROTOC $PROTOS --go_out="$BUILD_DIR/go_out" --go-grpc_out="$BUILD_DIR/go_out" $PROTOFLAGS
6859

69-
$PROTOC $PROTOS $PROTOFLAGS \
70-
--prost_out="$BUILD_DIR/rust_out/src" \
71-
--prost_opt=compile_well_known_types \
72-
--prost_opt=extern_path=.google.protobuf=::pbjson_types \
73-
--tonic_out="$BUILD_DIR/rust_out/src" \
74-
--tonic_opt=compile_well_known_types \
75-
--tonic_opt=extern_path=.google.protobuf=::pbjson_types \
76-
--prost-crate_out="$BUILD_DIR/rust_out" \
77-
--prost-crate_opt="gen_crate=rust/Cargo.toml"
78-
79-
set +o xtrace
80-
81-
rm -rf "$tmpdir"
82-
8360
echo "SUCCESS"

‎codegen/update.sh‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,9 +21,6 @@ cp -r "$tmpdir"/go_out/github.com/p4lang/p4runtime/go/* go/
2121
cp -r "$tmpdir"/py_out/p4 py/
2222
find py/p4 -type d -exec touch {}/__init__.py \;
2323

24-
# Rust
25-
cp -r "$tmpdir"/rust_out/* rust/
26-
2724
# Cleanup files owned by root user
2825
docker run --rm \
2926
-v "$tmpdir:/tmp/gen" \

‎proto/google/rpc/status.proto‎

Lines changed: 49 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,49 @@
1+
// Copyright 2025 Google LLC
2+
//
3+
// Licensed under the Apache License, Version 2.0 (the "License");
4+
// you may not use this file except in compliance with the License.
5+
// You may obtain a copy of the License at
6+
//
7+
// http://www.apache.org/licenses/LICENSE-2.0
8+
//
9+
// Unless required by applicable law or agreed to in writing, software
10+
// distributed under the License is distributed on an "AS IS" BASIS,
11+
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
12+
// See the License for the specific language governing permissions and
13+
// limitations under the License.
14+
15+
syntax = "proto3";
16+
17+
package google.rpc;
18+
19+
import "google/protobuf/any.proto";
20+
21+
option cc_enable_arenas = true;
22+
option go_package = "google.golang.org/genproto/googleapis/rpc/status;status";
23+
option java_multiple_files = true;
24+
option java_outer_classname = "StatusProto";
25+
option java_package = "com.google.rpc";
26+
option objc_class_prefix = "RPC";
27+
28+
// The `Status` type defines a logical error model that is suitable for
29+
// different programming environments, including REST APIs and RPC APIs. It is
30+
// used by [gRPC](https://github.com/grpc). Each `Status` message contains
31+
// three pieces of data: error code, error message, and error details.
32+
//
33+
// You can find out more about this error model and how to work with it in the
34+
// [API Design Guide](https://cloud.google.com/apis/design/errors).
35+
message Status {
36+
// The status code, which should be an enum value of
37+
// [google.rpc.Code][google.rpc.Code].
38+
int32 code = 1;
39+
40+
// A developer-facing error message, which should be in English. Any
41+
// user-facing error message should be localized and sent in the
42+
// [google.rpc.Status.details][google.rpc.Status.details] field, or localized
43+
// by the client.
44+
string message = 2;
45+
46+
// A list of messages that carry the error details. There is a common set of
47+
// message types for APIs to use.
48+
repeated google.protobuf.Any details = 3;
49+
}

‎proto/update_google_rpc_status.sh‎

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
#!/usr/bin/env bash
2+
#
3+
# Updates proto/google/rpc/status.proto with the latest version from the
4+
# official upstream repository.
5+
#
6+
# The file is very stable and hasn't changed in many years, but we enforce
7+
# freshness of this copy using a GitHub Actions workflow just in case.
8+
9+
set -e
10+
11+
STATUS_PROTO_URL="https://raw.githubusercontent.com/googleapis/googleapis/refs/heads/master/google/rpc/status.proto"
12+
THIS_DIR="$(cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd)"
13+
14+
wget "$STATUS_PROTO_URL" -O "$THIS_DIR/google/rpc/status.proto"

0 commit comments

Comments
 (0)