dependabot-nuget 0.297.1 → 0.297.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: be53ff734b786bb3984f1b6930aae597fd26aa6848fb9e74607abca2e85b7098
-  data.tar.gz: 254538df9bcc56e99bd1f4d8e9fe839794b40591f83e881f04890034df8bbd9c
+  metadata.gz: 303dd4ae4de15c33ca64bc0a8957ee6a4fa27cac4ffd2fbb93047d518d6afdb6
+  data.tar.gz: b4075db4bac953819932132e23d6478b6bc3e06242032d79235d2025caa1ed6f
 SHA512:
-  metadata.gz: 4ae5ecf781b1a73da4cb1dc8cfc1675b572cd5fa525b819423f768eddab7fb86689ac6cfe222bc0b2289c36299c03c5d91738b78d38dbee04f92cbb58cc7cdca
-  data.tar.gz: ab4dc1332f9108c4932aeb2f2c9491c5c064bc5fc618232e5c3156a4a96c7713b870cee954a00281aefffa7b0891c84ceb1fdd015af3939509655b015bbd9679
+  metadata.gz: 700973559052453bdfe9d999df2c980d1a5d95ecf296393edb1d1e030c050fa24eafd344898ed3017e2b6a19f7f61cf1503388ec875ffa093fc05b26cbbfc3a5
+  data.tar.gz: 3c3464e7f039d06e3fc55b3406e966767b2ed2e33d31c604f8034c7bde706aea942bcd5499b415ed1d8fae1b19323f57439e82b749e08ba0591aa53cab80aecb

data/helpers/lib/NuGetUpdater/NuGetUpdater.Core/DependencyNotFoundException.cs

@@ -0,0 +1,11 @@
+namespace NuGetUpdater.Core;
+
+internal class DependencyNotFoundException : Exception
+{
+    public string[] Dependencies { get; }
+
+    public DependencyNotFoundException(string[] dependencies)
+    {
+        Dependencies = dependencies;
+    }
+}

data/helpers/lib/NuGetUpdater/NuGetUpdater.Core/Run/ApiModel/DependencyNotFound.cs

@@ -0,0 +1,11 @@
+namespace NuGetUpdater.Core.Run.ApiModel;
+
+public record DependencyNotFound : JobErrorBase
+{
+    public DependencyNotFound(string dependency)
+        : base("dependency_not_found")
+    {
+        // the corresponding error type in Ruby calls this `source` but it's treated like a dependency name
+        Details["source"] = dependency;
+    }
+}

data/helpers/lib/NuGetUpdater/NuGetUpdater.Core/Run/ApiModel/JobErrorBase.cs

@@ -25,6 +25,7 @@ public abstract record JobErrorBase
         return ex switch
         {
             BadRequirementException badRequirement => new BadRequirement(badRequirement.Message),
+            DependencyNotFoundException dependencyNotFound => new DependencyNotFound(string.Join(", ", dependencyNotFound.Dependencies)),
             HttpRequestException httpRequest => httpRequest.StatusCode switch
             {
                 HttpStatusCode.Unauthorized or

data/helpers/lib/NuGetUpdater/NuGetUpdater.Core/Utilities/MSBuildHelper.cs

@@ -970,12 +970,17 @@ internal static partial class MSBuildHelper
 
     private static void ThrowOnMissingPackages(string output)
     {
-        var missingPackagesPattern = new Regex(@"Package '(?<PackageName>[^']*)' is not found on source");
-        var matchCollection = missingPackagesPattern.Matches(output);
-        var missingPackages = matchCollection.Select(m => m.Groups["PackageName"].Value).Distinct().ToArray();
-        if (missingPackages.Length > 0)
+        var patterns = new[]
+        {
+            new Regex(@"Package '(?<PackageName>[^']*)' is not found on source '(?<PackageSource>[^$\r\n]*)'\."),
+            new Regex(@"Unable to find package (?<PackageName>[^ ]+)\. No packages exist with this id in source\(s\): (?<PackageSource>.*)$", RegexOptions.Multiline),
+            new Regex(@"Unable to find package (?<PackageName>[^ ]+) with version \((?<PackageVersion>[^)]+)\)"),
+        };
+        var matches = patterns.Select(p => p.Match(output)).Where(m => m.Success);
+        if (matches.Any())
         {
-            throw new UpdateNotPossibleException(missingPackages);
+            var packages = matches.Select(m => m.Groups["PackageName"].Value).Distinct(StringComparer.OrdinalIgnoreCase).ToArray();
+            throw new DependencyNotFoundException(packages);
         }
     }
 

data/helpers/lib/NuGetUpdater/NuGetUpdater.Core.Test/Discover/DiscoveryWorkerTests.cs

@@ -1294,4 +1294,65 @@ public partial class DiscoveryWorkerTests : DiscoveryWorkerTestBase
             }
         );
     }
