Merge branch 'main' into frontend

myOmikron · Apr 29, 2024 · 5c86053 · 5c86053
2 parents b70714b + 6e49bfc
commit 5c86053
Show file tree

Hide file tree

Showing 5 changed files with 61 additions and 36 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/kraken/src/api/handler/data_export/handler.rs b/kraken/src/api/handler/data_export/handler.rs
@@ -6,6 +6,7 @@ use actix_web::web::Json;
 use actix_web::web::Path;
 use chrono::Utc;
 use futures::TryStreamExt;
+use log::error;
 use rorm::and;
 use rorm::query;
 use rorm::FieldAccess;
@@ -259,30 +260,45 @@ pub(crate) async fn export_workspace(
  host: None,
  port: None,
  service: None,
+ http_service: None,
  ..
  } => (*fm.key(), AggregationType::Domain),
  FindingAffected {
  domain: None,
  host: Some(fm),
  port: None,
  service: None,
+ http_service: None,
  ..
  } => (*fm.key(), AggregationType::Host),
  FindingAffected {
  domain: None,
  host: None,
  port: Some(fm),
  service: None,
+ http_service: None,
  ..
  } => (*fm.key(), AggregationType::Port),
  FindingAffected {
  domain: None,
  host: None,
  port: None,
  service: Some(fm),
+ http_service: None,
  ..
  } => (*fm.key(), AggregationType::Service),
- _ => return ready(Err(ApiError::InternalServerError)),
+ FindingAffected {
+ domain: None,
+ host: None,
+ port: None,
+ service: None,
+ http_service: Some(fm),
+ ..
+ } => (*fm.key(), AggregationType::HttpService),
+ FindingAffected {uuid, ..} => {
+ error!("Invalid \"findingaffected\": {uuid}. This means a) invalid db state or b) programmer forgot a match arm.");
+ return ready(Err(ApiError::InternalServerError));
+ }
  };
  ready(Ok((*x.finding.key(), aggr_uuid, aggr_type)))
  })

diff --git a/kraken_frontend/src/views/workspace/workspace-data.tsx b/kraken_frontend/src/views/workspace/workspace-data.tsx
@@ -908,7 +908,7 @@ export default function WorkspaceData(props: WorkspaceDataProps) {
  <span>{httpService.comment}</span>
  <Severity
  severity={httpService.severity}
- dataType={"Service"}
+ dataType={"HttpService"}
  uuid={httpService.uuid}
  workspace={workspace}
  />

diff --git a/kraken_frontend/src/views/workspace/workspace-finding/workspace-finding-data-table.tsx b/kraken_frontend/src/views/workspace/workspace-finding/workspace-finding-data-table.tsx
@@ -412,7 +412,7 @@ export const WorkspaceFindingDataTable = forwardRef<WorkspaceFindingDataTableRef
  <span>{httpService.comment}</span>
  <Severity
  severity={httpService.severity}
- dataType={"Service"}
+ dataType={"HttpService"}
  uuid={httpService.uuid}
  workspace={workspace}
  />

diff --git a/sdk/rust-kraken-sdk/src/sdk/domains.rs b/sdk/rust-kraken-sdk/src/sdk/domains.rs
@@ -72,7 +72,7 @@ impl KrakenClient {
  domain: Uuid,
  ) -> KrakenResult<DomainRelations> {
  self.get(&format!(
- "api/v1/workspaces/{workspace}/domain/{domain}/relations"
+ "api/v1/workspaces/{workspace}/domains/{domain}/relations"
  ))
  .send()
  .await