dependabot-nuget 0.352.0 → 0.354.0

data/helpers/lib/NuGetUpdater/NuGetUpdater.Core.Test/Run/ApiModel/JobTests.cs

@@ -4,6 +4,7 @@ using NuGet.Versioning;
 
 using NuGetUpdater.Core.Analyze;
 using NuGetUpdater.Core.Run.ApiModel;
+using NuGetUpdater.Core.Test.Utilities;
 
 using Xunit;
 
@@ -379,6 +380,44 @@ public class JobTests
         ];
     }
 
+    [Fact]
+    public async Task ExpandJobDirectories()
+    {
+        // arrange
+        using var tempDir = await TemporaryDirectory.CreateWithContentsAsync(
+            // file names are irrelevant, but make this function easy to use
+            ("src/client/android/ui/file.txt", "contents irrelevant"),
+            ("src/client/ios/ui/file.txt", "contents irrelevant"),
+            ("src/legacy/winphone/ui/file.txt", "contents irrelevant"),
+            ("src/server/linux/cloud/file.txt", "contents irrelevant"),
+            ("src/server/windows/file.txt", "contents irrelevant")
+        );
+        var job = new Job()
+        {
+            Source = new()
+            {
+                Provider = "github",
+                Repo = "test/repo",
+                Directories = [
+                    "src/server/linux", // single value
+                    "src/client/*/ui", // wildcard
+                ]
+            }
+        };
+
+        // act
+        var actualDirectories = job.GetAllDirectories(tempDir.DirectoryPath);
+
+        // assert - directories were expanded and original order maintained
+        var expectedDirectories = new[]
+        {
+            "/src/server/linux",
+            "/src/client/android/ui",
+            "/src/client/ios/ui"
+        }.ToImmutableArray();
+        AssertEx.Equal(expectedDirectories, actualDirectories);
+    }
+
     private static Job CreateJob(
         ImmutableArray<AllowedUpdate> allowedUpdates,
         ImmutableArray<string> dependencies,

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

@@ -995,6 +995,148 @@ public class EndToEndTests
         );
     }
 