+
+    [Fact]
+    public async Task MissingPackageIsCorrectlyReported_PackageNotFound()
+    {
+        await TestDiscoveryAsync(
+            packages: [
+                MockNuGetPackage.CreateSimplePackage("Some.Package", "1.2.3", "net8.0", [(null, [("Transitive.Dependency.Does.Not.Exist", "4.5.6")])]),
+            ],
+            experimentsManager: new ExperimentsManager() { UseDirectDiscovery = true },
+            workspacePath: "",
+            files: [
+                ("project.csproj", """
+                    <Project Sdk="Microsoft.NET.Sdk">
+                      <PropertyGroup>
+                        <TargetFramework>net8.0</TargetFramework>
+                      </PropertyGroup>
+                      <ItemGroup>
+                        <PackageReference Include="Some.Package" Version="1.2.3" />
+                      </ItemGroup>
+                    </Project>
+                    """)
+            ],
+            expectedResult: new()
+            {
+                Path = "",
+                Projects = [],
+                Error = new DependencyNotFound("Transitive.Dependency.Does.Not.Exist"),
+            }
+        );
+    }
+
+    [Fact]
+    public async Task MissingPackageIsCorrectlyReported_VersionNotFound()
+    {
+        await TestDiscoveryAsync(
+            packages: [
+                MockNuGetPackage.CreateSimplePackage("Some.Package", "1.2.3", "net8.0", [(null, [("Transitive.Dependency", "4.5.6")])]),
+                MockNuGetPackage.CreateSimplePackage("Transitive.Dependency", "0.1.2", "net8.0"),
+            ],
+            experimentsManager: new ExperimentsManager() { UseDirectDiscovery = true },
+            workspacePath: "",
+            files: [
+                ("project.csproj", """
+                    <Project Sdk="Microsoft.NET.Sdk">
+                      <PropertyGroup>
+                        <TargetFramework>net8.0</TargetFramework>
+                      </PropertyGroup>
+                      <ItemGroup>
+                        <PackageReference Include="Some.Package" Version="1.2.3" />
+                      </ItemGroup>
+                    </Project>
+                    """)
+            ],
+            expectedResult: new()
+            {
+                Path = "",
+                Projects = [],
+                Error = new DependencyNotFound("Transitive.Dependency"),
+            }
+        );
+    }
 }

data/helpers/lib/NuGetUpdater/NuGetUpdater.Core.Test/Run/SerializationTests.cs

@@ -620,6 +620,14 @@ public class SerializationTests
             """
         ];
 
+        yield return
+        [
+            new DependencyNotFound("some source"),
+            """
+            {"data":{"error-type":"dependency_not_found","error-details":{"source":"some source"}}}
+            """
+        ];
+
         yield return
         [
             new JobRepoNotFound("some message"),

data/helpers/lib/NuGetUpdater/NuGetUpdater.Core.Test/Update/UpdateWorkerTests.PackagesConfig.cs

@@ -2632,7 +2632,7 @@ public partial class UpdateWorkerTests
                     """,
                 expectedResult: new()
                 {
-                    Error = new UpdateNotPossible(["Unrelated.Package.1.0.0"]),
+                    Error = new DependencyNotFound("Unrelated.Package.1.0.0"),
                 }
             );
         }

