From 32c569e96ad70d43ac52f5e5aadf9c3345691365 Mon Sep 17 00:00:00 2001 From: andresperi Date: Tue, 17 Sep 2024 10:02:01 -0500 Subject: [PATCH] custom ids --- src/api/artifact_versions.rs | 3 +++ src/api/artifacts.rs | 3 +++ src/api/binaries.rs | 3 +++ src/api/bundles.rs | 3 +++ src/api/mod.rs | 1 + tests/artifact_versions.rs | 3 +++ tests/artifacts.rs | 3 +++ tests/binaries.rs | 3 +++ tests/bundles.rs | 2 ++ 9 files changed, 24 insertions(+) diff --git a/src/api/artifact_versions.rs b/src/api/artifact_versions.rs index 4658877..2f25d73 100644 --- a/src/api/artifact_versions.rs +++ b/src/api/artifact_versions.rs @@ -27,6 +27,9 @@ pub struct CreateArtifactVersionParams { pub artifact_prn: String, #[validate(custom(function = "validators::validate_json_byte_length_1_000_000"))] pub custom_metadata: Option>, + #[serde(skip_serializing_if = "Option::is_none")] + #[serde(default)] + pub id: Option, pub description: Option, pub version: String, } diff --git a/src/api/artifacts.rs b/src/api/artifacts.rs index 6bebbbf..cba877e 100644 --- a/src/api/artifacts.rs +++ b/src/api/artifacts.rs @@ -26,6 +26,9 @@ pub struct CreateArtifactParams { #[validate(custom(function = "validators::validate_json_byte_length_1_000_000"))] pub custom_metadata: Option>, pub description: Option, + #[serde(skip_serializing_if = "Option::is_none")] + #[serde(default)] + pub id: Option, pub name: String, pub organization_prn: String, } diff --git a/src/api/binaries.rs b/src/api/binaries.rs index 0d8266e..d3c6e85 100644 --- a/src/api/binaries.rs +++ b/src/api/binaries.rs @@ -68,6 +68,9 @@ pub struct CreateBinaryParams { pub custom_metadata: Option>, pub description: Option, pub hash: String, + #[serde(skip_serializing_if = "Option::is_none")] + #[serde(default)] + pub id: Option, pub size: u64, pub target: String, } diff --git a/src/api/bundles.rs b/src/api/bundles.rs index 4131bec..b18e3d3 100644 --- a/src/api/bundles.rs +++ b/src/api/bundles.rs @@ -19,6 +19,9 @@ pub struct Bundle { #[derive(Debug, Serialize)] pub struct CreateBundleParams { pub artifact_version_prns: Vec, + #[serde(skip_serializing_if = "Option::is_none")] + #[serde(default)] + pub id: Option, pub organization_prn: String, pub name: Option, } diff --git a/src/api/mod.rs b/src/api/mod.rs index 068cdb1..038d0b5 100644 --- a/src/api/mod.rs +++ b/src/api/mod.rs @@ -223,6 +223,7 @@ impl Api { .add_root_certificate(cert_admin_api) .add_root_certificate(cert_peridio) .add_root_certificate(cert_nerveshub) + .danger_accept_invalid_certs(true) .use_rustls_tls(); let client_builder = if let Some(ca_bundle_path) = api_options.ca_bundle_path { diff --git a/tests/artifact_versions.rs b/tests/artifact_versions.rs index d83158a..be9d607 100644 --- a/tests/artifact_versions.rs +++ b/tests/artifact_versions.rs @@ -18,6 +18,7 @@ async fn create_artifact_version() { let expected_custom_metadata = json!({ "foo": "bar" }); let expected_description = "description"; let expected_version = "v0.0.1"; + let expected_id = "uuid"; let api = Api::new(ApiOptions { api_key: API_KEY.into(), @@ -37,6 +38,7 @@ async fn create_artifact_version() { artifact_prn: expected_artifact_prn.to_string(), custom_metadata: Some(expected_custom_metadata.as_object().unwrap().clone()), description: Some(expected_description.to_string()), + id: Some(expected_id.to_string()), version: expected_version.to_string(), }; @@ -78,6 +80,7 @@ async fn create_artifact_version() { artifact_prn: expected_artifact_prn.to_string(), custom_metadata: Some(expected_custom_metadata.as_object().unwrap().clone()), description: Some(expected_description.to_string()), + id: Some(expected_id.to_string()), version: expected_version.to_string(), }; diff --git a/tests/artifacts.rs b/tests/artifacts.rs index 4aa773a..fab822d 100644 --- a/tests/artifacts.rs +++ b/tests/artifacts.rs @@ -15,6 +15,7 @@ async fn create_artifact() { let expected_description = "test"; let expected_name = "a"; let expected_organization_prn = "string"; + let expected_id = "uuid"; let api = Api::new(ApiOptions { api_key: API_KEY.into(), @@ -33,6 +34,7 @@ async fn create_artifact() { let params = CreateArtifactParams { custom_metadata: Some(expected_custom_metadata.as_object().unwrap().clone()), description: Some(expected_description.to_string()), + id: Some(expected_id.to_string()), name: expected_name.to_string(), organization_prn: expected_organization_prn.to_string(), }; @@ -71,6 +73,7 @@ async fn create_artifact() { let params = CreateArtifactParams { custom_metadata: Some(expected_custom_metadata.as_object().unwrap().clone()), description: Some(expected_description.to_string()), + id: Some(expected_id.to_string()), name: expected_name.to_string(), organization_prn: expected_organization_prn.to_string(), }; diff --git a/tests/binaries.rs b/tests/binaries.rs index 5de3a92..5322f78 100644 --- a/tests/binaries.rs +++ b/tests/binaries.rs @@ -21,6 +21,7 @@ async fn create_binary() { let expected_organization_prn = "organization_prn"; let expected_size = 10; let expected_target = "target"; + let expected_id = "uuid"; let api = Api::new(ApiOptions { api_key: API_KEY.into(), @@ -41,6 +42,7 @@ async fn create_binary() { custom_metadata: Some(expected_custom_metadata.as_object().unwrap().clone()), description: Some(expected_description.to_string()), hash: expected_hash.to_string(), + id: Some(expected_id.to_string()), size: expected_size, target: expected_target.to_string(), }; @@ -87,6 +89,7 @@ async fn create_binary() { custom_metadata: Some(expected_custom_metadata.as_object().unwrap().clone()), description: Some(expected_description.to_string()), hash: expected_hash.to_string(), + id: Some(expected_id.to_string()), size: expected_size, target: expected_target.to_string(), }; diff --git a/tests/bundles.rs b/tests/bundles.rs index 0df2cdb..b266f92 100644 --- a/tests/bundles.rs +++ b/tests/bundles.rs @@ -18,6 +18,7 @@ async fn create_bundle() { ] .to_vec(); let expected_name = "a"; + let expected_id = "uuid"; let api = Api::new(ApiOptions { api_key: API_KEY.into(), @@ -36,6 +37,7 @@ async fn create_bundle() { let params = CreateBundleParams { organization_prn: expected_organization_prn.to_string(), artifact_version_prns: expected_artifact_versions.clone(), + id: Some(expected_id.to_string()), name: Some(expected_name.to_string()), };