Merge branch 'main' into show-channel-status-on-overview-page

.github/dependabot.yml

@@ -1,5 +1,11 @@
 version: 2
 updates:
+  - package-ecosystem: "nuget"
+    directory: "/src/Core"
+    schedule:
+      interval: "weekly"
+      day: "monday"
+      time: "08:00"
   - package-ecosystem: "nuget"
     directory: "/src/Application"
     schedule:
@@ -27,6 +33,15 @@ updates:
     ignore:
       - dependency-name: "*"
         update-types: ["version-update:semver-major"]
+  - package-ecosystem: "nuget"
+    directory: "/tests/Infrastructure.UnitTests"
+    schedule:
+      interval: "weekly"
+      day: "monday"
+      time: "08:00"
+    ignore:
+      - dependency-name: "*"
+        update-types: ["version-update:semver-major"]
   - package-ecosystem: "nuget"
     directory: "/tests/Application.UnitTests"
     schedule:

Hippo.sln

@@ -21,6 +21,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Core.UnitTests", "tests\Cor
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Hippo.FunctionalTests", "tests\Hippo.FunctionalTests\Hippo.FunctionalTests.csproj", "{8C25A909-52B2-4326-BF00-23C053376EB5}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Infrastructure.UnitTests", "tests\Infrastructure.UnitTests\Infrastructure.UnitTests.csproj", "{4F25FBC8-3753-495C-8799-2DEE473D4764}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -58,6 +60,10 @@ Global
 		{8C25A909-52B2-4326-BF00-23C053376EB5}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{8C25A909-52B2-4326-BF00-23C053376EB5}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{8C25A909-52B2-4326-BF00-23C053376EB5}.Release|Any CPU.Build.0 = Release|Any CPU
+		{4F25FBC8-3753-495C-8799-2DEE473D4764}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{4F25FBC8-3753-495C-8799-2DEE473D4764}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{4F25FBC8-3753-495C-8799-2DEE473D4764}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{4F25FBC8-3753-495C-8799-2DEE473D4764}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(NestedProjects) = preSolution
 		{96764F9E-66BB-4F64-A1BA-DE92537996E1} = {A432DA6D-ADCE-4EA1-9697-7A637F75605D}
@@ -67,5 +73,6 @@ Global
 		{AE958DF1-B480-4556-A68C-E042072DB7A6} = {3043D016-B9BF-4706-9773-3D58457A78AC}
 		{0BFC9718-3107-4E48-B952-C0B345A55A20} = {3043D016-B9BF-4706-9773-3D58457A78AC}
 		{8C25A909-52B2-4326-BF00-23C053376EB5} = {3043D016-B9BF-4706-9773-3D58457A78AC}
+		{4F25FBC8-3753-495C-8799-2DEE473D4764} = {3043D016-B9BF-4706-9773-3D58457A78AC}
 	EndGlobalSection
 EndGlobal

src/Application/Application.csproj

@@ -28,7 +28,7 @@
 	</ItemGroup>
 
 	<ItemGroup>
-		<PackageReference Include="MinVer" Version="4.0.0" PrivateAssets="All" />
+		<PackageReference Include="MinVer" Version="4.1.0" PrivateAssets="All" />
 	</ItemGroup>
 
 	<PropertyGroup>

src/Application/Channels/Commands/PatchChannelCommand.cs