+    [Fact]
+    public async Task WildcardDirectory_OneOfWhichIsEmpty()
+    {
+        // job is run with a wildcard which will expand to
+        //   /src
+        //   /src/other
+        //   /src/project
+        // but only `/src/project` contains a project file that can be operated on
+        await RunAsync(
+            packages: [
+                MockNuGetPackage.CreateSimplePackage("Some.Package", "1.0.0", "net9.0"),
+                MockNuGetPackage.CreateSimplePackage("Some.Package", "2.0.0", "net9.0"),
+            ],
+            job: new()
+            {
+                Source = new()
+                {
+                    Provider = "github",
+                    Repo = "test/repo",
+                    Directory = "src/**/*",
+                }
+            },
+            files: [
+                ("src/Directory.Build.props", "<Project />"),
+                ("src/Directory.Build.targets", "<Project />"),
+                ("src/Directory.Packages.props", """
+                    <Project>
+                      <PropertyGroup>
+                        <ManagePackageVersionsCentrally>false</ManagePackageVersionsCentrally>
+                      </PropertyGroup>
+                    </Project>
+                    """),
+                ("src/other/not-a-nuget-file.txt", "contents irrelevant"),
+                ("src/project/project.csproj", """
+                    <Project Sdk="Microsoft.NET.Sdk">
+                      <PropertyGroup>
+                        <TargetFramework>net9.0</TargetFramework>
+                      </PropertyGroup>
+                      <ItemGroup>
+                        <PackageReference Include="Some.Package" Version="1.0.0" />
+                      </ItemGroup>
+                    </Project>
+                    """)
+            ],
+            discoveryWorker: null, // use real worker
+            analyzeWorker: null, // use real worker
+            updaterWorker: null, // use real worker
+            expectedApiMessages: [
+                new IncrementMetric()
+                {
+                    Metric = "updater.started",
+                    Tags = new()
+                    {
+                        ["operation"] = "group_update_all_versions"
+                    }
+                },
+                // no dependencies reported for `/src`
+                // no dependencies reported for `/src/other`
+                // but dependencies _are_ reported for `/src/project`
+                new UpdatedDependencyList()
+                {
+                    Dependencies = [
+                        new()
+                        {
+                            Name = "Some.Package",
+                            Version = "1.0.0",
+                            Requirements = [
+                                new()
+                                {
+                                    Requirement = "1.0.0",
+                                    File = "/src/project/project.csproj",
+                                    Groups = ["dependencies"],
+                                }
+                            ]
+                        },
+                    ],
+                    DependencyFiles = [
+                        "/src/Directory.Build.props",
+                        "/src/Directory.Build.targets",
+                        "/src/Directory.Packages.props",
+                        "/src/project/project.csproj",
+                    ],
+                },
+                new CreatePullRequest()
+                {
+                    Dependencies = [
+                        new()
+                        {
+                            Name = "Some.Package",
+                            Version = "2.0.0",
+                            Requirements = [
+                                new()
+                                {
+                                    Requirement = "2.0.0",
+                                    File = "/src/project/project.csproj",
+                                    Groups = ["dependencies"],
+                                    Source = new()
+                                    {
+                                        SourceUrl = null,
+                                        Type = "nuget_repo",
+                                    }
+                                }
+                            ],
+                            PreviousVersion = "1.0.0",
+                            PreviousRequirements = [
+                                new()
+                                {
+                                    Requirement = "1.0.0",
+                                    File = "/src/project/project.csproj",
+                                    Groups = ["dependencies"],
+                                }
+                            ],
+                        },
+                    ],
+                    UpdatedDependencyFiles = [
+                        new()
+                        {
+                            Directory = "/src/project",
+                            Name = "project.csproj",
+                            Content = """
+                                <Project Sdk="Microsoft.NET.Sdk">
+                                  <PropertyGroup>
+                                    <TargetFramework>net9.0</TargetFramework>
+                                  </PropertyGroup>
+                                  <ItemGroup>
+                                    <PackageReference Include="Some.Package" Version="2.0.0" />
+                                  </ItemGroup>
+                                </Project>
+                                """
+                        },
+                    ],
+                    BaseCommitSha = "TEST-COMMIT-SHA",
+                    CommitMessage = TestPullRequestCommitMessage,
+                    PrTitle = TestPullRequestTitle,
+                    PrBody = TestPullRequestBody,
+                    DependencyGroup = null,
+                },
+                new MarkAsProcessed("TEST-COMMIT-SHA")
+            ]
+        );
+    }
+
     public const string TestPullRequestCommitMessage = "test-pull-request-commit-message";
     public const string TestPullRequestTitle = "test-pull-request-title";
     public const string TestPullRequestBody = "test-pull-request-body";

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

@@ -147,6 +147,7 @@ public class HttpApiHandlerTests
         yield return [new DependencyFileNotParseable("unused"), "record_update_job_error"];
         yield return [new DependencyNotFound("unused"), "record_update_job_error"];
         yield return [new JobRepoNotFound("unused"), "record_update_job_error"];
+        yield return [new OutOfDisk(), "record_update_job_error"];
         yield return [new PrivateSourceAuthenticationFailure(["unused"]), "record_update_job_error"];
         yield return [new PrivateSourceBadResponse(["unused"], "unused"), "record_update_job_error"];
         yield return [new PrivateSourceTimedOut("unused"), "record_update_job_error"];

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

