Private
Public Access
1
0

style: fix rustfmt formatting for CI
Some checks failed
CI/CD Pipeline / Code Format (push) Successful in 5s
CI/CD Pipeline / Clippy Lints (push) Successful in 43s
CI/CD Pipeline / All Unit Tests (push) Successful in 1m14s
CI/CD Pipeline / Security Audit (push) Successful in 5s
CI/CD Pipeline / Enrollment Tests (push) Successful in 1m13s
CI/CD Pipeline / Verify Enrollment CLI Flag (push) Successful in 59s
CI/CD Pipeline / Build Arch Package (push) Failing after 2m53s
CI/CD Pipeline / Build Debian Package (Ubuntu 22.04) (push) Successful in 2m40s
CI/CD Pipeline / Build Debian Package (push) Successful in 2m53s
CI/CD Pipeline / Build Alpine Package (push) Successful in 4m0s
CI/CD Pipeline / Build RPM Package (push) Successful in 4m24s

This commit is contained in:
2026-05-18 23:54:15 +00:00
parent 653623b9f0
commit 11168b22df
4 changed files with 14 additions and 7 deletions

View File

@ -53,11 +53,15 @@ pub fn get_fqdn() -> Result<String> {
// 2. Try combining short hostname + domain from `hostname -d` // 2. Try combining short hostname + domain from `hostname -d`
if let Ok(short_output) = Command::new("hostname").output() { if let Ok(short_output) = Command::new("hostname").output() {
if short_output.status.success() { if short_output.status.success() {
let short = String::from_utf8_lossy(&short_output.stdout).trim().to_string(); let short = String::from_utf8_lossy(&short_output.stdout)
.trim()
.to_string();
if !short.is_empty() && short != "(none)" { if !short.is_empty() && short != "(none)" {
if let Ok(domain_output) = Command::new("hostname").arg("-d").output() { if let Ok(domain_output) = Command::new("hostname").arg("-d").output() {
if domain_output.status.success() { if domain_output.status.success() {
let domain = String::from_utf8_lossy(&domain_output.stdout).trim().to_string(); let domain = String::from_utf8_lossy(&domain_output.stdout)
.trim()
.to_string();
if !domain.is_empty() { if !domain.is_empty() {
let fqdn = format!("{}.{}", short, domain); let fqdn = format!("{}.{}", short, domain);
tracing::debug!(fqdn = %fqdn, "Resolved FQDN via hostname + hostname -d"); tracing::debug!(fqdn = %fqdn, "Resolved FQDN via hostname + hostname -d");

View File

@ -16,8 +16,8 @@ pub use client::{
}; };
/// Re-export identity extraction functions. /// Re-export identity extraction functions.
pub use identity::{ pub use identity::{
get_fqdn, get_hostname, get_ip_addresses, get_ip_for_interface, get_machine_id, get_fqdn, get_hostname, get_ip_addresses, get_ip_for_interface, get_machine_id, get_os_details,
get_os_details, get_primary_ip, get_route_source_ip, is_container_bridge, is_link_local, get_primary_ip, get_route_source_ip, is_container_bridge, is_link_local,
}; };
/// Run the full enrollment flow against the manager at the given URL. /// Run the full enrollment flow against the manager at the given URL.

View File

@ -477,7 +477,10 @@ async fn test_registration_payload_structure() {
// Verify hostname field (optional, may be present or absent) // Verify hostname field (optional, may be present or absent)
// When present, it should be a non-empty string without dots (short hostname) // When present, it should be a non-empty string without dots (short hostname)
if let Some(hostname) = payload.get("hostname").and_then(|v| v.as_str()) { if let Some(hostname) = payload.get("hostname").and_then(|v| v.as_str()) {
assert!(!hostname.is_empty(), "hostname should not be empty when present"); assert!(
!hostname.is_empty(),
"hostname should not be empty when present"
);
assert!( assert!(
!hostname.contains('.'), !hostname.contains('.'),
"hostname should be short form (no dots), got: {}", "hostname should be short form (no dots), got: {}",

View File

@ -203,8 +203,8 @@ fn test_enrollment_hostname_field_serializes() {
os_details: serde_json::json!({"name": "Test"}), os_details: serde_json::json!({"name": "Test"}),
hostname: Some("host".to_string()), hostname: Some("host".to_string()),
}; };
let json_with = serde_json::to_string(&request_with_hostname) let json_with =
.expect("Should serialize with hostname"); serde_json::to_string(&request_with_hostname).expect("Should serialize with hostname");
assert!( assert!(
json_with.contains("\"hostname\""), json_with.contains("\"hostname\""),
"hostname field should be present in JSON when Some" "hostname field should be present in JSON when Some"