From 20351946fe69dbc1b023d5203d446ea9c72f6862 Mon Sep 17 00:00:00 2001 From: Paul Hebble Date: Sat, 10 Feb 2024 11:31:19 -0600 Subject: [PATCH] Improve netkan relationship error message --- Netkan/Validators/ObeysCKANSchemaValidator.cs | 4 +--- Netkan/Validators/RelationshipsValidator.cs | 7 ++++--- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/Netkan/Validators/ObeysCKANSchemaValidator.cs b/Netkan/Validators/ObeysCKANSchemaValidator.cs index b7a4513780..7b1ab6d97b 100644 --- a/Netkan/Validators/ObeysCKANSchemaValidator.cs +++ b/Netkan/Validators/ObeysCKANSchemaValidator.cs @@ -11,9 +11,7 @@ public void Validate(Metadata metadata) var errors = CKANSchema.schema.Validate(metadata.Json()); if (errors.Any()) { - string msg = errors - .Select(err => $"{err.Path}: {err.Kind}") - .Aggregate((a, b) => $"{a}\r\n{b}"); + var msg = string.Join(", ", errors.Select(err => $"{err.Path}: {err.Kind}")); throw new Kraken($"Schema validation failed: {msg}"); } } diff --git a/Netkan/Validators/RelationshipsValidator.cs b/Netkan/Validators/RelationshipsValidator.cs index b0237715a5..a56ba5308c 100644 --- a/Netkan/Validators/RelationshipsValidator.cs +++ b/Netkan/Validators/RelationshipsValidator.cs @@ -1,7 +1,9 @@ +using System.Linq; + using Newtonsoft.Json.Linq; + using CKAN.Versioning; using CKAN.NetKAN.Model; -using System.Linq; namespace CKAN.NetKAN.Validators { @@ -18,7 +20,7 @@ public void Validate(Metadata metadata) { throw new Kraken("spec_version v1.2+ required for 'supports'"); } - foreach (JObject rel in json[relName].Cast()) + foreach (var rel in json[relName].Children()) { if (rel.ContainsKey("any_of")) { @@ -65,7 +67,6 @@ public void Validate(Metadata metadata) } } } - } private static readonly string[] relProps = new string[]