data/helpers/lib/NuGetUpdater/NuGetUpdater.Core.Test/Utilities/MSBuildHelperTests.cs

@@ -1521,9 +1521,25 @@ public class MSBuildHelperTests : TestBase
         yield return
         [
             // output
-            "Package 'Some.Package' is not found on source",
+            "Package 'Some.Package' is not found on source 'some-source'.",
             // expectedError
-            new UpdateNotPossible(["Some.Package"]),
+            new DependencyNotFound("Some.Package"),
+        ];
+
+        yield return
+        [
+            // output
+            "error NU1101: Unable to find package Some.Package. No packages exist with this id in source(s): some-source",
+            // expectedError
+            new DependencyNotFound("Some.Package"),
+        ];
+
+        yield return
+        [
+            // output
+            "Unable to find package Some.Package with version (= 1.2.3)",
+            // expectedError
+            new DependencyNotFound("Some.Package"),
         ];
 
         yield return

data/lib/dependabot/nuget/native_helpers.rb

@@ -325,6 +325,9 @@ module Dependabot
           file_path = T.let(error_details.fetch("file-path"), String)
           message = T.let(error_details.fetch("message", nil), T.nilable(String))
           raise DependencyFileNotParseable.new(file_path, message)
+        when "dependency_not_found"
+          source = T.let(error_details.fetch("source"), String)
+          raise DependencyNotFound, source
         when "illformed_requirement"
           raise BadRequirementError, T.let(error_details.fetch("message"), String)
         when "private_source_authentication_failure"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dependabot-nuget
 version: !ruby/object:Gem::Version
-  version: 0.297.1
+  version: 0.297.2
 platform: ruby
 authors:
 - Dependabot
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.297.1
+        version: 0.297.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.297.1
+        version: 0.297.2
 - !ruby/object:Gem::Dependency
   name: rubyzip
   requirement: !ruby/object:Gem::Requirement
@@ -402,6 +402,7 @@ files:
 - helpers/lib/NuGetUpdater/NuGetUpdater.Core/Dependency.cs
 - helpers/lib/NuGetUpdater/NuGetUpdater.Core/DependencyDiscovery.props
 - helpers/lib/NuGetUpdater/NuGetUpdater.Core/DependencyDiscovery.targets
+- helpers/lib/NuGetUpdater/NuGetUpdater.Core/DependencyNotFoundException.cs
 - helpers/lib/NuGetUpdater/NuGetUpdater.Core/DependencyType.cs
 - helpers/lib/NuGetUpdater/NuGetUpdater.Core/Discover/DiscoveryWorker.cs
 - helpers/lib/NuGetUpdater/NuGetUpdater.Core/Discover/DotNetToolsJsonDiscovery.cs
@@ -446,6 +447,7 @@ files:
 - helpers/lib/NuGetUpdater/NuGetUpdater.Core/Run/ApiModel/DependencyFileNotFound.cs
 - helpers/lib/NuGetUpdater/NuGetUpdater.Core/Run/ApiModel/DependencyFileNotParseable.cs
 - helpers/lib/NuGetUpdater/NuGetUpdater.Core/Run/ApiModel/DependencyGroup.cs
+- helpers/lib/NuGetUpdater/NuGetUpdater.Core/Run/ApiModel/DependencyNotFound.cs
 - helpers/lib/NuGetUpdater/NuGetUpdater.Core/Run/ApiModel/GroupPullRequest.cs
 - helpers/lib/NuGetUpdater/NuGetUpdater.Core/Run/ApiModel/IncrementMetric.cs
 - helpers/lib/NuGetUpdater/NuGetUpdater.Core/Run/ApiModel/Job.cs
@@ -533,7 +535,7 @@ licenses:
 - MIT
 metadata:
   bug_tracker_uri: https://github.com/dependabot/dependabot-core/issues
-  changelog_uri: https://github.com/dependabot/dependabot-core/releases/tag/v0.297.1
+  changelog_uri: https://github.com/dependabot/dependabot-core/releases/tag/v0.297.2
 post_install_message:
 rdoc_options: []
 require_paths: