krata: move api proto to /proto and version api

crates/krata/build.rs

@@ -4,11 +4,15 @@ fn main() -> Result<()> {
     let mut config = prost_build::Config::new();
     prost_reflect_build::Builder::new()
         .descriptor_pool("crate::DESCRIPTOR_POOL")
-        .configure(&mut config, &["proto/krata/control.proto"], &["proto/"])?;
+        .configure(
+            &mut config,
+            &["../../proto/krata/v1/control.proto"],
+            &["../../proto/"],
+        )?;
     tonic_build::configure().compile_with_config(
         config,
-        &["proto/krata/control.proto"],
-        &["proto/"],
+        &["../../proto/krata/v1/control.proto"],
+        &["../../proto/"],
     )?;
     Ok(())
 }

crates/krata/src/common.rs

@@ -1 +0,0 @@
-tonic::include_proto!("krata.common");

crates/krata/src/control.rs

@@ -1 +0,0 @@
-tonic::include_proto!("krata.control");

crates/krata/src/lib.rs

@@ -1,10 +1,9 @@
 use once_cell::sync::Lazy;
 use prost_reflect::DescriptorPool;
 
-pub mod common;
-pub mod control;
 pub mod dial;
 pub mod launchcfg;
+pub mod v1;
 
 #[cfg(target_os = "linux")]
 pub mod ethtool;

crates/krata/src/v1/common.rs

@@ -0,0 +1 @@
+tonic::include_proto!("krata.v1.common");

crates/krata/src/v1/control.rs

@@ -0,0 +1 @@
+tonic::include_proto!("krata.v1.control");

crates/krata/src/v1/mod.rs

@@ -0,0 +1,2 @@
+pub mod common;
+pub mod control;

crates/kratactl/src/cli/attach.rs

@@ -1,6 +1,6 @@
 use anyhow::Result;
 use clap::Parser;
-use krata::control::control_service_client::ControlServiceClient;
+use krata::v1::control::control_service_client::ControlServiceClient;
 
 use tokio::select;
 use tonic::transport::Channel;

crates/kratactl/src/cli/destroy.rs

@@ -1,6 +1,6 @@
 use anyhow::Result;
 use clap::Parser;
