diff --git a/Cargo.lock b/Cargo.lock index 3bd57510..0bbe5a81 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -17,15 +17,6 @@ dependencies = [ "memchr", ] -[[package]] -name = "android_system_properties" -version = "0.1.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ae221649c9976a6f6c56ae1facf410f3ddb33cc661c4b7b61020a912d4237fbc" -dependencies = [ - "libc", -] - [[package]] name = "anstream" version = "1.0.0" @@ -918,20 +909,6 @@ dependencies = [ "rand_core", ] -[[package]] -name = "chrono" -version = "0.4.45" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1aa79e62e7697b8e29b513a68abacf485adcd1fe8284a4316c5ae868e6633327" -dependencies = [ - "iana-time-zone", - "js-sys", - "num-traits", - "serde", - "wasm-bindgen", - "windows-link", -] - [[package]] name = "clap" version = "4.6.7" @@ -995,8 +972,8 @@ dependencies = [ "aws-sdk-kinesis", "aws-sdk-s3", "base64 0.23.1", - "chrono", "clickhouse-openapi-analyzer", + "jiff", "rcgen", "reqwest", "rustls", @@ -1028,7 +1005,6 @@ version = "0.6.0" dependencies = [ "base64 0.23.1", "bollard", - "chrono", "clap", "clap_complete", "clickhouse-cloud-api", @@ -1039,6 +1015,7 @@ dependencies = [ "futures-util", "indicatif", "is-ai-agent", + "jiff", "libc", "open", "rand", @@ -1950,30 +1927,6 @@ dependencies = [ "tower-service", ] -[[package]] -name = "iana-time-zone" -version = "0.1.65" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e31bc9ad994ba00e440a8aa5c9ef0ec67d5cb5e5cb0cc7f8b744a35b389cc470" -dependencies = [ - "android_system_properties", - "core-foundation-sys", - "iana-time-zone-haiku", - "js-sys", - "log", - "wasm-bindgen", - "windows-core", -] - -[[package]] -name = "iana-time-zone-haiku" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f31827a206f56af32e590ba56d5d2d085f558508192593743f16b2306495269f" -dependencies = [ - "cc", -] - [[package]] name = "icu_collections" version = "2.4.0" @@ -2153,6 +2106,41 @@ version = "1.0.19" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3bd1574e617a9a6c1f8f8181bd7e841e1f20e4277607ef28945765188d6284d4" +[[package]] +name = "jiff" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9cc767b5763de45e810109520123bb2829a653f3a7ed9be40b2bc4f81158f595" +dependencies = [ + "jiff-core", + "jiff-static", + "log", + "portable-atomic", + "portable-atomic-util", + "serde_core", +] + +[[package]] +name = "jiff-core" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "894f7ac42105f584100691b3bf6e6b92dd12fcfa225f6c397f95c8a94b47b68f" +dependencies = [ + "log", +] + +[[package]] +name = "jiff-static" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "955491488dc99b572ea6d67b172dcd98787d00744b1fb44a5689b4e6413695a6" +dependencies = [ + "jiff-core", + "proc-macro2", + "quote", + "syn 3.0.10", +] + [[package]] name = "jni" version = "0.22.4" @@ -2588,6 +2576,15 @@ version = "1.15.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "05c8b63e8d9609db387f0324918f81d68fe27748f084ef092fb35954d0539a85" +[[package]] +name = "portable-atomic-util" +version = "0.2.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "10ab3eb7f3becc3a1cbc4f2c6f20267996cfc1a6467a873763411b136a122715" +dependencies = [ + "portable-atomic", +] + [[package]] name = "postgres-protocol" version = "0.6.12" @@ -4101,65 +4098,12 @@ version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" -[[package]] -name = "windows-core" -version = "0.62.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b8e83a14d34d0623b51dce9581199302a221863196a1dde71a7663a4c2be9deb" -dependencies = [ - "windows-implement", - "windows-interface", - "windows-link", - "windows-result", - "windows-strings", -] - -[[package]] -name = "windows-implement" -version = "0.60.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "053e2e040ab57b9dc951b72c264860db7eb3b0200ba345b4e4c3b14f67855ddf" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.119", -] - -[[package]] -name = "windows-interface" -version = "0.59.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3f316c4a2570ba26bbec722032c4099d8c8bc095efccdc15688708623367e358" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.119", -] - [[package]] name = "windows-link" version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f0805222e57f7521d6a62e36fa9163bc891acd422f971defe97d64e70d0a4fe5" -[[package]] -name = "windows-result" -version = "0.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7781fa89eaf60850ac3d2da7af8e5242a5ea78d1a11c49bf2910bb5a73853eb5" -dependencies = [ - "windows-link", -] - -[[package]] -name = "windows-strings" -version = "0.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7837d08f69c77cf6b07689544538e017c1bfcf57e34b4c0ff58e6c2cd3b37091" -dependencies = [ - "windows-link", -] - [[package]] name = "windows-sys" version = "0.52.0" diff --git a/crates/clickhouse-cloud-api/CHANGELOG.md b/crates/clickhouse-cloud-api/CHANGELOG.md index 0295e670..3cda4314 100644 --- a/crates/clickhouse-cloud-api/CHANGELOG.md +++ b/crates/clickhouse-cloud-api/CHANGELOG.md @@ -16,6 +16,20 @@ minor version; read the entries before raising it. ## Unreleased +Timestamp fields are now `jiff::Timestamp` instead of +`chrono::DateTime`, and the crate no longer depends on `chrono`, +which is unmaintained (RUSTSEC-2026-0543). This covers every model field that +held a timestamp (`created_at`, `expire_at`, `start_timestamp` and similar) and +the `PgCreatedAtProperty` and `PgPitrRestoreTargetProperty` aliases. Callers +depend on `jiff` 1.x and convert at the boundary: +`"2030-01-02T03:04:05Z".parse::()?` to build a value, +`timestamp.to_string()` for RFC 3339 and `timestamp.as_second()` for Unix +seconds. A caller that must keep `chrono` can convert with +`chrono::DateTime::from_timestamp(ts.as_second(), ts.subsec_nanosecond() as u32)`. +On the wire, timestamps are still RFC 3339 in UTC with a `Z` suffix. One +difference: a fractional second is written with the fewest digits that +represent it (`.5Z`), where `chrono` padded to 3, 6 or 9 (`.500Z`). + Structs with a required field no longer implement `Default`: request bodies such as `ServicePostRequest`, `ClickPipePostRequest` and `ClickStackCreateAlertRequest`, their nested required types, the request diff --git a/crates/clickhouse-cloud-api/Cargo.toml b/crates/clickhouse-cloud-api/Cargo.toml index 834e9b2b..58007e07 100644 --- a/crates/clickhouse-cloud-api/Cargo.toml +++ b/crates/clickhouse-cloud-api/Cargo.toml @@ -30,7 +30,7 @@ serde_json = "1" thiserror = "2" url = "2" uuid = { version = "1", features = ["serde", "v4"] } -chrono = { version = "0.4", features = ["serde"] } +jiff = { version = "1.0.0", default-features = false, features = ["std", "serde"] } [dev-dependencies] # `credentials-login` lets the default credential chain read `aws login` sessions. @@ -45,7 +45,6 @@ aws-sdk-iam = { version = "1.108.1", default-features = false, features = ["defa aws-sdk-kinesis = { version = "1.104.0", default-features = false, features = ["default-https-client", "rt-tokio"] } aws-sdk-s3 = { version = "1.132.0", default-features = false, features = ["default-https-client", "rt-tokio", "sigv4a", "http-1x"] } base64 = "0.23" -chrono = "0.4" rcgen = "0.14.8" rustls = { version = "0.23.40", default-features = false, features = ["ring", "std", "tls12"] } tokio = { version = "1", features = ["macros", "rt-multi-thread"] } diff --git a/crates/clickhouse-cloud-api/src/models/activity.rs b/crates/clickhouse-cloud-api/src/models/activity.rs index cdb79f9c..bf7d6b80 100644 --- a/crates/clickhouse-cloud-api/src/models/activity.rs +++ b/crates/clickhouse-cloud-api/src/models/activity.rs @@ -606,7 +606,7 @@ pub struct Activity { #[serde(rename = "actorType", skip_serializing_if = "Option::is_none")] pub actor_type: Option, #[serde(rename = "createdAt", skip_serializing_if = "Option::is_none")] - pub created_at: Option>, + pub created_at: Option, #[serde(skip_serializing_if = "Option::is_none")] pub id: Option, #[serde(rename = "keyUpdateType", skip_serializing_if = "Option::is_none")] diff --git a/crates/clickhouse-cloud-api/src/models/api_keys.rs b/crates/clickhouse-cloud-api/src/models/api_keys.rs index 7a112697..e8b8d061 100644 --- a/crates/clickhouse-cloud-api/src/models/api_keys.rs +++ b/crates/clickhouse-cloud-api/src/models/api_keys.rs @@ -75,9 +75,9 @@ pub struct ApiKey { #[serde(rename = "assignedRoles", skip_serializing_if = "Option::is_none")] pub assigned_roles: Option>, #[serde(rename = "createdAt", skip_serializing_if = "Option::is_none")] - pub created_at: Option>, + pub created_at: Option, #[serde(rename = "expireAt", skip_serializing_if = "Option::is_none")] - pub expire_at: Option>, + pub expire_at: Option, #[serde(skip_serializing_if = "Option::is_none")] pub id: Option, #[serde(rename = "ipAccessList", skip_serializing_if = "Option::is_none")] @@ -92,7 +92,7 @@ pub struct ApiKey { #[serde(skip_serializing_if = "Option::is_none")] pub state: Option, #[serde(rename = "usedAt", skip_serializing_if = "Option::is_none")] - pub used_at: Option>, + pub used_at: Option, } /// `ApiKeyHashData` from the ClickHouse Cloud API. @@ -113,7 +113,7 @@ pub struct ApiKeyPatchRequest { pub assigned_role_ids: Option>, /// `None` preserves the expiry, `Some(Some(time))` sets it, and `Some(None)` clears it. #[serde(rename = "expireAt", skip_serializing_if = "Option::is_none")] - pub expire_at: Option>>, + pub expire_at: Option>, #[serde(rename = "ipAccessList", skip_serializing_if = "Option::is_none")] pub ip_access_list: Option>, #[serde(skip_serializing_if = "Option::is_none")] @@ -163,7 +163,7 @@ pub struct ApiKeyPostRequest { #[serde(rename = "assignedRoleIds", skip_serializing_if = "Option::is_none")] pub assigned_role_ids: Option>, #[serde(rename = "expireAt", skip_serializing_if = "Option::is_none")] - pub expire_at: Option>, + pub expire_at: Option, #[serde(rename = "hashData", skip_serializing_if = "Option::is_none")] pub hash_data: Option, #[serde(rename = "ipAccessList", skip_serializing_if = "Option::is_none")] diff --git a/crates/clickhouse-cloud-api/src/models/backups.rs b/crates/clickhouse-cloud-api/src/models/backups.rs index cd53f5f5..39e95ac7 100644 --- a/crates/clickhouse-cloud-api/src/models/backups.rs +++ b/crates/clickhouse-cloud-api/src/models/backups.rs @@ -93,7 +93,7 @@ pub struct Snapshot { #[serde(rename = "durationInSeconds", skip_serializing_if = "Option::is_none")] pub duration_in_seconds: Option, #[serde(rename = "finishedAt", skip_serializing_if = "Option::is_none")] - pub finished_at: Option>, + pub finished_at: Option, #[serde(skip_serializing_if = "Option::is_none")] pub id: Option, #[serde(rename = "serviceId", skip_serializing_if = "Option::is_none")] @@ -101,7 +101,7 @@ pub struct Snapshot { #[serde(rename = "sizeInBytes", skip_serializing_if = "Option::is_none")] pub size_in_bytes: Option, #[serde(rename = "startedAt", skip_serializing_if = "Option::is_none")] - pub started_at: Option>, + pub started_at: Option, #[serde(skip_serializing_if = "Option::is_none")] pub status: Option, #[serde(rename = "type", skip_serializing_if = "Option::is_none")] @@ -692,7 +692,7 @@ pub struct Backup { #[serde(rename = "durationInSeconds", skip_serializing_if = "Option::is_none")] pub duration_in_seconds: Option, #[serde(rename = "finishedAt", skip_serializing_if = "Option::is_none")] - pub finished_at: Option>, + pub finished_at: Option, #[serde(skip_serializing_if = "Option::is_none")] pub id: Option, #[serde(rename = "serviceId", skip_serializing_if = "Option::is_none")] @@ -700,7 +700,7 @@ pub struct Backup { #[serde(rename = "sizeInBytes", skip_serializing_if = "Option::is_none")] pub size_in_bytes: Option, #[serde(rename = "startedAt", skip_serializing_if = "Option::is_none")] - pub started_at: Option>, + pub started_at: Option, #[serde(skip_serializing_if = "Option::is_none")] pub status: Option, #[serde(skip_serializing_if = "Option::is_none")] diff --git a/crates/clickhouse-cloud-api/src/models/byoc.rs b/crates/clickhouse-cloud-api/src/models/byoc.rs index 23bc4a0c..15dce0d8 100644 --- a/crates/clickhouse-cloud-api/src/models/byoc.rs +++ b/crates/clickhouse-cloud-api/src/models/byoc.rs @@ -833,7 +833,7 @@ pub struct ByocInfrastructureProgress { #[serde(skip_serializing_if = "Option::is_none")] pub status: Option, #[serde(rename = "updatedAt", skip_serializing_if = "Option::is_none")] - pub updated_at: Option>, + pub updated_at: Option, } /// `ByocInfrastructureProgressStage` from the ClickHouse Cloud API. @@ -850,7 +850,7 @@ pub struct ByocInfrastructureProgressStage { #[serde(rename = "subStages", skip_serializing_if = "Option::is_none")] pub sub_stages: Option>, #[serde(rename = "updatedAt", skip_serializing_if = "Option::is_none")] - pub updated_at: Option>, + pub updated_at: Option, } /// `ByocInfrastructureValidation` from the ClickHouse Cloud API. @@ -902,11 +902,11 @@ pub struct ByocCustomerAuthorizedAccess { pub mode: Option, /// Start of the access window; present only for `window` mode. #[serde(rename = "startTimestamp", skip_serializing_if = "Option::is_none")] - pub start_timestamp: Option>, + pub start_timestamp: Option, /// End of the current access window; present only while access is allowed /// until a deadline. #[serde(rename = "windowEndTimestamp", skip_serializing_if = "Option::is_none")] - pub window_end_timestamp: Option>, + pub window_end_timestamp: Option, } /// `ByocCustomerAuthorizedAccessPatchRequest` from the ClickHouse Cloud API (Beta). @@ -921,5 +921,5 @@ pub struct ByocCustomerAuthorizedAccessPatchRequest { #[serde(rename = "mode", skip_serializing_if = "Option::is_none")] pub mode: Option, #[serde(rename = "startTimestamp", skip_serializing_if = "Option::is_none")] - pub start_timestamp: Option>, + pub start_timestamp: Option, } diff --git a/crates/clickhouse-cloud-api/src/models/clickpipes/mod.rs b/crates/clickhouse-cloud-api/src/models/clickpipes/mod.rs index cbba7716..9060aee4 100644 --- a/crates/clickhouse-cloud-api/src/models/clickpipes/mod.rs +++ b/crates/clickhouse-cloud-api/src/models/clickpipes/mod.rs @@ -124,7 +124,7 @@ impl std::fmt::Display for ClickPipeStatePatchRequestCommand { #[derive(Debug, Clone, PartialEq, Default, Serialize, Deserialize)] pub struct ClickPipe { #[serde(rename = "createdAt", skip_serializing_if = "Option::is_none")] - pub created_at: Option>, + pub created_at: Option, #[serde(skip_serializing_if = "Option::is_none")] pub destination: Option, #[serde(rename = "fieldMappings", skip_serializing_if = "Option::is_none")] @@ -144,7 +144,7 @@ pub struct ClickPipe { #[serde(skip_serializing_if = "Option::is_none")] pub state: Option, #[serde(rename = "updatedAt", skip_serializing_if = "Option::is_none")] - pub updated_at: Option>, + pub updated_at: Option, } /// `ClickPipeDestination` from the ClickHouse Cloud API. diff --git a/crates/clickhouse-cloud-api/src/models/clickpipes/pubsub.rs b/crates/clickhouse-cloud-api/src/models/clickpipes/pubsub.rs index 809b72e4..1b12995b 100644 --- a/crates/clickhouse-cloud-api/src/models/clickpipes/pubsub.rs +++ b/crates/clickhouse-cloud-api/src/models/clickpipes/pubsub.rs @@ -217,7 +217,7 @@ pub struct ClickPipePubSubSource { #[serde(rename = "projectId", skip_serializing_if = "Option::is_none")] pub project_id: Option, #[serde(rename = "seekTimestamp", skip_serializing_if = "Option::is_none")] - pub seek_timestamp: Option>, + pub seek_timestamp: Option, #[serde(rename = "seekType", skip_serializing_if = "Option::is_none")] pub seek_type: Option, #[serde(skip_serializing_if = "Option::is_none")] @@ -238,7 +238,7 @@ pub struct ClickPipePostPubSubServiceAccountSource { #[serde(rename = "seekType")] pub seek_type: ClickPipePostPubSubSourceSeektype, #[serde(rename = "seekTimestamp", skip_serializing_if = "Option::is_none")] - pub seek_timestamp: Option>, + pub seek_timestamp: Option, #[serde(rename = "filter", skip_serializing_if = "Option::is_none")] pub filter: Option, #[serde(rename = "enableOrdering", skip_serializing_if = "Option::is_none")] @@ -280,7 +280,7 @@ pub struct ClickPipePostPubSubWorkloadIdentitySource { #[serde(rename = "seekType")] pub seek_type: ClickPipePostPubSubSourceSeektype, #[serde(rename = "seekTimestamp", skip_serializing_if = "Option::is_none")] - pub seek_timestamp: Option>, + pub seek_timestamp: Option, #[serde(rename = "filter", skip_serializing_if = "Option::is_none")] pub filter: Option, #[serde(rename = "enableOrdering", skip_serializing_if = "Option::is_none")] diff --git a/crates/clickhouse-cloud-api/src/models/clickstack/alerts.rs b/crates/clickhouse-cloud-api/src/models/clickstack/alerts.rs index 06538fc4..7dd0ab4a 100644 --- a/crates/clickhouse-cloud-api/src/models/clickstack/alerts.rs +++ b/crates/clickhouse-cloud-api/src/models/clickstack/alerts.rs @@ -1592,7 +1592,7 @@ pub struct ClickStackAlertExecutionError { #[serde(skip_serializing_if = "Option::is_none")] pub message: Option, #[serde(skip_serializing_if = "Option::is_none")] - pub timestamp: Option>, + pub timestamp: Option, #[serde(skip_serializing_if = "Option::is_none")] pub r#type: Option, } @@ -1610,7 +1610,7 @@ pub struct ClickStackAlertResponse { #[serde(rename = "chartConfig", skip_serializing_if = "Option::is_none")] pub chart_config: Option, #[serde(rename = "createdAt", skip_serializing_if = "Option::is_none")] - pub created_at: Option>, + pub created_at: Option, #[serde(rename = "dashboardId", skip_serializing_if = "Option::is_none")] pub dashboard_id: Option, #[serde(rename = "displayName", skip_serializing_if = "Option::is_none")] @@ -1642,7 +1642,7 @@ pub struct ClickStackAlertResponse { )] pub schedule_offset_minutes: Option, #[serde(rename = "scheduleStartAt", skip_serializing_if = "Option::is_none")] - pub schedule_start_at: Option>, + pub schedule_start_at: Option, #[serde(skip_serializing_if = "Option::is_none")] pub silenced: Option, #[serde(skip_serializing_if = "Option::is_none")] @@ -1662,7 +1662,7 @@ pub struct ClickStackAlertResponse { #[serde(rename = "tileId", skip_serializing_if = "Option::is_none")] pub tile_id: Option, #[serde(rename = "updatedAt", skip_serializing_if = "Option::is_none")] - pub updated_at: Option>, + pub updated_at: Option, } /// `ClickStackAlertSilenced` from the ClickHouse Cloud API. @@ -1672,11 +1672,11 @@ pub struct ClickStackAlertResponse { #[derive(Debug, Clone, PartialEq, Default, Serialize, Deserialize)] pub struct ClickStackAlertSilenced { #[serde(skip_serializing_if = "Option::is_none")] - pub at: Option>, + pub at: Option, #[serde(skip_serializing_if = "Option::is_none")] pub by: Option, #[serde(skip_serializing_if = "Option::is_none")] - pub until: Option>, + pub until: Option, } /// `ClickStackCreateAlertRequest` from the ClickHouse Cloud API. @@ -1714,7 +1714,7 @@ pub struct ClickStackCreateAlertRequest { )] pub schedule_offset_minutes: Option, #[serde(rename = "scheduleStartAt", skip_serializing_if = "Option::is_none")] - pub schedule_start_at: Option>, + pub schedule_start_at: Option, #[serde(skip_serializing_if = "Option::is_none")] pub source: Option, #[serde(skip_serializing_if = "Option::is_none")] @@ -1763,7 +1763,7 @@ pub struct ClickStackUpdateAlertRequest { )] pub schedule_offset_minutes: Option, #[serde(rename = "scheduleStartAt", skip_serializing_if = "Option::is_none")] - pub schedule_start_at: Option>, + pub schedule_start_at: Option, #[serde(skip_serializing_if = "Option::is_none")] pub source: Option, #[serde(skip_serializing_if = "Option::is_none")] diff --git a/crates/clickhouse-cloud-api/src/models/clickstack/roles.rs b/crates/clickhouse-cloud-api/src/models/clickstack/roles.rs index b1623335..b77267ff 100644 --- a/crates/clickhouse-cloud-api/src/models/clickstack/roles.rs +++ b/crates/clickhouse-cloud-api/src/models/clickstack/roles.rs @@ -258,7 +258,7 @@ pub struct ClickStackMongoDBCASLPermissionRegexCondition { #[derive(Debug, Clone, PartialEq, Default, Serialize, Deserialize)] pub struct ClickStackRole { #[serde(rename = "createdAt", skip_serializing_if = "Option::is_none")] - pub created_at: Option>, + pub created_at: Option, #[serde(skip_serializing_if = "Option::is_none")] pub description: Option, #[serde(skip_serializing_if = "Option::is_none")] @@ -270,7 +270,7 @@ pub struct ClickStackRole { #[serde(skip_serializing_if = "Option::is_none")] pub permissions: Option>, #[serde(rename = "updatedAt", skip_serializing_if = "Option::is_none")] - pub updated_at: Option>, + pub updated_at: Option, } /// `ClickStackUpdateRoleRequest` from the ClickHouse Cloud API. diff --git a/crates/clickhouse-cloud-api/src/models/clickstack/saved_searches.rs b/crates/clickhouse-cloud-api/src/models/clickstack/saved_searches.rs index 9f80c6ba..ef5d3e25 100644 --- a/crates/clickhouse-cloud-api/src/models/clickstack/saved_searches.rs +++ b/crates/clickhouse-cloud-api/src/models/clickstack/saved_searches.rs @@ -8,7 +8,7 @@ use serde::{Deserialize, Serialize}; #[derive(Debug, Clone, PartialEq, Default, Serialize, Deserialize)] pub struct ClickStackSavedSearch { #[serde(rename = "createdAt", skip_serializing_if = "Option::is_none")] - pub created_at: Option>, + pub created_at: Option, #[serde(skip_serializing_if = "Option::is_none")] pub filters: Option>, #[serde(skip_serializing_if = "Option::is_none")] @@ -26,7 +26,7 @@ pub struct ClickStackSavedSearch { #[serde(rename = "teamId", skip_serializing_if = "Option::is_none")] pub team_id: Option, #[serde(rename = "updatedAt", skip_serializing_if = "Option::is_none")] - pub updated_at: Option>, + pub updated_at: Option, #[serde(skip_serializing_if = "Option::is_none")] pub r#where: Option, #[serde(rename = "whereLanguage", skip_serializing_if = "Option::is_none")] diff --git a/crates/clickhouse-cloud-api/src/models/clickstack/sources.rs b/crates/clickhouse-cloud-api/src/models/clickstack/sources.rs index 7b4c73cc..995b2365 100644 --- a/crates/clickhouse-cloud-api/src/models/clickstack/sources.rs +++ b/crates/clickhouse-cloud-api/src/models/clickstack/sources.rs @@ -134,7 +134,7 @@ pub struct ClickStackAggregatedColumnResponse { #[derive(Debug, Clone, PartialEq, Default, Serialize, Deserialize)] pub struct ClickStackConnection { #[serde(rename = "createdAt", skip_serializing_if = "Option::is_none")] - pub created_at: Option>, + pub created_at: Option, #[serde(skip_serializing_if = "Option::is_none")] pub host: Option, #[serde( @@ -152,7 +152,7 @@ pub struct ClickStackConnection { #[serde(skip_serializing_if = "Option::is_none")] pub name: Option, #[serde(rename = "updatedAt", skip_serializing_if = "Option::is_none")] - pub updated_at: Option>, + pub updated_at: Option, #[serde(skip_serializing_if = "Option::is_none")] pub username: Option, } @@ -500,7 +500,7 @@ pub struct ClickStackMaterializedView { #[serde(rename = "dimensionColumns")] pub dimension_columns: String, #[serde(rename = "minDate", skip_serializing_if = "Option::is_none")] - pub min_date: Option>, + pub min_date: Option, #[serde(rename = "minGranularity")] pub min_granularity: ClickStackMaterializedViewMingranularity, #[serde(rename = "tableName")] @@ -523,7 +523,7 @@ pub struct ClickStackMaterializedViewResponse { #[serde(rename = "dimensionColumns", skip_serializing_if = "Option::is_none")] pub dimension_columns: Option, #[serde(rename = "minDate", skip_serializing_if = "Option::is_none")] - pub min_date: Option>, + pub min_date: Option, #[serde(rename = "minGranularity", skip_serializing_if = "Option::is_none")] pub min_granularity: Option, #[serde(rename = "tableName", skip_serializing_if = "Option::is_none")] diff --git a/crates/clickhouse-cloud-api/src/models/clickstack/webhooks.rs b/crates/clickhouse-cloud-api/src/models/clickstack/webhooks.rs index dda2dbee..52230d38 100644 --- a/crates/clickhouse-cloud-api/src/models/clickstack/webhooks.rs +++ b/crates/clickhouse-cloud-api/src/models/clickstack/webhooks.rs @@ -61,7 +61,7 @@ pub struct ClickStackGenericWebhook { #[serde(skip_serializing_if = "Option::is_none")] pub body: Option, #[serde(rename = "createdAt", skip_serializing_if = "Option::is_none")] - pub created_at: Option>, + pub created_at: Option, #[serde(skip_serializing_if = "Option::is_none")] pub description: Option, #[serde(skip_serializing_if = "Option::is_none")] @@ -71,7 +71,7 @@ pub struct ClickStackGenericWebhook { #[serde(skip_serializing_if = "Option::is_none")] pub service: Option, #[serde(rename = "updatedAt", skip_serializing_if = "Option::is_none")] - pub updated_at: Option>, + pub updated_at: Option, #[serde(skip_serializing_if = "Option::is_none")] pub url: Option, } @@ -83,7 +83,7 @@ pub struct ClickStackGenericWebhook { #[derive(Debug, Clone, PartialEq, Default, Serialize, Deserialize)] pub struct ClickStackIncidentIOWebhook { #[serde(rename = "createdAt", skip_serializing_if = "Option::is_none")] - pub created_at: Option>, + pub created_at: Option, #[serde(skip_serializing_if = "Option::is_none")] pub description: Option, #[serde(skip_serializing_if = "Option::is_none")] @@ -93,7 +93,7 @@ pub struct ClickStackIncidentIOWebhook { #[serde(skip_serializing_if = "Option::is_none")] pub service: Option, #[serde(rename = "updatedAt", skip_serializing_if = "Option::is_none")] - pub updated_at: Option>, + pub updated_at: Option, #[serde(skip_serializing_if = "Option::is_none")] pub url: Option, } @@ -105,7 +105,7 @@ pub struct ClickStackIncidentIOWebhook { #[derive(Debug, Clone, PartialEq, Default, Serialize, Deserialize)] pub struct ClickStackPagerDutyAPIWebhook { #[serde(rename = "createdAt", skip_serializing_if = "Option::is_none")] - pub created_at: Option>, + pub created_at: Option, #[serde(skip_serializing_if = "Option::is_none")] pub description: Option, #[serde(skip_serializing_if = "Option::is_none")] @@ -115,7 +115,7 @@ pub struct ClickStackPagerDutyAPIWebhook { #[serde(skip_serializing_if = "Option::is_none")] pub service: Option, #[serde(rename = "updatedAt", skip_serializing_if = "Option::is_none")] - pub updated_at: Option>, + pub updated_at: Option, #[serde(skip_serializing_if = "Option::is_none")] pub url: Option, } @@ -127,7 +127,7 @@ pub struct ClickStackPagerDutyAPIWebhook { #[derive(Debug, Clone, PartialEq, Default, Serialize, Deserialize)] pub struct ClickStackSlackAPIWebhook { #[serde(rename = "createdAt", skip_serializing_if = "Option::is_none")] - pub created_at: Option>, + pub created_at: Option, #[serde(skip_serializing_if = "Option::is_none")] pub description: Option, #[serde(skip_serializing_if = "Option::is_none")] @@ -137,7 +137,7 @@ pub struct ClickStackSlackAPIWebhook { #[serde(skip_serializing_if = "Option::is_none")] pub service: Option, #[serde(rename = "updatedAt", skip_serializing_if = "Option::is_none")] - pub updated_at: Option>, + pub updated_at: Option, #[serde(skip_serializing_if = "Option::is_none")] pub url: Option, } @@ -149,7 +149,7 @@ pub struct ClickStackSlackAPIWebhook { #[derive(Debug, Clone, PartialEq, Default, Serialize, Deserialize)] pub struct ClickStackSlackWebhook { #[serde(rename = "createdAt", skip_serializing_if = "Option::is_none")] - pub created_at: Option>, + pub created_at: Option, #[serde(skip_serializing_if = "Option::is_none")] pub description: Option, #[serde(skip_serializing_if = "Option::is_none")] @@ -159,7 +159,7 @@ pub struct ClickStackSlackWebhook { #[serde(skip_serializing_if = "Option::is_none")] pub service: Option, #[serde(rename = "updatedAt", skip_serializing_if = "Option::is_none")] - pub updated_at: Option>, + pub updated_at: Option, #[serde(skip_serializing_if = "Option::is_none")] pub url: Option, } diff --git a/crates/clickhouse-cloud-api/src/models/invitations.rs b/crates/clickhouse-cloud-api/src/models/invitations.rs index 5aeb919b..19057be3 100644 --- a/crates/clickhouse-cloud-api/src/models/invitations.rs +++ b/crates/clickhouse-cloud-api/src/models/invitations.rs @@ -52,11 +52,11 @@ pub struct Invitation { #[serde(rename = "assignedRoles", skip_serializing_if = "Option::is_none")] pub assigned_roles: Option>, #[serde(rename = "createdAt", skip_serializing_if = "Option::is_none")] - pub created_at: Option>, + pub created_at: Option, #[serde(skip_serializing_if = "Option::is_none")] pub email: Option, #[serde(rename = "expireAt", skip_serializing_if = "Option::is_none")] - pub expire_at: Option>, + pub expire_at: Option, #[serde(skip_serializing_if = "Option::is_none")] pub id: Option, #[cfg(feature = "deprecated-fields")] diff --git a/crates/clickhouse-cloud-api/src/models/members.rs b/crates/clickhouse-cloud-api/src/models/members.rs index 67ec9d48..a750a360 100644 --- a/crates/clickhouse-cloud-api/src/models/members.rs +++ b/crates/clickhouse-cloud-api/src/models/members.rs @@ -54,7 +54,7 @@ pub struct Member { #[serde(skip_serializing_if = "Option::is_none")] pub email: Option, #[serde(rename = "joinedAt", skip_serializing_if = "Option::is_none")] - pub joined_at: Option>, + pub joined_at: Option, #[serde(skip_serializing_if = "Option::is_none")] pub name: Option, #[cfg(feature = "deprecated-fields")] diff --git a/crates/clickhouse-cloud-api/src/models/organizations.rs b/crates/clickhouse-cloud-api/src/models/organizations.rs index e4f2a29f..29c0f096 100644 --- a/crates/clickhouse-cloud-api/src/models/organizations.rs +++ b/crates/clickhouse-cloud-api/src/models/organizations.rs @@ -7,7 +7,7 @@ pub struct ActiveBalance { #[serde(rename = "amountSpent", skip_serializing_if = "Option::is_none")] pub amount_spent: Option, #[serde(rename = "expirationDate", skip_serializing_if = "Option::is_none")] - pub expiration_date: Option>, + pub expiration_date: Option, #[serde(rename = "id", skip_serializing_if = "Option::is_none")] pub id: Option, #[serde( @@ -16,7 +16,7 @@ pub struct ActiveBalance { )] pub remaining_prepaid_credits: Option, #[serde(rename = "startDate", skip_serializing_if = "Option::is_none")] - pub start_date: Option>, + pub start_date: Option, #[serde(rename = "totalAmount", skip_serializing_if = "Option::is_none")] pub total_amount: Option, } @@ -93,7 +93,7 @@ pub struct Organization { #[serde(skip_serializing_if = "Option::is_none")] pub capabilities: Option, #[serde(rename = "createdAt", skip_serializing_if = "Option::is_none")] - pub created_at: Option>, + pub created_at: Option, #[serde(rename = "enableCoreDumps", skip_serializing_if = "Option::is_none")] pub enable_core_dumps: Option, #[serde(skip_serializing_if = "Option::is_none")] @@ -186,7 +186,7 @@ pub struct Notification { #[serde(rename = "resourceName", skip_serializing_if = "Option::is_none")] pub resource_name: Option, #[serde(rename = "createdAt", skip_serializing_if = "Option::is_none")] - pub created_at: Option>, + pub created_at: Option, #[serde(rename = "title", skip_serializing_if = "Option::is_none")] pub title: Option, #[serde(rename = "description", skip_serializing_if = "Option::is_none")] @@ -234,9 +234,9 @@ pub struct CreditBalance { #[serde(rename = "amountSpent", skip_serializing_if = "Option::is_none")] pub amount_spent: Option, #[serde(rename = "startDate", skip_serializing_if = "Option::is_none")] - pub start_date: Option>, + pub start_date: Option, #[serde(rename = "expirationDate", skip_serializing_if = "Option::is_none")] - pub expiration_date: Option>, + pub expiration_date: Option, } /// `CreditBalances` from the ClickHouse Cloud API. diff --git a/crates/clickhouse-cloud-api/src/models/postgres.rs b/crates/clickhouse-cloud-api/src/models/postgres.rs index c7f3ec39..5cb9f9b1 100644 --- a/crates/clickhouse-cloud-api/src/models/postgres.rs +++ b/crates/clickhouse-cloud-api/src/models/postgres.rs @@ -1197,7 +1197,7 @@ impl PgConfigLogLockWaits { } /// Type alias for `pgCreatedAtProperty`. -pub type PgCreatedAtProperty = chrono::DateTime; +pub type PgCreatedAtProperty = jiff::Timestamp; /// Type alias for `pgDeletionProtectionProperty`. pub type PgDeletionProtectionProperty = bool; @@ -1215,7 +1215,7 @@ pub type PgNameProperty = String; pub type PgPassword = String; /// Type alias for `pgPitrRestoreTargetProperty`. -pub type PgPitrRestoreTargetProperty = chrono::DateTime; +pub type PgPitrRestoreTargetProperty = jiff::Timestamp; /// Type alias for `pgRegion`. pub type PgRegion = String; @@ -1267,7 +1267,7 @@ pub struct PostgresService { rename = "earliestRestoreTime", skip_serializing_if = "Option::is_none" )] - pub earliest_restore_time: Option>, + pub earliest_restore_time: Option, #[serde(rename = "haType", skip_serializing_if = "Option::is_none")] pub ha_type: Option, #[serde(skip_serializing_if = "Option::is_none")] @@ -1508,7 +1508,7 @@ pub struct PostgresServiceSetState { #[derive(Debug, Clone, PartialEq, Default, Serialize, Deserialize)] pub struct PostgresLogEntry { #[serde(rename = "timestamp", skip_serializing_if = "Option::is_none")] - pub timestamp: Option>, + pub timestamp: Option, #[serde(rename = "severity", skip_serializing_if = "Option::is_none")] pub severity: Option, #[serde(rename = "body", skip_serializing_if = "Option::is_none")] @@ -2031,7 +2031,7 @@ pub struct PostgresBackup { pub key: Option, /// Time the backup was last written to. #[serde(rename = "lastModified", skip_serializing_if = "Option::is_none")] - pub last_modified: Option>, + pub last_modified: Option, /// Status of the backup. Only completed backups are listed, so the API /// documents this as always `ready`; the spec does not constrain it to an /// enum. diff --git a/crates/clickhouse-cloud-api/src/models/rbac.rs b/crates/clickhouse-cloud-api/src/models/rbac.rs index 968d7c24..bedef44a 100644 --- a/crates/clickhouse-cloud-api/src/models/rbac.rs +++ b/crates/clickhouse-cloud-api/src/models/rbac.rs @@ -144,7 +144,7 @@ pub struct RBACRole { #[serde(skip_serializing_if = "Option::is_none")] pub actors: Option>, #[serde(rename = "createdAt", skip_serializing_if = "Option::is_none")] - pub created_at: Option>, + pub created_at: Option, #[serde(skip_serializing_if = "Option::is_none")] pub id: Option, #[serde(skip_serializing_if = "Option::is_none")] @@ -158,7 +158,7 @@ pub struct RBACRole { #[serde(skip_serializing_if = "Option::is_none")] pub r#type: Option, #[serde(rename = "updatedAt", skip_serializing_if = "Option::is_none")] - pub updated_at: Option>, + pub updated_at: Option, } /// `RoleCreateRequest` from the ClickHouse Cloud API. diff --git a/crates/clickhouse-cloud-api/src/models/scim.rs b/crates/clickhouse-cloud-api/src/models/scim.rs index da983da0..957b46db 100644 --- a/crates/clickhouse-cloud-api/src/models/scim.rs +++ b/crates/clickhouse-cloud-api/src/models/scim.rs @@ -96,9 +96,9 @@ pub struct ScimGroupMember { /// `ScimGroupMeta` from the ClickHouse Cloud API. #[derive(Debug, Clone, PartialEq, Serialize, Deserialize)] pub struct ScimGroupMeta { - pub created: chrono::DateTime, + pub created: jiff::Timestamp, #[serde(rename = "lastModified")] - pub last_modified: chrono::DateTime, + pub last_modified: jiff::Timestamp, #[serde(skip_serializing_if = "Option::is_none")] pub location: Option, #[serde(rename = "resourceType")] @@ -316,9 +316,9 @@ pub struct ScimUserIm { /// `ScimUserMeta` from the ClickHouse Cloud API. #[derive(Debug, Clone, PartialEq, Serialize, Deserialize)] pub struct ScimUserMeta { - pub created: chrono::DateTime, + pub created: jiff::Timestamp, #[serde(rename = "lastModified")] - pub last_modified: chrono::DateTime, + pub last_modified: jiff::Timestamp, #[serde(skip_serializing_if = "Option::is_none")] pub location: Option, #[serde(rename = "resourceType")] diff --git a/crates/clickhouse-cloud-api/src/models/services.rs b/crates/clickhouse-cloud-api/src/models/services.rs index 81519b46..daf5340e 100644 --- a/crates/clickhouse-cloud-api/src/models/services.rs +++ b/crates/clickhouse-cloud-api/src/models/services.rs @@ -1535,7 +1535,7 @@ pub struct Service { #[serde(rename = "complianceType", skip_serializing_if = "Option::is_none")] pub compliance_type: Option, #[serde(rename = "createdAt", skip_serializing_if = "Option::is_none")] - pub created_at: Option>, + pub created_at: Option, #[serde(rename = "currentScaling", skip_serializing_if = "Option::is_none")] pub current_scaling: Option, #[serde(rename = "dataWarehouseId", skip_serializing_if = "Option::is_none")] @@ -2059,7 +2059,7 @@ pub struct ServiceScalingPatchResponse { #[serde(rename = "complianceType", skip_serializing_if = "Option::is_none")] pub compliance_type: Option, #[serde(rename = "createdAt", skip_serializing_if = "Option::is_none")] - pub created_at: Option>, + pub created_at: Option, #[serde(rename = "currentScaling", skip_serializing_if = "Option::is_none")] pub current_scaling: Option, #[serde(rename = "dataWarehouseId", skip_serializing_if = "Option::is_none")] diff --git a/crates/clickhouse-cloud-api/src/models/udfs.rs b/crates/clickhouse-cloud-api/src/models/udfs.rs index 17071a64..c8020565 100644 --- a/crates/clickhouse-cloud-api/src/models/udfs.rs +++ b/crates/clickhouse-cloud-api/src/models/udfs.rs @@ -147,7 +147,7 @@ pub struct Udf { )] pub command_write_timeout: Option, #[serde(rename = "createdAt", skip_serializing_if = "Option::is_none")] - pub created_at: Option>, + pub created_at: Option, #[serde(skip_serializing_if = "Option::is_none")] pub error: Option, #[serde(skip_serializing_if = "Option::is_none")] @@ -180,7 +180,7 @@ pub struct Udf { #[serde(rename = "type", skip_serializing_if = "Option::is_none")] pub r#type: Option, #[serde(rename = "updatedAt", skip_serializing_if = "Option::is_none")] - pub updated_at: Option>, + pub updated_at: Option, #[serde(skip_serializing_if = "Option::is_none")] pub version: Option, } @@ -490,7 +490,7 @@ pub struct UdfListResponse { #[derive(Debug, Clone, PartialEq, Default, Serialize, Deserialize)] pub struct UdfUploadSession { #[serde(rename = "expiresAt", skip_serializing_if = "Option::is_none")] - pub expires_at: Option>, + pub expires_at: Option, #[serde(rename = "uploadId", skip_serializing_if = "Option::is_none")] pub upload_id: Option, #[serde(rename = "uploadUrl", skip_serializing_if = "Option::is_none")] diff --git a/crates/clickhouse-cloud-api/tests/client/api_keys.rs b/crates/clickhouse-cloud-api/tests/client/api_keys.rs index 88a2562e..9ba98f6f 100644 --- a/crates/clickhouse-cloud-api/tests/client/api_keys.rs +++ b/crates/clickhouse-cloud-api/tests/client/api_keys.rs @@ -1,4 +1,3 @@ -use chrono::Utc; use clickhouse_cloud_api::{Client, models::*}; use wiremock::matchers::{basic_auth, body_json, body_partial_json, method, path}; use wiremock::{Mock, MockServer, ResponseTemplate}; @@ -213,9 +212,7 @@ async fn delete_api_key() { #[tokio::test] async fn update_api_key_sends_omitted_timestamp_and_null_expiry() { - let timestamp = chrono::DateTime::parse_from_rfc3339("2030-01-02T03:04:05Z") - .unwrap() - .with_timezone(&Utc); + let timestamp = "2030-01-02T03:04:05Z".parse::().unwrap(); for (expire_at, wire) in [ (None, serde_json::json!({"name": "retained"})), ( diff --git a/crates/clickhouse-cloud-api/tests/client/byoc.rs b/crates/clickhouse-cloud-api/tests/client/byoc.rs index 6d34ceea..991219a1 100644 --- a/crates/clickhouse-cloud-api/tests/client/byoc.rs +++ b/crates/clickhouse-cloud-api/tests/client/byoc.rs @@ -277,8 +277,8 @@ async fn get_byoc_infrastructure_progress() { Some(ByocInfrastructureProgressStatus::InProgress) ); assert_eq!( - progress.updated_at.map(|t| t.to_rfc3339()), - Some("2026-09-30T12:00:00+00:00".to_string()) + progress.updated_at.map(|t| t.to_string()), + Some("2026-09-30T12:00:00Z".to_string()) ); let stages = progress.stages.unwrap(); assert_eq!(stages.len(), 2); diff --git a/crates/clickhouse-cloud-api/tests/client/postgres.rs b/crates/clickhouse-cloud-api/tests/client/postgres.rs index 271a2d97..97abd592 100644 --- a/crates/clickhouse-cloud-api/tests/client/postgres.rs +++ b/crates/clickhouse-cloud-api/tests/client/postgres.rs @@ -1,4 +1,3 @@ -use chrono::Utc; use clickhouse_cloud_api::models::*; use wiremock::matchers::{basic_auth, body_partial_json, method, path, query_param}; use wiremock::{Mock, ResponseTemplate}; @@ -586,7 +585,7 @@ async fn restore_postgres_service() { ("default_pool_size".into(), "16".into()), ("future_parameter".into(), "on".into()), ])), - restore_target: Utc::now(), + restore_target: jiff::Timestamp::now(), pg_config: None, tags: None, }; @@ -678,11 +677,7 @@ async fn postgres_service_backup_get_list_encodes_cursor_and_reads_envelope_pagi ); assert_eq!( result[0].last_modified, - Some( - chrono::DateTime::parse_from_rfc3339("2026-03-31T18:17:37Z") - .unwrap() - .with_timezone(&Utc) - ) + Some("2026-03-31T18:17:37Z".parse::().unwrap()) ); let requests = server.received_requests().await.unwrap(); let query: std::collections::HashMap<_, _> = diff --git a/crates/clickhouse-cloud-api/tests/integration_org_test.rs b/crates/clickhouse-cloud-api/tests/integration_org_test.rs index b8200f92..dd186ca4 100644 --- a/crates/clickhouse-cloud-api/tests/integration_org_test.rs +++ b/crates/clickhouse-cloud-api/tests/integration_org_test.rs @@ -1281,7 +1281,7 @@ async fn cloud_org_lifecycle() -> TestResult<()> { } let hit = entries.into_iter().find(|a| { a.created_at.is_some_and(|created_at| { - created_at.timestamp() as u64 >= window_start_secs + created_at.as_second() as u64 >= window_start_secs }) }); Ok(hit) @@ -1334,7 +1334,7 @@ async fn cloud_org_lifecycle() -> TestResult<()> { "activity_get returned no organizationId".into() ); } - if fetched.created_at.is_none_or(|at| at.timestamp() == 0) { + if fetched.created_at.is_none_or(|at| at.as_second() == 0) { return Err( "activity_get returned zero createdAt".into() ); @@ -1541,10 +1541,10 @@ async fn cloud_org_lifecycle() -> TestResult<()> { async move { let before = client.openapi_key_get(&org_id, &api_key_uuid).await? .result.ok_or("key missing before expiry update")?; - let expires = chrono::Utc::now() + chrono::Duration::days(7); // Use whole seconds because the API may normalize timestamp precision. - let expires = chrono::DateTime::from_timestamp(expires.timestamp(), 0) - .ok_or("invalid expiry timestamp")?; + let expires = jiff::Timestamp::from_second( + jiff::Timestamp::now().as_second() + 7 * 24 * 60 * 60, + )?; for expire_at in [Some(expires), None] { let request = ApiKeyPatchRequest { expire_at: Some(expire_at), diff --git a/crates/clickhouse-cloud-api/tests/models/api_keys.rs b/crates/clickhouse-cloud-api/tests/models/api_keys.rs index bde4dd29..132236aa 100644 --- a/crates/clickhouse-cloud-api/tests/models/api_keys.rs +++ b/crates/clickhouse-cloud-api/tests/models/api_keys.rs @@ -49,9 +49,7 @@ fn api_key_minimal_response() { #[test] fn api_key_patch_expiry_preserves_omit_set_and_clear() { - let timestamp = chrono::DateTime::parse_from_rfc3339("2030-01-02T03:04:05Z") - .unwrap() - .with_timezone(&chrono::Utc); + let timestamp = "2030-01-02T03:04:05Z".parse::().unwrap(); for (expire_at, wire) in [ (None, serde_json::json!({})), ( diff --git a/crates/clickhouse-cloud-api/tests/models/byoc.rs b/crates/clickhouse-cloud-api/tests/models/byoc.rs index 367c3357..d1c85317 100644 --- a/crates/clickhouse-cloud-api/tests/models/byoc.rs +++ b/crates/clickhouse-cloud-api/tests/models/byoc.rs @@ -506,8 +506,8 @@ fn byoc_customer_authorized_access_keeps_window_fields_and_open_mode() { assert_eq!(access.duration_seconds, Some(3600)); assert_eq!(access.allowed, Some(true)); assert_eq!( - access.start_timestamp.unwrap().to_rfc3339(), - "2026-11-09T10:00:00+00:00" + access.start_timestamp.unwrap().to_string(), + "2026-11-09T10:00:00Z" ); assert!(access.window_end_timestamp.is_some()); diff --git a/crates/clickhouse-cloud-api/tests/models/scim.rs b/crates/clickhouse-cloud-api/tests/models/scim.rs index 2cc07054..0a9e025e 100644 --- a/crates/clickhouse-cloud-api/tests/models/scim.rs +++ b/crates/clickhouse-cloud-api/tests/models/scim.rs @@ -25,8 +25,8 @@ fn scim_user_enterprise_extension_uses_the_exact_wire_name() { ims: None, locale: None, meta: ScimUserMeta { - created: chrono::DateTime::::default(), - last_modified: chrono::DateTime::::default(), + created: jiff::Timestamp::default(), + last_modified: jiff::Timestamp::default(), location: None, resource_type: String::new(), }, diff --git a/crates/clickhouse-openapi-analyzer/src/responses.rs b/crates/clickhouse-openapi-analyzer/src/responses.rs index 1e838298..9e87a70b 100644 --- a/crates/clickhouse-openapi-analyzer/src/responses.rs +++ b/crates/clickhouse-openapi-analyzer/src/responses.rs @@ -500,7 +500,6 @@ impl Checker<'_> { } if let TypeNode::Applied(name, _) = ty && !self.rust.model_types.contains(name) - && name != "DateTime" { self.finding( FindingKind::UnsupportedResponseSchema, @@ -661,14 +660,12 @@ impl Checker<'_> { .is_some_and(|info| info.uses_i64_serde_conversion); let matches = match kind { Some("string") => { - matches!( - scalar, - "String" | "str" | "Uuid" | "DateTime" | "NaiveDateTime" | "NaiveDate" - ) || self - .rust - .enums - .get(scalar) - .is_some_and(|info| info.is_value_enum && !info.uses_i64_serde_conversion) + matches!(scalar, "String" | "str" | "Uuid" | "Timestamp") + || self + .rust + .enums + .get(scalar) + .is_some_and(|info| info.is_value_enum && !info.uses_i64_serde_conversion) } Some("integer") => { integer diff --git a/crates/clickhouse-openapi-analyzer/tests/entrypoint_test.rs b/crates/clickhouse-openapi-analyzer/tests/entrypoint_test.rs index 217e3b10..c195a196 100644 --- a/crates/clickhouse-openapi-analyzer/tests/entrypoint_test.rs +++ b/crates/clickhouse-openapi-analyzer/tests/entrypoint_test.rs @@ -262,9 +262,9 @@ fn contract_report(target: &str, snapshot: &str) -> DriftReport { #[cfg(feature = "deprecated-fields")] pub roles: Option>, #[serde(rename = "assignedRoles")] pub assigned_roles: Option>, #[serde(rename = "keySuffix")] pub key_suffix: Option, - #[serde(rename = "createdAt")] pub created_at: Option>, - #[serde(rename = "expireAt")] pub expire_at: Option>, - #[serde(rename = "usedAt")] pub used_at: Option>, + #[serde(rename = "createdAt")] pub created_at: Option, + #[serde(rename = "expireAt")] pub expire_at: Option, + #[serde(rename = "usedAt")] pub used_at: Option, #[serde(rename = "ipAccessList")] pub ip_access_list: Option>, } pub enum ApiKeyState { diff --git a/crates/clickhousectl/Cargo.toml b/crates/clickhousectl/Cargo.toml index f066db2a..4c9f4648 100644 --- a/crates/clickhousectl/Cargo.toml +++ b/crates/clickhousectl/Cargo.toml @@ -53,7 +53,6 @@ libc = "0.2.183" urlencoding = "2.1.3" flate2 = "1.1.9" tar = "0.4.45" -chrono = "0.4.44" open = "5.3.3" url = "2.5.8" tabled = "0.22" @@ -74,6 +73,7 @@ zip = { version = "9", default-features = false, features = ["deflate-flate2"] } unicode-normalization = { version = "0.1.26", optional = true } strsim = "0.11.1" clap_complete = { version = "=4.6.11", features = ["unstable-dynamic"] } +jiff = { version = "1.0.0", default-features = false, features = ["std"] } [dev-dependencies] rustls = { version = "0.23.46", default-features = false, features = ["aws_lc_rs", "std", "tls12"] } diff --git a/crates/clickhousectl/src/cloud/activity.rs b/crates/clickhousectl/src/cloud/activity.rs index 3e9e02cd..21b2a430 100644 --- a/crates/clickhousectl/src/cloud/activity.rs +++ b/crates/clickhousectl/src/cloud/activity.rs @@ -10,9 +10,10 @@ pub(super) const PERMISSIONS: &[Permission] = &[ use crate::cloud::client::{CloudClient, ResourceKind, ResourceLookup, Result as CloudResult}; use crate::cloud::output::{or_absent, print_human}; use crate::cloud::shared::{parse_date_only, resolve_org_id}; -use chrono::{Datelike, Days, NaiveDate, Utc}; use clap::Subcommand; use clap::builder::NonEmptyStringValueParser; +use jiff::civil::Date; +use jiff::{Timestamp, ToSpan}; use tabled::{Table, Tabled, settings::Style}; #[derive(Subcommand)] @@ -61,10 +62,8 @@ async fn activity_list( json: bool, ) -> CloudResult<()> { let org_id = resolve_org_id(client).await?; - let from_date = from_date.map_or_else( - || default_from_date(to_date, Utc::now().date_naive()), - str::to_string, - ); + let from_date = + from_date.map_or_else(|| default_from_date(to_date, today_utc()), str::to_string); let to_date = to_date.map(exclusive_end_date); let activities = client .list_activities(&org_id, Some(&from_date), to_date.as_deref()) @@ -91,7 +90,11 @@ async fn activity_list( .map(|activity| Row { id: or_absent(activity.id.as_deref()), activity_type: or_absent(activity.r#type.as_ref()), - created: or_absent(activity.created_at.map(|at| at.to_rfc3339())), + created: or_absent( + activity + .created_at + .map(crate::cloud::shared::format_rfc3339), + ), }) .collect(); println!("{}", Table::new(rows).with(Style::markdown())); @@ -100,29 +103,33 @@ async fn activity_list( } /// Days `activity list` covers when `--from-date` is absent, counting the end day. -const DEFAULT_WINDOW_DAYS: u64 = 7; +const DEFAULT_WINDOW_DAYS: i64 = 7; /// Without a start date the API returns the whole history, so default to the /// last `DEFAULT_WINDOW_DAYS` days ending on `--to-date`, or on `today`. -fn default_from_date(to_date: Option<&str>, today: NaiveDate) -> String { +fn default_from_date(to_date: Option<&str>, today: Date) -> String { let end = to_date - .and_then(|date| NaiveDate::parse_from_str(date, "%Y-%m-%d").ok()) + .and_then(|date| Date::strptime("%Y-%m-%d", date).ok()) .unwrap_or(today); - end.checked_sub_days(Days::new(DEFAULT_WINDOW_DAYS - 1)) + end.checked_sub((DEFAULT_WINDOW_DAYS - 1).days()) .unwrap_or(end) - .format("%Y-%m-%d") .to_string() } +fn today_utc() -> Date { + Timestamp::now() + .to_zoned_datetime(jiff::tz::TimeZone::UTC) + .date() +} + /// The API reads `to_date` as midnight at the start of that day, so a bare /// date would exclude the day it names. Send the following day instead, which /// makes `--to-date` inclusive like `org usage --to-date`. fn exclusive_end_date(to_date: &str) -> String { - NaiveDate::parse_from_str(to_date, "%Y-%m-%d") + Date::strptime("%Y-%m-%d", to_date) .ok() - .and_then(|date| date.succ_opt()) - .filter(|next| next.year() <= 9999) - .map(|next| next.format("%Y-%m-%d").to_string()) + .and_then(|date| date.tomorrow().ok()) + .map(|next| next.to_string()) .unwrap_or_else(|| to_date.to_string()) } @@ -246,7 +253,7 @@ mod tests { #[test] fn default_from_date_covers_seven_days_ending_today() { - let today = NaiveDate::from_ymd_opt(2026, 3, 3).unwrap(); + let today = jiff::civil::date(2026, 3, 3); assert_eq!(default_from_date(None, today), "2026-02-25"); // A named end day wins over today, across a leap day. assert_eq!(default_from_date(Some("2024-03-01"), today), "2024-02-24"); diff --git a/crates/clickhousectl/src/cloud/api_keys.rs b/crates/clickhousectl/src/cloud/api_keys.rs index 32864721..1d293a0d 100644 --- a/crates/clickhousectl/src/cloud/api_keys.rs +++ b/crates/clickhousectl/src/cloud/api_keys.rs @@ -18,7 +18,9 @@ use crate::cloud::client::{ }; use crate::cloud::output::{or_absent, print_human}; use crate::cloud::shared::{NameSelector, NamedResource}; -use crate::cloud::shared::{parse_datetime, parse_ip_access_entries, resolve_org_id}; +use crate::cloud::shared::{ + format_rfc3339, parse_datetime, parse_ip_access_entries, parse_rfc3339, resolve_org_id, +}; use crate::cloud::types::DeleteResponse; use clap::{Subcommand, builder::PossibleValuesParser}; #[cfg(test)] @@ -315,10 +317,8 @@ fn parse_api_key_state_patch(value: &str) -> CloudResult CloudResult> { - chrono::DateTime::parse_from_rfc3339(value) - .map(|datetime| datetime.with_timezone(&chrono::Utc)) - .map_err(|error| { +fn parse_expire_at(value: &str) -> CloudResult { + parse_rfc3339(value).map_err(|error| { CloudError::usage(format!( "invalid expire_at '{}': expected ISO 8601 / RFC 3339 format (e.g. 2025-12-31T23:59:59Z): {}", value, error @@ -488,7 +488,7 @@ fn print_key_table(keys: Vec, all: bool) { state: or_absent(key.state.as_ref()), expires: key .expire_at - .map(|time| time.to_rfc3339()) + .map(format_rfc3339) .unwrap_or_else(|| "never".into()), }) .collect(); @@ -1370,10 +1370,7 @@ mod tests { }) .unwrap(); let expected_role_id = uuid::Uuid::parse_str(role_id).unwrap(); - let expected_create_expiration = - chrono::DateTime::parse_from_rfc3339("2025-12-31T23:59:59Z") - .unwrap() - .with_timezone(&chrono::Utc); + let expected_create_expiration = "2025-12-31T23:59:59Z".parse::().unwrap(); assert_eq!(create.name, "ci-key"); assert_eq!(create.assigned_role_ids, Some(vec![expected_role_id])); assert_eq!(create.expire_at, Some(expected_create_expiration)); @@ -1403,10 +1400,7 @@ mod tests { clear_ip_allow: false, }) .unwrap(); - let expected_update_expiration = - chrono::DateTime::parse_from_rfc3339("2025-01-01T00:00:00Z") - .unwrap() - .with_timezone(&chrono::Utc); + let expected_update_expiration = "2025-01-01T00:00:00Z".parse::().unwrap(); assert_eq!(update.name.as_deref(), Some("renamed")); assert_eq!(update.assigned_role_ids, Some(vec![expected_role_id])); assert_eq!(update.expire_at, Some(Some(expected_update_expiration))); diff --git a/crates/clickhousectl/src/cloud/auth.rs b/crates/clickhousectl/src/cloud/auth.rs index 8a36721b..048fbc40 100644 --- a/crates/clickhousectl/src/cloud/auth.rs +++ b/crates/clickhousectl/src/cloud/auth.rs @@ -1125,7 +1125,7 @@ pub fn clear_tokens() { } pub fn is_token_valid(tokens: &TokenStore) -> bool { - let now = chrono::Utc::now().timestamp(); + let now = jiff::Timestamp::now().as_second(); tokens.expires_at > now + 60 } @@ -1229,7 +1229,7 @@ pub async fn device_auth_login(api_url: &str, json: bool) -> CloudResult String { } } -fn format_backup_created(value: Option>) -> String { - or_absent(value.map(|at| at.to_rfc3339_opts(chrono::SecondsFormat::AutoSi, true))) +fn format_backup_created(value: Option) -> String { + or_absent(value.map(crate::cloud::shared::format_rfc3339)) } impl CloudClient { @@ -1201,14 +1201,14 @@ mod tests { #[test] fn formats_backup_created_as_utc_with_subseconds_and_missing_values() { - let offset = chrono::DateTime::parse_from_rfc3339("2026-09-15T10:34:56+02:00") - .unwrap() - .with_timezone(&chrono::Utc); + let offset = "2026-09-15T10:34:56+02:00" + .parse::() + .unwrap(); assert_eq!(format_backup_created(Some(offset)), "2026-09-15T08:34:56Z"); - let subsecond = chrono::DateTime::parse_from_rfc3339("2026-09-15T08:34:56.123Z") - .unwrap() - .with_timezone(&chrono::Utc); + let subsecond = "2026-09-15T08:34:56.123Z" + .parse::() + .unwrap(); assert_eq!( format_backup_created(Some(subsecond)), "2026-09-15T08:34:56.123Z" diff --git a/crates/clickhousectl/src/cloud/clickpipes/sources/pubsub.rs b/crates/clickhousectl/src/cloud/clickpipes/sources/pubsub.rs index 42af9f9a..ee5ed287 100644 --- a/crates/clickhousectl/src/cloud/clickpipes/sources/pubsub.rs +++ b/crates/clickhousectl/src/cloud/clickpipes/sources/pubsub.rs @@ -162,10 +162,8 @@ fn parse_pubsub_filter(value: &str) -> Result { /// Parse `--seek-timestamp` into the library's UTC timestamp. clap already /// validates the format with `parse_datetime`, so this keeps the builder total /// rather than being a second gate the user can hit. -fn parse_pubsub_seek_timestamp(value: &str) -> CloudResult> { - chrono::DateTime::parse_from_rfc3339(value) - .map(|datetime| datetime.with_timezone(&chrono::Utc)) - .map_err(|error| { +fn parse_pubsub_seek_timestamp(value: &str) -> CloudResult { + crate::cloud::shared::parse_rfc3339(value).map_err(|error| { CloudError::usage(format!( "invalid --seek-timestamp '{value}': expected ISO 8601 / RFC 3339 format (e.g. 2026-04-10T12:00:00Z): {error}" )) @@ -494,11 +492,7 @@ mod tests { }; assert_eq!( built.seek_timestamp, - Some( - chrono::DateTime::parse_from_rfc3339("2026-04-10T12:00:00Z") - .expect("fixed timestamp") - .with_timezone(&chrono::Utc) - ) + Some("2026-04-10T12:00:00Z".parse::().unwrap()) ); // clap cannot express the inverse relationship, so the builder refuses @@ -729,11 +723,7 @@ mod tests { // The offset is normalized to UTC for the wire. assert_eq!( source.seek_timestamp, - Some( - chrono::DateTime::parse_from_rfc3339("2026-04-10T10:00:00Z") - .expect("fixed timestamp") - .with_timezone(&chrono::Utc) - ) + Some("2026-04-10T10:00:00Z".parse::().unwrap()) ); assert_eq!(source.filter.as_deref(), Some("attributes.region = \"eu\"")); assert_eq!(source.enable_ordering, Some(true)); @@ -834,11 +824,7 @@ mod tests { ); assert_eq!( source.seek_timestamp, - Some( - chrono::DateTime::parse_from_rfc3339("2026-04-10T12:00:00Z") - .expect("fixed timestamp") - .with_timezone(&chrono::Utc) - ) + Some("2026-04-10T12:00:00Z".parse::().unwrap()) ); assert_eq!(source.filter.as_deref(), Some("attributes.region = \"eu\"")); assert_eq!(source.enable_ordering, Some(true)); diff --git a/crates/clickhousectl/src/cloud/organizations/byoc.rs b/crates/clickhousectl/src/cloud/organizations/byoc.rs index bed494f6..7f782bf3 100644 --- a/crates/clickhousectl/src/cloud/organizations/byoc.rs +++ b/crates/clickhousectl/src/cloud/organizations/byoc.rs @@ -209,8 +209,7 @@ pub(super) fn build_byoc_access_update_request( .start .as_deref() .map(|start| { - chrono::DateTime::parse_from_rfc3339(start) - .map(|start| start.with_timezone(&chrono::Utc)) + crate::cloud::shared::parse_rfc3339(start) .map_err(|error| CloudError::usage(format!("invalid --start '{start}': {error}"))) }) .transpose()?; @@ -753,11 +752,7 @@ pub(super) mod tests { assert_eq!(request.mode.as_deref(), Some("window")); assert_eq!( request.start_timestamp, - Some( - chrono::DateTime::parse_from_rfc3339("2026-11-10T07:00:00Z") - .unwrap() - .with_timezone(&chrono::Utc) - ) + Some("2026-11-10T07:00:00Z".parse::().unwrap()) ); assert_eq!(request.duration_seconds, Some(14400)); } diff --git a/crates/clickhousectl/src/cloud/organizations/members.rs b/crates/clickhousectl/src/cloud/organizations/members.rs index 0f0545d7..2e1aea7f 100644 --- a/crates/clickhousectl/src/cloud/organizations/members.rs +++ b/crates/clickhousectl/src/cloud/organizations/members.rs @@ -259,7 +259,11 @@ pub(super) async fn invitation_list(client: &CloudClient, json: bool) -> CloudRe roles: join_absent(invitation.assigned_roles.as_deref(), |role| { or_absent(role.role_name.as_deref()) }), - expires: or_absent(invitation.expire_at.map(|at| at.to_rfc3339())), + expires: or_absent( + invitation + .expire_at + .map(crate::cloud::shared::format_rfc3339), + ), }) .collect(); println!("{}", Table::new(rows).with(Style::markdown())); diff --git a/crates/clickhousectl/src/cloud/postgres/lifecycle.rs b/crates/clickhousectl/src/cloud/postgres/lifecycle.rs index 22694041..7197f219 100644 --- a/crates/clickhousectl/src/cloud/postgres/lifecycle.rs +++ b/crates/clickhousectl/src/cloud/postgres/lifecycle.rs @@ -278,7 +278,7 @@ pub(super) fn render_postgres_service(svc: &PostgresService) { println!(" Username: {}", or_absent(svc.username.as_deref())); println!( " Created: {}", - or_absent(svc.created_at.map(|c| c.to_rfc3339())) + or_absent(svc.created_at.map(crate::cloud::shared::format_rfc3339)) ); if let Some(svc_tags) = svc.tags.as_ref().filter(|t| !t.is_empty()) { let tags: Vec = svc_tags @@ -301,7 +301,10 @@ pub(super) fn render_postgres_service(svc: &PostgresService) { fn postgres_restore_and_access_lines(svc: &PostgresService) -> Vec { let mut lines = Vec::new(); if let Some(at) = svc.earliest_restore_time { - lines.push(format!(" Earliest restore: {}", at.to_rfc3339())); + lines.push(format!( + " Earliest restore: {}", + crate::cloud::shared::format_rfc3339(at) + )); } let Some(rules) = svc.ip_access_list.as_ref() else { return lines; diff --git a/crates/clickhousectl/src/cloud/postgres/observability.rs b/crates/clickhousectl/src/cloud/postgres/observability.rs index f7c58753..a8d8e85b 100644 --- a/crates/clickhousectl/src/cloud/postgres/observability.rs +++ b/crates/clickhousectl/src/cloud/postgres/observability.rs @@ -1,6 +1,6 @@ use crate::cloud::client::{CloudClient, CloudError, Result as CloudResult}; use crate::cloud::output::{ABSENT, or_absent, print_human}; -use crate::cloud::shared::{parse_serde_enum, resolve_org_id}; +use crate::cloud::shared::{format_rfc3339, parse_rfc3339, parse_serde_enum, resolve_org_id}; use clickhouse_cloud_api::models::{ PostgresBackup, PostgresLogEntry, PostgresLogsGetListSeverity, PostgresLogsGetListSortorder, PostgresMetrics, PostgresSlowQueryPattern, SlowQueryPatternsGetListSortby, @@ -43,14 +43,14 @@ pub(super) fn build_postgres_logs_query( limit: Option, offset: Option, ) -> CloudResult { - let from = chrono::DateTime::parse_from_rfc3339(from_date) + let from = parse_rfc3339(from_date) .map_err(|error| CloudError::usage(format!("invalid from-date: {error}")))?; - let to = chrono::DateTime::parse_from_rfc3339(to_date) + let to = parse_rfc3339(to_date) .map_err(|error| CloudError::usage(format!("invalid to-date: {error}")))?; if to <= from { return Err(CloudError::usage("to-date must be after from-date")); } - if to.signed_duration_since(from) > chrono::Duration::days(30) { + if to.duration_since(from) > jiff::SignedDuration::from_hours(30 * 24) { return Err(CloudError::usage( "the Postgres log time window must not exceed 30 days", )); @@ -143,7 +143,7 @@ fn postgres_log_row(log: &PostgresLogEntry) -> PostgresLogRow { timestamp: or_absent( log.timestamp .as_ref() - .map(|timestamp| timestamp.to_rfc3339_opts(chrono::SecondsFormat::AutoSi, true)), + .map(|timestamp| format_rfc3339(*timestamp)), ), severity: or_absent(log.severity.as_deref()), message: postgres_log_message(log.body.as_deref()), @@ -172,9 +172,9 @@ fn postgres_log_message(body: Option<&str>) -> String { // These endpoints accept UTC timestamps with exactly three fractional digits, // for window bounds and the slow-query detail `--timestamp` alike. -// Check the original fraction: chrono discards digits beyond nanosecond precision. +// Check the original fraction: parsing drops digits beyond nanosecond precision. pub(super) fn parse_postgres_window_datetime(value: &str) -> Result { - let timestamp = chrono::DateTime::parse_from_rfc3339(value) + let timestamp = parse_rfc3339(value) .map_err(|_| format!("invalid datetime '{value}': expected ISO 8601 / RFC 3339"))?; if value.split_once('.').is_some_and(|(_, fraction)| { fraction @@ -187,15 +187,13 @@ pub(super) fn parse_postgres_window_datetime(value: &str) -> Result CloudResult<()> { - let from = chrono::DateTime::parse_from_rfc3339(from_date) + let from = parse_rfc3339(from_date) .map_err(|_| CloudError::usage("invalid --from-date: expected ISO 8601 / RFC 3339"))?; - let to = chrono::DateTime::parse_from_rfc3339(to_date) + let to = parse_rfc3339(to_date) .map_err(|_| CloudError::usage("invalid --to-date: expected ISO 8601 / RFC 3339"))?; if from > to { return Err(CloudError::usage( @@ -207,9 +205,9 @@ fn validate_datetime_range(from_date: &str, to_date: &str) -> CloudResult<()> { fn postgres_metric_timestamp(timestamp: Option) -> String { timestamp - .and_then(|timestamp| chrono::DateTime::from_timestamp(timestamp, 0)) - .map(|timestamp| timestamp.to_rfc3339_opts(chrono::SecondsFormat::Secs, true)) - // The wire type permits epoch values outside chrono's calendar range. + .and_then(|timestamp| jiff::Timestamp::from_second(timestamp).ok()) + .map(|timestamp| format!("{timestamp:.0}")) + // The wire type permits epoch values outside the calendar range. // Keep such a value visible rather than dropping its data point. .unwrap_or_else(|| match timestamp { Some(timestamp) => format!("{timestamp} (outside displayable date range)"), @@ -416,7 +414,7 @@ fn build_slow_query_detail_query( input: SlowQueryDetailInput<'_>, ) -> CloudResult> { if let Some(timestamp) = input.timestamp { - chrono::DateTime::parse_from_rfc3339(timestamp) + parse_rfc3339(timestamp) .map_err(|_| CloudError::usage("invalid --timestamp: expected ISO 8601 / RFC 3339"))?; } Ok(SlowQueryDetailQuery { @@ -585,11 +583,7 @@ fn render_postgres_backup_page(page: PostgresBackupPage) -> String { let rows = page.result.into_iter().map(|backup| Row { key: or_absent(backup.key), status: or_absent(backup.status), - last_modified: or_absent( - backup - .last_modified - .map(|at| at.to_rfc3339_opts(chrono::SecondsFormat::AutoSi, true)), - ), + last_modified: or_absent(backup.last_modified.map(format_rfc3339)), }); Table::new(rows).with(Style::markdown()).to_string() }; @@ -961,8 +955,8 @@ mod tests { let normalized = parse_postgres_window_datetime(input).unwrap(); assert_eq!(normalized, expected, "{input}"); assert_eq!( - chrono::DateTime::parse_from_rfc3339(input).unwrap(), - chrono::DateTime::parse_from_rfc3339(&normalized).unwrap(), + parse_rfc3339(input).unwrap(), + parse_rfc3339(&normalized).unwrap(), "normalization changed {input}" ); } diff --git a/crates/clickhousectl/src/cloud/postgres/topology.rs b/crates/clickhousectl/src/cloud/postgres/topology.rs index 8bb6e744..ac5c13a3 100644 --- a/crates/clickhousectl/src/cloud/postgres/topology.rs +++ b/crates/clickhousectl/src/cloud/postgres/topology.rs @@ -152,9 +152,8 @@ pub async fn postgres_restore( .pg_bouncer_config_file .map(|path| load_json_file::("--pg-bouncer-config-file", path)) .transpose()?; - let restore_target = chrono::DateTime::parse_from_rfc3339(opts.restore_target) - .map_err(|e| CloudError::usage(format!("invalid restore-target: {}", e)))? - .with_timezone(&chrono::Utc); + let restore_target = crate::cloud::shared::parse_rfc3339(opts.restore_target) + .map_err(|e| CloudError::usage(format!("invalid restore-target: {}", e)))?; let org_id = resolve_org_id(client).await?; diff --git a/crates/clickhousectl/src/cloud/shared.rs b/crates/clickhousectl/src/cloud/shared.rs index 531d6078..d8093c16 100644 --- a/crates/clickhousectl/src/cloud/shared.rs +++ b/crates/clickhousectl/src/cloud/shared.rs @@ -3,7 +3,6 @@ use crate::cloud::client::{ }; use crate::cloud::output::{CloudErrorCode, CloudErrorDetail}; use crate::failure::{ApiFailure, FailureKind}; -use chrono::{DateTime, FixedOffset, NaiveDate}; use clap::builder::NonEmptyStringValueParser; use clickhouse_cloud_api::models::{IpAccessListEntry, ResourceTagsV1}; use std::net::IpAddr; @@ -481,15 +480,80 @@ pub(super) fn parse_ip_access_entries( } pub(super) fn parse_date_only(value: &str) -> Result { - if NaiveDate::parse_from_str(value, "%Y-%m-%d").is_err() { + if jiff::civil::Date::strptime("%Y-%m-%d", value).is_err() { return Err(format!("invalid date '{}': expected YYYY-MM-DD", value)); } Ok(value.to_string()) } +/// Parse an RFC 3339 timestamp. +/// +/// jiff also reads wider ISO 8601 and RFC 9557 forms (no seconds, basic format, +/// `[zone]` annotations) that the Cloud API rejects, so check the shape first. +/// Fraction digits beyond nanoseconds are dropped, not rejected. +pub(super) fn parse_rfc3339(value: &str) -> Result { + let fraction_end = rfc3339_fraction_end(value) + .ok_or_else(|| "expected a date, a time and a UTC offset".to_string())?; + let kept = fraction_end.min(RFC3339_SECONDS_END + 1 + 9); + let trimmed = [&value[..kept], &value[fraction_end..]].concat(); + trimmed + .parse::() + .map_err(|error| error.to_string()) +} + +/// Length of `YYYY-MM-DDTHH:MM:SS`. +const RFC3339_SECONDS_END: usize = 19; + +/// The byte offset where the fraction ends (where the offset starts), if +/// `value` has the RFC 3339 shape. Field ranges are left to jiff. +fn rfc3339_fraction_end(value: &str) -> Option { + let bytes = value.as_bytes(); + let shape = b"dddd-dd-ddTdd:dd:dd"; + if bytes.len() <= shape.len() { + return None; + } + for (byte, expected) in bytes.iter().zip(shape) { + let matches = match expected { + b'd' => byte.is_ascii_digit(), + b'T' => matches!(byte, b'T' | b't' | b' '), + other => byte == other, + }; + if !matches { + return None; + } + } + let mut end = shape.len(); + if bytes[end] == b'.' { + let digits = bytes[end + 1..] + .iter() + .take_while(|byte| byte.is_ascii_digit()) + .count(); + if digits == 0 { + return None; + } + end += 1 + digits; + } + let offset = &bytes[end..]; + let numeric = offset.len() == 6 + && matches!(offset[0], b'+' | b'-') + && offset[3] == b':' + && [1, 2, 4, 5].iter().all(|&i| offset[i].is_ascii_digit()); + (numeric || matches!(offset, b"Z" | b"z")).then_some(end) +} + +/// A timestamp as RFC 3339 in UTC, with 0, 3, 6 or 9 fraction digits. +pub(super) fn format_rfc3339(timestamp: jiff::Timestamp) -> String { + match timestamp.subsec_nanosecond() { + 0 => format!("{timestamp:.0}"), + nanos if nanos % 1_000_000 == 0 => format!("{timestamp:.3}"), + nanos if nanos % 1_000 == 0 => format!("{timestamp:.6}"), + _ => format!("{timestamp:.9}"), + } +} + pub(super) fn parse_datetime(value: &str) -> Result { - if DateTime::::parse_from_rfc3339(value).is_err() { + if parse_rfc3339(value).is_err() { return Err(format!( "invalid datetime '{}': expected ISO 8601 / RFC 3339", value @@ -504,6 +568,50 @@ mod tests { use super::*; use crate::cloud::client::CloudErrorKind; + #[test] + fn parse_rfc3339_accepts_only_the_rfc_3339_shape() { + let instant = parse_rfc3339("2026-04-16T12:00:00Z").unwrap(); + for same in [ + "2026-04-16t12:00:00z", + "2026-04-16 12:00:00Z", + "2026-04-16T14:00:00+02:00", + "2026-04-16T12:00:00.000000000000Z", + ] { + assert_eq!(parse_rfc3339(same).unwrap(), instant, "{same}"); + } + // Forms jiff reads but RFC 3339 does not allow, and plain junk. + for rejected in [ + "", + "2026-04-16", + "2026-04-16T12:00:00", + "2026-04-16T12:00Z", + "20260416T120000Z", + "2026-04-16T12:00:00.Z", + "2026-04-16T12:00:00+0200", + "2026-04-16T12:00:00+02", + "2026-04-16T12:00:00Z[UTC]", + "2026-13-16T12:00:00Z", + "2026-04-16T12:00:00Zé", + ] { + assert!(parse_rfc3339(rejected).is_err(), "{rejected}"); + } + } + + #[test] + fn format_rfc3339_uses_utc_and_whole_groups_of_fraction_digits() { + for (input, expected) in [ + ("2026-09-15T10:34:56+02:00", "2026-09-15T08:34:56Z"), + ("2026-09-15T08:34:56.1Z", "2026-09-15T08:34:56.100Z"), + ("2026-09-15T08:34:56.1234Z", "2026-09-15T08:34:56.123400Z"), + ( + "2026-09-15T08:34:56.1234567Z", + "2026-09-15T08:34:56.123456700Z", + ), + ] { + assert_eq!(format_rfc3339(parse_rfc3339(input).unwrap()), expected); + } + } + #[test] fn parse_tag_rejects_empty_keys() { // With and without `=`, the error quotes the rejected tag. diff --git a/crates/clickhousectl/src/version_manager/download.rs b/crates/clickhousectl/src/version_manager/download.rs index b092becf..c1da5eee 100644 --- a/crates/clickhousectl/src/version_manager/download.rs +++ b/crates/clickhousectl/src/version_manager/download.rs @@ -1,9 +1,11 @@ use crate::error::{Error, NetworkFailure, NetworkStage, Result}; use crate::version_manager::platform::{DownloadSource, Platform}; use crate::version_manager::{master::ArtifactInfo, network}; -use chrono::{DateTime, NaiveDateTime, Utc}; use futures_util::StreamExt; use indicatif::{ProgressBar, ProgressStyle}; +use jiff::Timestamp; +use jiff::civil::DateTime; +use jiff::tz::TimeZone; use reqwest::StatusCode; use reqwest::header::{IF_NONE_MATCH, RETRY_AFTER}; use std::path::Path; @@ -188,7 +190,7 @@ async fn download_once( .headers() .get(RETRY_AFTER) .and_then(|value| value.to_str().ok()) - .and_then(|value| parse_retry_after(value, Utc::now())); + .and_then(|value| parse_retry_after(value, Timestamp::now())); return Err(DownloadAttemptError::Network(DownloadAttemptFailure { failure: network::failure_from_status(NetworkStage::DownloadHeaders, url, status), retryable: status == StatusCode::REQUEST_TIMEOUT @@ -250,21 +252,20 @@ fn retry_delay(policy: &RetryPolicy, attempt: usize, retry_after: Option) -> Option { +fn parse_retry_after(value: &str, now: Timestamp) -> Option { if let Ok(seconds) = value.trim().parse::() { return Some(Duration::from_secs(seconds)); } - let deadline = DateTime::parse_from_rfc2822(value) - .map(|date| date.with_timezone(&Utc)) - .or_else(|_| { - NaiveDateTime::parse_from_str(value, "%A, %d-%b-%y %H:%M:%S GMT") - .map(|date| date.and_utc()) - }) - .or_else(|_| { - NaiveDateTime::parse_from_str(value, "%a %b %e %H:%M:%S %Y").map(|date| date.and_utc()) - }) + let utc = |date: DateTime| { + date.to_zoned_datetime(TimeZone::UTC) + .map(|zoned| zoned.timestamp()) + }; + let deadline = jiff::fmt::rfc2822::DateTimeParser::new() + .parse_timestamp(value) + .or_else(|_| DateTime::strptime("%A, %d-%b-%y %H:%M:%S GMT", value).and_then(utc)) + .or_else(|_| DateTime::strptime("%a %b %e %H:%M:%S %Y", value).and_then(utc)) .ok()?; - (deadline - now).to_std().ok() + Duration::try_from(deadline.duration_since(now)).ok() } #[cfg(test)] @@ -323,9 +324,9 @@ mod tests { #[test] fn retry_after_supports_seconds_and_all_http_date_forms() { - let now = DateTime::parse_from_rfc2822("Wed, 21 Oct 2015 07:28:00 GMT") - .unwrap() - .with_timezone(&Utc); + let now = jiff::fmt::rfc2822::DateTimeParser::new() + .parse_timestamp("Wed, 21 Oct 2015 07:28:00 GMT") + .unwrap(); assert_eq!(parse_retry_after("7", now), Some(Duration::from_secs(7))); for value in [ "Wed, 21 Oct 2015 07:28:05 GMT", @@ -342,9 +343,9 @@ mod tests { #[test] fn expired_retry_after_dates_are_ignored() { - let now = DateTime::parse_from_rfc2822("Wed, 21 Oct 2015 07:28:00 GMT") - .unwrap() - .with_timezone(&Utc); + let now = jiff::fmt::rfc2822::DateTimeParser::new() + .parse_timestamp("Wed, 21 Oct 2015 07:28:00 GMT") + .unwrap(); for value in [ "Wed, 21 Oct 2015 07:27:59 GMT", "Wednesday, 21-Oct-15 07:27:59 GMT", diff --git a/crates/clickhousectl/src/version_manager/list.rs b/crates/clickhousectl/src/version_manager/list.rs index 6c6b739c..9872386a 100644 --- a/crates/clickhousectl/src/version_manager/list.rs +++ b/crates/clickhousectl/src/version_manager/list.rs @@ -2,7 +2,6 @@ use crate::error::{Error, NetworkStage, Result}; use crate::paths; use crate::version_manager::atomic::CommitLock; use crate::version_manager::network::{self, ProbeOutcome}; -use chrono::Datelike; use futures_util::{StreamExt, stream}; use serde::Deserialize; use std::fmt; @@ -112,7 +111,9 @@ pub async fn list_available_versions_from_builds() -> Result> { use crate::version_manager::platform::{Platform, builds_probe_url}; let platform = Platform::detect()?; - let current_year = chrono::Utc::now().year() as u32; + let current_year = jiff::Timestamp::now() + .to_zoned_datetime(jiff::tz::TimeZone::UTC) + .year() as u32; // ClickHouse uses YY.MM versioning — scan from current year down to 20 (2020) // Use two-digit year format let start_yy = current_year % 100; diff --git a/crates/clickhousectl/tests/cloud/auth.rs b/crates/clickhousectl/tests/cloud/auth.rs index e32eabb1..64571a6f 100644 --- a/crates/clickhousectl/tests/cloud/auth.rs +++ b/crates/clickhousectl/tests/cloud/auth.rs @@ -1088,7 +1088,7 @@ async fn custom_oauth_login_pins_config_through_refresh_and_relogin() { saved = serde_json::from_slice(&std::fs::read(&token_path).unwrap()).unwrap(); assert_eq!(saved["auth_config"], config_a); assert_eq!(saved["refresh_token"], "rotated-a"); - assert!(saved["expires_at"].as_i64().unwrap() > chrono::Utc::now().timestamp()); + assert!(saved["expires_at"].as_i64().unwrap() > jiff::Timestamp::now().as_second()); assert!(issuer_b.received_requests().await.unwrap().is_empty()); }