Adjust to SE-0305: Adjust suffixes for artifact bundles and artifact indices

Author: abertelrud

Fixtures/Miscellaneous/Plugins/MyBinaryToolPlugin/Binaries/MyVendedSourceGenBuildTool.arar/info.json renamed to Fixtures/Miscellaneous/Plugins/MyBinaryToolPlugin/Binaries/MyVendedSourceGenBuildTool.artifactbundle/info.json

@@ -22,7 +22,7 @@ let package = Package(
         // The vended executable that generates source files.
         .binaryTarget(
             name: "MyVendedSourceGenBuildTool",
-            path: "Binaries/MyVendedSourceGenBuildTool.arar"
+            path: "Binaries/MyVendedSourceGenBuildTool.artifactbundle"
         ),
     ]
 )

Fixtures/Miscellaneous/Plugins/MyBinaryToolPlugin/Binaries/MyVendedSourceGenBuildTool.arar/mytool-linux/mytool renamed to Fixtures/Miscellaneous/Plugins/MyBinaryToolPlugin/Binaries/MyVendedSourceGenBuildTool.artifactbundle/mytool-linux/mytool

@@ -547,7 +547,7 @@ public final class BinaryTarget: Target {
             case .xcframework:
                 return "xcframework"
             case .artifactsArchive:
-                return "arar"
+                return "artifactbundle"
             }
         }
 

Fixtures/Miscellaneous/Plugins/MyBinaryToolPlugin/Binaries/MyVendedSourceGenBuildTool.arar/mytool-macos/mytool renamed to Fixtures/Miscellaneous/Plugins/MyBinaryToolPlugin/Binaries/MyVendedSourceGenBuildTool.artifactbundle/mytool-macos/mytool

