dependabot-nuget 0.396.0 → 0.398.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3c8d2c369fea3791d04cedce39111d000bc6d0052f48a6df16116b9c811b1f4c
-  data.tar.gz: '08c4cec0fef16173ca1d28eb497127064b4ecc5daeb2a2d84f3ab8ee72cc6852'
+  metadata.gz: 3df370cfa9828e959bf529b8a391e336d368cc0c87aab8393665a554fa5e4b48
+  data.tar.gz: d3e16c0df803153b916f442af358e42573b89cefff989e5da52524dad83affe4
 SHA512:
-  metadata.gz: 220207aba4f007a902a08030847f865afad86e57de5dfcbfe81d9a6ef5bdaa5284ace3c4259f122778a69ad6401e42645858dd09516edf75055b14c48f3c4f59
-  data.tar.gz: c309c50fd55d24516bca819ff47c5b3981b867fe7d15a5990505c2ad0e527e999d0aa988fcb81c359e98291eb8da983edae2a7d803e7677530bf0dfef8fc85da
+  metadata.gz: 0464c48c69bf48bbc512a314c8600b50822defbe997f387ab8f29f54bd9308b8598e0c31d84995c98c266740bb90be3b2e612f0ed69a5d52132f7b57c4c481fd
+  data.tar.gz: c7efa1a36e6b822254fa4caf97e4c9b891042df0c866c7e34c9e566be1a64e0f4b3635cf6169d0b0d0b7b3e66ad9331fd0076d8c8296bea347cd57c3569a27f1

data/helpers/lib/NuGetUpdater/Directory.Packages.props

@@ -16,9 +16,9 @@
     <PackageVersion Include="Microsoft.Build.Utilities.Core" Version="$(MSBuildPackageVersion)" />
     <PackageVersion Include="Microsoft.CodeAnalysis.CSharp" Version="5.9.0" />
     <PackageVersion Include="Microsoft.CSharp" Version="4.7.0" />
-    <PackageVersion Include="Microsoft.Extensions.FileProviders.Abstractions" Version="10.0.11" />
+    <PackageVersion Include="Microsoft.Extensions.FileProviders.Abstractions" Version="10.0.12" />
     <PackageVersion Include="Microsoft.Extensions.FileSystemGlobbing" Version="10.0.11" />
-    <PackageVersion Include="Microsoft.Extensions.Logging" Version="10.0.11" />
+    <PackageVersion Include="Microsoft.Extensions.Logging" Version="10.0.12" />
     <PackageVersion Include="Microsoft.NET.StringTools" Version="$(MSBuildPackageVersion)" />
     <PackageVersion Include="Microsoft.NET.Test.Sdk" Version="18.9.0" />
     <PackageVersion Include="Microsoft.VisualStudio.Setup.Configuration.Interop" Version="3.14.2075" />

data/helpers/lib/NuGetUpdater/NuGetUpdater.Core/Discover/DiscoveryWorker.cs

@@ -285,7 +285,12 @@ public partial class DiscoveryWorker : IDiscoveryWorker
     {
         HashSet<string> expandedProjects = new(PathComparer.Instance);
         HashSet<string> seenProjects = new(PathComparer.Instance);
-        Stack<string> filesToExpand = new(entryPoints);
+        Stack<string> filesToExpand = new();
+        foreach (string entryPoint in entryPoints)
+        {
+            PushExistingPaths(filesToExpand, entryPoint, repoRootPath);
+        }
+
         while (filesToExpand.Count > 0)
         {
             string candidateEntryPoint = filesToExpand.Pop();
@@ -299,7 +304,7 @@ public partial class DiscoveryWorker : IDiscoveryWorker
                     foreach (ProjectInSolution project in solution.ProjectsInOrder)
                     {
                         logger.Info($"      Expanded project: {project.AbsolutePath}");
-                        filesToExpand.Push(project.AbsolutePath);
+                        PushExistingPaths(filesToExpand, project.AbsolutePath, repoRootPath);
                     }
                 }
                 else if (extension == ".slnx")
@@ -321,7 +326,7 @@ public partial class DiscoveryWorker : IDiscoveryWorker
                     {
                         string projectPath = Path.Combine(solutionPath, project.FilePath);
                         logger.Info($"      Expanded project: {projectPath}");
-                        filesToExpand.Push(projectPath);
+                        PushExistingPaths(filesToExpand, projectPath, repoRootPath);
                     }
                 }
                 else if (extension == ".proj")
