From 85ec987a486d622bf84ecb94ee9237c1cc960e87 Mon Sep 17 00:00:00 2001
From: Dietmar Maurer <dietmar@proxmox.com>
Date: Thu, 23 Sep 2021 12:38:09 +0200
Subject: [PATCH] move src/server/h2service.rs into proxmox-rest-server crate

---
 {src/server => proxmox-rest-server/src}/h2service.rs | 6 +++---
 proxmox-rest-server/src/lib.rs                       | 5 ++++-
 proxmox-rest-server/src/rest.rs                      | 2 +-
 3 files changed, 8 insertions(+), 5 deletions(-)
 rename {src/server => proxmox-rest-server/src}/h2service.rs (96%)

diff --git a/src/server/h2service.rs b/proxmox-rest-server/src/h2service.rs
similarity index 96%
rename from src/server/h2service.rs
rename to proxmox-rest-server/src/h2service.rs
index 0b51a710..f5556d1a 100644
--- a/src/server/h2service.rs
+++ b/proxmox-rest-server/src/h2service.rs
@@ -11,8 +11,8 @@ use hyper::{Body, Request, Response, StatusCode};
 use proxmox::api::{ApiResponseFuture, HttpError, Router, RpcEnvironment};
 use proxmox::http_err;
 
-use proxmox_rest_server::{normalize_uri_path, WorkerTask};
-use proxmox_rest_server::formatter::*;
+use crate::{normalize_uri_path, WorkerTask};
+use crate::formatter::*;
 
 /// Hyper Service implementation to handle stateful H2 connections.
 ///
@@ -59,7 +59,7 @@ impl <E: RpcEnvironment + Clone> H2Service<E> {
                 future::ok((formatter.format_error)(err)).boxed()
             }
             Some(api_method) => {
-                proxmox_rest_server::handle_api_request(
+                crate::rest::handle_api_request(
                     self.rpcenv.clone(), api_method, formatter, parts, body, uri_param).boxed()
             }
         }
diff --git a/proxmox-rest-server/src/lib.rs b/proxmox-rest-server/src/lib.rs
index 9acdb3fd..5ba72ce0 100644
--- a/proxmox-rest-server/src/lib.rs
+++ b/proxmox-rest-server/src/lib.rs
@@ -30,11 +30,14 @@ mod api_config;
 pub use api_config::ApiConfig;
 
 mod rest;
-pub use rest::{RestServer, handle_api_request};
+pub use rest::RestServer;
 
 mod worker_task;
 pub use worker_task::*;
 
+mod h2service;
+pub use h2service::*;
+
 pub enum AuthError {
     Generic(Error),
     NoData,
diff --git a/proxmox-rest-server/src/rest.rs b/proxmox-rest-server/src/rest.rs
index dde47b55..929e4043 100644
--- a/proxmox-rest-server/src/rest.rs
+++ b/proxmox-rest-server/src/rest.rs
@@ -388,7 +388,7 @@ async fn proxy_protected_request(
     Ok(resp)
 }
 
-pub async fn handle_api_request<Env: RpcEnvironment, S: 'static + BuildHasher + Send>(
+pub(crate) async fn handle_api_request<Env: RpcEnvironment, S: 'static + BuildHasher + Send>(
     mut rpcenv: Env,
     info: &'static ApiMethod,
     formatter: &'static OutputFormatter,