@@ -40,6 +40,13 @@ public class JobErrorBaseTests : TestBase
 
     public static IEnumerable<object[]> GenerateErrorFromExceptionTestData()
     {
+        // disk full
+        yield return
+        [
+            new IOException("No space left on device : '/path/to/directory'"),
+            new OutOfDisk(),
+        ];
+
         // something elevated to a bad response
         yield return
         [

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

@@ -138,6 +138,17 @@ public class MessageReportTests
             """
         ];
 
+        yield return
+        [
+            // message
+            new OutOfDisk(),
+            // expected
+            """
+            Error type: out_of_disk
+            """
+
+        ];
+
         yield return
         [
             // message

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

@@ -129,14 +129,15 @@ public class MiscellaneousTests
     }
 
     [Fact]
-    public void DeserializeDependencyGroup()
+    public void DeserializeDependencyGroup_SpecificValues()
     {
         var json = """
             {
               "name": "test-group",
               "rules": {
                 "patterns": ["Test.*"],
-                "exclude-patterns": ["Dependency.*"]
+                "exclude-patterns": ["Dependency.*"],
+                "update-types": ["minor", "patch"]
               }
             }
             """;
@@ -146,6 +147,24 @@ public class MiscellaneousTests
         var matcher = group.GetGroupMatcher();
         Assert.Equal(["Test.*"], matcher.Patterns);
         Assert.Equal(["Dependency.*"], matcher.ExcludePatterns);
+        Assert.Equal([GroupUpdateType.Minor, GroupUpdateType.Patch], matcher.UpdateTypes);
+    }
+
+    [Fact]
+    public void DeserializeDependencyGroup_DefaultValues()
+    {
+        var json = """
+            {
+              "name": "test-group"
+            }
+            """;
+        var group = JsonSerializer.Deserialize<DependencyGroup>(json, RunWorker.SerializerOptions);
+        Assert.NotNull(group);
+        Assert.Equal("test-group", group.Name);
+        var matcher = group.GetGroupMatcher();
+        Assert.Equal(["*"], matcher.Patterns);
+        Assert.Equal([], matcher.ExcludePatterns);
+        Assert.Equal([GroupUpdateType.Major, GroupUpdateType.Minor, GroupUpdateType.Patch], matcher.UpdateTypes);
     }
 
     [Fact]
@@ -156,7 +175,8 @@ public class MiscellaneousTests
               "name": "test-group",
               "rules": {
                 "patterns": { "unexpected": 1 },
-                "exclude-patterns": { "unexpected": 2 }
+                "exclude-patterns": { "unexpected": 2 },
+                "update-types": { "unexpected": 3 }
               }
             }
             """;
@@ -166,6 +186,7 @@ public class MiscellaneousTests
         var matcher = group.GetGroupMatcher();
         Assert.Equal([], matcher.Patterns);
         Assert.Equal([], matcher.ExcludePatterns);
+        Assert.Equal([], matcher.UpdateTypes);
     }
 
     [Theory]
@@ -515,9 +536,9 @@ public class MiscellaneousTests
 
     [Theory]
     [MemberData(nameof(DependencyInfoFromJobData))]
-    public void DependencyInfoFromJob(Job job, Dependency dependency, DependencyInfo expectedDependencyInfo)
+    public void DependencyInfoFromJob(Job job, Dependency dependency, GroupMatcher? groupMatcher, DependencyInfo expectedDependencyInfo)
     {
-        var actualDependencyInfo = RunWorker.GetDependencyInfo(job, dependency, allowCooldown: true);
+        var actualDependencyInfo = RunWorker.GetDependencyInfo(job, dependency, groupMatcher is null ? [] : [groupMatcher], allowCooldown: true);
         var expectedString = JsonSerializer.Serialize(expectedDependencyInfo, AnalyzeWorker.SerializerOptions);
         var actualString = JsonSerializer.Serialize(actualDependencyInfo, AnalyzeWorker.SerializerOptions);
         Assert.Equal(expectedString, actualString);
@@ -604,7 +625,7 @@ public class MiscellaneousTests
         ];
     }
 
