Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
8 changes: 5 additions & 3 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -340,9 +340,11 @@ jobs:
# Create test target YAML file
echo 'name: "test-web-server"' > test_target.yml
echo 'targetType: "ssh"' >> test_target.yml
echo 'address: "192.168.1.100"' >> test_target.yml
echo 'username: "deploy"' >> test_target.yml
echo 'description: "Test web server"' >> test_target.yml
echo 'spec:' >> test_target.yml
echo ' address: "192.168.1.100"' >> test_target.yml
echo ' username: "deploy"' >> test_target.yml
echo 'metadata:' >> test_target.yml
echo ' description: "Test web server"' >> test_target.yml

# Test target create
echo "Testing: target create"
Expand Down
24 changes: 6 additions & 18 deletions src/client.rs
Original file line number Diff line number Diff line change
Expand Up @@ -525,31 +525,19 @@ impl GodonClient {
None => return ApiResponse::error("Missing required field: targetType"),
};

let address = match yaml_data.get("address").and_then(|v| v.as_str()) {
Some(a) => a.to_string(),
None => return ApiResponse::error("Missing required field: address"),
let spec = match yaml_data.get("spec") {
Some(s) => serde_json::to_value(s).unwrap_or_else(|_| serde_json::json!({})),
None => return ApiResponse::error("Missing required field: spec"),
};

let mut target_data = serde_json::json!({
"name": name,
"targetType": target_type,
"address": address
"spec": spec
});

if let Some(v) = yaml_data.get("username").and_then(|v| v.as_str()) {
target_data["username"] = serde_json::Value::String(v.to_string());
}
if let Some(v) = yaml_data.get("credentialId").and_then(|v| v.as_str()) {
target_data["credentialId"] = serde_json::Value::String(v.to_string());
}
if let Some(v) = yaml_data.get("credentialName").and_then(|v| v.as_str()) {
target_data["credentialName"] = serde_json::Value::String(v.to_string());
}
if let Some(v) = yaml_data.get("description").and_then(|v| v.as_str()) {
target_data["description"] = serde_json::Value::String(v.to_string());
}
if let Some(v) = yaml_data.get("allowsDowntime").and_then(|v| v.as_bool()) {
target_data["allowsDowntime"] = serde_json::Value::Bool(v);
if let Some(m) = yaml_data.get("metadata") {
target_data["metadata"] = serde_json::to_value(m).unwrap_or_else(|_| serde_json::json!({}));
}

self.create_target(target_data).await
Expand Down
12 changes: 3 additions & 9 deletions src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -59,15 +59,9 @@ pub struct Target {
pub name: String,
#[serde(rename = "targetType")]
pub target_type: String,
pub address: String,
pub username: Option<String>,
#[serde(rename = "credentialId")]
pub credential_id: Option<String>,
#[serde(rename = "credentialName")]
pub credential_name: Option<String>,
pub description: Option<String>,
#[serde(rename = "allowsDowntime")]
pub allows_downtime: Option<bool>,
pub spec: serde_json::Value,
#[serde(skip_serializing_if = "Option::is_none")]
pub metadata: Option<serde_json::Value>,
#[serde(rename = "createdAt")]
pub created_at: Option<String>,
#[serde(rename = "lastUsedAt")]
Expand Down
21 changes: 12 additions & 9 deletions src/main.rs
Original file line number Diff line number Diff line change
Expand Up @@ -279,11 +279,16 @@ fn format_credential_created(credential: &Credential) {
fn format_target_list(targets: &[Target]) {
println!("Targets:");
for target in targets {
let spec_summary = target
.spec
.get("address")
.or_else(|| target.spec.get("url"))
.and_then(|v| v.as_str())
.unwrap_or("-");
println!(" ID: {}", target.id);
println!(" Name: {}", target.name);
println!(" Type: {}", target.target_type);
println!(" Address: {}", target.address);
println!(" Description: {}", target.description.as_deref().unwrap_or(""));
println!(" Spec: {}", spec_summary);
println!(" Created: {}", target.created_at.as_deref().unwrap_or(""));
println!(" ---");
}
Expand All @@ -294,12 +299,10 @@ fn format_target(target: &Target) {
println!(" ID: {}", target.id);
println!(" Name: {}", target.name);
println!(" Type: {}", target.target_type);
println!(" Address: {}", target.address);
println!(" Username: {}", target.username.as_deref().unwrap_or(""));
println!(" Credential ID: {}", target.credential_id.as_deref().unwrap_or(""));
println!(" Credential Name: {}", target.credential_name.as_deref().unwrap_or(""));
println!(" Description: {}", target.description.as_deref().unwrap_or(""));
println!(" Allows Downtime: {}", target.allows_downtime.map_or("N/A".to_string(), |v| v.to_string()));
println!(" Spec: {}", serde_json::to_string_pretty(&target.spec).unwrap_or_default());
if let Some(ref metadata) = target.metadata {
println!(" Metadata: {}", serde_json::to_string_pretty(metadata).unwrap_or_default());
}
println!(" Created: {}", target.created_at.as_deref().unwrap_or(""));
println!(" Last Used: {}", target.last_used_at.as_deref().unwrap_or(""));
}
Expand All @@ -309,7 +312,7 @@ fn format_target_created(target: &Target) {
println!(" ID: {}", target.id);
println!(" Name: {}", target.name);
println!(" Type: {}", target.target_type);
println!(" Address: {}", target.address);
println!(" Spec: {}", serde_json::to_string_pretty(&target.spec).unwrap_or_default());
}

#[tokio::main]
Expand Down
Loading