@@ -331,7 +336,7 @@ public partial class DiscoveryWorker : IDiscoveryWorker
                     foreach (var foundProject in foundProjects)
                     {
                         logger.Info($"      Expanded project: {foundProject}");
-                        filesToExpand.Push(foundProject);
+                        PushExistingPaths(filesToExpand, foundProject, repoRootPath);
                     }
                 }
 
@@ -372,6 +377,18 @@ public partial class DiscoveryWorker : IDiscoveryWorker
         return result;
     }
 
+    private static void PushExistingPaths(Stack<string> filesToExpand, string candidatePath, string repoRootPath)
+    {
+        var resolvedPaths = PathHelper.ResolveCaseInsensitivePathsInsideRepoRoot(candidatePath, repoRootPath);
+        foreach (string resolvedPath in resolvedPaths ?? [])
+        {
+            if (File.Exists(resolvedPath))
+            {
+                filesToExpand.Push(resolvedPath);
+            }
+        }
+    }
+
     private static IEnumerable<string> ExpandItemGroupFilesFromProject(string projectPath, params string[] itemTypes)
     {
         if (!File.Exists(projectPath))

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

@@ -41,6 +41,8 @@ public abstract record JobErrorBase : MessageBase
                 return new PrivateSourceBadResponse([badResponse.Uri], badResponse.Message);
             case DependencyNotFoundException dependencyNotFound:
                 return new DependencyNotFound(string.Join(", ", dependencyNotFound.Dependencies));
+            case HttpApiException:
+                return new UnknownError(ex, jobId);
             case HttpRequestException httpRequest:
                 if (httpRequest.StatusCode is null)
                 {

data/helpers/lib/NuGetUpdater/NuGetUpdater.Core/Run/HttpApiException.cs

@@ -0,0 +1,24 @@
+using System.Net;
+
+namespace NuGetUpdater.Core.Run;
+
+public sealed class HttpApiException : HttpRequestException
+{
+    public string Method { get; }
+    public string Endpoint { get; }
+    public string? ResponseContent { get; }
+
+    public HttpApiException(string method, string endpoint, HttpStatusCode statusCode, string? responseContent)
+        : base(BuildMessage(method, endpoint, statusCode, responseContent), inner: null, statusCode: statusCode)
+    {
+        Method = method;
+        Endpoint = endpoint;
+        ResponseContent = string.IsNullOrEmpty(responseContent) ? null : responseContent;
+    }
+
+    private static string BuildMessage(string method, string endpoint, HttpStatusCode statusCode, string? responseContent)
+    {
+        var message = $"{method} {endpoint} failed with {(int)statusCode} ({statusCode})";
+        return string.IsNullOrEmpty(responseContent) ? message : $"{message}: {responseContent}";
+    }
+}

data/helpers/lib/NuGetUpdater/NuGetUpdater.Core/Run/HttpApiHandler.cs

@@ -46,12 +46,7 @@ public class HttpApiHandler : IApiHandler, IApiRetryDelayProvider
         if (!response.IsSuccessStatusCode)
         {
             var responseContent = await response.Content.ReadAsStringAsync();
-            if (!string.IsNullOrEmpty(responseContent))
-            {
-                responseContent = string.Concat(": ", responseContent);
-            }
-
-            throw new HttpRequestException(message: $"{(int)response.StatusCode} ({response.StatusCode}){responseContent}", inner: null, statusCode: response.StatusCode);
+            throw new HttpApiException(method, endpoint, response.StatusCode, responseContent);
         }
     }
 

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

@@ -1736,6 +1736,45 @@ public partial class DiscoveryWorkerTests : DiscoveryWorkerTestBase
         AssertEx.Equal(expectedEntryPoints, actualEntryPoints);
     }
 