-    public static IEnumerable<object[]> DependencyInfoFromJobData()
+    public static IEnumerable<object?[]> DependencyInfoFromJobData()
     {
         // with security advisory
         yield return
@@ -634,6 +655,8 @@ public class MiscellaneousTests
             },
             // dependency
             new Dependency("Some.Dependency", "1.0.0", DependencyType.PackageReference),
+            // groupMatcher
+            null,
             // expectedDependencyInfo
             new DependencyInfo()
             {
@@ -679,6 +702,8 @@ public class MiscellaneousTests
             },
             // dependency
             new Dependency("Some.Dependency", "1.0.0", DependencyType.PackageReference),
+            // groupMatcher
+            null,
             // expectedDependencyInfo
             new DependencyInfo()
             {
@@ -712,6 +737,8 @@ public class MiscellaneousTests
             },
             // dependency
             new Dependency("Some.Dependency", "1.0.0", DependencyType.PackageReference),
+            // groupMatcher
+            null,
             // expectedDependencyInfo
             new DependencyInfo()
             {
@@ -753,6 +780,8 @@ public class MiscellaneousTests
             },
             // dependency
             new Dependency("Some.Dependency", "1.0.0", DependencyType.PackageReference),
+            // groupMatcher
+            null,
             // expectedDependencyInfo
             new DependencyInfo()
             {
@@ -795,6 +824,8 @@ public class MiscellaneousTests
             },
             // dependency
             new Dependency("Some.Dependency", "1.0.0", DependencyType.PackageReference),
+            // groupMatcher
+            null,
             // expectedDependencyInfo
             new DependencyInfo()
             {
@@ -808,6 +839,44 @@ public class MiscellaneousTests
             },
         ];
 
-
+        // with limited group update types; major is explicitly ignored, only patch is explicitly allowed => major and minor are ignored
+        yield return
+        [
+            // job
+            new Job()
+            {
+                Source = new()
+                {
+                    Provider = "github",
+                    Repo = "some/repo"
+                },
+                IgnoreConditions = [
+                    new Condition()
+                    {
+                        DependencyName = "Some.*",
+                        UpdateTypes = [ConditionUpdateType.SemVerMajor],
+                    },
+                ],
+            },
+            // dependency
+            new Dependency("Some.Dependency", "1.0.0", DependencyType.PackageReference),
+            // groupMatcher
+            new GroupMatcher()
+            {
+                Patterns = ["Some.*"],
+                ExcludePatterns = [],
+                UpdateTypes = [GroupUpdateType.Patch],
+            },
+            // expectedDependencyInfo
+            new DependencyInfo()
+            {
+                Name = "Some.Dependency",
+                Version = "1.0.0",
+                IsVulnerable = false,
+                IgnoredVersions = [],
+                Vulnerabilities = [],
+                IgnoredUpdateTypes = [ConditionUpdateType.SemVerMajor, ConditionUpdateType.SemVerMinor],
+            },
+        ];
     }
 }

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