@@ -64,7 +64,7 @@ private void UpdateEnvironmentVariables(PatchChannelCommand request, Channel cha
     {
         var existingVariables = GetExistingEnvironmentVariables(request.ChannelId);
 
-        var envVariablesToBeAdded = EnvironmentVariablesToBeAdded(request.EnvironmentVariables.Value, channel);
+        var envVariablesToBeAdded = EnvironmentVariablesToBeAdded(existingVariables, request.EnvironmentVariables.Value, channel);
         var envVariablesToBeUpdated = EnvironmentVariablesToBeUpdated(existingVariables, request.EnvironmentVariables.Value);
         var envVariablesToBeDeleted = EnvironmentVariablesToBeRemoved(existingVariables, request.EnvironmentVariables.Value);
 
@@ -79,7 +79,7 @@ private void UpdateEnvironmentVariables(PatchChannelCommand request, Channel cha
         {
             foreach (var environmentVariable in request.EnvironmentVariables.Value)
             {
-                var updatedEnvVar = existingVariables.FirstOrDefault(v => v.Id == environmentVariable.Id);
+                var updatedEnvVar = existingVariables.FirstOrDefault(v => v.Key == environmentVariable.Key);
 
                 if (updatedEnvVar is null)
                 {
@@ -107,29 +107,25 @@ private List<EnvironmentVariable> GetExistingEnvironmentVariables(Guid channelId
             .ToList();
     }
 
-    private static List<EnvironmentVariable> EnvironmentVariablesToBeAdded(List<UpdateEnvironmentVariableDto>? environmentVariables, Channel channel)
+    private static List<EnvironmentVariable> EnvironmentVariablesToBeAdded(List<EnvironmentVariable> existingVariables, 
+        List<UpdateEnvironmentVariableDto>? environmentVariables, Channel channel)
     {
         if (environmentVariables is null)
         {
             return new List<EnvironmentVariable>();
         }
 
-        var toBeAdded = new List<EnvironmentVariable>();
-        var newVariables = environmentVariables.Where(v => v.Id is null);
+        var existingVariablesKeys = existingVariables.Select(v => v.Key);
 
-        foreach (var environmentVariable in newVariables)
-        {
-            var entity = new EnvironmentVariable
+        return environmentVariables
+            .Where(v => !existingVariablesKeys.Contains(v.Key))
+            .Select(entity => new EnvironmentVariable
             {
-                Key = environmentVariable.Key,
-                Value = environmentVariable.Value,
+                Key = entity.Key,
+                Value = entity.Value,
                 Channel = channel
-            };
-
-            toBeAdded.Add(entity);
-        }
-
-        return toBeAdded;
+            })
+            .ToList();
     }
 
     private static List<EnvironmentVariable> EnvironmentVariablesToBeUpdated(List<EnvironmentVariable> existingVariables,
@@ -140,9 +136,9 @@ private static List<EnvironmentVariable> EnvironmentVariablesToBeUpdated(List<En
             return new List<EnvironmentVariable>();
         }
 
-        var environmentVariablesIds = environmentVariables.Select(v => v.Id);
+        var environmentVariablesKeys = environmentVariables.Select(v => v.Key);
 
-        return existingVariables.Where(v => environmentVariablesIds.Contains(v.Id)).ToList();
+        return existingVariables.Where(v => environmentVariablesKeys.Contains(v.Key)).ToList();
     }
 
     private static List<EnvironmentVariable> EnvironmentVariablesToBeRemoved(List<EnvironmentVariable> existingVariables,
@@ -153,8 +149,8 @@ private static List<EnvironmentVariable> EnvironmentVariablesToBeRemoved(List<En
             environmentVariables = new List<UpdateEnvironmentVariableDto>();
         }
 
-        var environmentVariablesIds = environmentVariables.Select(v => v.Id);
+        var environmentVariablesKeys = environmentVariables.Select(v => v.Key);
 
-        return existingVariables.Where(v => !environmentVariablesIds.Contains(v.Id)).ToList();
+        return existingVariables.Where(v => !environmentVariablesKeys.Contains(v.Key)).ToList();
     }
 }

src/Application/Channels/Queries/ChannelItem.cs

@@ -14,7 +14,7 @@ public class ChannelItem : IMapFrom<Channel>
 {
     public ChannelItem()
     {
-        EnvironmentVariables = new List<EnvironmentVariableDto>();
+        EnvironmentVariables = new List<EnvironmentVariableItem>();
     }
 
     [Required]
@@ -41,7 +41,7 @@ public ChannelItem()
     public CertificateItem? Certificate { get; set; }
 
     [Required]
-    public IList<EnvironmentVariableDto> EnvironmentVariables { get; set; }
+    public IList<EnvironmentVariableItem> EnvironmentVariables { get; set; }
 
     [NoMap]
     public AppSummaryDto? AppSummary { get; set; }

src/Application/Common/Behaviours/AuthorizationBehaviour.cs

@@ -6,7 +6,7 @@
 
 namespace Hippo.Application.Common.Behaviours;
 
-public class AuthorizationBehaviour<TRequest, TResponse> : IPipelineBehavior<TRequest, TResponse> where TRequest : notnull
+public class AuthorizationBehaviour<TRequest, TResponse> : IPipelineBehavior<TRequest, TResponse> where TRequest : IRequest<TResponse>
 {
     private readonly ICurrentUserService _currentUserService;
     private readonly IIdentityService _identityService;

src/Application/Common/Behaviours/PerformanceBehaviour.cs

@@ -5,7 +5,7 @@
 
 namespace Hippo.Application.Common.Behaviours;
 
-public class PerformanceBehaviour<TRequest, TResponse> : IPipelineBehavior<TRequest, TResponse> where TRequest : notnull
+public class PerformanceBehaviour<TRequest, TResponse> : IPipelineBehavior<TRequest, TResponse> where TRequest : IRequest<TResponse>
 {
     private readonly Stopwatch _timer;
     private readonly ILogger<TRequest> _logger;

src/Application/Common/Behaviours/UnhandledExceptionBehaviour.cs

@@ -3,7 +3,7 @@
 
 namespace Hippo.Application.Common.Behaviours;
 
-public class UnhandledExceptionBehaviour<TRequest, TResponse> : IPipelineBehavior<TRequest, TResponse> where TRequest : notnull
+public class UnhandledExceptionBehaviour<TRequest, TResponse> : IPipelineBehavior<TRequest, TResponse> where TRequest : IRequest<TResponse>
 {
     private readonly ILogger<TRequest> _logger;
 

src/Application/Common/Behaviours/ValidationBehaviour.cs

@@ -4,8 +4,7 @@
 
 namespace Hippo.Application.Common.Behaviours;
 
-public class ValidationBehaviour<TRequest, TResponse> : IPipelineBehavior<TRequest, TResponse>
-     where TRequest : notnull
+public class ValidationBehaviour<TRequest, TResponse> : IPipelineBehavior<TRequest, TResponse> where TRequest : IRequest<TResponse>
 {
     private readonly IEnumerable<IValidator<TRequest>> _validators;
 

src/Application/Common/Interfaces/BindleService/RevisionSpinToml.cs

@@ -1,11 +1,15 @@
 using System.ComponentModel.DataAnnotations;
+using System.Runtime.Serialization;
 
 namespace Hippo.Application.Common.Interfaces.StorageService;
 
 public class RevisionSpinToml
 {
     public RevisionTrigger? Trigger { get; set; }
 
+    public Dictionary<string, Dictionary<string, string>> Config { get; set; } = new();
+
     [Required]
-    public List<RevisionComponent> Component { get; set; } = new();
+    [DataMember(Name = "component")]
+    public List<RevisionComponent> Components { get; set; } = new();
 }