+    [Fact]
+    public async Task ExpandEntryPoints_IgnoresSolutionFolders()
+    {
+        using var tempDir = await TemporaryDirectory.CreateWithContentsAsync(
+            ("solution.sln", """
+                Microsoft Visual Studio Solution File, Format Version 12.00
+                Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Project", "src\project.csproj", "{00000000-0000-0000-0000-000000000001}"
+                EndProject
+                Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = ".sln", ".sln", "{2730C57A-D6A7-4A4F-913A-AF211E54B717}"
+                    ProjectSection(SolutionItems) = preProject
+                        .editorconfig = .editorconfig
+                    EndProjectSection
+                EndProject
+                """),
+            ("src/project.csproj", """
+                <Project Sdk="Microsoft.NET.Sdk">
+                  <PropertyGroup>
+                    <TargetFramework>net9.0</TargetFramework>
+                  </PropertyGroup>
+                </Project>
+                """)
+        );
+        Directory.CreateDirectory(Path.Combine(tempDir.DirectoryPath, ".sln"));
+
+        var actualEntryPoints = (await DiscoveryWorker.ExpandEntryPointsIntoProjectsAsync(
+            [Path.Combine(tempDir.DirectoryPath, "solution.sln")],
+            new ExperimentsManager(),
+            new TestLogger(),
+            repoRootPath: tempDir.DirectoryPath))
+            .Select(p => p.NormalizePathToUnix())
+            .ToArray();
+        var expectedEntryPoints = new[]
+        {
+            Path.Combine(tempDir.DirectoryPath, "src/project.csproj").NormalizePathToUnix(),
+        };
+
+        AssertEx.Equal(expectedEntryPoints, actualEntryPoints);
+    }
+
     [Fact]
     public async Task ExpandEntryPoints_FiltersProjectsInSubmodules()
     {
@@ -2385,4 +2424,3 @@ public partial class DiscoveryWorkerTests : DiscoveryWorkerTestBase
         );
     }
 }
-

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

@@ -1,3 +1,5 @@
+using System.Net;
+
 using NuGetUpdater.Core.Run;
 using NuGetUpdater.Core.Run.ApiModel;
 using NuGetUpdater.Core.Test.Utilities;
@@ -21,15 +23,19 @@ public class HttpApiHandlerTests
         var handler = new HttpApiHandler(http.BaseUrl, "TEST-ID");
 
         // act
-        var exception = await Assert.ThrowsAsync<HttpRequestException>(() => handler.IncrementMetric(new()
+        var exception = await Assert.ThrowsAsync<HttpApiException>(() => handler.IncrementMetric(new()
         {
             // body is irrelevant for this test
             Metric = "TEST",
         }));
 
         // assert
-        var expectedMessage = $"400 (BadRequest): {errorContent}";
+        var expectedMessage = $"POST increment_metric failed with 400 (BadRequest): {errorContent}";
         Assert.Equal(expectedMessage, exception.Message);
+        Assert.Equal("POST", exception.Method);
+        Assert.Equal("increment_metric", exception.Endpoint);
+        Assert.Equal(errorContent, exception.ResponseContent);
+        Assert.Equal(HttpStatusCode.BadRequest, exception.StatusCode);
     }
 
     [Fact]
@@ -44,15 +50,50 @@ public class HttpApiHandlerTests
         var handler = new HttpApiHandler(http.BaseUrl, "TEST-ID");
 
         // act
-        var exception = await Assert.ThrowsAsync<HttpRequestException>(() => handler.IncrementMetric(new()
+        var exception = await Assert.ThrowsAsync<HttpApiException>(() => handler.IncrementMetric(new()
         {
             // body is irrelevant for this test
             Metric = "TEST",
         }));
 
         // assert
-        var expectedMessage = $"400 (BadRequest)";
+        var expectedMessage = $"POST increment_metric failed with 400 (BadRequest)";
         Assert.Equal(expectedMessage, exception.Message);
+        Assert.Null(exception.ResponseContent);
+    }
+
+    [Fact]
+    public async Task ForbiddenResponseFromCreatePullRequestIsReportedAsAnApiFailure()
+    {
+        // arrange
+        var requestCount = 0;
+        using var http = TestHttpServer.CreateTestStringServer((method, url) =>
+        {
+            requestCount++;
+            return (403, "forbidden");
+        });
+        var handler = new HttpApiHandler(http.BaseUrl, "TEST-ID");
+
+        // act
+        var exception = await Assert.ThrowsAsync<HttpApiException>(() =>
+            handler.CreatePullRequest(new()
+            {
+                Dependencies = [],
+                UpdatedDependencyFiles = [],
+                BaseCommitSha = "base-commit-sha",
+                CommitMessage = "commit message",
+                PrTitle = "PR title",
+                PrBody = "PR body",
+                DependencyGroup = null,
+            }));
+
+        // assert
+        Assert.Equal("POST create_pull_request failed with 403 (Forbidden): forbidden", exception.Message);
+        Assert.Equal("POST", exception.Method);
+        Assert.Equal("create_pull_request", exception.Endpoint);
+        Assert.Equal("forbidden", exception.ResponseContent);
+        Assert.Equal(HttpStatusCode.Forbidden, exception.StatusCode);
+        Assert.Equal(1, requestCount);
     }
 
     [Fact]
@@ -95,7 +136,7 @@ public class HttpApiHandlerTests
         var handler = new HttpApiHandler(http.BaseUrl, "TEST-ID");
 
         // act
-        await Assert.ThrowsAsync<HttpRequestException>(() => handler.IncrementMetric(new() { Metric = "test" }));
+        await Assert.ThrowsAsync<HttpApiException>(() => handler.IncrementMetric(new() { Metric = "test" }));
 
         // assert
         Assert.Equal(1, requestCount);
@@ -114,10 +155,10 @@ public class HttpApiHandlerTests
         var handler = new HttpApiHandler(http.BaseUrl, "TEST-ID", static _ => Task.CompletedTask);
 
         // act
-        var exception = await Assert.ThrowsAsync<HttpRequestException>(() => handler.IncrementMetric(new() { Metric = "test" }));
+        var exception = await Assert.ThrowsAsync<HttpApiException>(() => handler.IncrementMetric(new() { Metric = "test" }));
 
         // assert
-        Assert.Equal("500 (InternalServerError): attempt-4", exception.Message);
+        Assert.Equal("POST increment_metric failed with 500 (InternalServerError): attempt-4", exception.Message);
         Assert.Equal(4, requestCount);
     }
 

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

@@ -89,6 +89,23 @@ public class JobErrorBaseTests : TestBase
             new PrivateSourceAuthenticationFailure(["http://nuget.example.com/v3/index.json"]),
         ];
 
