Restore previous naming in PRs

common/lib/dependabot/dependency.rb

@@ -103,6 +103,9 @@ def subdependency_production_check
     end
 
     def display_name
+      custom_display_name = metadata[:display_name]
+      return custom_display_name if custom_display_name
+
       display_name_builder =
         self.class.display_name_builder_for_package_manager(package_manager)
       return name unless display_name_builder

swift/lib/dependabot/swift/file_parser/dependency_parser.rb

@@ -54,7 +54,7 @@ def all_dependencies(data, level: 0)
           version = data["version"]
 
           source = { type: "git", url: url, ref: version, branch: nil }
-          metadata = { identity: identity }
+          metadata = { display_name: identity }
           args = { name: name, version: version, package_manager: "swift", requirements: [], metadata: metadata }
 
           if level.zero?

swift/lib/dependabot/swift/file_updater/lockfile_updater.rb

@@ -18,7 +18,12 @@ def updated_lockfile_content
           SharedHelpers.in_a_temporary_repo_directory(manifest.directory, repo_contents_path) do
             File.write(manifest.name, manifest.content)
 
-            dependency_names = dependencies.map { |dep| dep.metadata[:identity] }.join(" ")
+            # For Swift the name of the dependency needs to match what Github
+            # uses elsewhere. In this case, it's something like
+            # `github.com/apple/swift-nio-http2`, which swift package manager
+            # does not understand. We keep a more user friendly name as
+            # `display_name` that Swift understands just fine
+            dependency_names = dependencies.map(&:display_name).join(" ")
 
             SharedHelpers.with_git_configured(credentials: credentials) do
               SharedHelpers.run_shell_command(

swift/spec/dependabot/swift/file_parser_spec.rb

@@ -52,15 +52,15 @@
         url = expected[:url]
         version = expected[:version]
         name = expected[:name]
-        identity = expected[:identity]
+        display_name = expected[:display_name]
         source = { type: "git", url: url, ref: version, branch: nil }
 
         dependency = dependencies[index]
 
         expect(dependency).to be_a(Dependabot::Dependency)
         expect(dependency.name).to eq(name)
         expect(dependency.version).to eq(version)
-        expect(dependency.metadata).to eq({ identity: identity })
+        expect(dependency.metadata).to eq({ display_name: display_name })
 
         if expected[:requirement]
           expect(dependency.requirements).to eq([
@@ -92,7 +92,7 @@
     let(:expectations) do
       [
         {
-          identity: "reactiveswift",
+          display_name: "reactiveswift",
           name: "github.com/reactivecocoa/reactiveswift",
           url: "https://github.com/ReactiveCocoa/ReactiveSwift.git",
           version: "7.1.0",
@@ -102,7 +102,7 @@
           requirement_string: "exact: \"7.1.0\""
         },
         {
-          identity: "swift-docc-plugin",
+          display_name: "swift-docc-plugin",
           name: "github.com/apple/swift-docc-plugin",
           url: "https://github.com/apple/swift-docc-plugin",
           version: "1.0.0",
@@ -112,7 +112,7 @@
           requirement_string: "from: \"1.0.0\""
         },
         {
-          identity: "swift-benchmark",
+          display_name: "swift-benchmark",
           name: "github.com/google/swift-benchmark",
           url: "https://github.com/google/swift-benchmark",
           version: "0.1.1",
@@ -121,7 +121,7 @@
           requirement_string: "\"0.1.0\"..<\"0.1.2\""
         },
         {
-          identity: "swift-argument-parser",
+          display_name: "swift-argument-parser",
           name: "github.com/apple/swift-argument-parser",
           url: "https://github.com/apple/swift-argument-parser",
           version: "0.5.0",
@@ -131,7 +131,7 @@
           requirement_string: "\"0.4.0\" ... \"0.5.0\""
         },
         {
-          identity: "combine-schedulers",
+          display_name: "combine-schedulers",
           name: "github.com/pointfreeco/combine-schedulers",
           url: "https://github.com/pointfreeco/combine-schedulers",
           version: "0.10.0",
@@ -141,7 +141,7 @@
           requirement_string: "\"0.9.2\"...\"0.10.0\""
         },
         {
-          identity: "xctest-dynamic-overlay",
+          display_name: "xctest-dynamic-overlay",
           name: "github.com/pointfreeco/xctest-dynamic-overlay",
           url: "https://github.com/pointfreeco/xctest-dynamic-overlay",
           version: "0.8.5"
@@ -158,7 +158,7 @@
     let(:expectations) do
       [
         {
-          identity: "quick",
+          display_name: "quick",
           name: "github.com/quick/quick",
           url: "https://github.com/Quick/Quick.git",
           version: "7.0.2",
@@ -168,7 +168,7 @@
           requirement_string: ".upToNextMajor(from: \"7.0.0\")"
         },
         {
-          identity: "nimble",
+          display_name: "nimble",
           name: "github.com/quick/nimble",
           url: "https://github.com/Quick/Nimble.git",
           version: "9.0.1",
@@ -178,7 +178,7 @@
           requirement_string: ".upToNextMinor(from: \"9.0.0\")"
         },
         {
-          identity: "swift-docc-plugin",
+          display_name: "swift-docc-plugin",
           name: "github.com/apple/swift-docc-plugin",
           url: "https://github.com/apple/swift-docc-plugin",
           version: "1.0.0",
@@ -188,7 +188,7 @@
           requirement_string: ".exact(\"1.0.0\")"
         },
         {
-          identity: "swift-benchmark",
+          display_name: "swift-benchmark",
           name: "github.com/google/swift-benchmark",
           url: "https://github.com/google/swift-benchmark",
           version: "0.1.1",
@@ -198,13 +198,13 @@
           requirement_string: "\"0.1.0\"..<\"0.1.2\""
         },
         {
-          identity: "swift-argument-parser",
+          display_name: "swift-argument-parser",
           name: "github.com/apple/swift-argument-parser",
           url: "https://github.com/apple/swift-argument-parser",
           version: "0.5.0"
         },
         {
-          identity: "xctest-dynamic-overlay",
+          display_name: "xctest-dynamic-overlay",
           name: "github.com/pointfreeco/xctest-dynamic-overlay",
           url: "https://github.com/pointfreeco/xctest-dynamic-overlay",
           version: "0.8.5"