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
87 changes: 14 additions & 73 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 3 additions & 3 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -151,7 +151,7 @@ os_info = { version = "3.11" }
# dsc, dsc-lib
path-absolutize = { version = "3.1" }
# dsc, dsc-lib
regex = { version = "1.11" }
regex = { version = "1.12" }
# registry, dsc-lib-registry
registry = { version = "1.3" }
# dsc
Expand All @@ -161,7 +161,7 @@ rt-format = { version = "0.3" }
# dsc, dsc-lib, dscecho, registry, dsc-lib-registry, runcommandonset, sshdconfig
rust-i18n = { version = "3.1" }
# dsc, dsc-lib, dscecho, registry, dsc-lib-registry, sshdconfig, dsctest, test_group_resource
schemars = { version = "1.0", features = ["preserve_order"] }
schemars = { version = "1.1", features = ["preserve_order"] }
# dsc, dsc-lib
semver = { version = "1.0" }
# dsc, dsc-lib, dscecho, dsc-lib-osinfo, process, registry, dsc-lib-registry, runcommandonset, sshdconfig, dsctest, test_group_resource
Expand All @@ -179,7 +179,7 @@ tempfile = { version = "3.23" }
# dsc, dsc-lib, registry, dsc-lib-registry, sshdconfig
thiserror = { version = "2.0" }
# dsc, dsc-lib
tokio = { version = "1.47" }
tokio = { version = "1.48" }
# dsc
tokio-util = { version = "0.7" }
# dsc, dsc-lib, registry, dsc-lib-registry, runcommandonset, sshdconfig
Expand Down
2 changes: 1 addition & 1 deletion dsc/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "dsc"
version = "3.2.0-preview.7"
version = "3.2.0-preview.8"
edition = "2021"

[dependencies]
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -572,7 +572,6 @@ test_cases_for_get_keyword_as_mut!(
}

#[cfg(test)] mod get_defs_subschema_from_reference_mut {
use pretty_assertions::assert_ne;
use schemars::json_schema;
use serde_json::json;

Expand Down Expand Up @@ -623,13 +622,6 @@ test_cases_for_get_keyword_as_mut!(
None
);
}
/// Inverted the test - current logic fails due to a bug in [`schemars::Schema::pointer_mut()`],
/// see [schemars#478].
///
/// This bug will be fixed when schemars merges [schemars#479] and makes a new release.
///
/// [schemars#478]: https://github.com/GREsau/schemars/issues/478
/// [schemars#479]: https://github.com/GREsau/schemars/pull/479
#[test] fn with_defs_pointer_reference() {
let ref mut schema = json_schema!({
"$schema": "https://json-schema.org/draft/2020-12/schema",
Expand All @@ -647,7 +639,7 @@ test_cases_for_get_keyword_as_mut!(
"title": "Foo"
});

assert_ne!(
assert_eq!(
schema.get_defs_subschema_from_reference_mut("#/$defs/foo"),
expected.as_object_mut()
);
Expand Down
12 changes: 12 additions & 0 deletions lib/dsc-lib/tests/integration/schemas/schema_for.rs
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@ macro_rules! test_schema_for {
#[allow(non_snake_case)]
#[cfg(test)] mod dsc_lib {
#[cfg(test)] mod configure {
#[allow(unused_must_use)]
#[cfg(test)] mod config_doc {
test_schema_for!(dsc_lib::configure::config_doc::SecurityContextKind);
test_schema_for!(dsc_lib::configure::config_doc::Operation);
Expand All @@ -51,6 +52,7 @@ macro_rules! test_schema_for {
test_schema_for!(dsc_lib::configure::config_doc::Sku);
test_schema_for!(dsc_lib::configure::config_doc::Resource);
}
#[allow(unused_must_use)]
#[cfg(test)] mod config_results {
test_schema_for!(dsc_lib::configure::config_result::MessageLevel);
test_schema_for!(dsc_lib::configure::config_result::ResourceMessage);
Expand All @@ -64,6 +66,7 @@ macro_rules! test_schema_for {
test_schema_for!(dsc_lib::configure::config_result::ConfigurationTestResult);
test_schema_for!(dsc_lib::configure::config_result::ConfigurationExportResult);
}
#[allow(unused_must_use)]
#[cfg(test)] mod parameters {
test_schema_for!(dsc_lib::configure::parameters::Input);
test_schema_for!(dsc_lib::configure::parameters::SecureString);
Expand All @@ -72,17 +75,20 @@ macro_rules! test_schema_for {
}
}
#[cfg(test)] mod discovery {
#[allow(unused_must_use)]
#[cfg(test)] mod command_discovery {
test_schema_for!(dsc_lib::discovery::command_discovery::ImportedManifest);
}
}

#[cfg(test)] mod dscresources {
#[allow(unused_must_use)]
#[cfg(test)] mod dscresource {
test_schema_for!(dsc_lib::dscresources::dscresource::DscResource);
test_schema_for!(dsc_lib::dscresources::dscresource::Capability);
test_schema_for!(dsc_lib::dscresources::dscresource::ImplementedAs);
}
#[allow(unused_must_use)]
#[cfg(test)] mod invoke_result {
test_schema_for!(dsc_lib::dscresources::invoke_result::GetResult);
test_schema_for!(dsc_lib::dscresources::invoke_result::ResourceGetResponse);
Expand All @@ -94,6 +100,7 @@ macro_rules! test_schema_for {
test_schema_for!(dsc_lib::dscresources::invoke_result::ExportResult);
test_schema_for!(dsc_lib::dscresources::invoke_result::ResolveResult);
}
#[allow(unused_must_use)]
#[cfg(test)] mod resource_manifest {
test_schema_for!(dsc_lib::dscresources::resource_manifest::Kind);
test_schema_for!(dsc_lib::dscresources::resource_manifest::ArgKind);
Expand All @@ -116,21 +123,26 @@ macro_rules! test_schema_for {
}

#[cfg(test)] mod extensions {
#[allow(unused_must_use)]
#[cfg(test)] mod discover {
test_schema_for!(dsc_lib::extensions::discover::DiscoverMethod);
test_schema_for!(dsc_lib::extensions::discover::DiscoverResult);
}
#[allow(unused_must_use)]
#[cfg(test)] mod dscextension {
test_schema_for!(dsc_lib::extensions::dscextension::DscExtension);
test_schema_for!(dsc_lib::extensions::dscextension::Capability);
}
#[allow(unused_must_use)]
#[cfg(test)] mod extension_manifest {
test_schema_for!(dsc_lib::extensions::extension_manifest::ExtensionManifest);
}
#[allow(unused_must_use)]
#[cfg(test)] mod import {
test_schema_for!(dsc_lib::extensions::import::ImportMethod);
test_schema_for!(dsc_lib::extensions::import::ImportArgKind);
}
#[allow(unused_must_use)]
#[cfg(test)] mod secret {
test_schema_for!(dsc_lib::extensions::secret::SecretArgKind);
test_schema_for!(dsc_lib::extensions::secret::SecretMethod);
Expand Down
32 changes: 32 additions & 0 deletions pal/Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.