common: Replace APIVersion with the library Version structure

The structures APIVersion defined in common.rs was equivalent to the
Version structure defined in the library.

Remove APIVersion in favor of the Version structure from the library.

Signed-off-by: Anderson Toshiyuki Sasaki <[email protected]>

Author: ansasaki

keylime-agent/src/common.rs

@@ -29,18 +29,6 @@ use tss_esapi::{
     structures::PcrSlot, traits::UnMarshall, utils::TpmsContext,
 };
 
-#[derive(Serialize, Deserialize, Debug)]
-pub(crate) struct APIVersion {
-    major: u32,
-    minor: u32,
-}
-
-impl Display for APIVersion {
-    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
-        write!(f, "v{}.{}", self.major, self.minor)
-    }
-}
-
 #[derive(Serialize, Deserialize, Debug)]
 pub(crate) struct JsonWrapper<A> {
     pub code: u16,

keylime-agent/src/errors_handler.rs

@@ -1,17 +1,15 @@
 // SPDX-License-Identifier: Apache-2.0
 // Copyright 2021 Keylime Authors
 
-use crate::{
-    common::{APIVersion, JsonWrapper},
-    QuoteData,
-};
+use crate::{common::JsonWrapper, QuoteData};
 use actix_web::{
     body, dev,
     error::{InternalError, JsonPayloadError, PathError, QueryPayloadError},
     http,
     middleware::{ErrorHandlerResponse, ErrorHandlers},
     web, Error, HttpRequest, HttpResponse, Responder, Result,
 };
+use keylime::version::Version;
 use log::*;
 
 pub(crate) async fn app_default(
@@ -70,9 +68,9 @@ pub(crate) async fn app_default(
 
 pub(crate) async fn version_not_supported(
     req: HttpRequest,
-    version: web::Path<APIVersion>,
+    version: web::Path<Version>,
 ) -> impl Responder {
-    let message = format!("API version not supported: {version}");
+    let message = format!("API version not supported: v{version}");
 
     warn!("{} returning 400 response. {}", req.head().method, message);
 

keylime/src/version.rs

@@ -52,7 +52,9 @@ where
     }
 }
 
-#[derive(Clone, Debug, Eq, PartialEq, PartialOrd, Ord)]
+#[derive(
+    Clone, Debug, Deserialize, Eq, PartialEq, PartialOrd, Ord, Serialize,
+)]
 pub struct Version {
     major: u32,
     minor: u32,