@@ -791,6 +791,14 @@ public class SerializationTests : TestBase
             """
         ];
 
+        yield return
+        [
+            new OutOfDisk(),
+            """
+            {"data":{"error-type":"out_of_disk","error-details":{}}}
+            """
+        ];
+
         yield return
         [
             new PrivateSourceAuthenticationFailure(["url1", "url2"]),

data/helpers/lib/NuGetUpdater/NuGetUpdater.Core.Test/Update/PackageReferenceUpdaterTests.cs

@@ -11,6 +11,36 @@ namespace NuGetUpdater.Core.Test.Update;
 
 public class PackageReferenceUpdaterTests
 {
+    [Theory]
+    [InlineData("net9.0", "net9.0")]
+    [InlineData("net9.0-android", "net9.0")]
+    [InlineData("net9.0-android", "net9.0-android")]
+    public async Task GetPackageGraphForDependencies_DifferentTargetFrameworks(string projectTfm, string packageTfm)
+    {
+        // arrange
+        using var repoRoot = await TemporaryDirectory.CreateWithContentsAsync(("project.csproj", "<Project Sdk=\"Microsoft.NET.Sdk\" />"));
+        var projectPath = Path.Combine(repoRoot.DirectoryPath, "project.csproj");
+        await UpdateWorkerTestBase.MockNuGetPackagesInDirectory([
+            MockNuGetPackage.CreateSimplePackage("Parent.Package", "1.0.0", packageTfm, [(null, [("Transitive.Package", "2.0.0")])]),
+            MockNuGetPackage.CreateSimplePackage("Transitive.Package", "2.0.0", packageTfm, [(null, [("Super.Transitive.Package", "3.0.0")])]),
+            MockNuGetPackage.CreateSimplePackage("Super.Transitive.Package", "3.0.0", "net8.0"), // explicitly a different but compatible tfm
+        ], repoRoot.DirectoryPath);
+        var topLevelDependencies = new[]
+        {
+            new Dependency("Parent.Package", "1.0.0", DependencyType.PackageReference),
+        };
+
+        // act
+        var packageGraph = await PackageReferenceUpdater.GetPackageGraphForDependencies(repoRoot.DirectoryPath, projectPath, projectTfm, [.. topLevelDependencies], new TestLogger());
+
+        // assert
+        Assert.Equal("1.0.0", packageGraph.PackageVersions["Parent.Package"].ToString());
+        Assert.Equal("2.0.0", packageGraph.PackageVersions["Transitive.Package"].ToString());
+        Assert.Equal("3.0.0", packageGraph.PackageVersions["Super.Transitive.Package"].ToString());
+        Assert.Equal("Parent.Package", packageGraph.PackageParents["Transitive.Package"].Single());
+        Assert.Equal("Transitive.Package", packageGraph.PackageParents["Super.Transitive.Package"].Single());
+    }
+
     [Theory]
     [MemberData(nameof(ComputeUpdateOperationsTestData))]
     public async Task ComputeUpdateOperations

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

@@ -414,6 +414,19 @@ public class MSBuildHelperTests : TestBase
                 // normalize default message for the test
                 actualError = new DependencyFileNotFound(notFound.Details["file-path"].ToString()!, "test message");
             }
+            if (actualError is DependencyFileNotParseable notParseable)
+            {
+                // normalize the path for the test
+                actualError = new DependencyFileNotParseable("/" + notParseable.Details["file-path"].ToString()!.TrimStart('.', '/'), notParseable.Details["message"]?.ToString());
+            }
+            if (actualError is UnknownError unknownError)
+            {
+                // remove callstack from unknown error to make testing easier
+                var originalMessage = unknownError.Exception.Message;
+                var newlineIndex = originalMessage.IndexOf('\n');
+                var trimmedMessage = newlineIndex >= 0 ? originalMessage[..newlineIndex] : originalMessage;
+                actualError = new UnknownError(new Exception(trimmedMessage.Trim()), "TEST-JOB-ID");
+            }
 
             var actualErrorJson = JsonSerializer.Serialize(actualError, RunWorker.SerializerOptions);
             var expectedErrorJson = JsonSerializer.Serialize(expectedError, RunWorker.SerializerOptions);
@@ -609,5 +622,17 @@ public class MSBuildHelperTests : TestBase
             // expectedError
             new DependencyFileNotParseable("/path/to/NuGet.Config", "Some error message."),
         ];
+
+        yield return
+        [
+            // output
+            """
+            Output:
+            Using Msbuild from '/usr/local/dotnet/current/sdk/9.0.307'.
+            Found multiple project files for '/home/dependabot/dependabot-updater/repo/path/to/packages.config'.
+            """,
+            // expectedError
+            new UnknownError(new Exception("Multiple project files found for single packages.config"), "TEST-JOB-ID"),
+        ];
     }
 }