WEBDIENSTE/NLnetLabs-krill
1
0
Fork 0
mirror of https://github.com/NLnetLabs/krill.git synced 2026-09-29 12:54:52 +02:00
Code Issues Packages Projects Releases Wiki Activity

Show RFC8183 XML in CLI (#868)

Browse Source
This commit is contained in:
Tim Bruijnzeels
2022-08-29 16:51:39 +02:00
parent 0468106522
commit d34a7f2fdb
8 changed files with 57 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/cli/client.rs
+4 -4
View File
@@ -191,8 +191,8 @@ impl KrillClient {
CaCommand::ParentResponse(handle, child) => {
let uri = format!("api/v1/cas/{}/children/{}/contact", handle, child);
let info: ParentCaContact = get_json(&self.server, &self.token, &uri).await?;
Ok(ApiResponse::ParentCaContact(info))
let response: idexchange::ParentResponse = get_json(&self.server, &self.token, &uri).await?;
Ok(ApiResponse::Rfc8183ParentResponse(response))
}
CaCommand::ChildRequest(handle) => {
@@ -263,8 +263,8 @@ impl KrillClient {
CaCommand::ChildAdd(handle, req) => {
let uri = format!("api/v1/cas/{}/children", handle);
let info: ParentCaContact = post_json_with_response(&self.server, &self.token, &uri, req).await?;
Ok(ApiResponse::ParentCaContact(info))
let response = post_json_with_response(&self.server, &self.token, &uri, req).await?;
Ok(ApiResponse::Rfc8183ParentResponse(response))
}
CaCommand::ChildUpdate(handle, child, req) => {
let uri = format!("api/v1/cas/{}/children/{}", handle, child);
src/cli/report.rs
+25 -3
View File
@@ -55,6 +55,7 @@ pub enum ApiResponse {
PublisherList(PublisherList),
RepoStats(RepoStats),
Rfc8183ParentResponse(idexchange::ParentResponse),
Rfc8183RepositoryResponse(idexchange::RepositoryResponse),
Rfc8183ChildRequest(idexchange::ChildRequest),
Rfc8183PublisherRequest(idexchange::PublisherRequest),
@@ -100,6 +101,7 @@ impl ApiResponse {
ApiResponse::PublisherList(list) => Ok(Some(list.report(fmt)?)),
ApiResponse::PublisherDetails(details) => Ok(Some(details.report(fmt)?)),
ApiResponse::RepoStats(stats) => Ok(Some(stats.report(fmt)?)),
ApiResponse::Rfc8183ParentResponse(res) => Ok(Some(res.report(fmt)?)),
ApiResponse::Rfc8183ChildRequest(req) => Ok(Some(req.report(fmt)?)),
ApiResponse::Rfc8183PublisherRequest(req) => Ok(Some(req.report(fmt)?)),
ApiResponse::Rfc8183RepositoryResponse(res) => Ok(Some(res.report(fmt)?)),
@@ -196,9 +198,29 @@ impl Report for ChildrenConnectionStats {}
impl Report for PublisherDetails {}
impl Report for idexchange::RepositoryResponse {}
impl Report for idexchange::ChildRequest {}
impl Report for idexchange::PublisherRequest {}
impl Report for idexchange::RepositoryResponse {
fn text(&self) -> Result<String, ReportError> {
Ok(self.to_xml_string())
}
}
impl Report for idexchange::ParentResponse {
fn text(&self) -> Result<String, ReportError> {
Ok(self.to_xml_string())
}
}
impl Report for idexchange::ChildRequest {
fn text(&self) -> Result<String, ReportError> {
Ok(self.to_xml_string())
}
}
impl Report for idexchange::PublisherRequest {
fn text(&self) -> Result<String, ReportError> {
Ok(self.to_xml_string())
}
}
impl Report for RoaDefinitions {}