Upgrade to .NET 8 and latest C# language features (#881)

tinglesoftware · Nov 20, 2023 · c67c7a2 · c67c7a2
1 parent 5d60bfc
commit c67c7a2
Show file tree

Hide file tree

Showing 29 changed files with 129 additions and 154 deletions.
diff --git a/.github/workflows/server.yml b/.github/workflows/server.yml
@@ -45,7 +45,7 @@ jobs:
     - name: Setup .NET SDK
       uses: actions/setup-dotnet@v3
       with:
-        dotnet-version: '7.x'
+        dotnet-version: '8.x'
 
     - name: Test
       run: dotnet test -c $buildConfiguration --verbosity normal --collect "Code coverage"

diff --git a/server/Directory.Build.props b/server/Directory.Build.props
@@ -2,11 +2,11 @@
   <!-- There is nothing else to import. -->
 
   <PropertyGroup>
-    <TargetFramework>net7.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
   </PropertyGroup>
 
   <PropertyGroup>
-    <LangVersion>11.0</LangVersion>
+    <LangVersion>latest</LangVersion>
     <Nullable>enable</Nullable>
     <ImplicitUsings>enable</ImplicitUsings>
   </PropertyGroup>

diff --git a/server/Tingle.Dependabot.Tests/Models/DependabotConfigurationTests.cs b/server/Tingle.Dependabot.Tests/Models/DependabotConfigurationTests.cs
@@ -42,7 +42,7 @@ public void Deserialization_Works()
         Assert.Equal(DependabotScheduleDay.Monday, second.Schedule?.Day);
         Assert.Equal("Etc/UTC", second.Schedule?.Timezone);
         Assert.Equal("deny", second.InsecureExternalCodeExecution);
-        Assert.Equal(new[] { "reg1", "reg2", }, second.Registries);
+        Assert.Equal(["reg1", "reg2"], second.Registries);
     }
 
     [Fact]
@@ -51,15 +51,15 @@ public void Validation_Works()
         var configuration = new DependabotConfiguration
         {
             Version = 2,
-            Updates = new List<DependabotUpdate>
-            {
+            Updates =
+            [
                 new DependabotUpdate
                 {
                     PackageEcosystem = "npm",
                     Directory = "/",
-                    Registries = new List<string> { "dummy1", "dummy2", },
+                    Registries = ["dummy1", "dummy2",],
                 },
-            },
+            ],
             Registries = new Dictionary<string, DependabotRegistry>
             {
                 ["dummy1"] = new DependabotRegistry
@@ -87,7 +87,7 @@ public void Validation_Works()
 
         // fails: registry not referenced
         configuration.Updates[0].Registries?.Clear();
-        results = new List<ValidationResult>();
+        results = [];
         actual = RecursiveValidator.TryValidateObject(configuration, results);
         Assert.False(actual);
         var val = Assert.Single(results);
@@ -96,8 +96,8 @@ public void Validation_Works()
         Assert.Equal("Registries: 'dummy1,dummy2' have not been referenced by any update", val.ErrorMessage);
 
         // fails: registrynot configured
-        configuration.Updates[0].Registries?.AddRange(new[] { "dummy1", "dummy2", "dummy3" });
-        results = new List<ValidationResult>();
+        configuration.Updates[0].Registries?.AddRange(["dummy1", "dummy2", "dummy3"]);
+        results = [];
         actual = RecursiveValidator.TryValidateObject(configuration, results);
         Assert.False(actual);
         val = Assert.Single(results);

diff --git a/server/Tingle.Dependabot.Tests/PeriodicTasks/MissedTriggerCheckerTaskTests.cs b/server/Tingle.Dependabot.Tests/PeriodicTasks/MissedTriggerCheckerTaskTests.cs
@@ -120,8 +120,8 @@ await context.Repositories.AddAsync(new Repository
             ProviderId = Guid.NewGuid().ToString(),
             Name = "test-repo",
             ConfigFileContents = "",
-            Updates = new List<RepositoryUpdate>
-            {
+            Updates =
+            [
                 new RepositoryUpdate
                 {
                     PackageEcosystem = "npm",
@@ -144,7 +144,7 @@ await context.Repositories.AddAsync(new Repository
                     },
                     LatestUpdate = lastUpdate1,
                 },
-            },
+            ],
         });
         await context.SaveChangesAsync();
 

diff --git a/server/Tingle.Dependabot.Tests/PeriodicTasks/UpdateJobsCleanerTaskTests.cs b/server/Tingle.Dependabot.Tests/PeriodicTasks/UpdateJobsCleanerTaskTests.cs
@@ -169,8 +169,8 @@ await context.Repositories.AddAsync(new Repository
             ProviderId = Guid.NewGuid().ToString(),
             Name = "test-repo",
             ConfigFileContents = "",
-            Updates = new List<RepositoryUpdate>
-            {
+            Updates =
+            [
                 new RepositoryUpdate
                 {
                     PackageEcosystem = "npm",
@@ -191,7 +191,7 @@ await context.Repositories.AddAsync(new Repository
                         Time = new(3, 30),
                     },
                 },
-            },
+            ],
         });
         await context.SaveChangesAsync();
 

diff --git a/server/Tingle.Dependabot.Tests/WebhooksControllerIntegrationTests.cs b/server/Tingle.Dependabot.Tests/WebhooksControllerIntegrationTests.cs
@@ -61,7 +61,7 @@ await TestAsync(async (harness, client) =>
             var response = await client.SendAsync(request);
             Assert.Equal(HttpStatusCode.BadRequest, response.StatusCode);
             var body = await response.Content.ReadAsStringAsync();
-            Assert.Contains("\"type\":\"https://tools.ietf.org/html/rfc7231#section-6.5.1\"", body);
+            Assert.Contains("\"type\":\"https://tools.ietf.org/html/rfc9110#section-15.5.1\"", body);
             Assert.Contains("\"title\":\"One or more validation errors occurred.\"", body);
             Assert.Contains("\"status\":400", body);
             Assert.Contains("\"errors\":{\"\":[\"A non-empty request body is required.\"],\"model\":[\"The model field is required.\"]}", body);
@@ -80,7 +80,7 @@ await TestAsync(async (harness, client) =>
             var response = await client.SendAsync(request);
             Assert.Equal(HttpStatusCode.BadRequest, response.StatusCode);
             var body = await response.Content.ReadAsStringAsync();
-            Assert.Contains("\"type\":\"https://tools.ietf.org/html/rfc7231#section-6.5.1\"", body);
+            Assert.Contains("\"type\":\"https://tools.ietf.org/html/rfc9110#section-15.5.1\"", body);
             Assert.Contains("\"title\":\"One or more validation errors occurred.\"", body);
             Assert.Contains("\"status\":400", body);
             Assert.Contains("\"SubscriptionId\":[\"The SubscriptionId field is required.\"]", body);
@@ -102,7 +102,7 @@ await TestAsync(async (harness, client) =>
             var response = await client.SendAsync(request);
             Assert.Equal(HttpStatusCode.UnsupportedMediaType, response.StatusCode);
             var body = await response.Content.ReadAsStringAsync();
-            Assert.Contains("\"type\":\"https://tools.ietf.org/html/rfc7231#section-6.5.13\"", body);
+            Assert.Contains("\"type\":\"https://tools.ietf.org/html/rfc9110#section-15.5.16\"", body);
             Assert.Contains("\"title\":\"Unsupported Media Type\"", body);
             Assert.Contains("\"status\":415", body);
             Assert.Empty(await harness.PublishedAsync());

diff --git a/server/Tingle.Dependabot.Tests/Workflow/UpdateRunnerTests.cs b/server/Tingle.Dependabot.Tests/Workflow/UpdateRunnerTests.cs
@@ -35,58 +35,58 @@ public void MakeCredentialsMetadata_Works()
 
         // composer-repository
         var metadata = metadatas[0];
-        Assert.Equal(new[] { "type", "host", }, metadata.Keys);
-        Assert.Equal(new[] { "composer_repository", "repo.packagist.com", }, metadata.Values);
+        Assert.Equal<string>(["type", "host"], metadata.Keys);
+        Assert.Equal<string>(["composer_repository", "repo.packagist.com"], metadata.Values);
 
         // docker-registry
         metadata = metadatas[1];
-        Assert.Equal(new[] { "type", "host", }, metadata.Keys);
-        Assert.Equal(new[] { "docker_registry", "registry.hub.docker.com", }, metadata.Values);
+        Assert.Equal<string>(["type", "host"], metadata.Keys);
+        Assert.Equal<string>(["docker_registry", "registry.hub.docker.com"], metadata.Values);
 
         // git
         metadata = metadatas[2];
-        Assert.Equal(new[] { "type", "host", }, metadata.Keys);
-        Assert.Equal(new[] { "git", "github.com", }, metadata.Values);
+        Assert.Equal<string>(["type", "host"], metadata.Keys);
+        Assert.Equal<string>(["git", "github.com"], metadata.Values);
 
         // hex-organization
         metadata = metadatas[3];
-        Assert.Equal(new[] { "type", }, metadata.Keys);
-        Assert.Equal(new[] { "hex_organization", }, metadata.Values);
+        Assert.Equal<string>(["type"], metadata.Keys);
+        Assert.Equal<string>(["hex_organization"], metadata.Values);
 
         // hex-repository
         metadata = metadatas[4];
-        Assert.Equal(new[] { "type", "host", }, metadata.Keys);
-        Assert.Equal(new[] { "hex_repository", "private-repo.example.com", }, metadata.Values);
+        Assert.Equal<string>(["type", "host"], metadata.Keys);
+        Assert.Equal<string>(["hex_repository", "private-repo.example.com"], metadata.Values);
 
         // maven-repository
         metadata = metadatas[5];
-        Assert.Equal(new[] { "type", "host", }, metadata.Keys);
-        Assert.Equal(new[] { "maven_repository", "artifactory.example.com", }, metadata.Values);
+        Assert.Equal<string>(["type", "host"], metadata.Keys);
+        Assert.Equal<string>(["maven_repository", "artifactory.example.com"], metadata.Values);
 
         // npm-registry
         metadata = metadatas[6];
-        Assert.Equal(new[] { "type", "host", }, metadata.Keys);
-        Assert.Equal(new[] { "npm_registry", "npm.pkg.github.com", }, metadata.Values);
+        Assert.Equal<string>(["type", "host"], metadata.Keys);
+        Assert.Equal<string>(["npm_registry", "npm.pkg.github.com"], metadata.Values);
 
         // nuget-feed
         metadata = metadatas[7];
-        Assert.Equal(new[] { "type", "host", }, metadata.Keys);
-        Assert.Equal(new[] { "nuget_feed", "pkgs.dev.azure.com", }, metadata.Values);
+        Assert.Equal<string>(["type", "host"], metadata.Keys);
+        Assert.Equal<string>(["nuget_feed", "pkgs.dev.azure.com"], metadata.Values);
 
         // python-index
         metadata = metadatas[8];
-        Assert.Equal(new[] { "type", "host", }, metadata.Keys);
-        Assert.Equal(new[] { "python_index", "pkgs.dev.azure.com", }, metadata.Values);
+        Assert.Equal<string>(["type", "host"], metadata.Keys);
+        Assert.Equal<string>(["python_index", "pkgs.dev.azure.com"], metadata.Values);
 
         // rubygems-server
         metadata = metadatas[9];
-        Assert.Equal(new[] { "type", "host", }, metadata.Keys);
-        Assert.Equal(new[] { "rubygems_server", "rubygems.pkg.github.com", }, metadata.Values);
+        Assert.Equal<string>(["type", "host"], metadata.Keys);
+        Assert.Equal<string>(["rubygems_server", "rubygems.pkg.github.com"], metadata.Values);
 
         // terraform-registry
         metadata = metadatas[10];
-        Assert.Equal(new[] { "type", "host", }, metadata.Keys);
-        Assert.Equal(new[] { "terraform_registry", "terraform.example.com", }, metadata.Values);
+        Assert.Equal<string>(["type", "host"], metadata.Keys);
+        Assert.Equal<string>(["terraform_registry", "terraform.example.com"], metadata.Values);
     }
 
     [Fact]

diff --git a/server/Tingle.Dependabot/ApiKeyProvider.cs b/server/Tingle.Dependabot/ApiKeyProvider.cs
@@ -5,15 +5,8 @@
 
 namespace Tingle.Dependabot;
 
-internal class ApiKeyProvider : IApiKeyProvider
+internal class ApiKeyProvider(MainDbContext dbContext) : IApiKeyProvider
 {
-    private readonly MainDbContext dbContext;
-
-    public ApiKeyProvider(MainDbContext dbContext)
-    {
-        this.dbContext = dbContext ?? throw new ArgumentNullException(nameof(dbContext));
-    }
-
     public async Task<IApiKey?> ProvideAsync(string key)
     {
         var job = await dbContext.UpdateJobs.SingleOrDefaultAsync(j => j.AuthKey == key);
@@ -25,17 +18,10 @@ public ApiKeyProvider(MainDbContext dbContext)
         return null;
     }
 
-    class ApiKey : IApiKey
+    class ApiKey(string key, string owner, IReadOnlyCollection<Claim>? claims = null) : IApiKey
     {
-        public ApiKey(string key, string owner, IReadOnlyCollection<Claim>? claims = null)
-        {
-            Key = key;
-            OwnerName = owner;
-            Claims = claims ?? new List<Claim>();
-        }
-
-        public string Key { get; }
-        public string OwnerName { get; }
-        public IReadOnlyCollection<Claim> Claims { get; }
+        public string Key { get; } = key;
+        public string OwnerName { get; } = owner;
+        public IReadOnlyCollection<Claim> Claims { get; } = claims ?? new List<Claim>();
     }
 }
diff --git a/server/Tingle.Dependabot/ApplicationInsights/InsightsFilteringProcessor.cs b/server/Tingle.Dependabot/ApplicationInsights/InsightsFilteringProcessor.cs
@@ -10,10 +10,10 @@ namespace Tingle.Dependabot.ApplicationInsights;
 internal class InsightsFilteringProcessor : ITelemetryProcessor
 {
     private static readonly string[] excludedRequestNames =
-    {
+    [
         "ServiceBusReceiver.Receive",
         "ServiceBusProcessor.ProcessMessage",
-    };
+    ];
 
     private readonly ITelemetryProcessor next;
 

diff --git a/server/Tingle.Dependabot/Consumers/UpdateJobEventsConsumer.cs b/server/Tingle.Dependabot/Consumers/UpdateJobEventsConsumer.cs
@@ -1,5 +1,4 @@
 using Microsoft.EntityFrameworkCore;
-using Microsoft.Extensions.Logging;
 using Tingle.Dependabot.Events;
 using Tingle.Dependabot.Models;
 using Tingle.Dependabot.Models.Management;

diff --git a/server/Tingle.Dependabot/Controllers/UpdateJobsController.cs b/server/Tingle.Dependabot/Controllers/UpdateJobsController.cs
@@ -117,7 +117,7 @@ public async Task<IActionResult> UpdateDependencyListAsync([FromRoute, Required]
         var update = repository.Updates.SingleOrDefault(u => u.PackageEcosystem == job.PackageEcosystem && u.Directory == job.Directory);
         if (update is not null)
         {
-            update.Files = model.Data?.DependencyFiles ?? new();
+            update.Files = model.Data?.DependencyFiles ?? [];
         }
         await dbContext.SaveChangesAsync();
 

diff --git a/server/Tingle.Dependabot/Dockerfile b/server/Tingle.Dependabot/Dockerfile
@@ -1,21 +1,25 @@
-#See https://aka.ms/containerfastmode to understand how Visual Studio uses this Dockerfile to build your images for faster debugging.
+#See https://aka.ms/customizecontainer to learn how to customize your debug container and how Visual Studio uses this Dockerfile to build your images for faster debugging.
 
-FROM mcr.microsoft.com/dotnet/aspnet:7.0-bullseye-slim AS base
+FROM mcr.microsoft.com/dotnet/aspnet:8.0-bookworm-slim AS base
 LABEL org.opencontainers.image.source="https://github.com/tinglesoftware/dependabot-azure-devops"
+USER app
 WORKDIR /app
-EXPOSE 80
-EXPOSE 443
+EXPOSE 8080
+EXPOSE 8081
 
-FROM mcr.microsoft.com/dotnet/sdk:7.0-bullseye-slim AS build
+FROM mcr.microsoft.com/dotnet/sdk:8.0-bookworm-slim AS build
+ARG BUILD_CONFIGURATION=Release
 WORKDIR /src
-COPY ["Tingle.Dependabot/Tingle.Dependabot.csproj", "Tingle.Dependabot/"]
-RUN dotnet restore "Tingle.Dependabot/Tingle.Dependabot.csproj"
+COPY ["server/Directory.Build.props", "server/"]
+COPY ["server/Tingle.Dependabot/Tingle.Dependabot.csproj", "server/Tingle.Dependabot/"]
+RUN dotnet restore "./server/Tingle.Dependabot/./Tingle.Dependabot.csproj"
 COPY . .
-WORKDIR "/src/Tingle.Dependabot"
-RUN dotnet build "Tingle.Dependabot.csproj" -c Release -o /app/build
+WORKDIR "/src/server/Tingle.Dependabot"
+RUN dotnet build "./Tingle.Dependabot.csproj" -c $BUILD_CONFIGURATION -o /app/build
 
 FROM build AS publish
-RUN dotnet publish "Tingle.Dependabot.csproj" -c Release -o /app/publish
+ARG BUILD_CONFIGURATION=Release
+RUN dotnet publish "./Tingle.Dependabot.csproj" -c $BUILD_CONFIGURATION -o /app/publish /p:UseAppHost=false
 
 FROM base AS final
 WORKDIR /app

diff --git a/server/Tingle.Dependabot/Dockerfile.CI b/server/Tingle.Dependabot/Dockerfile.CI
@@ -4,10 +4,12 @@
 #
 # As a result, we only copy publish output and put it in the container
 
-FROM mcr.microsoft.com/dotnet/aspnet:7.0-bullseye-slim AS base
+FROM mcr.microsoft.com/dotnet/aspnet:8.0-bookworm-slim AS base
 LABEL org.opencontainers.image.source="https://github.com/tinglesoftware/dependabot-azure-devops"
-EXPOSE 80
-EXPOSE 443
+USER app
 WORKDIR /app
+EXPOSE 8080
+EXPOSE 8081
+
 COPY . .
 ENTRYPOINT ["dotnet", "Tingle.Dependabot.dll"]
diff --git a/server/Tingle.Dependabot/Extensions/PropertyBuilderExtensions.cs b/server/Tingle.Dependabot/Extensions/PropertyBuilderExtensions.cs
@@ -105,7 +105,7 @@ public static PropertyBuilder<T> HasJsonConversion<T>(this PropertyBuilder<T> pr
 
     private static List<T> ConvertFromString<T>(string? value, string separator, JsonSerializerOptions? serializerOptions) where T : IConvertible
     {
-        if (string.IsNullOrWhiteSpace(value)) return new List<T>();
+        if (string.IsNullOrWhiteSpace(value)) return [];
         if (string.IsNullOrWhiteSpace(separator))
         {
             throw new ArgumentException($"'{nameof(separator)}' cannot be null or whitespace.", nameof(separator));

diff --git a/server/Tingle.Dependabot/Models/Azure/AzdoSubscriptionsQuery.cs b/server/Tingle.Dependabot/Models/Azure/AzdoSubscriptionsQuery.cs
@@ -75,7 +75,7 @@ public class AzdoSubscription
     public required string PublisherId { get; set; }
 
     [JsonPropertyName("publisherInputs")]
-    public Dictionary<string, string> PublisherInputs { get; set; } = new();
+    public Dictionary<string, string> PublisherInputs { get; set; } = [];
 
     [JsonPropertyName("consumerId")]
     public string? ConsumerId { get; set; }
@@ -84,7 +84,7 @@ public class AzdoSubscription
     public string? ConsumerActionId { get; set; }
 
     [JsonPropertyName("consumerInputs")]
-    public Dictionary<string, string> ConsumerInputs { get; set; } = new();
+    public Dictionary<string, string> ConsumerInputs { get; set; } = [];
 
     [JsonPropertyName("eventType")]
     public required string EventType { get; set; }

diff --git a/server/Tingle.Dependabot/Models/Dependabot/DependabotConfiguration.cs b/server/Tingle.Dependabot/Models/Dependabot/DependabotConfiguration.cs
@@ -14,13 +14,13 @@ public class DependabotConfiguration : IValidatableObject
     public List<DependabotUpdate>? Updates { get; set; }
 
     [JsonPropertyName("registries")]
-    public Dictionary<string, DependabotRegistry> Registries { get; set; } = new();
+    public Dictionary<string, DependabotRegistry> Registries { get; set; } = [];
 
     public IEnumerable<ValidationResult> Validate(ValidationContext validationContext)
     {
-        var updates = Updates ?? new();
+        var updates = Updates ?? [];
         var configured = Registries.Keys;
-        var referenced = updates.SelectMany(r => r.Registries ?? new()).ToList();
+        var referenced = updates.SelectMany(r => r.Registries ?? []).ToList();
 
         // ensure there are no configured registries that have not been referenced
         var missingConfiguration = referenced.Except(configured).ToList();

diff --git a/server/Tingle.Dependabot/Models/MainDbContext.cs b/server/Tingle.Dependabot/Models/MainDbContext.cs
@@ -7,10 +7,8 @@
 
 namespace Tingle.Dependabot.Models;
 
-public class MainDbContext : DbContext, IDataProtectionKeyContext
+public class MainDbContext(DbContextOptions<MainDbContext> options) : DbContext(options), IDataProtectionKeyContext
 {
-    public MainDbContext(DbContextOptions<MainDbContext> options) : base(options) { }
-
     public DbSet<Project> Projects => Set<Project>();
     public DbSet<Repository> Repositories => Set<Repository>();
     public DbSet<UpdateJob> UpdateJobs => Set<UpdateJob>();