dependabot-nuget 0.342.2 → 0.343.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 60fbe0fbaa5bb2494d76a9cbe53912c79557910c13a5c2672721ca7665696995
-  data.tar.gz: 027bc2de484a8724567e9901a88f3dac47acba9aca76fa1edec8a521a5ed1078
+  metadata.gz: b0a5be5cf920a9c9314b1377a657101d176b366b50cc385a9271056c55302a59
+  data.tar.gz: 35f2e1f95b349a6044a955c633a69bafa1a887859fe7324b77c6c5a94621dcf5
 SHA512:
-  metadata.gz: 58150b153196abc1033d83ed24852e66bb8579f48bff844fdd867036fea12280cc53a7038d7f918189d741aabf1e2bfb628b41e1da86cc065b4ade0f68492e3e
-  data.tar.gz: d6509ec9845d2540cdf3823b94587dd386adc72ddbcaaa12670bfa9a9624bdb9dbd7b5b7ae0fe176a98b9d140f818c6c776e3bd3125d4fe0f37726577853fc9a
+  metadata.gz: 121232d229b12c58087f63704e5e3e3ccee8e3e1b60f13e62645043c7607499d1042bd60bb2a0b0298e981c3b3bd9c8a0c0c2f2bec2ed49287024d6404b905ad
+  data.tar.gz: f619759742611bc9ea752fd5edbab1c647448ed0dfa7ef35ae37d7bf0d6e52548ad8f4fcc3c2489c3288c0833d03c3a871a68e3b500aad8ad11860a68b46f6fd

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

@@ -38,7 +38,7 @@ public abstract record JobErrorBase : MessageBase
             case BadRequirementException badRequirement:
                 return new BadRequirement(badRequirement.Message);
             case BadResponseException badResponse:
-                return new PrivateSourceBadResponse([badResponse.Uri]);
+                return new PrivateSourceBadResponse([badResponse.Uri], badResponse.Message);
             case DependencyNotFoundException dependencyNotFound:
                 return new DependencyNotFound(string.Join(", ", dependencyNotFound.Dependencies));
             case HttpRequestException httpRequest:
@@ -48,7 +48,7 @@ public abstract record JobErrorBase : MessageBase
                         ioException.HttpRequestError == HttpRequestError.ResponseEnded)
                     {
                         // server hung up on us
-                        return new PrivateSourceBadResponse(NuGetContext.GetPackageSourceUrls(currentDirectory));
+                        return new PrivateSourceBadResponse(NuGetContext.GetPackageSourceUrls(currentDirectory), ioException.Message);
                     }
 
                     return new UnknownError(ex, jobId);
@@ -61,17 +61,17 @@ public abstract record JobErrorBase : MessageBase
                         return new PrivateSourceAuthenticationFailure(NuGetContext.GetPackageSourceUrls(currentDirectory));
                     case HttpStatusCode.TooManyRequests:
                     case HttpStatusCode.ServiceUnavailable:
-                        return new PrivateSourceBadResponse(NuGetContext.GetPackageSourceUrls(currentDirectory));
+                        return new PrivateSourceBadResponse(NuGetContext.GetPackageSourceUrls(currentDirectory), httpRequest.Message);
                     default:
                         if ((int)httpRequest.StatusCode / 100 == 5)
                         {
-                            return new PrivateSourceBadResponse(NuGetContext.GetPackageSourceUrls(currentDirectory));
+                            return new PrivateSourceBadResponse(NuGetContext.GetPackageSourceUrls(currentDirectory), httpRequest.Message);
                         }
 
                         return new UnknownError(ex, jobId);
                 }
             case InvalidDataException invalidData when invalidData.Message == "Central Directory corrupt.":
-                return new PrivateSourceBadResponse(NuGetContext.GetPackageSourceUrls(currentDirectory));
+                return new PrivateSourceBadResponse(NuGetContext.GetPackageSourceUrls(currentDirectory), invalidData.Message);
             case InvalidProjectFileException invalidProjectFile:
                 return new DependencyFileNotParseable(invalidProjectFile.ProjectFile);
             case MissingFileException missingFile:

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

@@ -1,10 +1,25 @@
+using System.Text.Json.Serialization;
+
 namespace NuGetUpdater.Core.Run.ApiModel;
 
 public record PrivateSourceBadResponse : JobErrorBase
 {
-    public PrivateSourceBadResponse(string[] urls)
+    [JsonIgnore]
+    public string Message { get; }
+
+    public PrivateSourceBadResponse(string[] urls, string message)
         : base("private_source_bad_response")
     {
         Details["source"] = $"({string.Join("|", urls)})";
+        Message = message;
+    }
+
+    public override string GetReport()
+    {
+        var report = base.GetReport();
+
+        // this extra info isn't part of the reported shape but is useful to have in the log
+        var fullReport = string.Concat(report, "\n", $"- message: {Message}");
+        return fullReport;
     }
 }

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

@@ -1,8 +1,12 @@
 using System.Collections.Immutable;
+using System.Text.Json.Serialization;
 
 namespace NuGetUpdater.Core.Run.ApiModel;
 
 public record PullRequest
 {
+    [JsonPropertyName("pr-number")]
+    public int? PrNumber { get; init; } = null;
+    [JsonPropertyName("dependencies")]
     public ImmutableArray<PullRequestDependency> Dependencies { get; init; } = [];
 }

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

@@ -1,4 +1,4 @@
-using System.Collections.Immutable;
+using System.Collections.Immutable;
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
@@ -10,16 +10,36 @@ public class PullRequestConverter : JsonConverter<PullRequest>
 {
     public override PullRequest? Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
     {
-        if (reader.TokenType != JsonTokenType.StartArray)
+        PullRequest? result;
+        switch (reader.TokenType)
         {
-            throw new JsonException("expected array of pull request dependencies");
+            case JsonTokenType.StartArray:
+                // old format, array of arrays of dependencies
+                var dependencies = JsonSerializer.Deserialize<ImmutableArray<PullRequestDependency>>(ref reader, options);
+                result = new PullRequest()
+                {
+                    Dependencies = dependencies
+                };
+                break;
+            case JsonTokenType.StartObject:
+                // new format, direct object
+                // use the same deserializer options but exclude this special converter
+                var optionsWithoutThisCustomConverter = new JsonSerializerOptions(options);
+                for (int i = optionsWithoutThisCustomConverter.Converters.Count - 1; i >= 0; i--)
+                {
+                    if (optionsWithoutThisCustomConverter.Converters[i].GetType() == typeof(PullRequestConverter))
+                    {
+                        optionsWithoutThisCustomConverter.Converters.RemoveAt(i);
+                    }
+                }
+
+                result = JsonSerializer.Deserialize<PullRequest>(ref reader, optionsWithoutThisCustomConverter);
+                break;
+            default:
+                throw new JsonException("expected pull request object or array of pull request dependencies");
         }
 
-        var dependencies = JsonSerializer.Deserialize<ImmutableArray<PullRequestDependency>>(ref reader, options);
-        return new PullRequest()
-        {
-            Dependencies = dependencies
-        };
+        return result;
     }
 
     public override void Write(Utf8JsonWriter writer, PullRequest value, JsonSerializerOptions options)

data/helpers/lib/NuGetUpdater/NuGetUpdater.Core.Test/Analyze/VersionFinderTests.cs

@@ -293,7 +293,7 @@ public class VersionFinderTests : TestBase
         var error = JobErrorBase.ErrorFromException(exception, "TEST-JOB-ID", tempDir.DirectoryPath);
 
         // assert
-        var expected = new PrivateSourceBadResponse([feedUrl]);
+        var expected = new PrivateSourceBadResponse([feedUrl], "unused");
         var expectedJson = JsonSerializer.Serialize(expected, RunWorker.SerializerOptions);
         var actualJson = JsonSerializer.Serialize(error, RunWorker.SerializerOptions);
         Assert.Equal(expectedJson, actualJson);

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

@@ -1124,7 +1124,7 @@ public partial class DiscoveryWorkerTests : DiscoveryWorkerTestBase
             ],
             expectedResult: new()
             {
-                Error = new PrivateSourceBadResponse([$"{http.BaseUrl.TrimEnd('/')}/index.json"]),
+                Error = new PrivateSourceBadResponse([$"{http.BaseUrl.TrimEnd('/')}/index.json"], "unused"),
                 Path = "",
                 Projects = [],
             }
@@ -1199,7 +1199,7 @@ public partial class DiscoveryWorkerTests : DiscoveryWorkerTestBase
             ],
             expectedResult: new()
             {
-                Error = new PrivateSourceBadResponse([$"{http.BaseUrl.TrimEnd('/')}/index.json"]),
+                Error = new PrivateSourceBadResponse([$"{http.BaseUrl.TrimEnd('/')}/index.json"], "unused"),
                 Path = "",
                 Projects = [],
             }

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

@@ -148,7 +148,7 @@ public class HttpApiHandlerTests
         yield return [new DependencyNotFound("unused"), "record_update_job_error"];
         yield return [new JobRepoNotFound("unused"), "record_update_job_error"];
         yield return [new PrivateSourceAuthenticationFailure(["unused"]), "record_update_job_error"];
-        yield return [new PrivateSourceBadResponse(["unused"]), "record_update_job_error"];
+        yield return [new PrivateSourceBadResponse(["unused"], "unused"), "record_update_job_error"];
         yield return [new PrivateSourceTimedOut("unused"), "record_update_job_error"];
         yield return [new PullRequestExistsForLatestVersion("unused", "unused"), "record_update_job_error"];
         yield return [new PullRequestExistsForSecurityUpdate([]), "record_update_job_error"];

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

@@ -40,32 +40,39 @@ public class JobErrorBaseTests : TestBase
 
     public static IEnumerable<object[]> GenerateErrorFromExceptionTestData()
     {
+        // something elevated to a bad response
+        yield return
+        [
+            new BadResponseException("nope", "http://nuget.example.com/v3/index.json"),
+            new PrivateSourceBadResponse(["http://nuget.example.com/v3/index.json"], "nope"),
+        ];
+
         // internal error from package feed
         yield return
         [
             new HttpRequestException("nope", null, HttpStatusCode.InternalServerError),
-            new PrivateSourceBadResponse(["http://nuget.example.com/v3/index.json"]),
+            new PrivateSourceBadResponse(["http://nuget.example.com/v3/index.json"], "nope"),
         ];
 
         // inner exception turns into private_source_bad_response; 500
         yield return
         [
-            new FatalProtocolException("nope", new HttpRequestException("nope", null, HttpStatusCode.InternalServerError)),
-            new PrivateSourceBadResponse(["http://nuget.example.com/v3/index.json"]),
+            new FatalProtocolException("nope", new HttpRequestException("inner nope", null, HttpStatusCode.InternalServerError)),
+            new PrivateSourceBadResponse(["http://nuget.example.com/v3/index.json"], "inner nope"),
         ];
 
         // inner exception turns into private_source_bad_response; ResponseEnded
         yield return
         [
-            new FatalProtocolException("nope", new HttpRequestException("nope", new HttpIOException(HttpRequestError.ResponseEnded))),
-            new PrivateSourceBadResponse(["http://nuget.example.com/v3/index.json"]),
+            new FatalProtocolException("nope", new HttpRequestException("inner nope", new HttpIOException(HttpRequestError.ResponseEnded))),
+            new PrivateSourceBadResponse(["http://nuget.example.com/v3/index.json"], "inner nope"),
         ];
 
         // service returned corrupt package
         yield return
         [
             new InvalidDataException("Central Directory corrupt."),
-            new PrivateSourceBadResponse(["http://nuget.example.com/v3/index.json"]),
+            new PrivateSourceBadResponse(["http://nuget.example.com/v3/index.json"], "Central Directory corrupt."),
         ];
 
         // top-level exception turns into private_source_authentication_failure

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

@@ -152,11 +152,12 @@ public class MessageReportTests
         yield return
         [
             // message
-            new PrivateSourceBadResponse(["url1", "url2"]),
+            new PrivateSourceBadResponse(["url1", "url2"], "some extra info"),
             // expected
             """
             Error type: private_source_bad_response
             - source: (url1|url2)
+            - message: some extra info
             """
         ];
 

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

@@ -407,7 +407,7 @@ public class SerializationTests : TestBase
     }
 
     [Fact]
-    public void DeserializeExistingPullRequests()
+    public void DeserializeExistingPullRequestsOldFormat()
     {
         var jsonWrapperJson = """
             {
@@ -429,6 +429,41 @@ public class SerializationTests : TestBase
             """;
         var jobWrapper = RunWorker.Deserialize(jsonWrapperJson)!;
         Assert.Single(jobWrapper.Job.ExistingPullRequests);
+        Assert.Null(jobWrapper.Job.ExistingPullRequests[0].PrNumber);
+        Assert.Single(jobWrapper.Job.ExistingPullRequests[0].Dependencies);
+        Assert.Equal("Some.Package", jobWrapper.Job.ExistingPullRequests[0].Dependencies[0].DependencyName);
+        Assert.Equal(NuGetVersion.Parse("1.2.3"), jobWrapper.Job.ExistingPullRequests[0].Dependencies[0].DependencyVersion);
+        Assert.False(jobWrapper.Job.ExistingPullRequests[0].Dependencies[0].DependencyRemoved);
+        Assert.Null(jobWrapper.Job.ExistingPullRequests[0].Dependencies[0].Directory);
+    }
+
+    [Fact]
+    public void DeserializeExistingPullRequestsNewFormat()
+    {
+        var jsonWrapperJson = """
+            {
+                "job": {
+                    "source": {
+                        "provider": "github",
+                        "repo": "some/repo"
+                    },
+                    "existing-pull-requests": [
+                        {
+                            "pr-number": 123,
+                            "dependencies": [
+                                {
+                                    "dependency-name": "Some.Package",
+                                    "dependency-version": "1.2.3"
+                                }
+                            ]
+                        }
+                    ]
+                }
+            }
+            """;
+        var jobWrapper = RunWorker.Deserialize(jsonWrapperJson)!;
+        Assert.Single(jobWrapper.Job.ExistingPullRequests);
+        Assert.Equal(123, jobWrapper.Job.ExistingPullRequests[0].PrNumber);
         Assert.Single(jobWrapper.Job.ExistingPullRequests[0].Dependencies);
         Assert.Equal("Some.Package", jobWrapper.Job.ExistingPullRequests[0].Dependencies[0].DependencyName);
         Assert.Equal(NuGetVersion.Parse("1.2.3"), jobWrapper.Job.ExistingPullRequests[0].Dependencies[0].DependencyVersion);
@@ -766,7 +801,7 @@ public class SerializationTests : TestBase
 
         yield return
         [
-            new PrivateSourceBadResponse(["url1", "url2"]),
+            new PrivateSourceBadResponse(["url1", "url2"], "unused"),
             """
             {"data":{"error-type":"private_source_bad_response","error-details":{"source":"(url1|url2)"}}}
             """

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

@@ -452,7 +452,7 @@ public class MSBuildHelperTests : TestBase
             // output
             "Response status code does not indicate success: 500 (Internal Server Error).",
             // expectedError
-            new PrivateSourceBadResponse(["http://localhost/test-feed"]),
+            new PrivateSourceBadResponse(["http://localhost/test-feed"], "unused"),
         ];
 
         yield return
@@ -460,7 +460,7 @@ public class MSBuildHelperTests : TestBase
             // output
             "The response ended prematurely. (ResponseEnded)",
             // expectedError
-            new PrivateSourceBadResponse(["http://localhost/test-feed"]),
+            new PrivateSourceBadResponse(["http://localhost/test-feed"], "unused"),
         ];
 
         yield return
@@ -468,7 +468,7 @@ public class MSBuildHelperTests : TestBase
             // output
             "The file is not a valid nupkg.",
             // expectedError
-            new PrivateSourceBadResponse(["http://localhost/test-feed"]),
+            new PrivateSourceBadResponse(["http://localhost/test-feed"], "unused"),
         ];
 
         yield return
@@ -476,7 +476,7 @@ public class MSBuildHelperTests : TestBase
             // output
             "The content at 'http://localhost/test-feed/Packages(Id='Some.Package',Version='1.2.3')' is not valid XML.",
             // expectedError
-            new PrivateSourceBadResponse(["http://localhost/test-feed"]),
+            new PrivateSourceBadResponse(["http://localhost/test-feed"], "unused"),
         ];
 
         yield return

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dependabot-nuget
 version: !ruby/object:Gem::Version
-  version: 0.342.2
+  version: 0.343.0
 platform: ruby
 authors:
 - Dependabot
@@ -15,14 +15,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.342.2
+        version: 0.343.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.342.2
+        version: 0.343.0
 - !ruby/object:Gem::Dependency
   name: debug
   requirement: !ruby/object:Gem::Requirement
@@ -551,7 +551,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.342.2
+  changelog_uri: https://github.com/dependabot/dependabot-core/releases/tag/v0.343.0
 rdoc_options: []
 require_paths:
 - lib