tyler/proxmox-backup
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

api/compat: remove remaining api_schema references

Browse Source 
Signed-off-by: Wolfgang Bumiller <w.bumiller@proxmox.com>
This commit is contained in:
Wolfgang Bumiller
2019-11-21 14:53:15 +01:00
parent a2479cfa1a
commit cad540e969
15 changed files with 70 additions and 77 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/api2/access.rs
View File

@ -3,14 +3,15 @@ use failure::*;
use serde_json::{json, Value};
use proxmox::{sortable, identity};
use proxmox::api::{http_err, list_subdirs_api_method};
use proxmox::api::{ApiHandler, ApiMethod, Router, RpcEnvironment};
use proxmox::api::router::SubdirMap;
use proxmox::api::schema::*;
use crate::tools;
use crate::api_schema::*;
use crate::api_schema::router::*;
use crate::tools::ticket::*;
use crate::auth_helpers::*;
fn authenticate_user(username: &str, password: &str) -> Result<(), Error> {
let ticket_lifetime = tools::ticket::TICKET_LIFETIME;

29
src/api2/admin/datastore.rs
View File

@ -1,26 +1,25 @@
use failure::*;
use futures::*;
use crate::tools;
use crate::api2::types::*;
use crate::api_schema::*;
use crate::api_schema::router::*;
//use crate::server::rest::*;
use serde_json::{json, Value};
use std::collections::{HashSet, HashMap};
use chrono::{DateTime, Datelike, TimeZone, Local};
use std::path::PathBuf;
use chrono::{DateTime, Datelike, TimeZone, Local};
use failure::*;
use futures::*;
use hyper::http::request::Parts;
use hyper::{header, Body, Response, StatusCode};
use serde_json::{json, Value};
use proxmox::{sortable, identity};
use proxmox::api::{http_err, list_subdirs_api_method};
use proxmox::api::{ApiFuture, ApiHandler, ApiMethod, Router, RpcEnvironment, RpcEnvironmentType};
use proxmox::api::router::SubdirMap;
use proxmox::api::schema::*;
use proxmox::tools::{try_block, fs::file_get_contents, fs::file_set_contents};
use crate::config::datastore;
use crate::api2::types::*;
use crate::backup::*;
use crate::config::datastore;
use crate::server::WorkerTask;
use hyper::{header, Body, Response, StatusCode};
use hyper::http::request::Parts;
use crate::tools;
fn read_backup_index(store: &DataStore, backup_dir: &BackupDir) -> Result<Value, Error> {

10
src/api2/backup.rs
View File

@ -1,18 +1,18 @@
use failure::*;
use futures::*;
use hyper::header::{HeaderValue, UPGRADE};
use hyper::{Body, Response, StatusCode};
use hyper::http::request::Parts;
use hyper::{Body, Response, StatusCode};
use serde_json::{json, Value};
use proxmox::{sortable, identity};
use proxmox::api::list_subdirs_api_method;
use proxmox::api::{ApiFuture, ApiHandler, ApiMethod, Router, RpcEnvironment};
use proxmox::api::router::SubdirMap;
use proxmox::api::schema::*;
use crate::tools;
use crate::tools::wrapped_reader_stream::*;
use crate::api_schema::router::*;
use crate::api_schema::*;
use crate::server::{WorkerTask, H2Service};
use crate::backup::*;
use crate::api2::types::*;

19
src/api2/node/services.rs
View File

@ -1,15 +1,16 @@
use failure::*;
use proxmox::{sortable, identity};
use crate::tools;
use crate::api_schema::*;
use crate::api_schema::router::*;
use serde_json::{json, Value};
use std::process::{Command, Stdio};
use failure::*;
use serde_json::{json, Value};
use proxmox::{sortable, identity};
use proxmox::api::list_subdirs_api_method;
use proxmox::api::{ApiHandler, ApiMethod, Router, RpcEnvironment};
use proxmox::api::router::SubdirMap;
use proxmox::api::schema::*;
use crate::api2::types::*;
use crate::tools;
static SERVICE_NAME_LIST: [&str; 7] = [
"proxmox-backup",

14
src/api2/node/tasks.rs
View File

@ -1,14 +1,16 @@
use failure::*;
use serde_json::{json, Value};
use std::fs::File;
use std::io::{BufRead,BufReader};
use std::io::{BufRead, BufReader};
use failure::*;
use serde_json::{json, Value};
use proxmox::{sortable, identity};
use proxmox::api::list_subdirs_api_method;
use proxmox::api::{ApiHandler, ApiMethod, Router, RpcEnvironment};
use proxmox::api::router::SubdirMap;
use proxmox::api::schema::*;
use crate::tools;
use crate::api_schema::*;
use crate::api_schema::router::*;
use crate::api2::types::*;
use crate::server::{self, UPID};

4
src/api2/node/time.rs
View File

@ -5,11 +5,11 @@ use failure::*;
use serde_json::{json, Value};
use proxmox::{sortable, identity};
use proxmox::api::{ApiHandler, ApiMethod, Router, RpcEnvironment};
use proxmox::api::schema::*;
use proxmox::tools::fs::{file_read_firstline, file_set_contents};
use crate::api2::types::*;
use crate::api_schema::router::*;
use crate::api_schema::*;
fn read_etc_localtime() -> Result<String, Error> {
// use /etc/timezone

17
src/api2/reader.rs
View File

@ -1,21 +1,20 @@
//use chrono::{Local, TimeZone};
use failure::*;
use futures::*;
use hyper::header::{self, HeaderValue, UPGRADE};
use hyper::{Body, Response, StatusCode};
use hyper::http::request::Parts;
//use chrono::{Local, TimeZone};
use hyper::{Body, Response, StatusCode};
use serde_json::Value;
use proxmox::{sortable, identity};
use proxmox::api::http_err;
use proxmox::api::{ApiFuture, ApiHandler, ApiMethod, Router, RpcEnvironment};
use proxmox::api::schema::*;
use crate::tools;
use crate::api_schema::router::*;
use crate::api_schema::*;
use crate::server::{WorkerTask, H2Service};
use crate::backup::*;
use crate::api2::types::*;
use crate::backup::*;
use crate::server::{WorkerTask, H2Service};
use crate::tools;
mod environment;
use environment::*;

8
src/api2/types.rs
View File

@ -1,8 +1,10 @@
use failure::*;
//use lazy_static::lazy_static;
//use std::sync::Arc;
use crate::api_schema::*;
use failure::*;
//use lazy_static::lazy_static;
use proxmox::api::const_regex;
use proxmox::api::schema::*;
use proxmox::tools::*; // required to use IPRE!() macro ???
// File names: may not contain slashes, may not start with "."