-use krata::{
+use krata::v1::{
     common::GuestStatus,
     control::{
         control_service_client::ControlServiceClient, watch_events_reply::Event,

crates/kratactl/src/cli/launch.rs

@@ -2,7 +2,7 @@ use std::collections::HashMap;
 
 use anyhow::Result;
 use clap::Parser;
-use krata::{
+use krata::v1::{
     common::{
         guest_image_spec::Image, GuestEnvVar, GuestImageSpec, GuestOciImageSpec, GuestSpec,
         GuestStatus,

crates/kratactl/src/cli/list.rs

@@ -1,7 +1,7 @@
 use anyhow::{anyhow, Result};
 use clap::{Parser, ValueEnum};
 use cli_tables::Table;
-use krata::{
+use krata::v1::{
     common::{guest_image_spec::Image, Guest},
     control::{
         control_service_client::ControlServiceClient, ListGuestsRequest, ResolveGuestRequest,

crates/kratactl/src/cli/mod.rs

@@ -7,7 +7,7 @@ pub mod watch;
 
 use anyhow::{anyhow, Result};
 use clap::{Parser, Subcommand};
-use krata::control::{
+use krata::v1::control::{
     control_service_client::ControlServiceClient, ResolveGuestRequest, WatchEventsRequest,
 };
 use tonic::{transport::Channel, Request};

crates/kratactl/src/cli/resolve.rs

@@ -1,6 +1,6 @@
 use anyhow::Result;
 use clap::Parser;
-use krata::control::{control_service_client::ControlServiceClient, ResolveGuestRequest};
+use krata::v1::control::{control_service_client::ControlServiceClient, ResolveGuestRequest};
 
 use tonic::{transport::Channel, Request};
 

crates/kratactl/src/cli/watch.rs

@@ -1,6 +1,6 @@
 use anyhow::Result;
 use clap::{Parser, ValueEnum};
-use krata::{common::Guest, control::watch_events_reply::Event};
+use krata::v1::{common::Guest, control::watch_events_reply::Event};
 use prost_reflect::ReflectMessage;
 use serde_json::Value;
 

crates/kratactl/src/client.rs

@@ -1,7 +1,7 @@
 #[cfg(not(unix))]
 use anyhow::anyhow;
 use anyhow::Result;
-use krata::{control::control_service_client::ControlServiceClient, dial::ControlDialAddress};
+use krata::{dial::ControlDialAddress, v1::control::control_service_client::ControlServiceClient};
 #[cfg(unix)]
 use tokio::net::UnixStream;
 #[cfg(unix)]

crates/kratactl/src/console.rs

@@ -4,7 +4,7 @@ use crossterm::{
     terminal::{disable_raw_mode, enable_raw_mode, is_raw_mode_enabled},
     tty::IsTty,
 };
-use krata::{
+use krata::v1::{
     common::GuestStatus,
     control::{watch_events_reply::Event, ConsoleDataReply, ConsoleDataRequest},
 };

crates/kratactl/src/events.rs

@@ -1,7 +1,7 @@
 use std::sync::Arc;
 
 use anyhow::Result;
-use krata::control::{watch_events_reply::Event, WatchEventsReply};
+use krata::v1::control::{watch_events_reply::Event, WatchEventsReply};
 use log::trace;
 use tokio::{sync::broadcast, task::JoinHandle};
 use tokio_stream::StreamExt;

crates/kratactl/src/format.rs

@@ -1,7 +1,7 @@
 use std::collections::HashMap;
 
 use anyhow::Result;
-use krata::common::{GuestState, GuestStatus};
+use krata::v1::common::{GuestState, GuestStatus};
 use prost_reflect::{DynamicMessage, ReflectMessage, Value};
 
 pub fn proto2dynamic(proto: impl ReflectMessage) -> Result<DynamicMessage> {

crates/kratad/build.rs

@@ -2,7 +2,7 @@ use std::io::Result;
 
 fn main() -> Result<()> {
     prost_build::Config::new()
-        .extern_path(".krata.common", "::krata::common")
-        .compile_protos(&["proto/kratad/db.proto"], &["proto/", "../krata/proto"])?;
+        .extern_path(".krata.v1.common", "::krata::v1::common")
+        .compile_protos(&["proto/kratad/db.proto"], &["proto/", "../../proto"])?;
     Ok(())
 }

crates/kratad/proto/kratad/db.proto

@@ -2,9 +2,9 @@ syntax = "proto3";
 
 package kratad.db;
 
-import "krata/common.proto";
+import "krata/v1/common.proto";
 
 message GuestEntry {
     string id = 1;
-    krata.common.Guest guest = 2;
+    krata.v1.common.Guest guest = 2;
 }

crates/kratad/src/control.rs

@@ -2,7 +2,7 @@ use std::{io, pin::Pin, str::FromStr};
 
 use async_stream::try_stream;
 use futures::Stream;
-use krata::{
+use krata::v1::{
     common::{Guest, GuestState, GuestStatus},
     control::{
         control_service_server::ControlService, ConsoleDataReply, ConsoleDataRequest,

crates/kratad/src/event.rs

@@ -5,7 +5,7 @@ use std::{
 };
 
 use anyhow::Result;
-use krata::common::{GuestExitInfo, GuestState, GuestStatus};
+use krata::v1::common::{GuestExitInfo, GuestState, GuestStatus};
 use log::error;
 use tokio::{
     select,
@@ -22,7 +22,7 @@ use kratart::Runtime;
 
 use crate::db::GuestStore;
 
-pub type DaemonEvent = krata::control::watch_events_reply::Event;
+pub type DaemonEvent = krata::v1::control::watch_events_reply::Event;
 
 const EVENT_CHANNEL_QUEUE_LEN: usize = 1000;
 const EXIT_CODE_CHANNEL_QUEUE_LEN: usize = 1000;

crates/kratad/src/lib.rs

@@ -4,7 +4,7 @@ use anyhow::Result;
 use control::RuntimeControlService;
 use db::GuestStore;
 use event::{DaemonEventContext, DaemonEventGenerator};
-use krata::{control::control_service_server::ControlServiceServer, dial::ControlDialAddress};
+use krata::{dial::ControlDialAddress, v1::control::control_service_server::ControlServiceServer};
 use kratart::Runtime;
 use log::info;
 use reconcile::guest::GuestReconciler;

crates/kratad/src/reconcile/guest.rs

@@ -1,7 +1,7 @@
 use std::{collections::HashMap, time::Duration};
 
 use anyhow::{anyhow, Result};
-use krata::{
+use krata::v1::{
     common::{
         guest_image_spec::Image, Guest, GuestErrorInfo, GuestExitInfo, GuestNetworkState,
         GuestState, GuestStatus,

proto/krata/v1/common.proto

@@ -1,9 +1,9 @@
 syntax = "proto3";
 
-package krata.common;
+package krata.v1.common;
 
 option java_multiple_files = true;
-option java_package = "dev.krata.proto.common";
+option java_package = "dev.krata.proto.v1.common";
 option java_outer_classname = "CommonProto";
 
 message Guest {

proto/krata/v1/control.proto

@@ -1,12 +1,12 @@
 syntax = "proto3";
 
-package krata.control;
+package krata.v1.control;
 
 option java_multiple_files = true;
-option java_package = "dev.krata.proto.control";
+option java_package = "dev.krata.proto.v1.control";
 option java_outer_classname = "ControlProto";
 
-import "krata/common.proto";
+import "krata/v1/common.proto";
 
 service ControlService {
     rpc CreateGuest(CreateGuestRequest) returns (CreateGuestReply);
@@ -18,7 +18,7 @@ service ControlService {
 }
 
 message CreateGuestRequest {
-    krata.common.GuestSpec spec = 1;
+    krata.v1.common.GuestSpec spec = 1;
 }
 
 message CreateGuestReply {
@@ -36,13 +36,13 @@ message ResolveGuestRequest {
 }
 
 message ResolveGuestReply {
-    krata.common.Guest guest = 1;
+    krata.v1.common.Guest guest = 1;
 }
 
 message ListGuestsRequest {}
 
 message ListGuestsReply {
-    repeated krata.common.Guest guests = 1;
+    repeated krata.v1.common.Guest guests = 1;
 }
 
 message ConsoleDataRequest {
@@ -63,5 +63,5 @@ message WatchEventsReply {
 }
 
 message GuestChangedEvent {
-    krata.common.Guest guest = 1;
+    krata.v1.common.Guest guest = 1;
 }