cargo fmt

This commit is contained in:
jasonwitty 2025-08-16 01:25:03 -07:00
parent 3d14e4a370
commit 36e73fd9ed
5 changed files with 44 additions and 14 deletions

View File

@ -52,7 +52,6 @@ fn parse_args<I: IntoIterator<Item = String>>(args: I) -> Result<(String, Option
} }
} }
#[tokio::main] #[tokio::main]
async fn main() -> Result<(), Box<dyn std::error::Error>> { async fn main() -> Result<(), Box<dyn std::error::Error>> {
// Reuse the same parsing logic for testability // Reuse the same parsing logic for testability

View File

@ -6,13 +6,13 @@ use rustls::{ClientConfig, RootCertStore};
use rustls_pemfile::Item; use rustls_pemfile::Item;
use std::io::Read; use std::io::Read;
use std::{fs::File, io::BufReader, sync::Arc}; use std::{fs::File, io::BufReader, sync::Arc};
use url::Url;
use tokio::net::TcpStream; use tokio::net::TcpStream;
use tokio::time::{interval, Duration}; use tokio::time::{interval, Duration};
use tokio_tungstenite::{ use tokio_tungstenite::{
connect_async, connect_async_tls_with_config, tungstenite::client::IntoClientRequest, connect_async, connect_async_tls_with_config, tungstenite::client::IntoClientRequest,
tungstenite::Message, Connector, MaybeTlsStream, WebSocketStream, tungstenite::Message, Connector, MaybeTlsStream, WebSocketStream,
}; };
use url::Url;
use crate::types::{DiskInfo, Metrics, ProcessesPayload}; use crate::types::{DiskInfo, Metrics, ProcessesPayload};

View File

@ -11,8 +11,15 @@ fn test_help_mentions_short_and_long_flags() {
.arg("--help") .arg("--help")
.output() .output()
.expect("run socktop --help"); .expect("run socktop --help");
let text = format!("{}{}", String::from_utf8_lossy(&output.stdout), String::from_utf8_lossy(&output.stderr)); let text = format!(
assert!(text.contains("--tls-ca") && text.contains("-t"), "help text missing --tls-ca/-t\n{text}"); "{}{}",
String::from_utf8_lossy(&output.stdout),
String::from_utf8_lossy(&output.stderr)
);
assert!(
text.contains("--tls-ca") && text.contains("-t"),
"help text missing --tls-ca/-t\n{text}"
);
} }
#[test] #[test]
@ -21,18 +28,29 @@ fn test_tlc_ca_arg_long_and_short_parsed() {
let exe = env!("CARGO_BIN_EXE_socktop"); let exe = env!("CARGO_BIN_EXE_socktop");
// Long form with help // Long form with help
let out = Command::new(exe) let out = Command::new(exe)
.args(["--tls-ca", "/tmp/cert.pem", "--help"]) .args(["--tls-ca", "/tmp/cert.pem", "--help"])
.output() .output()
.expect("run socktop"); .expect("run socktop");
assert!(out.status.success(), "socktop --tls-ca … --help did not succeed"); assert!(
let text = format!("{}{}", String::from_utf8_lossy(&out.stdout), String::from_utf8_lossy(&out.stderr)); out.status.success(),
"socktop --tls-ca … --help did not succeed"
);
let text = format!(
"{}{}",
String::from_utf8_lossy(&out.stdout),
String::from_utf8_lossy(&out.stderr)
);
assert!(text.contains("Usage:")); assert!(text.contains("Usage:"));
// Short form with help // Short form with help
let out2 = Command::new(exe) let out2 = Command::new(exe)
.args(["-t", "/tmp/cert.pem", "--help"]) .args(["-t", "/tmp/cert.pem", "--help"])
.output() .output()
.expect("run socktop"); .expect("run socktop");
assert!(out2.status.success(), "socktop -t … --help did not succeed"); assert!(out2.status.success(), "socktop -t … --help did not succeed");
let text2 = format!("{}{}", String::from_utf8_lossy(&out2.stdout), String::from_utf8_lossy(&out2.stderr)); let text2 = format!(
"{}{}",
String::from_utf8_lossy(&out2.stdout),
String::from_utf8_lossy(&out2.stderr)
);
assert!(text2.contains("Usage:")); assert!(text2.contains("Usage:"));
} }

View File

@ -99,7 +99,9 @@ mod tests_cli_agent {
"--port" => long = it.next(), "--port" => long = it.next(),
"-p" => short = it.next(), "-p" => short = it.next(),
_ if a.starts_with("--port=") => { _ if a.starts_with("--port=") => {
if let Some((_, v)) = a.split_once('=') { long = Some(v.to_string()); } if let Some((_, v)) = a.split_once('=') {
long = Some(v.to_string());
}
} }
_ => {} _ => {}
} }
@ -111,9 +113,18 @@ mod tests_cli_agent {
#[test] #[test]
fn port_long_short_and_assign() { fn port_long_short_and_assign() {
assert_eq!(parse_port(vec!["agent".into(), "--port".into(), "9001".into()], 8443), 9001); assert_eq!(
assert_eq!(parse_port(vec!["agent".into(), "-p".into(), "9002".into()], 8443), 9002); parse_port(vec!["agent".into(), "--port".into(), "9001".into()], 8443),
assert_eq!(parse_port(vec!["agent".into(), "--port=9003".into()], 8443), 9003); 9001
);
assert_eq!(
parse_port(vec!["agent".into(), "-p".into(), "9002".into()], 8443),
9002
);
assert_eq!(
parse_port(vec!["agent".into(), "--port=9003".into()], 8443),
9003
);
assert_eq!(parse_port(vec!["agent".into()], 8443), 8443); assert_eq!(parse_port(vec!["agent".into()], 8443), 8443);
} }
} }

View File

@ -3,7 +3,9 @@ use openssl::hash::MessageDigest;
use openssl::nid::Nid; use openssl::nid::Nid;
use openssl::pkey::PKey; use openssl::pkey::PKey;
use openssl::rsa::Rsa; use openssl::rsa::Rsa;
use openssl::x509::extension::{BasicConstraints, ExtendedKeyUsage, KeyUsage, SubjectAlternativeName}; use openssl::x509::extension::{
BasicConstraints, ExtendedKeyUsage, KeyUsage, SubjectAlternativeName,
};
use openssl::x509::{X509NameBuilder, X509}; use openssl::x509::{X509NameBuilder, X509};
use std::{ use std::{
fs, fs,