fix: rename policy crate and library

.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 }}

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.

policies/dotnet/Devolutions.UniGetUI.Broker.Policy.Tests/Devolutions.UniGetUI.Broker.Policy.Tests.csproj → policies/dotnet/Devolutions.Broker.Policy.Tests/Devolutions.Broker.Policy.Tests.csproj

@@ -5,7 +5,7 @@
     <Nullable>enable</Nullable>
     <ImplicitUsings>enable</ImplicitUsings>
     <IsPackable>false</IsPackable>
-    <RootNamespace>Devolutions.UniGetUI.Broker.Policy.Tests</RootNamespace>
+    <RootNamespace>Devolutions.Broker.Policy.Tests</RootNamespace>
   </PropertyGroup>
 
   <ItemGroup>
@@ -16,7 +16,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <ProjectReference Include="../Devolutions.UniGetUI.Broker.Policy/Devolutions.UniGetUI.Broker.Policy.csproj" />
+    <ProjectReference Include="../Devolutions.Broker.Policy/Devolutions.Broker.Policy.csproj" />
   </ItemGroup>
 
 </Project>

policies/dotnet/Devolutions.UniGetUI.Broker.Policy.Tests/PolicyTests.cs → policies/dotnet/Devolutions.Broker.Policy.Tests/PolicyTests.cs

@@ -5,15 +5,15 @@
 
 using Xunit;
 
-namespace Devolutions.UniGetUI.Broker.Policy.Tests;
+namespace Devolutions.Broker.Policy.Tests;
 
 public class PolicyTests
 {
     private static string PolicyCrateRoot { get; } = ResolvePolicyCrateRoot();
 
     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<object[]> 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://devolutions.net/schemas/broker-policy.schema.1.0.json",
             "PolicyVersion": "1.0.0",
             "PolicyType": "PackageBrokerPolicy",
             "Metadata": {

policies/dotnet/Devolutions.Broker.Policy.slnx

@@ -0,0 +1,4 @@
+<Solution>
+  <Project Path="Devolutions.Broker.Policy.Tests/Devolutions.Broker.Policy.Tests.csproj"/>
+  <Project Path="Devolutions.Broker.Policy/Devolutions.Broker.Policy.csproj"/>
+</Solution>

policies/dotnet/Devolutions.UniGetUI.Broker.Policy/Devolutions.UniGetUI.Broker.Policy.csproj → policies/dotnet/Devolutions.Broker.Policy/Devolutions.Broker.Policy.csproj

@@ -4,16 +4,16 @@
     <LangVersion>latest</LangVersion>
     <Nullable>enable</Nullable>
     <ImplicitUsings>enable</ImplicitUsings>
-    <RootNamespace>Devolutions.UniGetUI.Broker.Policy</RootNamespace>
-    <AssemblyName>Devolutions.UniGetUI.Broker.Policy</AssemblyName>
+    <RootNamespace>Devolutions.Broker.Policy</RootNamespace>
+    <AssemblyName>Devolutions.Broker.Policy</AssemblyName>
     <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
   </PropertyGroup>
 
   <PropertyGroup>
-    <PackageId>Devolutions.UniGetUI.Broker.Policy</PackageId>
+    <PackageId>Devolutions.Broker.Policy</PackageId>
     <Version>0.0.0.0</Version>
-    <AssemblyTitle>Devolutions Agent UniGetUI package broker policy model</AssemblyTitle>
-    <Description>Policy creation and parsing APIs for the Devolutions Agent UniGetUI package broker.</Description>
+    <AssemblyTitle>Devolutions broker policy model</AssemblyTitle>
+    <Description>Policy creation and parsing APIs for Devolutions broker policies.</Description>
     <Authors>Devolutions Inc.</Authors>
     <Copyright>© Devolutions Inc. All rights reserved.</Copyright>
     <PackageLicenseExpression>MIT OR Apache-2.0</PackageLicenseExpression>

policies/dotnet/Devolutions.UniGetUI.Broker.Policy/Enums.cs → 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;
 
 /// <summary>Package operation type.</summary>
 [JsonConverter(typeof(JsonStringEnumConverter<Operation>))]

policies/dotnet/Devolutions.UniGetUI.Broker.Policy/PolicyJson.cs → 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
 {

policies/dotnet/Devolutions.UniGetUI.Broker.Policy/PolicyModels.cs → 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://devolutions.net/schemas/broker-policy.schema.1.0.json";
 }
 
 /// <summary>A policy document governing which package operations are allowed or denied.</summary>

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.

policies/rust/unigetui-broker-policy/Cargo.toml → policies/rust/devolutions-broker-policy/Cargo.toml

@@ -1,13 +1,13 @@
 [package]
-name = "unigetui-broker-policy"
+name = "devolutions-broker-policy"
 version = "0.1.0"
 edition = "2024"
 license.workspace = true
 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"

policies/rust/unigetui-broker-policy/README.md → 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.

policies/rust/unigetui-broker-policy/assets/samples/corporate-allowlist.policy.json → 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://devolutions.net/schemas/broker-policy.schema.1.0.json",
   "PolicyVersion": "1.0.0",
   "PolicyType": "PackageBrokerPolicy",
   "Metadata": {

policies/rust/unigetui-broker-policy/assets/samples/corporate-allowlist.policy.yaml → 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://devolutions.net/schemas/broker-policy.schema.1.0.json
 PolicyVersion: 1.0.0
 PolicyType: PackageBrokerPolicy
 Metadata:

policies/rust/unigetui-broker-policy/assets/samples/deny-risky-options.policy.json → 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://devolutions.net/schemas/broker-policy.schema.1.0.json",
   "PolicyVersion": "1.0.0",
   "PolicyType": "PackageBrokerPolicy",
   "Metadata": {

policies/rust/unigetui-broker-policy/assets/samples/invalid/policies/invalid-failure-decision.policy.json → 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://devolutions.net/schemas/broker-policy.schema.1.0.json",
   "PolicyVersion": "1.0.0",
   "PolicyType": "PackageBrokerPolicy",
   "Metadata": {

policies/rust/unigetui-broker-policy/assets/samples/powershell-advanced.policy.json → 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://devolutions.net/schemas/broker-policy.schema.1.0.json",
   "PolicyVersion": "1.0.0",
   "PolicyType": "PackageBrokerPolicy",
   "Metadata": {

policies/rust/unigetui-broker-policy/assets/samples/powershell-current-user.policy.json → 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://devolutions.net/schemas/broker-policy.schema.1.0.json",
   "PolicyVersion": "1.0.0",
   "PolicyType": "PackageBrokerPolicy",
   "Metadata": {

policies/rust/unigetui-broker-policy/assets/samples/scenario-coverage.policy.json → 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://devolutions.net/schemas/broker-policy.schema.1.0.json",
   "PolicyVersion": "1.0.0",
   "PolicyType": "PackageBrokerPolicy",
   "Metadata": {

policies/rust/unigetui-broker-policy/schema/unigetui.package-policy.schema.json → 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://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/unigetui/package-policy.schema.1.0.json"
+        "https://devolutions.net/schemas/broker-policy.schema.1.0.json"
       ],
       "type": "string"
     },

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::*;

policies/rust/unigetui-broker-policy/src/markers.rs → 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://devolutions.net/schemas/broker-policy.schema.1.0.json";
 
 fixed_string_marker! {
     /// Marker type for the policy `$schema` field.

policies/rust/unigetui-broker-policy/tests/policy_samples.rs → 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://devolutions.net/schemas/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);

policies/rust/unigetui-broker-policy/tools/generate_schema.rs → 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");