@@ -1593,11 +1593,11 @@ extension Workspace {
         let authProvider: AuthorizationProviding? = try? Netrc.load(fromFileAtPath: netrcFilePath).get()
 
         // zip files to download
-        // stored in a thread-safe way as we may fetch more from "ari" files
+        // stored in a thread-safe way as we may fetch more from "artifactbundleindex" files
         let zipArtifacts = ThreadSafeArrayStore<RemoteArtifact>(artifacts.filter { $0.url.pathExtension.lowercased() == "zip" })
 
-        // fetch and parse "ari" files, if any
-        let indexFiles = artifacts.filter { $0.url.pathExtension.lowercased() == "ari" }
+        // fetch and parse "artifactbundleindex" files, if any
+        let indexFiles = artifacts.filter { $0.url.pathExtension.lowercased() == "artifactbundleindex" }
         if !indexFiles.isEmpty {
             let hostToolchain = try UserToolchain(destination: .hostDestination())
             let jsonDecoder = JSONDecoder.makeWithDefaults()
@@ -1642,7 +1642,7 @@ extension Workspace {
                 }
             }
 
-            // wait for all "ari" files to be processed
+            // wait for all "artifactbundleindex" files to be processed
             group.wait()
 
             // no reason to continue if we already ran into issues

Fixtures/Miscellaneous/Plugins/MyBinaryToolPlugin/Package.swift

@@ -2672,7 +2672,7 @@ final class BuildPlanTests: XCTestCase {
         let fs = InMemoryFileSystem(emptyFiles: "/Pkg/Sources/exe/main.swift")
 
         let artifactName = "my-tool"
-        let toolPath = AbsolutePath("/Pkg/MyTool.arar")
+        let toolPath = AbsolutePath("/Pkg/MyTool.artifactbundle")
         try fs.createDirectory(toolPath, recursive: true)
 
         try fs.writeFileContents(
@@ -2710,7 +2710,7 @@ final class BuildPlanTests: XCTestCase {
                     ],
                     targets: [
                         TargetDescription(name: "exe", dependencies: ["MyTool"]),
-                        TargetDescription(name: "MyTool", path: "MyTool.arar", type: .binary),
+                        TargetDescription(name: "MyTool", path: "MyTool.artifactbundle", type: .binary),
                     ]
                 ),
             ],

Sources/PackageModel/Target.swift

@@ -250,7 +250,7 @@ class PackageDescription5_3LoadingTests: PackageDescriptionLoadingTests {
                 """
 
             XCTAssertManifestLoadThrows(stream.bytes) { _, diagnostics in
-                diagnostics.check(diagnostic: "unsupported extension for binary target 'Foo'; valid extensions are: 'xcframework', 'arar'", behavior: .error)
+                diagnostics.check(diagnostic: "unsupported extension for binary target 'Foo'; valid extensions are: 'xcframework', 'artifactbundle'", behavior: .error)
             }
         }
 
@@ -293,7 +293,7 @@ class PackageDescription5_3LoadingTests: PackageDescriptionLoadingTests {
                 """
 
             XCTAssertManifestLoadThrows(stream.bytes) { _, diagnostics in
-                diagnostics.check(diagnostic: "unsupported extension for binary target 'Foo'; valid extensions are: 'xcframework', 'arar'", behavior: .error)
+                diagnostics.check(diagnostic: "unsupported extension for binary target 'Foo'; valid extensions are: 'xcframework', 'artifactbundle'", behavior: .error)
             }
         }
 

Sources/Workspace/Workspace.swift

@@ -4914,9 +4914,9 @@ final class WorkspaceTests: XCTestCase {
                 do {
                     let contents: String
                     switch request.url.lastPathComponent {
-                    case "a1.ari":
+                    case "a1.artifactbundleindex":
                         contents = ariFiles[0]
-                    case "a2.ari":
+                    case "a2.artifactbundleindex":
                         contents = ariFiles[1]
                     default:
                         throw StringError("unexpected url \(request.url)")
@@ -4959,11 +4959,11 @@ final class WorkspaceTests: XCTestCase {
                 let name: String
                 switch archivePath.basename {
                 case "a1.zip":
-                    name = "A1.arar"
+                    name = "A1.artifactbundle"
                 case "a2.zip":
-                    name = "A2.arar"
+                    name = "A2.artifactbundle"
                 case "b.zip":
-                    name = "B.arar"
+                    name = "B.artifactbundle"
                 default:
                     throw StringError("unexpected archivePath \(archivePath)")
                 }
@@ -5005,13 +5005,13 @@ final class WorkspaceTests: XCTestCase {
                         MockTarget(
                             name: "A1",
                             type: .binary,
-                            url: "https://a.com/a1.ari",
+                            url: "https://a.com/a1.artifactbundleindex",
                             checksum: ariFilesChecksums[0]
                         ),
                         MockTarget(
                             name: "A2",
                             type: .binary,
-                            url: "https://a.com/a2.ari",
+                            url: "https://a.com/a2.artifactbundleindex",
                             checksum: ariFilesChecksums[1]
                         )
                     ],
@@ -5077,23 +5077,23 @@ final class WorkspaceTests: XCTestCase {
                             url: "https://a.com/a1.zip",
                             checksum: "a1"
                          ),
-                         path: workspace.artifactsDir.appending(components: "A", "A1.arar")
+                         path: workspace.artifactsDir.appending(components: "A", "A1.artifactbundle")
             )
             result.check(packageName: "A",
                          targetName: "A2",
                          source: .remote(
                             url: "https://a.com/a2/a2.zip",
                             checksum: "a2"
                          ),
-                         path: workspace.artifactsDir.appending(components: "A", "A2.arar")
+                         path: workspace.artifactsDir.appending(components: "A", "A2.artifactbundle")
             )
             result.check(packageName: "B",
                          targetName: "B",
                          source: .remote(
                             url: "https://b.com/b.zip",
                             checksum: "b0"
                          ),
-                         path: workspace.artifactsDir.appending(components: "B", "B.arar")
+                         path: workspace.artifactsDir.appending(components: "B", "B.artifactbundle")
             )
         }
     }
@@ -5127,7 +5127,7 @@ final class WorkspaceTests: XCTestCase {
                 MockPackage(
                     name: "A",
                     targets: [
-                        MockTarget(name: "A", type: .binary, url: "https://a.com/a.ari", checksum: "does-not-matter"),
+                        MockTarget(name: "A", type: .binary, url: "https://a.com/a.artifactbundleindex", checksum: "does-not-matter"),
                     ],
                     products: [
                         MockProduct(name: "A", targets: ["A"]),
@@ -5139,7 +5139,7 @@ final class WorkspaceTests: XCTestCase {
 
         workspace.checkPackageGraphFailure(roots: ["Foo"]) { diagnostics in
             DiagnosticsEngineTester(diagnostics) { result in
-                result.check(diagnostic: .contains("failed retrieving 'https://a.com/a.ari': badResponseStatusCode(500)"), behavior: .error)
+                result.check(diagnostic: .contains("failed retrieving 'https://a.com/a.artifactbundleindex': badResponseStatusCode(500)"), behavior: .error)
             }
         }
     }
@@ -5169,7 +5169,7 @@ final class WorkspaceTests: XCTestCase {
             do {
                 let contents: String
                 switch request.url.lastPathComponent {
-                case "a.ari":
+                case "a.artifactbundleindex":
                     contents = ari
                 default:
                     throw StringError("unexpected url \(request.url)")
@@ -5200,7 +5200,7 @@ final class WorkspaceTests: XCTestCase {
                 MockPackage(
                     name: "A",
                     targets: [
-                        MockTarget(name: "A", type: .binary, url: "https://a.com/a.ari", checksum: "incorrect"),
+                        MockTarget(name: "A", type: .binary, url: "https://a.com/a.artifactbundleindex", checksum: "incorrect"),
                     ],
                     products: [
                         MockProduct(name: "A", targets: ["A"]),
@@ -5212,7 +5212,7 @@ final class WorkspaceTests: XCTestCase {
 
         workspace.checkPackageGraphFailure(roots: ["Foo"]) { diagnostics in
             DiagnosticsEngineTester(diagnostics) { result in
-                result.check(diagnostic: .contains("failed retrieving 'https://a.com/a.ari': checksum of downloaded artifact of binary target 'A' (\(ariChecksums)) does not match checksum specified by the manifest (incorrect)"), behavior: .error)
+                result.check(diagnostic: .contains("failed retrieving 'https://a.com/a.artifactbundleindex': checksum of downloaded artifact of binary target 'A' (\(ariChecksums)) does not match checksum specified by the manifest (incorrect)"), behavior: .error)
             }
         }
     }
@@ -5240,7 +5240,7 @@ final class WorkspaceTests: XCTestCase {
                 MockPackage(
                     name: "A",
                     targets: [
-                        MockTarget(name: "A", type: .binary, url: "https://a.com/a.ari", checksum: "a"),
+                        MockTarget(name: "A", type: .binary, url: "https://a.com/a.artifactbundleindex", checksum: "a"),
                     ],
                     products: [
                         MockProduct(name: "A", targets: ["A"]),
@@ -5266,7 +5266,7 @@ final class WorkspaceTests: XCTestCase {
                     packageRef: aRef,
                     targetName: "A",
                     source: .remote(
-                        url: "https://a.com/a.ari",
+                        url: "https://a.com/a.artifactbundleindex",
                         checksum: "old-checksum"
                     ),
                     path: workspace.packagesDir.appending(components: "A", "A.xcframework")
@@ -5308,7 +5308,7 @@ final class WorkspaceTests: XCTestCase {
                 do {
                     let contents: String
                     switch request.url.lastPathComponent {
-                    case "a.ari":
+                    case "a.artifactbundleindex":
                         contents = ari
                     default:
                         throw StringError("unexpected url \(request.url)")
@@ -5346,7 +5346,7 @@ final class WorkspaceTests: XCTestCase {
                 let name: String
                 switch archivePath.basename {
                 case "a.zip":
-                    name = "A.arar"
+                    name = "A.artifactbundle"
                 default:
                     throw StringError("unexpected archivePath \(archivePath)")
                 }
@@ -5380,7 +5380,7 @@ final class WorkspaceTests: XCTestCase {
                 MockPackage(
                     name: "A",
                     targets: [
-                        MockTarget(name: "A", type: .binary, url: "https://a.com/a.ari", checksum: ariChecksums),
+                        MockTarget(name: "A", type: .binary, url: "https://a.com/a.artifactbundleindex", checksum: ariChecksums),
                     ],
                     products: [
                         MockProduct(name: "A", targets: ["A"]),
@@ -5424,7 +5424,7 @@ final class WorkspaceTests: XCTestCase {
                 do {
                     let contents: String
                     switch request.url.lastPathComponent {
-                    case "a.ari":
+                    case "a.artifactbundleindex":
                         contents = ari
                     default:
                         throw StringError("unexpected url \(request.url)")
@@ -5458,7 +5458,7 @@ final class WorkspaceTests: XCTestCase {
                 MockPackage(
                     name: "A",
                     targets: [
-                        MockTarget(name: "A", type: .binary, url: "https://a.com/a.ari", checksum: ariChecksums),
+                        MockTarget(name: "A", type: .binary, url: "https://a.com/a.artifactbundleindex", checksum: ariChecksums),
                     ],
                     products: [
                         MockProduct(name: "A", targets: ["A"]),
@@ -5503,7 +5503,7 @@ final class WorkspaceTests: XCTestCase {
             do {
                 let contents: String
                 switch request.url.lastPathComponent {
-                case "a.ari":
+                case "a.artifactbundleindex":
                     contents = ari
                 default:
                     throw StringError("unexpected url \(request.url)")
@@ -5534,7 +5534,7 @@ final class WorkspaceTests: XCTestCase {
                 MockPackage(
                     name: "A",
                     targets: [
-                        MockTarget(name: "A", type: .binary, url: "https://a.com/a.ari", checksum: ariChecksum),
+                        MockTarget(name: "A", type: .binary, url: "https://a.com/a.artifactbundleindex", checksum: ariChecksum),
                     ],
                     products: [
                         MockProduct(name: "A", targets: ["A"]),
@@ -5546,7 +5546,7 @@ final class WorkspaceTests: XCTestCase {
 
         workspace.checkPackageGraphFailure(roots: ["Foo"]) { diagnostics in
             DiagnosticsEngineTester(diagnostics) { result in
-                result.check(diagnostic: .contains("failed retrieving 'https://a.com/a.ari': No supported archive was found for '\(hostToolchain.triple.tripleString)'"), behavior: .error)
+                result.check(diagnostic: .contains("failed retrieving 'https://a.com/a.artifactbundleindex': No supported archive was found for '\(hostToolchain.triple.tripleString)'"), behavior: .error)
             }
         }
     }