Improve package collection validation error message (#4166)

rdar://89172182

Author: yim-lee

Sources/PackageCollections/PackageCollections+Validation.swift

@@ -1,7 +1,7 @@
 /*
  This source file is part of the Swift.org open source project
 
- Copyright (c) 2020-2021 Apple Inc. and the Swift project authors
+ Copyright (c) 2020-2022 Apple Inc. and the Swift project authors
  Licensed under Apache License v2.0 with Runtime Library Exception
 
  See http://swift.org/LICENSE.txt for license information
@@ -80,7 +80,7 @@ extension PackageCollectionModel.V1 {
 
         // TODO: validate package url?
         private func validate(package: Collection.Package, messages: inout [ValidationMessage]) {
-            let packageID = PackageIdentity(url: package.url).description
+            let packageID = "\(PackageIdentity(url: package.url).description) (\(package.url.absoluteString))"
 
             guard !package.versions.isEmpty else {
                 messages.append(.error("Package \(packageID) does not have any versions.", property: "package.versions"))
@@ -145,7 +145,7 @@ extension PackageCollectionModel.V1 {
 
                 version.manifests.forEach { toolsVersion, manifest in
                     if toolsVersion != manifest.toolsVersion {
-                        messages.append(.error("Manifest tools version \(manifest.toolsVersion) does not match \(toolsVersion)", property: "version.manifest"))
+                        messages.append(.error("Package \(packageID) manifest tools version \(manifest.toolsVersion) does not match \(toolsVersion)", property: "version.manifest"))
                     }
 
                     if manifest.products.isEmpty {
@@ -231,6 +231,15 @@ extension Array where Element == ValidationMessage {
 public enum ValidationError: Error, Equatable, CustomStringConvertible {
     case property(name: String, message: String)
     case other(message: String)
+    
+    public var message: String {
+        switch self {
+        case .property(_, let message):
+            return message
+        case .other(let message):
+            return message
+        }
+    }
 
     public var description: String {
         switch self {

Sources/PackageCollections/Providers/JSONPackageCollectionProvider.swift

@@ -1,7 +1,7 @@
 /*
  This source file is part of the Swift.org open source project
 
- Copyright (c) 2020-2021 Apple Inc. and the Swift project authors
+ Copyright (c) 2020-2022 Apple Inc. and the Swift project authors
  Licensed under Apache License v2.0 with Runtime Library Exception
 
  See http://swift.org/LICENSE.txt for license information
@@ -195,7 +195,7 @@ struct JSONPackageCollectionProvider: PackageCollectionProvider {
     private func makeCollection(from collection: JSONModel.Collection, source: Model.CollectionSource, signature: Model.SignatureData?) -> Result<Model.Collection, Error> {
         do {
             if let errors = self.validator.validate(collection: collection)?.errors() {
-                throw JSONPackageCollectionProviderError.invalidCollection("\(errors)")
+                throw JSONPackageCollectionProviderError.invalidCollection("\(errors.map { $0.message }.joined(separator: " "))")
             }
 
             var serializationOkay = true