+        // a forbidden response from a package feed turns into private_source_authentication_failure
+        yield return
+        [
+            new HttpRequestException("nope", null, HttpStatusCode.Forbidden),
+            new PrivateSourceAuthenticationFailure(["http://nuget.example.com/v3/index.json"]),
+        ];
+
+        // a forbidden response from the Dependabot API is an unknown updater error
+        yield return
+        [
+            new HttpApiException("POST", "create_pull_request", HttpStatusCode.Forbidden, "forbidden"),
+            new UnknownError(
+                new HttpApiException("POST", "create_pull_request", HttpStatusCode.Forbidden, "forbidden"),
+                "TEST-JOB-ID"
+            ),
+        ];
+
         // inner exception turns into private_source_authentication_failure
         yield return
         [

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dependabot-nuget
 version: !ruby/object:Gem::Version
-  version: 0.396.0
+  version: 0.398.0
 platform: ruby
 authors:
 - Dependabot
@@ -15,14 +15,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.396.0
+        version: 0.398.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.396.0
+        version: 0.398.0
 - !ruby/object:Gem::Dependency
   name: debug
   requirement: !ruby/object:Gem::Requirement
@@ -511,6 +511,7 @@ files:
 - helpers/lib/NuGetUpdater/NuGetUpdater.Core/Run/ApiModel/UpdatedDependencyList.cs
 - helpers/lib/NuGetUpdater/NuGetUpdater.Core/Run/CommitOptions_IncludeScopeConverter.cs
 - helpers/lib/NuGetUpdater/NuGetUpdater.Core/Run/GitEOLMetadataProvider.cs
+- helpers/lib/NuGetUpdater/NuGetUpdater.Core/Run/HttpApiException.cs
 - helpers/lib/NuGetUpdater/NuGetUpdater.Core/Run/HttpApiHandler.cs
 - helpers/lib/NuGetUpdater/NuGetUpdater.Core/Run/IApiHandler.cs
 - helpers/lib/NuGetUpdater/NuGetUpdater.Core/Run/IEOLMetadataProvider.cs
@@ -587,7 +588,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.396.0
+  changelog_uri: https://github.com/dependabot/dependabot-core/releases/tag/v0.398.0
 rdoc_options: []
 require_paths:
 - lib