From 7d943d9280f11751facad33bc07d642ee63e9d29 Mon Sep 17 00:00:00 2001 From: Vladyslav Nikonov Date: Fri, 19 Jun 2026 19:54:52 +0300 Subject: [PATCH 1/2] fix: rename policy crate and library --- .github/workflows/nuget-publish.yml | 6 ++-- Cargo.lock | 28 +++++++++---------- policies/README.md | 2 +- .../Devolutions.Broker.Policy.Tests.csproj} | 4 +-- .../PolicyTests.cs | 8 +++--- .../dotnet/Devolutions.Broker.Policy.slnx | 4 +++ .../Devolutions.Broker.Policy.csproj} | 10 +++---- .../Enums.cs | 2 +- .../PolicyJson.cs | 2 +- .../PolicyModels.cs | 4 +-- .../Devolutions.UniGetUI.Broker.Policy.slnx | 4 --- policies/dotnet/README.md | 6 ++-- .../Cargo.toml | 6 ++-- .../README.md | 6 ++-- .../samples/corporate-allowlist.policy.json | 2 +- .../samples/corporate-allowlist.policy.yaml | 2 +- .../samples/deny-risky-options.policy.json | 2 +- .../invalid-failure-decision.policy.json | 2 +- .../samples/powershell-advanced.policy.json | 2 +- .../powershell-current-user.policy.json | 2 +- .../samples/scenario-coverage.policy.json | 2 +- .../devolutions.broker-policy.schema.json} | 4 +-- .../src/enums.rs | 0 .../rust/devolutions-broker-policy/src/lib.rs | 14 ++++++++++ .../src/markers.rs | 2 +- .../src/newtypes.rs | 0 .../src/policy.rs | 0 .../src/schema.rs | 0 .../tests/policy_samples.rs | 8 +++--- .../tools/generate_schema.rs | 8 +++--- .../rust/unigetui-broker-policy/src/lib.rs | 18 ------------ xtask/src/dotnet.rs | 4 +-- 32 files changed, 80 insertions(+), 84 deletions(-) rename policies/dotnet/{Devolutions.UniGetUI.Broker.Policy.Tests/Devolutions.UniGetUI.Broker.Policy.Tests.csproj => Devolutions.Broker.Policy.Tests/Devolutions.Broker.Policy.Tests.csproj} (72%) rename policies/dotnet/{Devolutions.UniGetUI.Broker.Policy.Tests => Devolutions.Broker.Policy.Tests}/PolicyTests.cs (95%) create mode 100644 policies/dotnet/Devolutions.Broker.Policy.slnx rename policies/dotnet/{Devolutions.UniGetUI.Broker.Policy/Devolutions.UniGetUI.Broker.Policy.csproj => Devolutions.Broker.Policy/Devolutions.Broker.Policy.csproj} (70%) rename policies/dotnet/{Devolutions.UniGetUI.Broker.Policy => Devolutions.Broker.Policy}/Enums.cs (96%) rename policies/dotnet/{Devolutions.UniGetUI.Broker.Policy => Devolutions.Broker.Policy}/PolicyJson.cs (91%) rename policies/dotnet/{Devolutions.UniGetUI.Broker.Policy => Devolutions.Broker.Policy}/PolicyModels.cs (98%) delete mode 100644 policies/dotnet/Devolutions.UniGetUI.Broker.Policy.slnx rename policies/rust/{unigetui-broker-policy => devolutions-broker-policy}/Cargo.toml (77%) rename policies/rust/{unigetui-broker-policy => devolutions-broker-policy}/README.md (67%) rename policies/rust/{unigetui-broker-policy => devolutions-broker-policy}/assets/samples/corporate-allowlist.policy.json (97%) rename policies/rust/{unigetui-broker-policy => devolutions-broker-policy}/assets/samples/corporate-allowlist.policy.yaml (94%) rename policies/rust/{unigetui-broker-policy => devolutions-broker-policy}/assets/samples/deny-risky-options.policy.json (96%) rename policies/rust/{unigetui-broker-policy => devolutions-broker-policy}/assets/samples/invalid/policies/invalid-failure-decision.policy.json (88%) rename policies/rust/{unigetui-broker-policy => devolutions-broker-policy}/assets/samples/powershell-advanced.policy.json (96%) rename policies/rust/{unigetui-broker-policy => devolutions-broker-policy}/assets/samples/powershell-current-user.policy.json (96%) rename policies/rust/{unigetui-broker-policy => devolutions-broker-policy}/assets/samples/scenario-coverage.policy.json (98%) rename policies/rust/{unigetui-broker-policy/schema/unigetui.package-policy.schema.json => devolutions-broker-policy/schema/devolutions.broker-policy.schema.json} (99%) rename policies/rust/{unigetui-broker-policy => devolutions-broker-policy}/src/enums.rs (100%) create mode 100644 policies/rust/devolutions-broker-policy/src/lib.rs rename policies/rust/{unigetui-broker-policy => devolutions-broker-policy}/src/markers.rs (95%) rename policies/rust/{unigetui-broker-policy => devolutions-broker-policy}/src/newtypes.rs (100%) rename policies/rust/{unigetui-broker-policy => devolutions-broker-policy}/src/policy.rs (100%) rename policies/rust/{unigetui-broker-policy => devolutions-broker-policy}/src/schema.rs (100%) rename policies/rust/{unigetui-broker-policy => devolutions-broker-policy}/tests/policy_samples.rs (91%) rename policies/rust/{unigetui-broker-policy => devolutions-broker-policy}/tools/generate_schema.rs (76%) delete mode 100644 policies/rust/unigetui-broker-policy/src/lib.rs diff --git a/.github/workflows/nuget-publish.yml b/.github/workflows/nuget-publish.yml index ef08e3a..58053ef 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: UniGetUIPolicy - libpath: ./policies/dotnet/Devolutions.UniGetUI.Broker.Policy + - library: BrokerPolicy + libpath: ./policies/dotnet/Devolutions.Broker.Policy csproj-paths: | - policies\dotnet\Devolutions.UniGetUI.Broker.Policy\Devolutions.UniGetUI.Broker.Policy.csproj + policies\dotnet\Devolutions.Broker.Policy\Devolutions.Broker.Policy.csproj steps: - name: Check out ${{ github.repository }} diff --git a/Cargo.lock b/Cargo.lock index 0695ba1..4a26c09 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -80,6 +80,20 @@ 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" @@ -769,20 +783,6 @@ version = "1.0.24" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e6e4313cd5fcd3dad5cafa179702e2b244f760991f45397d14d4ebf38247da75" -[[package]] -name = "unigetui-broker-policy" -version = "0.1.0" -dependencies = [ - "chrono", - "schemars", - "semver", - "serde", - "serde_json", - "serde_yaml", - "thiserror", - "url", -] - [[package]] name = "unsafe-libyaml" version = "0.2.11" diff --git a/policies/README.md b/policies/README.md index 8832996..70fd5eb 100644 --- a/policies/README.md +++ b/policies/README.md @@ -1,6 +1,6 @@ Policies ======== -This directory is reserved for the UniGetUI/PEDM policy engine libraries. +This directory is reserved for Devolutions broker policy engine libraries. The future policy engine NuGet package and Rust crate will live here. \ No newline at end of file diff --git a/policies/dotnet/Devolutions.UniGetUI.Broker.Policy.Tests/Devolutions.UniGetUI.Broker.Policy.Tests.csproj b/policies/dotnet/Devolutions.Broker.Policy.Tests/Devolutions.Broker.Policy.Tests.csproj similarity index 72% rename from policies/dotnet/Devolutions.UniGetUI.Broker.Policy.Tests/Devolutions.UniGetUI.Broker.Policy.Tests.csproj rename to policies/dotnet/Devolutions.Broker.Policy.Tests/Devolutions.Broker.Policy.Tests.csproj index 9aeab80..27b4e7a 100644 --- a/policies/dotnet/Devolutions.UniGetUI.Broker.Policy.Tests/Devolutions.UniGetUI.Broker.Policy.Tests.csproj +++ b/policies/dotnet/Devolutions.Broker.Policy.Tests/Devolutions.Broker.Policy.Tests.csproj @@ -5,7 +5,7 @@ enable enable false - Devolutions.UniGetUI.Broker.Policy.Tests + Devolutions.Broker.Policy.Tests @@ -16,7 +16,7 @@ - + diff --git a/policies/dotnet/Devolutions.UniGetUI.Broker.Policy.Tests/PolicyTests.cs b/policies/dotnet/Devolutions.Broker.Policy.Tests/PolicyTests.cs similarity index 95% rename from policies/dotnet/Devolutions.UniGetUI.Broker.Policy.Tests/PolicyTests.cs rename to policies/dotnet/Devolutions.Broker.Policy.Tests/PolicyTests.cs index 30f2a55..cde811c 100644 --- a/policies/dotnet/Devolutions.UniGetUI.Broker.Policy.Tests/PolicyTests.cs +++ b/policies/dotnet/Devolutions.Broker.Policy.Tests/PolicyTests.cs @@ -5,7 +5,7 @@ using Xunit; -namespace Devolutions.UniGetUI.Broker.Policy.Tests; +namespace Devolutions.Broker.Policy.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", "unigetui.package-policy.schema.json"); + private static string PolicySchema => Path.Combine(PolicyCrateRoot, "schema", "devolutions.broker-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", "unigetui-broker-policy")); + return Path.GetFullPath(Path.Combine(testsDir, "..", "..", "rust", "devolutions-broker-policy")); } private static string MinimalPolicyJson(string revision, string rules) { return $$""" { - "$schema": "https://aka.ms/unigetui/package-policy.schema.1.0.json", + "$schema": "https://aka.ms/devolutions/broker-policy.schema.1.0.json", "PolicyVersion": "1.0.0", "PolicyType": "PackageBrokerPolicy", "Metadata": { diff --git a/policies/dotnet/Devolutions.Broker.Policy.slnx b/policies/dotnet/Devolutions.Broker.Policy.slnx new file mode 100644 index 0000000..d52e34a --- /dev/null +++ b/policies/dotnet/Devolutions.Broker.Policy.slnx @@ -0,0 +1,4 @@ + + + + diff --git a/policies/dotnet/Devolutions.UniGetUI.Broker.Policy/Devolutions.UniGetUI.Broker.Policy.csproj b/policies/dotnet/Devolutions.Broker.Policy/Devolutions.Broker.Policy.csproj similarity index 70% rename from policies/dotnet/Devolutions.UniGetUI.Broker.Policy/Devolutions.UniGetUI.Broker.Policy.csproj rename to policies/dotnet/Devolutions.Broker.Policy/Devolutions.Broker.Policy.csproj index c2dc958..2ed4363 100644 --- a/policies/dotnet/Devolutions.UniGetUI.Broker.Policy/Devolutions.UniGetUI.Broker.Policy.csproj +++ b/policies/dotnet/Devolutions.Broker.Policy/Devolutions.Broker.Policy.csproj @@ -4,16 +4,16 @@ latest enable enable - Devolutions.UniGetUI.Broker.Policy - Devolutions.UniGetUI.Broker.Policy + Devolutions.Broker.Policy + Devolutions.Broker.Policy true - Devolutions.UniGetUI.Broker.Policy + Devolutions.Broker.Policy 0.0.0.0 - Devolutions Agent UniGetUI package broker policy model - Policy creation and parsing APIs for the Devolutions Agent UniGetUI package broker. + 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 diff --git a/policies/dotnet/Devolutions.UniGetUI.Broker.Policy/Enums.cs b/policies/dotnet/Devolutions.Broker.Policy/Enums.cs similarity index 96% rename from policies/dotnet/Devolutions.UniGetUI.Broker.Policy/Enums.cs rename to policies/dotnet/Devolutions.Broker.Policy/Enums.cs index f710141..25d2bc9 100644 --- a/policies/dotnet/Devolutions.UniGetUI.Broker.Policy/Enums.cs +++ b/policies/dotnet/Devolutions.Broker.Policy/Enums.cs @@ -1,6 +1,6 @@ using System.Text.Json.Serialization; -namespace Devolutions.UniGetUI.Broker.Policy; +namespace Devolutions.Broker.Policy; /// Package operation type. [JsonConverter(typeof(JsonStringEnumConverter))] diff --git a/policies/dotnet/Devolutions.UniGetUI.Broker.Policy/PolicyJson.cs b/policies/dotnet/Devolutions.Broker.Policy/PolicyJson.cs similarity index 91% rename from policies/dotnet/Devolutions.UniGetUI.Broker.Policy/PolicyJson.cs rename to policies/dotnet/Devolutions.Broker.Policy/PolicyJson.cs index cd4ff8b..96ef619 100644 --- a/policies/dotnet/Devolutions.UniGetUI.Broker.Policy/PolicyJson.cs +++ b/policies/dotnet/Devolutions.Broker.Policy/PolicyJson.cs @@ -1,7 +1,7 @@ using System.Text.Json; using System.Text.Json.Serialization; -namespace Devolutions.UniGetUI.Broker.Policy; +namespace Devolutions.Broker.Policy; public static class PolicyJson { diff --git a/policies/dotnet/Devolutions.UniGetUI.Broker.Policy/PolicyModels.cs b/policies/dotnet/Devolutions.Broker.Policy/PolicyModels.cs similarity index 98% rename from policies/dotnet/Devolutions.UniGetUI.Broker.Policy/PolicyModels.cs rename to policies/dotnet/Devolutions.Broker.Policy/PolicyModels.cs index 22591be..7794980 100644 --- a/policies/dotnet/Devolutions.UniGetUI.Broker.Policy/PolicyModels.cs +++ b/policies/dotnet/Devolutions.Broker.Policy/PolicyModels.cs @@ -6,11 +6,11 @@ using YamlDotNet.Core; using YamlDotNet.RepresentationModel; -namespace Devolutions.UniGetUI.Broker.Policy; +namespace Devolutions.Broker.Policy; public static class SchemaUris { - public const string Policy = "https://aka.ms/unigetui/package-policy.schema.1.0.json"; + public const string Policy = "https://aka.ms/devolutions/broker-policy.schema.1.0.json"; } /// A policy document governing which package operations are allowed or denied. diff --git a/policies/dotnet/Devolutions.UniGetUI.Broker.Policy.slnx b/policies/dotnet/Devolutions.UniGetUI.Broker.Policy.slnx deleted file mode 100644 index 21b0d0e..0000000 --- a/policies/dotnet/Devolutions.UniGetUI.Broker.Policy.slnx +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/policies/dotnet/README.md b/policies/dotnet/README.md index d8907b9..9a93ae4 100644 --- a/policies/dotnet/README.md +++ b/policies/dotnet/README.md @@ -1,4 +1,4 @@ -Devolutions UniGetUI broker policy -================================== +Devolutions broker policy +========================= -This package provides .NET types and JSON/YAML parsing helpers for the UniGetUI package broker policy format. +This package provides .NET types and JSON/YAML parsing helpers for the Devolutions broker policy format. diff --git a/policies/rust/unigetui-broker-policy/Cargo.toml b/policies/rust/devolutions-broker-policy/Cargo.toml similarity index 77% rename from policies/rust/unigetui-broker-policy/Cargo.toml rename to policies/rust/devolutions-broker-policy/Cargo.toml index ba16899..56550b0 100644 --- a/policies/rust/unigetui-broker-policy/Cargo.toml +++ b/policies/rust/devolutions-broker-policy/Cargo.toml @@ -1,5 +1,5 @@ [package] -name = "unigetui-broker-policy" +name = "devolutions-broker-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 = "UniGetUI package broker policy model and schema" +description = "Devolutions broker policy model and schema" publish = true [lints] @@ -24,5 +24,5 @@ thiserror = "2" url = "2" [[bin]] -name = "generate-unigetui-broker-policy-schema" +name = "generate-devolutions-broker-policy-schema" path = "tools/generate_schema.rs" diff --git a/policies/rust/unigetui-broker-policy/README.md b/policies/rust/devolutions-broker-policy/README.md similarity index 67% rename from policies/rust/unigetui-broker-policy/README.md rename to policies/rust/devolutions-broker-policy/README.md index 1428b82..525c3f4 100644 --- a/policies/rust/unigetui-broker-policy/README.md +++ b/policies/rust/devolutions-broker-policy/README.md @@ -1,7 +1,7 @@ -UniGetUI broker policy model -============================ +Devolutions broker policy model +=============================== -This crate provides the Rust policy model and JSON Schema helpers for the UniGetUI package broker policy format. +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. diff --git a/policies/rust/unigetui-broker-policy/assets/samples/corporate-allowlist.policy.json b/policies/rust/devolutions-broker-policy/assets/samples/corporate-allowlist.policy.json similarity index 97% rename from policies/rust/unigetui-broker-policy/assets/samples/corporate-allowlist.policy.json rename to policies/rust/devolutions-broker-policy/assets/samples/corporate-allowlist.policy.json index fe788a4..4052a5c 100644 --- a/policies/rust/unigetui-broker-policy/assets/samples/corporate-allowlist.policy.json +++ b/policies/rust/devolutions-broker-policy/assets/samples/corporate-allowlist.policy.json @@ -1,5 +1,5 @@ { - "$schema": "https://aka.ms/unigetui/package-policy.schema.1.0.json", + "$schema": "https://aka.ms/devolutions/broker-policy.schema.1.0.json", "PolicyVersion": "1.0.0", "PolicyType": "PackageBrokerPolicy", "Metadata": { diff --git a/policies/rust/unigetui-broker-policy/assets/samples/corporate-allowlist.policy.yaml b/policies/rust/devolutions-broker-policy/assets/samples/corporate-allowlist.policy.yaml similarity index 94% rename from policies/rust/unigetui-broker-policy/assets/samples/corporate-allowlist.policy.yaml rename to policies/rust/devolutions-broker-policy/assets/samples/corporate-allowlist.policy.yaml index 20d9519..65be80a 100644 --- a/policies/rust/unigetui-broker-policy/assets/samples/corporate-allowlist.policy.yaml +++ b/policies/rust/devolutions-broker-policy/assets/samples/corporate-allowlist.policy.yaml @@ -1,4 +1,4 @@ -"$schema": https://aka.ms/unigetui/package-policy.schema.1.0.json +"$schema": https://aka.ms/devolutions/broker-policy.schema.1.0.json PolicyVersion: 1.0.0 PolicyType: PackageBrokerPolicy Metadata: diff --git a/policies/rust/unigetui-broker-policy/assets/samples/deny-risky-options.policy.json b/policies/rust/devolutions-broker-policy/assets/samples/deny-risky-options.policy.json similarity index 96% rename from policies/rust/unigetui-broker-policy/assets/samples/deny-risky-options.policy.json rename to policies/rust/devolutions-broker-policy/assets/samples/deny-risky-options.policy.json index ac0896f..8d9cd2e 100644 --- a/policies/rust/unigetui-broker-policy/assets/samples/deny-risky-options.policy.json +++ b/policies/rust/devolutions-broker-policy/assets/samples/deny-risky-options.policy.json @@ -1,5 +1,5 @@ { - "$schema": "https://aka.ms/unigetui/package-policy.schema.1.0.json", + "$schema": "https://aka.ms/devolutions/broker-policy.schema.1.0.json", "PolicyVersion": "1.0.0", "PolicyType": "PackageBrokerPolicy", "Metadata": { diff --git a/policies/rust/unigetui-broker-policy/assets/samples/invalid/policies/invalid-failure-decision.policy.json b/policies/rust/devolutions-broker-policy/assets/samples/invalid/policies/invalid-failure-decision.policy.json similarity index 88% rename from policies/rust/unigetui-broker-policy/assets/samples/invalid/policies/invalid-failure-decision.policy.json rename to policies/rust/devolutions-broker-policy/assets/samples/invalid/policies/invalid-failure-decision.policy.json index 9439e34..06ead7a 100644 --- a/policies/rust/unigetui-broker-policy/assets/samples/invalid/policies/invalid-failure-decision.policy.json +++ b/policies/rust/devolutions-broker-policy/assets/samples/invalid/policies/invalid-failure-decision.policy.json @@ -1,5 +1,5 @@ { - "$schema": "https://aka.ms/unigetui/package-policy.schema.1.0.json", + "$schema": "https://aka.ms/devolutions/broker-policy.schema.1.0.json", "PolicyVersion": "1.0.0", "PolicyType": "PackageBrokerPolicy", "Metadata": { diff --git a/policies/rust/unigetui-broker-policy/assets/samples/powershell-advanced.policy.json b/policies/rust/devolutions-broker-policy/assets/samples/powershell-advanced.policy.json similarity index 96% rename from policies/rust/unigetui-broker-policy/assets/samples/powershell-advanced.policy.json rename to policies/rust/devolutions-broker-policy/assets/samples/powershell-advanced.policy.json index 9aa4cd8..46bf567 100644 --- a/policies/rust/unigetui-broker-policy/assets/samples/powershell-advanced.policy.json +++ b/policies/rust/devolutions-broker-policy/assets/samples/powershell-advanced.policy.json @@ -1,5 +1,5 @@ { - "$schema": "https://aka.ms/unigetui/package-policy.schema.1.0.json", + "$schema": "https://aka.ms/devolutions/broker-policy.schema.1.0.json", "PolicyVersion": "1.0.0", "PolicyType": "PackageBrokerPolicy", "Metadata": { diff --git a/policies/rust/unigetui-broker-policy/assets/samples/powershell-current-user.policy.json b/policies/rust/devolutions-broker-policy/assets/samples/powershell-current-user.policy.json similarity index 96% rename from policies/rust/unigetui-broker-policy/assets/samples/powershell-current-user.policy.json rename to policies/rust/devolutions-broker-policy/assets/samples/powershell-current-user.policy.json index 36af55b..e5ab9d9 100644 --- a/policies/rust/unigetui-broker-policy/assets/samples/powershell-current-user.policy.json +++ b/policies/rust/devolutions-broker-policy/assets/samples/powershell-current-user.policy.json @@ -1,5 +1,5 @@ { - "$schema": "https://aka.ms/unigetui/package-policy.schema.1.0.json", + "$schema": "https://aka.ms/devolutions/broker-policy.schema.1.0.json", "PolicyVersion": "1.0.0", "PolicyType": "PackageBrokerPolicy", "Metadata": { diff --git a/policies/rust/unigetui-broker-policy/assets/samples/scenario-coverage.policy.json b/policies/rust/devolutions-broker-policy/assets/samples/scenario-coverage.policy.json similarity index 98% rename from policies/rust/unigetui-broker-policy/assets/samples/scenario-coverage.policy.json rename to policies/rust/devolutions-broker-policy/assets/samples/scenario-coverage.policy.json index 0447ec9..de34b7c 100644 --- a/policies/rust/unigetui-broker-policy/assets/samples/scenario-coverage.policy.json +++ b/policies/rust/devolutions-broker-policy/assets/samples/scenario-coverage.policy.json @@ -1,5 +1,5 @@ { - "$schema": "https://aka.ms/unigetui/package-policy.schema.1.0.json", + "$schema": "https://aka.ms/devolutions/broker-policy.schema.1.0.json", "PolicyVersion": "1.0.0", "PolicyType": "PackageBrokerPolicy", "Metadata": { diff --git a/policies/rust/unigetui-broker-policy/schema/unigetui.package-policy.schema.json b/policies/rust/devolutions-broker-policy/schema/devolutions.broker-policy.schema.json similarity index 99% rename from policies/rust/unigetui-broker-policy/schema/unigetui.package-policy.schema.json rename to policies/rust/devolutions-broker-policy/schema/devolutions.broker-policy.schema.json index c824093..5f038e5 100644 --- a/policies/rust/unigetui-broker-policy/schema/unigetui.package-policy.schema.json +++ b/policies/rust/devolutions-broker-policy/schema/devolutions.broker-policy.schema.json @@ -1,5 +1,5 @@ { - "$id": "https://aka.ms/unigetui/package-policy.schema.1.0.json", + "$id": "https://aka.ms/devolutions/broker-policy.schema.1.0.json", "$schema": "http://json-schema.org/draft-07/schema#", "additionalProperties": false, "definitions": { @@ -489,7 +489,7 @@ }, "PolicySchemaUri": { "enum": [ - "https://aka.ms/unigetui/package-policy.schema.1.0.json" + "https://aka.ms/devolutions/broker-policy.schema.1.0.json" ], "type": "string" }, diff --git a/policies/rust/unigetui-broker-policy/src/enums.rs b/policies/rust/devolutions-broker-policy/src/enums.rs similarity index 100% rename from policies/rust/unigetui-broker-policy/src/enums.rs rename to policies/rust/devolutions-broker-policy/src/enums.rs diff --git a/policies/rust/devolutions-broker-policy/src/lib.rs b/policies/rust/devolutions-broker-policy/src/lib.rs new file mode 100644 index 0000000..c355c4d --- /dev/null +++ b/policies/rust/devolutions-broker-policy/src/lib.rs @@ -0,0 +1,14 @@ +//! Devolutions broker policy model and schema helpers. + +#![allow(clippy::std_instead_of_core, unused_qualifications)] + +pub mod enums; +pub mod markers; +pub mod newtypes; +pub mod policy; +pub mod schema; + +pub use enums::*; +pub use markers::*; +pub use newtypes::*; +pub use policy::*; diff --git a/policies/rust/unigetui-broker-policy/src/markers.rs b/policies/rust/devolutions-broker-policy/src/markers.rs similarity index 95% rename from policies/rust/unigetui-broker-policy/src/markers.rs rename to policies/rust/devolutions-broker-policy/src/markers.rs index 3882b5f..534c40d 100644 --- a/policies/rust/unigetui-broker-policy/src/markers.rs +++ b/policies/rust/devolutions-broker-policy/src/markers.rs @@ -57,7 +57,7 @@ fixed_string_marker! { } /// Schema URI for package policy documents. -pub const POLICY_SCHEMA_URI: &str = "https://aka.ms/unigetui/package-policy.schema.1.0.json"; +pub const POLICY_SCHEMA_URI: &str = "https://aka.ms/devolutions/broker-policy.schema.1.0.json"; fixed_string_marker! { /// Marker type for the policy `$schema` field. diff --git a/policies/rust/unigetui-broker-policy/src/newtypes.rs b/policies/rust/devolutions-broker-policy/src/newtypes.rs similarity index 100% rename from policies/rust/unigetui-broker-policy/src/newtypes.rs rename to policies/rust/devolutions-broker-policy/src/newtypes.rs diff --git a/policies/rust/unigetui-broker-policy/src/policy.rs b/policies/rust/devolutions-broker-policy/src/policy.rs similarity index 100% rename from policies/rust/unigetui-broker-policy/src/policy.rs rename to policies/rust/devolutions-broker-policy/src/policy.rs diff --git a/policies/rust/unigetui-broker-policy/src/schema.rs b/policies/rust/devolutions-broker-policy/src/schema.rs similarity index 100% rename from policies/rust/unigetui-broker-policy/src/schema.rs rename to policies/rust/devolutions-broker-policy/src/schema.rs diff --git a/policies/rust/unigetui-broker-policy/tests/policy_samples.rs b/policies/rust/devolutions-broker-policy/tests/policy_samples.rs similarity index 91% rename from policies/rust/unigetui-broker-policy/tests/policy_samples.rs rename to policies/rust/devolutions-broker-policy/tests/policy_samples.rs index 815df2e..84ab8d5 100644 --- a/policies/rust/unigetui-broker-policy/tests/policy_samples.rs +++ b/policies/rust/devolutions-broker-policy/tests/policy_samples.rs @@ -4,7 +4,7 @@ use std::path::{Path, PathBuf}; -use unigetui_broker_policy::PolicyDocument; +use devolutions_broker_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://aka.ms/unigetui/package-policy.schema.1.0.json", + "$schema": "https://aka.ms/devolutions/broker-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 = unigetui_broker_policy::schema::policy_schema_json(); + let schema = devolutions_broker_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 = unigetui_broker_policy::schema::policy_schema_json(); + let schema = devolutions_broker_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/unigetui-broker-policy/tools/generate_schema.rs b/policies/rust/devolutions-broker-policy/tools/generate_schema.rs similarity index 76% rename from policies/rust/unigetui-broker-policy/tools/generate_schema.rs rename to policies/rust/devolutions-broker-policy/tools/generate_schema.rs index 3ddb19d..32b1c6b 100644 --- a/policies/rust/unigetui-broker-policy/tools/generate_schema.rs +++ b/policies/rust/devolutions-broker-policy/tools/generate_schema.rs @@ -1,19 +1,19 @@ //! Generates the JSON schema for the policy document. //! -//! Usage: `cargo run -p unigetui-broker-policy --bin generate-unigetui-broker-policy-schema` +//! Usage: `cargo run -p devolutions-broker-policy --bin generate-devolutions-broker-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 serde_json::{Map, Value}; -use unigetui_broker_policy::POLICY_SCHEMA_URI; -use unigetui_broker_policy::schema::policy_schema_json; fn main() { let crate_dir = Path::new(env!("CARGO_MANIFEST_DIR")); - let out_path = crate_dir.join("schema").join("unigetui.package-policy.schema.json"); + let out_path = crate_dir.join("schema").join("devolutions.broker-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/policies/rust/unigetui-broker-policy/src/lib.rs b/policies/rust/unigetui-broker-policy/src/lib.rs deleted file mode 100644 index f3cd2bc..0000000 --- a/policies/rust/unigetui-broker-policy/src/lib.rs +++ /dev/null @@ -1,18 +0,0 @@ -//! UniGetUI package broker policy model and schema helpers. -//! -//! This crate intentionally contains only admin-authored policy types. -//! Broker request, response, server, transport, and execution types live in -//! `unigetui-broker`. - -#![allow(clippy::std_instead_of_core, unused_qualifications)] - -pub mod enums; -pub mod markers; -pub mod newtypes; -pub mod policy; -pub mod schema; - -pub use enums::*; -pub use markers::*; -pub use newtypes::*; -pub use policy::*; diff --git a/xtask/src/dotnet.rs b/xtask/src/dotnet.rs index 6cdba48..e09b92b 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.UniGetUI.Broker.Policy.slnx", - artifact_project: "policies/dotnet/Devolutions.UniGetUI.Broker.Policy", + path: "policies/dotnet/Devolutions.Broker.Policy.slnx", + artifact_project: "policies/dotnet/Devolutions.Broker.Policy", set_platform: false, }, ]; From 14b13b5e2ca30cf3f03fbd4860a886f0c06b1c2b Mon Sep 17 00:00:00 2001 From: Vladyslav Nikonov Date: Fri, 19 Jun 2026 20:17:50 +0300 Subject: [PATCH 2/2] refactor: remove aka.ms schema url --- .../dotnet/Devolutions.Broker.Policy.Tests/PolicyTests.cs | 2 +- policies/dotnet/Devolutions.Broker.Policy/PolicyModels.cs | 2 +- .../assets/samples/corporate-allowlist.policy.json | 2 +- .../assets/samples/corporate-allowlist.policy.yaml | 2 +- .../assets/samples/deny-risky-options.policy.json | 2 +- .../invalid/policies/invalid-failure-decision.policy.json | 2 +- .../assets/samples/powershell-advanced.policy.json | 2 +- .../assets/samples/powershell-current-user.policy.json | 2 +- .../assets/samples/scenario-coverage.policy.json | 2 +- .../schema/devolutions.broker-policy.schema.json | 4 ++-- policies/rust/devolutions-broker-policy/src/markers.rs | 2 +- .../rust/devolutions-broker-policy/tests/policy_samples.rs | 2 +- 12 files changed, 13 insertions(+), 13 deletions(-) diff --git a/policies/dotnet/Devolutions.Broker.Policy.Tests/PolicyTests.cs b/policies/dotnet/Devolutions.Broker.Policy.Tests/PolicyTests.cs index cde811c..542b5d5 100644 --- a/policies/dotnet/Devolutions.Broker.Policy.Tests/PolicyTests.cs +++ b/policies/dotnet/Devolutions.Broker.Policy.Tests/PolicyTests.cs @@ -137,7 +137,7 @@ private static string MinimalPolicyJson(string revision, string rules) { return $$""" { - "$schema": "https://aka.ms/devolutions/broker-policy.schema.1.0.json", + "$schema": "https://devolutions.net/schemas/broker-policy.schema.1.0.json", "PolicyVersion": "1.0.0", "PolicyType": "PackageBrokerPolicy", "Metadata": { diff --git a/policies/dotnet/Devolutions.Broker.Policy/PolicyModels.cs b/policies/dotnet/Devolutions.Broker.Policy/PolicyModels.cs index 7794980..a66f935 100644 --- a/policies/dotnet/Devolutions.Broker.Policy/PolicyModels.cs +++ b/policies/dotnet/Devolutions.Broker.Policy/PolicyModels.cs @@ -10,7 +10,7 @@ namespace Devolutions.Broker.Policy; public static class SchemaUris { - public const string Policy = "https://aka.ms/devolutions/broker-policy.schema.1.0.json"; + public const string Policy = "https://devolutions.net/schemas/broker-policy.schema.1.0.json"; } /// A policy document governing which package operations are allowed or denied. diff --git a/policies/rust/devolutions-broker-policy/assets/samples/corporate-allowlist.policy.json b/policies/rust/devolutions-broker-policy/assets/samples/corporate-allowlist.policy.json index 4052a5c..9a0d2e1 100644 --- a/policies/rust/devolutions-broker-policy/assets/samples/corporate-allowlist.policy.json +++ b/policies/rust/devolutions-broker-policy/assets/samples/corporate-allowlist.policy.json @@ -1,5 +1,5 @@ { - "$schema": "https://aka.ms/devolutions/broker-policy.schema.1.0.json", + "$schema": "https://devolutions.net/schemas/broker-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/devolutions-broker-policy/assets/samples/corporate-allowlist.policy.yaml index 65be80a..b7e40f0 100644 --- a/policies/rust/devolutions-broker-policy/assets/samples/corporate-allowlist.policy.yaml +++ b/policies/rust/devolutions-broker-policy/assets/samples/corporate-allowlist.policy.yaml @@ -1,4 +1,4 @@ -"$schema": https://aka.ms/devolutions/broker-policy.schema.1.0.json +"$schema": https://devolutions.net/schemas/broker-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/devolutions-broker-policy/assets/samples/deny-risky-options.policy.json index 8d9cd2e..811439c 100644 --- a/policies/rust/devolutions-broker-policy/assets/samples/deny-risky-options.policy.json +++ b/policies/rust/devolutions-broker-policy/assets/samples/deny-risky-options.policy.json @@ -1,5 +1,5 @@ { - "$schema": "https://aka.ms/devolutions/broker-policy.schema.1.0.json", + "$schema": "https://devolutions.net/schemas/broker-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/devolutions-broker-policy/assets/samples/invalid/policies/invalid-failure-decision.policy.json index 06ead7a..51590c8 100644 --- a/policies/rust/devolutions-broker-policy/assets/samples/invalid/policies/invalid-failure-decision.policy.json +++ b/policies/rust/devolutions-broker-policy/assets/samples/invalid/policies/invalid-failure-decision.policy.json @@ -1,5 +1,5 @@ { - "$schema": "https://aka.ms/devolutions/broker-policy.schema.1.0.json", + "$schema": "https://devolutions.net/schemas/broker-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/devolutions-broker-policy/assets/samples/powershell-advanced.policy.json index 46bf567..afb5d25 100644 --- a/policies/rust/devolutions-broker-policy/assets/samples/powershell-advanced.policy.json +++ b/policies/rust/devolutions-broker-policy/assets/samples/powershell-advanced.policy.json @@ -1,5 +1,5 @@ { - "$schema": "https://aka.ms/devolutions/broker-policy.schema.1.0.json", + "$schema": "https://devolutions.net/schemas/broker-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/devolutions-broker-policy/assets/samples/powershell-current-user.policy.json index e5ab9d9..a5b3e4b 100644 --- a/policies/rust/devolutions-broker-policy/assets/samples/powershell-current-user.policy.json +++ b/policies/rust/devolutions-broker-policy/assets/samples/powershell-current-user.policy.json @@ -1,5 +1,5 @@ { - "$schema": "https://aka.ms/devolutions/broker-policy.schema.1.0.json", + "$schema": "https://devolutions.net/schemas/broker-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/devolutions-broker-policy/assets/samples/scenario-coverage.policy.json index de34b7c..990c606 100644 --- a/policies/rust/devolutions-broker-policy/assets/samples/scenario-coverage.policy.json +++ b/policies/rust/devolutions-broker-policy/assets/samples/scenario-coverage.policy.json @@ -1,5 +1,5 @@ { - "$schema": "https://aka.ms/devolutions/broker-policy.schema.1.0.json", + "$schema": "https://devolutions.net/schemas/broker-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/devolutions-broker-policy/schema/devolutions.broker-policy.schema.json index 5f038e5..978a903 100644 --- a/policies/rust/devolutions-broker-policy/schema/devolutions.broker-policy.schema.json +++ b/policies/rust/devolutions-broker-policy/schema/devolutions.broker-policy.schema.json @@ -1,5 +1,5 @@ { - "$id": "https://aka.ms/devolutions/broker-policy.schema.1.0.json", + "$id": "https://devolutions.net/schemas/broker-policy.schema.1.0.json", "$schema": "http://json-schema.org/draft-07/schema#", "additionalProperties": false, "definitions": { @@ -489,7 +489,7 @@ }, "PolicySchemaUri": { "enum": [ - "https://aka.ms/devolutions/broker-policy.schema.1.0.json" + "https://devolutions.net/schemas/broker-policy.schema.1.0.json" ], "type": "string" }, diff --git a/policies/rust/devolutions-broker-policy/src/markers.rs b/policies/rust/devolutions-broker-policy/src/markers.rs index 534c40d..5d7f470 100644 --- a/policies/rust/devolutions-broker-policy/src/markers.rs +++ b/policies/rust/devolutions-broker-policy/src/markers.rs @@ -57,7 +57,7 @@ fixed_string_marker! { } /// Schema URI for package policy documents. -pub const POLICY_SCHEMA_URI: &str = "https://aka.ms/devolutions/broker-policy.schema.1.0.json"; +pub const POLICY_SCHEMA_URI: &str = "https://devolutions.net/schemas/broker-policy.schema.1.0.json"; fixed_string_marker! { /// Marker type for the policy `$schema` field. diff --git a/policies/rust/devolutions-broker-policy/tests/policy_samples.rs b/policies/rust/devolutions-broker-policy/tests/policy_samples.rs index 84ab8d5..2214900 100644 --- a/policies/rust/devolutions-broker-policy/tests/policy_samples.rs +++ b/policies/rust/devolutions-broker-policy/tests/policy_samples.rs @@ -43,7 +43,7 @@ fn all_sample_policies_deserialize() { #[test] fn invalid_policy_unknown_field_fails_deserialization() { let value = serde_json::json!({ - "$schema": "https://aka.ms/devolutions/broker-policy.schema.1.0.json", + "$schema": "https://devolutions.net/schemas/broker-policy.schema.1.0.json", "PolicyVersion": "1.0.0", "PolicyType": "PackageBrokerPolicy", "Metadata": {