agent/protocols: Move agent.proto out of the mock folder of agent

Because the repos have been merged and the agent repo will be removed in the future,
we do not need mock the file structure any more.

Signed-off-by: Tim Zhang <tim@hyper.sh>
This commit is contained in:
Tim Zhang 2020-10-23 15:01:56 +08:00
parent 9cb4150777
commit 9e9988df29
4 changed files with 7 additions and 7 deletions

View File

@ -8,7 +8,7 @@ use std::io::{Read, Write};
fn main() { fn main() {
let protos = vec![ let protos = vec![
"protos/github.com/kata-containers/agent/pkg/types/types.proto", "protos/types.proto",
"protos/agent.proto", "protos/agent.proto",
"protos/health.proto", "protos/health.proto",
"protos/google/protobuf/empty.proto", "protos/google/protobuf/empty.proto",

View File

@ -1,7 +1,7 @@
#!/bin/bash #!/bin/bash
# // # //
# // Copyright (c) 2020 Ant Financial # // Copyright (c) 2020 Ant Group
# // # //
# // SPDX-License-Identifier: Apache-2.0 # // SPDX-License-Identifier: Apache-2.0
# // # //
@ -51,7 +51,7 @@ generate_go_sources() {
--gogottrpc_out=plugins=ttrpc+fieldpath,\ --gogottrpc_out=plugins=ttrpc+fieldpath,\
import_path=github.com/kata-containers/kata-containers/src/runtime/virtcontainers/pkg/agent/protocols/grpc,\ import_path=github.com/kata-containers/kata-containers/src/runtime/virtcontainers/pkg/agent/protocols/grpc,\
\ \
Mgithub.com/kata-containers/kata-containers/src/agent/protocols/protos/github.com/kata-containers/agent/pkg/types/types.proto=github.com/kata-containers/kata-containers/src/runtime/virtcontainers/pkg/agent/protocols,\ Mgithub.com/kata-containers/kata-containers/src/agent/protocols/protos/types.proto=github.com/kata-containers/kata-containers/src/runtime/virtcontainers/pkg/agent/protocols,\
\ \
Mgithub.com/kata-containers/kata-containers/src/agent/protocols/protos/oci.proto=github.com/kata-containers/kata-containers/src/runtime/virtcontainers/pkg/agent/protocols/grpc,\ Mgithub.com/kata-containers/kata-containers/src/agent/protocols/protos/oci.proto=github.com/kata-containers/kata-containers/src/runtime/virtcontainers/pkg/agent/protocols/grpc,\
\ \
@ -69,7 +69,7 @@ if [ "$(basename $(pwd))" != "agent" ]; then
fi fi
# Protocol buffer files required to generate golang/rust bindings. # Protocol buffer files required to generate golang/rust bindings.
proto_files_list=(agent.proto health.proto oci.proto github.com/kata-containers/agent/pkg/types/types.proto) proto_files_list=(agent.proto health.proto oci.proto types.proto)
if [ "$1" = "" ]; then if [ "$1" = "" ]; then
show_usage "${proto_files_list[@]}" show_usage "${proto_files_list[@]}"

View File

@ -1,6 +1,6 @@
// //
// Copyright 2017 HyperHQ Inc. // Copyright 2017 HyperHQ Inc.
// Copyright (c) 2019 Ant Financial // Copyright (c) 2019-2020 Ant Group
// //
// SPDX-License-Identifier: Apache-2.0 // SPDX-License-Identifier: Apache-2.0
// //
@ -12,7 +12,7 @@ option go_package = "github.com/kata-containers/kata-containers/src/runtime/virt
package grpc; package grpc;
import "oci.proto"; import "oci.proto";
import "github.com/kata-containers/agent/pkg/types/types.proto"; import "types.proto";
import "google/protobuf/empty.proto"; import "google/protobuf/empty.proto";

View File

@ -1,6 +1,6 @@
// //
// Copyright 2018 Intel Corporation. // Copyright 2018 Intel Corporation.
// Copyright (c) 2019 Ant Financial // Copyright (c) 2019-2020 Ant Group
// //
// SPDX-License-Identifier: Apache-2.0 // SPDX-License-Identifier: Apache-2.0
// //