diff --git a/.github/workflows/nuget-publish.yml b/.github/workflows/nuget-publish.yml index 58053ef..b9cc2ad 100644 --- a/.github/workflows/nuget-publish.yml +++ b/.github/workflows/nuget-publish.yml @@ -60,10 +60,10 @@ jobs: csproj-paths: | protocols\dotnet\Devolutions.NowClient\Devolutions.NowClient.csproj protocols\dotnet\Devolutions.NowProto\Devolutions.NowProto.csproj - - library: BrokerPolicy - libpath: ./policies/dotnet/Devolutions.Broker.Policy + - library: NowPolicy + libpath: ./policies/dotnet/Devolutions.NowPolicy csproj-paths: | - policies\dotnet\Devolutions.Broker.Policy\Devolutions.Broker.Policy.csproj + policies\dotnet\Devolutions.NowPolicy\Devolutions.NowPolicy.csproj steps: - name: Check out ${{ github.repository }} diff --git a/Cargo.lock b/Cargo.lock index 4a26c09..41f545c 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -80,20 +80,6 @@ version = "0.8.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "773648b94d0e5d620f64f280777445740e61fe701025087ec8b57f45c791888b" -[[package]] -name = "devolutions-broker-policy" -version = "0.1.0" -dependencies = [ - "chrono", - "schemars", - "semver", - "serde", - "serde_json", - "serde_yaml", - "thiserror", - "url", -] - [[package]] name = "displaydoc" version = "0.2.6" @@ -395,6 +381,20 @@ version = "2.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f8ca58f447f06ed17d5fc4043ce1b10dd205e060fb3ce5b979b8ed8e59ff3f79" +[[package]] +name = "now-policy" +version = "0.1.0" +dependencies = [ + "chrono", + "schemars", + "semver", + "serde", + "serde_json", + "serde_yaml", + "thiserror", + "url", +] + [[package]] name = "now-proto-fuzzing" version = "0.0.0" diff --git a/README.md b/README.md index c7c3cc6..ab73744 100644 --- a/README.md +++ b/README.md @@ -6,10 +6,10 @@ Shared libraries for Devolutions NOW components. ## Libraries - [protocols](./protocols/) contains the NOW protocol specifications, Rust crates, .NET libraries, and protocol test tools. -- [policies](./policies/) is reserved for the UniGetUI/PEDM policy engine libraries. +- [policies](./policies/) contains Devolutions Agent NOW policy libraries. ## Repository Layout - Root-level tooling and CI are shared across library families. - Protocol-specific documentation and source code live under `protocols/`. -- Policy-specific documentation and source code will live under `policies/`. \ No newline at end of file +- Policy-specific documentation and source code live under `policies/`. \ No newline at end of file diff --git a/policies/README.md b/policies/README.md index 70fd5eb..facee08 100644 --- a/policies/README.md +++ b/policies/README.md @@ -1,6 +1,6 @@ Policies ======== -This directory is reserved for Devolutions broker policy engine libraries. +This directory contains Devolutions Agent NOW policy libraries. -The future policy engine NuGet package and Rust crate will live here. \ No newline at end of file +The .NET package is published as `Devolutions.NowPolicy`, and the Rust crate is published as `now-policy`. \ No newline at end of file diff --git a/policies/dotnet/Devolutions.Broker.Policy.slnx b/policies/dotnet/Devolutions.Broker.Policy.slnx deleted file mode 100644 index d52e34a..0000000 --- a/policies/dotnet/Devolutions.Broker.Policy.slnx +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/policies/dotnet/Devolutions.Broker.Policy.Tests/Devolutions.Broker.Policy.Tests.csproj b/policies/dotnet/Devolutions.NowPolicy.Tests/Devolutions.NowPolicy.Tests.csproj similarity index 75% rename from policies/dotnet/Devolutions.Broker.Policy.Tests/Devolutions.Broker.Policy.Tests.csproj rename to policies/dotnet/Devolutions.NowPolicy.Tests/Devolutions.NowPolicy.Tests.csproj index 27b4e7a..e515722 100644 --- a/policies/dotnet/Devolutions.Broker.Policy.Tests/Devolutions.Broker.Policy.Tests.csproj +++ b/policies/dotnet/Devolutions.NowPolicy.Tests/Devolutions.NowPolicy.Tests.csproj @@ -1,22 +1,22 @@ - - - - latest - enable - enable - false - Devolutions.Broker.Policy.Tests - - - - - - - - - - - - - - + + + + latest + enable + enable + false + Devolutions.NowPolicy.Tests + + + + + + + + + + + + + + diff --git a/policies/dotnet/Devolutions.Broker.Policy.Tests/PolicyTests.cs b/policies/dotnet/Devolutions.NowPolicy.Tests/PolicyTests.cs similarity index 95% rename from policies/dotnet/Devolutions.Broker.Policy.Tests/PolicyTests.cs rename to policies/dotnet/Devolutions.NowPolicy.Tests/PolicyTests.cs index 542b5d5..19c6005 100644 --- a/policies/dotnet/Devolutions.Broker.Policy.Tests/PolicyTests.cs +++ b/policies/dotnet/Devolutions.NowPolicy.Tests/PolicyTests.cs @@ -5,7 +5,7 @@ using Xunit; -namespace Devolutions.Broker.Policy.Tests; +namespace Devolutions.NowPolicy.Tests; public class PolicyTests { @@ -13,7 +13,7 @@ public class PolicyTests private static string SamplesDir => Path.Combine(PolicyCrateRoot, "assets", "samples"); - private static string PolicySchema => Path.Combine(PolicyCrateRoot, "schema", "devolutions.broker-policy.schema.json"); + private static string PolicySchema => Path.Combine(PolicyCrateRoot, "schema", "devolutions.now-policy.schema.json"); public static IEnumerable PolicySamples() => Directory.GetFiles(SamplesDir, "*.policy.*").Select(f => new object[] { f }); @@ -130,14 +130,14 @@ private static PolicyDocument ParsePolicy(string path) private static string ResolvePolicyCrateRoot([CallerFilePath] string thisFile = "") { var testsDir = Path.GetDirectoryName(thisFile)!; - return Path.GetFullPath(Path.Combine(testsDir, "..", "..", "rust", "devolutions-broker-policy")); + return Path.GetFullPath(Path.Combine(testsDir, "..", "..", "rust", "now-policy")); } private static string MinimalPolicyJson(string revision, string rules) { return $$""" { - "$schema": "https://devolutions.net/schemas/broker-policy.schema.1.0.json", + "$schema": "https://devolutions.net/schemas/now-policy.schema.1.0.json", "PolicyVersion": "1.0.0", "PolicyType": "PackageBrokerPolicy", "Metadata": { diff --git a/policies/dotnet/Devolutions.NowPolicy.slnx b/policies/dotnet/Devolutions.NowPolicy.slnx new file mode 100644 index 0000000..1207986 --- /dev/null +++ b/policies/dotnet/Devolutions.NowPolicy.slnx @@ -0,0 +1,4 @@ + + + + diff --git a/policies/dotnet/Devolutions.Broker.Policy/Devolutions.Broker.Policy.csproj b/policies/dotnet/Devolutions.NowPolicy/Devolutions.NowPolicy.csproj similarity index 78% rename from policies/dotnet/Devolutions.Broker.Policy/Devolutions.Broker.Policy.csproj rename to policies/dotnet/Devolutions.NowPolicy/Devolutions.NowPolicy.csproj index 2ed4363..ba2a631 100644 --- a/policies/dotnet/Devolutions.Broker.Policy/Devolutions.Broker.Policy.csproj +++ b/policies/dotnet/Devolutions.NowPolicy/Devolutions.NowPolicy.csproj @@ -1,36 +1,36 @@ - - - - latest - enable - enable - Devolutions.Broker.Policy - Devolutions.Broker.Policy - true - - - - Devolutions.Broker.Policy - 0.0.0.0 - Devolutions broker policy model - Policy creation and parsing APIs for Devolutions broker policies. - Devolutions Inc. - © Devolutions Inc. All rights reserved. - MIT OR Apache-2.0 - https://github.com/Devolutions/now-libraries.git - git - true - snupkg - false - README.md - - - - - - - - - - - + + + + latest + enable + enable + Devolutions.NowPolicy + Devolutions.NowPolicy + true + + + + Devolutions.NowPolicy + 0.0.0.0 + Devolutions NOW policy model + Policy creation and parsing APIs for Devolutions Agent NOW policy documents. + Devolutions Inc. + © Devolutions Inc. All rights reserved. + MIT OR Apache-2.0 + https://github.com/Devolutions/now-libraries.git + git + true + snupkg + false + README.md + + + + + + + + + + + diff --git a/policies/dotnet/Devolutions.Broker.Policy/Enums.cs b/policies/dotnet/Devolutions.NowPolicy/Enums.cs similarity index 97% rename from policies/dotnet/Devolutions.Broker.Policy/Enums.cs rename to policies/dotnet/Devolutions.NowPolicy/Enums.cs index 25d2bc9..0636ca3 100644 --- a/policies/dotnet/Devolutions.Broker.Policy/Enums.cs +++ b/policies/dotnet/Devolutions.NowPolicy/Enums.cs @@ -1,6 +1,6 @@ using System.Text.Json.Serialization; -namespace Devolutions.Broker.Policy; +namespace Devolutions.NowPolicy; /// Package operation type. [JsonConverter(typeof(JsonStringEnumConverter))] diff --git a/policies/dotnet/Devolutions.Broker.Policy/PolicyJson.cs b/policies/dotnet/Devolutions.NowPolicy/PolicyJson.cs similarity index 93% rename from policies/dotnet/Devolutions.Broker.Policy/PolicyJson.cs rename to policies/dotnet/Devolutions.NowPolicy/PolicyJson.cs index 96ef619..3d8b629 100644 --- a/policies/dotnet/Devolutions.Broker.Policy/PolicyJson.cs +++ b/policies/dotnet/Devolutions.NowPolicy/PolicyJson.cs @@ -1,7 +1,7 @@ using System.Text.Json; using System.Text.Json.Serialization; -namespace Devolutions.Broker.Policy; +namespace Devolutions.NowPolicy; public static class PolicyJson { diff --git a/policies/dotnet/Devolutions.Broker.Policy/PolicyModels.cs b/policies/dotnet/Devolutions.NowPolicy/PolicyModels.cs similarity index 99% rename from policies/dotnet/Devolutions.Broker.Policy/PolicyModels.cs rename to policies/dotnet/Devolutions.NowPolicy/PolicyModels.cs index a66f935..8ec7a25 100644 --- a/policies/dotnet/Devolutions.Broker.Policy/PolicyModels.cs +++ b/policies/dotnet/Devolutions.NowPolicy/PolicyModels.cs @@ -6,11 +6,11 @@ using YamlDotNet.Core; using YamlDotNet.RepresentationModel; -namespace Devolutions.Broker.Policy; +namespace Devolutions.NowPolicy; public static class SchemaUris { - public const string Policy = "https://devolutions.net/schemas/broker-policy.schema.1.0.json"; + public const string Policy = "https://devolutions.net/schemas/now-policy.schema.1.0.json"; } /// A policy document governing which package operations are allowed or denied. diff --git a/policies/dotnet/README.md b/policies/dotnet/README.md index 9a93ae4..9d60bf7 100644 --- a/policies/dotnet/README.md +++ b/policies/dotnet/README.md @@ -1,4 +1,4 @@ -Devolutions broker policy -========================= - -This package provides .NET types and JSON/YAML parsing helpers for the Devolutions broker policy format. +Devolutions NOW policy +====================== + +This package provides .NET types and JSON/YAML parsing helpers for Devolutions Agent NOW policy documents. diff --git a/policies/rust/devolutions-broker-policy/Cargo.toml b/policies/rust/now-policy/Cargo.toml similarity index 77% rename from policies/rust/devolutions-broker-policy/Cargo.toml rename to policies/rust/now-policy/Cargo.toml index 56550b0..9aee784 100644 --- a/policies/rust/devolutions-broker-policy/Cargo.toml +++ b/policies/rust/now-policy/Cargo.toml @@ -1,5 +1,5 @@ [package] -name = "devolutions-broker-policy" +name = "now-policy" version = "0.1.0" edition = "2024" license.workspace = true @@ -7,7 +7,7 @@ homepage.workspace = true repository.workspace = true authors.workspace = true readme = "README.md" -description = "Devolutions broker policy model and schema" +description = "Devolutions NOW policy model and schema" publish = true [lints] @@ -24,5 +24,5 @@ thiserror = "2" url = "2" [[bin]] -name = "generate-devolutions-broker-policy-schema" +name = "generate-now-policy-schema" path = "tools/generate_schema.rs" diff --git a/policies/rust/devolutions-broker-policy/README.md b/policies/rust/now-policy/README.md similarity index 67% rename from policies/rust/devolutions-broker-policy/README.md rename to policies/rust/now-policy/README.md index 525c3f4..39887d3 100644 --- a/policies/rust/devolutions-broker-policy/README.md +++ b/policies/rust/now-policy/README.md @@ -1,7 +1,7 @@ -Devolutions broker policy model -=============================== - -This crate provides the Rust policy model and JSON Schema helpers for the Devolutions broker policy format. - -It contains only admin-authored policy types and schema generation utilities. -Broker request, response, server, transport, and execution types are intentionally out of scope. +Devolutions NOW policy model +============================ + +This crate provides the Rust policy model and JSON Schema helpers for Devolutions Agent NOW policy documents. + +It contains only admin-authored policy types and schema generation utilities. +Broker request, response, server, transport, and execution types are intentionally out of scope. diff --git a/policies/rust/devolutions-broker-policy/assets/samples/corporate-allowlist.policy.json b/policies/rust/now-policy/assets/samples/corporate-allowlist.policy.json similarity index 97% rename from policies/rust/devolutions-broker-policy/assets/samples/corporate-allowlist.policy.json rename to policies/rust/now-policy/assets/samples/corporate-allowlist.policy.json index 9a0d2e1..4d50bc4 100644 --- a/policies/rust/devolutions-broker-policy/assets/samples/corporate-allowlist.policy.json +++ b/policies/rust/now-policy/assets/samples/corporate-allowlist.policy.json @@ -1,5 +1,5 @@ { - "$schema": "https://devolutions.net/schemas/broker-policy.schema.1.0.json", + "$schema": "https://devolutions.net/schemas/now-policy.schema.1.0.json", "PolicyVersion": "1.0.0", "PolicyType": "PackageBrokerPolicy", "Metadata": { diff --git a/policies/rust/devolutions-broker-policy/assets/samples/corporate-allowlist.policy.yaml b/policies/rust/now-policy/assets/samples/corporate-allowlist.policy.yaml similarity index 94% rename from policies/rust/devolutions-broker-policy/assets/samples/corporate-allowlist.policy.yaml rename to policies/rust/now-policy/assets/samples/corporate-allowlist.policy.yaml index b7e40f0..6dbe84d 100644 --- a/policies/rust/devolutions-broker-policy/assets/samples/corporate-allowlist.policy.yaml +++ b/policies/rust/now-policy/assets/samples/corporate-allowlist.policy.yaml @@ -1,4 +1,4 @@ -"$schema": https://devolutions.net/schemas/broker-policy.schema.1.0.json +"$schema": https://devolutions.net/schemas/now-policy.schema.1.0.json PolicyVersion: 1.0.0 PolicyType: PackageBrokerPolicy Metadata: diff --git a/policies/rust/devolutions-broker-policy/assets/samples/deny-risky-options.policy.json b/policies/rust/now-policy/assets/samples/deny-risky-options.policy.json similarity index 96% rename from policies/rust/devolutions-broker-policy/assets/samples/deny-risky-options.policy.json rename to policies/rust/now-policy/assets/samples/deny-risky-options.policy.json index 811439c..5ddf8d1 100644 --- a/policies/rust/devolutions-broker-policy/assets/samples/deny-risky-options.policy.json +++ b/policies/rust/now-policy/assets/samples/deny-risky-options.policy.json @@ -1,5 +1,5 @@ { - "$schema": "https://devolutions.net/schemas/broker-policy.schema.1.0.json", + "$schema": "https://devolutions.net/schemas/now-policy.schema.1.0.json", "PolicyVersion": "1.0.0", "PolicyType": "PackageBrokerPolicy", "Metadata": { diff --git a/policies/rust/devolutions-broker-policy/assets/samples/invalid/policies/invalid-failure-decision.policy.json b/policies/rust/now-policy/assets/samples/invalid/policies/invalid-failure-decision.policy.json similarity index 87% rename from policies/rust/devolutions-broker-policy/assets/samples/invalid/policies/invalid-failure-decision.policy.json rename to policies/rust/now-policy/assets/samples/invalid/policies/invalid-failure-decision.policy.json index 51590c8..2b65f4c 100644 --- a/policies/rust/devolutions-broker-policy/assets/samples/invalid/policies/invalid-failure-decision.policy.json +++ b/policies/rust/now-policy/assets/samples/invalid/policies/invalid-failure-decision.policy.json @@ -1,5 +1,5 @@ { - "$schema": "https://devolutions.net/schemas/broker-policy.schema.1.0.json", + "$schema": "https://devolutions.net/schemas/now-policy.schema.1.0.json", "PolicyVersion": "1.0.0", "PolicyType": "PackageBrokerPolicy", "Metadata": { diff --git a/policies/rust/devolutions-broker-policy/assets/samples/powershell-advanced.policy.json b/policies/rust/now-policy/assets/samples/powershell-advanced.policy.json similarity index 96% rename from policies/rust/devolutions-broker-policy/assets/samples/powershell-advanced.policy.json rename to policies/rust/now-policy/assets/samples/powershell-advanced.policy.json index afb5d25..2e2e3b9 100644 --- a/policies/rust/devolutions-broker-policy/assets/samples/powershell-advanced.policy.json +++ b/policies/rust/now-policy/assets/samples/powershell-advanced.policy.json @@ -1,5 +1,5 @@ { - "$schema": "https://devolutions.net/schemas/broker-policy.schema.1.0.json", + "$schema": "https://devolutions.net/schemas/now-policy.schema.1.0.json", "PolicyVersion": "1.0.0", "PolicyType": "PackageBrokerPolicy", "Metadata": { diff --git a/policies/rust/devolutions-broker-policy/assets/samples/powershell-current-user.policy.json b/policies/rust/now-policy/assets/samples/powershell-current-user.policy.json similarity index 96% rename from policies/rust/devolutions-broker-policy/assets/samples/powershell-current-user.policy.json rename to policies/rust/now-policy/assets/samples/powershell-current-user.policy.json index a5b3e4b..ddb5ae3 100644 --- a/policies/rust/devolutions-broker-policy/assets/samples/powershell-current-user.policy.json +++ b/policies/rust/now-policy/assets/samples/powershell-current-user.policy.json @@ -1,5 +1,5 @@ { - "$schema": "https://devolutions.net/schemas/broker-policy.schema.1.0.json", + "$schema": "https://devolutions.net/schemas/now-policy.schema.1.0.json", "PolicyVersion": "1.0.0", "PolicyType": "PackageBrokerPolicy", "Metadata": { diff --git a/policies/rust/devolutions-broker-policy/assets/samples/scenario-coverage.policy.json b/policies/rust/now-policy/assets/samples/scenario-coverage.policy.json similarity index 98% rename from policies/rust/devolutions-broker-policy/assets/samples/scenario-coverage.policy.json rename to policies/rust/now-policy/assets/samples/scenario-coverage.policy.json index 990c606..77ba46c 100644 --- a/policies/rust/devolutions-broker-policy/assets/samples/scenario-coverage.policy.json +++ b/policies/rust/now-policy/assets/samples/scenario-coverage.policy.json @@ -1,5 +1,5 @@ { - "$schema": "https://devolutions.net/schemas/broker-policy.schema.1.0.json", + "$schema": "https://devolutions.net/schemas/now-policy.schema.1.0.json", "PolicyVersion": "1.0.0", "PolicyType": "PackageBrokerPolicy", "Metadata": { diff --git a/policies/rust/devolutions-broker-policy/schema/devolutions.broker-policy.schema.json b/policies/rust/now-policy/schema/devolutions.now-policy.schema.json similarity index 99% rename from policies/rust/devolutions-broker-policy/schema/devolutions.broker-policy.schema.json rename to policies/rust/now-policy/schema/devolutions.now-policy.schema.json index 978a903..cc059bf 100644 --- a/policies/rust/devolutions-broker-policy/schema/devolutions.broker-policy.schema.json +++ b/policies/rust/now-policy/schema/devolutions.now-policy.schema.json @@ -1,5 +1,5 @@ { - "$id": "https://devolutions.net/schemas/broker-policy.schema.1.0.json", + "$id": "https://devolutions.net/schemas/now-policy.schema.1.0.json", "$schema": "http://json-schema.org/draft-07/schema#", "additionalProperties": false, "definitions": { @@ -489,7 +489,7 @@ }, "PolicySchemaUri": { "enum": [ - "https://devolutions.net/schemas/broker-policy.schema.1.0.json" + "https://devolutions.net/schemas/now-policy.schema.1.0.json" ], "type": "string" }, diff --git a/policies/rust/devolutions-broker-policy/src/enums.rs b/policies/rust/now-policy/src/enums.rs similarity index 100% rename from policies/rust/devolutions-broker-policy/src/enums.rs rename to policies/rust/now-policy/src/enums.rs diff --git a/policies/rust/devolutions-broker-policy/src/lib.rs b/policies/rust/now-policy/src/lib.rs similarity index 80% rename from policies/rust/devolutions-broker-policy/src/lib.rs rename to policies/rust/now-policy/src/lib.rs index c355c4d..efdd132 100644 --- a/policies/rust/devolutions-broker-policy/src/lib.rs +++ b/policies/rust/now-policy/src/lib.rs @@ -1,4 +1,4 @@ -//! Devolutions broker policy model and schema helpers. +//! Devolutions NOW policy model and schema helpers. #![allow(clippy::std_instead_of_core, unused_qualifications)] diff --git a/policies/rust/devolutions-broker-policy/src/markers.rs b/policies/rust/now-policy/src/markers.rs similarity index 98% rename from policies/rust/devolutions-broker-policy/src/markers.rs rename to policies/rust/now-policy/src/markers.rs index 5d7f470..0ad8db6 100644 --- a/policies/rust/devolutions-broker-policy/src/markers.rs +++ b/policies/rust/now-policy/src/markers.rs @@ -57,7 +57,7 @@ fixed_string_marker! { } /// Schema URI for package policy documents. -pub const POLICY_SCHEMA_URI: &str = "https://devolutions.net/schemas/broker-policy.schema.1.0.json"; +pub const POLICY_SCHEMA_URI: &str = "https://devolutions.net/schemas/now-policy.schema.1.0.json"; fixed_string_marker! { /// Marker type for the policy `$schema` field. diff --git a/policies/rust/devolutions-broker-policy/src/newtypes.rs b/policies/rust/now-policy/src/newtypes.rs similarity index 99% rename from policies/rust/devolutions-broker-policy/src/newtypes.rs rename to policies/rust/now-policy/src/newtypes.rs index 06a0af6..5002aeb 100644 --- a/policies/rust/devolutions-broker-policy/src/newtypes.rs +++ b/policies/rust/now-policy/src/newtypes.rs @@ -1,4 +1,4 @@ -//! Schema-validated newtypes used by package broker policy documents. +//! Schema-validated newtypes used by NOW policy documents. use schemars::JsonSchema; use serde::{Deserialize, Serialize}; diff --git a/policies/rust/devolutions-broker-policy/src/policy.rs b/policies/rust/now-policy/src/policy.rs similarity index 100% rename from policies/rust/devolutions-broker-policy/src/policy.rs rename to policies/rust/now-policy/src/policy.rs diff --git a/policies/rust/devolutions-broker-policy/src/schema.rs b/policies/rust/now-policy/src/schema.rs similarity index 100% rename from policies/rust/devolutions-broker-policy/src/schema.rs rename to policies/rust/now-policy/src/schema.rs diff --git a/policies/rust/devolutions-broker-policy/tests/policy_samples.rs b/policies/rust/now-policy/tests/policy_samples.rs similarity index 91% rename from policies/rust/devolutions-broker-policy/tests/policy_samples.rs rename to policies/rust/now-policy/tests/policy_samples.rs index 2214900..c44ef7a 100644 --- a/policies/rust/devolutions-broker-policy/tests/policy_samples.rs +++ b/policies/rust/now-policy/tests/policy_samples.rs @@ -4,7 +4,7 @@ use std::path::{Path, PathBuf}; -use devolutions_broker_policy::PolicyDocument; +use now_policy::PolicyDocument; fn samples_dir() -> PathBuf { PathBuf::from(env!("CARGO_MANIFEST_DIR")).join("assets/samples") @@ -43,7 +43,7 @@ fn all_sample_policies_deserialize() { #[test] fn invalid_policy_unknown_field_fails_deserialization() { let value = serde_json::json!({ - "$schema": "https://devolutions.net/schemas/broker-policy.schema.1.0.json", + "$schema": "https://devolutions.net/schemas/now-policy.schema.1.0.json", "PolicyVersion": "1.0.0", "PolicyType": "PackageBrokerPolicy", "Metadata": { @@ -74,7 +74,7 @@ fn invalid_policy_fixture_fails_deserialization() { #[test] fn policy_schema_generates_valid_json() { - let schema = devolutions_broker_policy::schema::policy_schema_json(); + let schema = now_policy::schema::policy_schema_json(); assert!(schema.is_object()); let obj = schema.as_object().unwrap(); assert!( @@ -85,7 +85,7 @@ fn policy_schema_generates_valid_json() { #[test] fn policy_match_schema_requires_at_least_one_property() { - let schema = devolutions_broker_policy::schema::policy_schema_json(); + let schema = now_policy::schema::policy_schema_json(); let min_properties = schema .pointer("/definitions/PolicyRule/properties/Match/minProperties") .and_then(serde_json::Value::as_u64); diff --git a/policies/rust/devolutions-broker-policy/tools/generate_schema.rs b/policies/rust/now-policy/tools/generate_schema.rs similarity index 76% rename from policies/rust/devolutions-broker-policy/tools/generate_schema.rs rename to policies/rust/now-policy/tools/generate_schema.rs index 32b1c6b..fdf617d 100644 --- a/policies/rust/devolutions-broker-policy/tools/generate_schema.rs +++ b/policies/rust/now-policy/tools/generate_schema.rs @@ -1,19 +1,19 @@ //! Generates the JSON schema for the policy document. //! -//! Usage: `cargo run -p devolutions-broker-policy --bin generate-devolutions-broker-policy-schema` +//! Usage: `cargo run -p now-policy --bin generate-now-policy-schema` #![allow(clippy::print_stdout, reason = "this is a developer-facing CLI tool")] #![allow(clippy::std_instead_of_core, unused_crate_dependencies)] use std::path::Path; -use devolutions_broker_policy::POLICY_SCHEMA_URI; -use devolutions_broker_policy::schema::policy_schema_json; +use now_policy::POLICY_SCHEMA_URI; +use now_policy::schema::policy_schema_json; use serde_json::{Map, Value}; fn main() { let crate_dir = Path::new(env!("CARGO_MANIFEST_DIR")); - let out_path = crate_dir.join("schema").join("devolutions.broker-policy.schema.json"); + let out_path = crate_dir.join("schema").join("devolutions.now-policy.schema.json"); let schema = with_id(policy_schema_json(), POLICY_SCHEMA_URI); let json = serde_json::to_string_pretty(&schema).expect("BUG: schema serialization failed"); diff --git a/xtask/src/dotnet.rs b/xtask/src/dotnet.rs index e09b92b..951c2da 100644 --- a/xtask/src/dotnet.rs +++ b/xtask/src/dotnet.rs @@ -17,8 +17,8 @@ const SOLUTIONS: &[DotnetSolution] = &[ set_platform: true, }, DotnetSolution { - path: "policies/dotnet/Devolutions.Broker.Policy.slnx", - artifact_project: "policies/dotnet/Devolutions.Broker.Policy", + path: "policies/dotnet/Devolutions.NowPolicy.slnx", + artifact_project: "policies/dotnet/Devolutions.NowPolicy", set_platform: false, }, ];