Skip to content

delete correlation API response change #1102

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jan 16, 2025
Merged

delete correlation API response change #1102

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 14 additions & 10 deletions src/cli.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,8 @@ use url::Url;

use crate::{
oidc::{self, OpenidConfig},
option::{validation, Compression, Mode}, storage::{AzureBlobConfig, FSConfig, S3Config},
option::{validation, Compression, Mode},
storage::{AzureBlobConfig, FSConfig, S3Config},
};

#[cfg(any(
Expand All @@ -43,7 +44,6 @@ use std::string::String as KafkaSslProtocol;
pub const DEFAULT_USERNAME: &str = "admin";
pub const DEFAULT_PASSWORD: &str = "admin";


#[derive(Parser)]
#[command(
name = "parseable",
Expand Down Expand Up @@ -81,11 +81,11 @@ pub struct Cli {
#[derive(Parser)]
pub enum StorageOptions {
#[command(name = "local-store")]
Local(LocalStoreArgs),
Local(LocalStoreArgs),

#[command(name = "s3-store")]
S3(S3StoreArgs),

#[command(name = "blob-store")]
Blob(BlobStoreArgs),
}
Expand Down Expand Up @@ -125,7 +125,7 @@ pub struct Options {

// Server configuration
#[arg(
long,
long,
env = "P_ADDR",
default_value = "0.0.0.0:8000",
value_parser = validation::socket_addr,
Expand Down Expand Up @@ -381,13 +381,13 @@ pub struct Options {
)]
pub audit_logger: Option<Url>,

#[arg(long ,env = "P_AUDIT_USERNAME", help = "Audit logger username")]
#[arg(long, env = "P_AUDIT_USERNAME", help = "Audit logger username")]
pub audit_username: Option<String>,

#[arg(long ,env = "P_AUDIT_PASSWORD", help = "Audit logger password")]
#[arg(long, env = "P_AUDIT_PASSWORD", help = "Audit logger password")]
pub audit_password: Option<String>,

#[arg(long ,env = "P_MS_CLARITY_TAG", help = "Tag for MS Clarity")]
#[arg(long, env = "P_MS_CLARITY_TAG", help = "Tag for MS Clarity")]
pub ms_clarity_tag: Option<String>,
}

Expand All @@ -405,7 +405,11 @@ impl Options {
}

pub fn openid(&self) -> Option<OpenidConfig> {
match (&self.oidc_client_id, &self.oidc_client_secret, &self.oidc_issuer) {
match (
&self.oidc_client_id,
&self.oidc_client_secret,
&self.oidc_issuer,
) {
(Some(id), Some(secret), Some(issuer)) => {
let origin = if let Some(url) = self.domain_address.clone() {
oidc::Origin::Production(url)
Expand Down
4 changes: 2 additions & 2 deletions src/handlers/http/correlation.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
*
*/

use actix_web::{web, HttpRequest, Responder};
use actix_web::{web, HttpRequest, HttpResponse, Responder};
use bytes::Bytes;
use itertools::Itertools;
use relative_path::RelativePathBuf;
Expand Down Expand Up @@ -151,5 +151,5 @@ pub async fn delete(req: HttpRequest) -> Result<impl Responder, CorrelationError

// Delete from memory
CORRELATIONS.delete(correlation_id).await?;
Ok(format!("Deleted correlation with ID- {correlation_id}"))
Ok(HttpResponse::Ok().finish())
}
Loading