@@ -23,7 +23,8 @@ use url::Url;
23
23
24
24
use crate :: {
25
25
oidc:: { self , OpenidConfig } ,
26
- option:: { validation, Compression , Mode } , storage:: { AzureBlobConfig , FSConfig , S3Config } ,
26
+ option:: { validation, Compression , Mode } ,
27
+ storage:: { AzureBlobConfig , FSConfig , S3Config } ,
27
28
} ;
28
29
29
30
#[ cfg( any(
@@ -43,7 +44,6 @@ use std::string::String as KafkaSslProtocol;
43
44
pub const DEFAULT_USERNAME : & str = "admin" ;
44
45
pub const DEFAULT_PASSWORD : & str = "admin" ;
45
46
46
-
47
47
#[ derive( Parser ) ]
48
48
#[ command(
49
49
name = "parseable" ,
@@ -81,11 +81,11 @@ pub struct Cli {
81
81
#[ derive( Parser ) ]
82
82
pub enum StorageOptions {
83
83
#[ command( name = "local-store" ) ]
84
- Local ( LocalStoreArgs ) ,
85
-
84
+ Local ( LocalStoreArgs ) ,
85
+
86
86
#[ command( name = "s3-store" ) ]
87
87
S3 ( S3StoreArgs ) ,
88
-
88
+
89
89
#[ command( name = "blob-store" ) ]
90
90
Blob ( BlobStoreArgs ) ,
91
91
}
@@ -125,7 +125,7 @@ pub struct Options {
125
125
126
126
// Server configuration
127
127
#[ arg(
128
- long,
128
+ long,
129
129
env = "P_ADDR" ,
130
130
default_value = "0.0.0.0:8000" ,
131
131
value_parser = validation:: socket_addr,
@@ -381,13 +381,13 @@ pub struct Options {
381
381
) ]
382
382
pub audit_logger : Option < Url > ,
383
383
384
- #[ arg( long , env = "P_AUDIT_USERNAME" , help = "Audit logger username" ) ]
384
+ #[ arg( long, env = "P_AUDIT_USERNAME" , help = "Audit logger username" ) ]
385
385
pub audit_username : Option < String > ,
386
386
387
- #[ arg( long , env = "P_AUDIT_PASSWORD" , help = "Audit logger password" ) ]
387
+ #[ arg( long, env = "P_AUDIT_PASSWORD" , help = "Audit logger password" ) ]
388
388
pub audit_password : Option < String > ,
389
389
390
- #[ arg( long , env = "P_MS_CLARITY_TAG" , help = "Tag for MS Clarity" ) ]
390
+ #[ arg( long, env = "P_MS_CLARITY_TAG" , help = "Tag for MS Clarity" ) ]
391
391
pub ms_clarity_tag : Option < String > ,
392
392
}
393
393
@@ -405,7 +405,11 @@ impl Options {
405
405
}
406
406
407
407
pub fn openid ( & self ) -> Option < OpenidConfig > {
408
- match ( & self . oidc_client_id , & self . oidc_client_secret , & self . oidc_issuer ) {
408
+ match (
409
+ & self . oidc_client_id ,
410
+ & self . oidc_client_secret ,
411
+ & self . oidc_issuer ,
412
+ ) {
409
413
( Some ( id) , Some ( secret) , Some ( issuer) ) => {
410
414
let origin = if let Some ( url) = self . domain_address . clone ( ) {
411
415
oidc:: Origin :: Production ( url)
0 commit comments