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
11 changes: 6 additions & 5 deletions src/cloud/commands.rs
Original file line number Diff line number Diff line change
Expand Up @@ -95,13 +95,13 @@ fn parse_service_endpoint_changes(
Ok((!changes.is_empty()).then_some(changes))
}

fn parse_instance_tag_patches(add: &[String], remove: &[String]) -> Option<Vec<InstanceTagsPatch>> {
fn parse_instance_tags_patch(add: &[String], remove: &[String]) -> Option<InstanceTagsPatch> {
let patch = InstanceTagsPatch {
add: parse_tags(add),
remove: parse_tags(remove),
};

(patch.add.is_some() || patch.remove.is_some()).then_some(vec![patch])
(patch.add.is_some() || patch.remove.is_some()).then_some(patch)
}

fn parse_org_private_endpoint_remove(
Expand Down Expand Up @@ -467,7 +467,7 @@ fn build_update_service_request(
.transpose()?,
endpoints: parse_service_endpoint_changes(&opts.enable_endpoints, &opts.disable_endpoints)?,
transparent_data_encryption_key_id: opts.transparent_data_encryption_key_id.clone(),
tags: parse_instance_tag_patches(&opts.add_tags, &opts.remove_tags),
tags: parse_instance_tags_patch(&opts.add_tags, &opts.remove_tags),
enable_core_dumps: opts.enable_core_dumps,
})
}
Expand Down Expand Up @@ -1545,8 +1545,9 @@ mod tests {
assert_eq!(json["ipAccessList"]["remove"][0]["source"], "0.0.0.0/0");
assert_eq!(json["privateEndpointIds"]["add"][0], "pe-1");
assert_eq!(json["privateEndpointIds"]["remove"][0], "pe-2");
assert_eq!(json["tags"][0]["add"][0]["key"], "env");
assert_eq!(json["tags"][0]["remove"][0]["key"], "old");
assert!(json["tags"].is_object());
assert_eq!(json["tags"]["add"][0]["key"], "env");
assert_eq!(json["tags"]["remove"][0]["key"], "old");
assert_eq!(json["transparentDataEncryptionKeyId"], "tde-1");
assert_eq!(json["enableCoreDumps"], false);
}
Expand Down
2 changes: 1 addition & 1 deletion src/cloud/types.rs
Original file line number Diff line number Diff line change
Expand Up @@ -652,7 +652,7 @@ pub struct UpdateServiceRequest {
pub transparent_data_encryption_key_id: Option<String>,

#[serde(skip_serializing_if = "Option::is_none")]
pub tags: Option<Vec<InstanceTagsPatch>>,
pub tags: Option<InstanceTagsPatch>,

#[serde(skip_serializing_if = "Option::is_none")]
pub enable_core_dumps: Option<bool>,
Expand Down
9 changes: 6 additions & 3 deletions src/cloud/types_test.rs
Original file line number Diff line number Diff line change
Expand Up @@ -641,13 +641,15 @@ fn test_update_service_request_full() {
enabled: true,
}]),
transparent_data_encryption_key_id: Some("tde-key-1".to_string()),
tags: Some(vec![InstanceTagsPatch {
// The published schema currently shows an array here, but the live API
// expects a single patch object and rejects array payloads.
tags: Some(InstanceTagsPatch {
add: Some(vec![ResourceTag {
key: "env".to_string(),
value: Some("staging".to_string()),
}]),
remove: None,
}]),
}),
enable_core_dumps: Some(false),
};
let json = serde_json::to_value(&req).unwrap();
Expand All @@ -660,7 +662,8 @@ fn test_update_service_request_full() {
assert_eq!(json["releaseChannel"], "fast");
assert_eq!(json["endpoints"][0]["protocol"], "mysql");
assert_eq!(json["transparentDataEncryptionKeyId"], "tde-key-1");
assert_eq!(json["tags"][0]["add"][0]["key"], "env");
assert!(json["tags"].is_object());
assert_eq!(json["tags"]["add"][0]["key"], "env");
assert_eq!(json["enableCoreDumps"], false);
}

Expand Down