Merge #192

UKHO · Oct 3, 2024 · 88709fb · 88709fb
2 parents 92a2cff + 20c7e18
commit 88709fb
Show file tree

Hide file tree

Showing 15 changed files with 35 additions and 54 deletions.
diff --git a/Deployment/src/APIM/azure.tf b/Deployment/src/APIM/azure.tf
@@ -2,11 +2,11 @@ terraform {
   required_providers {
     azurerm = {
       source  = "hashicorp/azurerm"
-      version = "=3.89.0"
+      version = "=3.116.0"
     }
   }
 
-  required_version = "=1.7.2"
+  required_version = "=1.9.6"
   backend "azurerm" {
     container_name = "tfstate"
     key            = "terraform.apim.tfplan"

diff --git a/Deployment/src/azure.tf b/Deployment/src/azure.tf
@@ -2,11 +2,11 @@ terraform {
   required_providers {
     azurerm = {
       source  = "hashicorp/azurerm"
-      version = "=3.89.0"
+      version = "=3.116.0"
     }
   }
 
-  required_version = "=1.7.2"
+  required_version = "=1.9.6"
   backend "azurerm" {
     container_name = "tfstate"
     key            = "terraform.deployment.tfplan"

diff --git a/NVDSuppressions.xml b/NVDSuppressions.xml
@@ -258,15 +258,6 @@
     <cpe>cpe:/a:asp-project:asp-project</cpe>
     <cve>CVE-2015-0897</cve>
   </suppress>
-  <suppress>
-    <notes>
-      <![CDATA[
-   file name: Various
-   False positive - relates to Drupal
-   ]]>
-    </notes>
-    <cve>CVE-2014-9152</cve>
-  </suppress>
   <suppress>
     <notes>
       <![CDATA[
@@ -334,16 +325,6 @@
     <cpe>cpe:/a:services_project:services</cpe>
     <cve>CVE-2014-9152</cve>
   </suppress>
-  <suppress>
-    <notes>
-      <![CDATA[
-   file name: System.Runtime.CompilerServices.Unsafe.dll
-   ]]>
-    </notes>
-    <packageUrl regex="true">^pkg:generic/System\.Runtime\.CompilerServices\.Unsafe@.*$</packageUrl>
-    <cpe>cpe:/a:services_project:services</cpe>
-    <cve>CVE-2014-9152</cve>
-  </suppress>
   <suppress>
     <notes>
       <![CDATA[

diff --git a/...O.D365CallbackDistributorStub.API.Tests/UKHO.D365CallbackDistributorStub.API.Tests.csproj b/...O.D365CallbackDistributorStub.API.Tests/UKHO.D365CallbackDistributorStub.API.Tests.csproj
@@ -12,12 +12,12 @@
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
     <PackageReference Include="FakeItEasy" Version="8.3.0" />
-    <PackageReference Include="NUnit" Version="4.1.0" />
+    <PackageReference Include="NUnit" Version="4.2.2" />
     <PackageReference Include="NUnit3TestAdapter" Version="4.6.0">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.11.0" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.11.1" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/...Stub.API/UKHO.D365CallbackDistributorStub.API/UKHO.D365CallbackDistributorStub.API.csproj b/...Stub.API/UKHO.D365CallbackDistributorStub.API/UKHO.D365CallbackDistributorStub.API.csproj
@@ -7,9 +7,9 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Azure.Core" Version="1.42.0" />
+    <PackageReference Include="Azure.Core" Version="1.43.0" />
     <PackageReference Include="Serilog.Extensions.Logging.File" Version="3.0.0" />
-    <PackageReference Include="Swashbuckle.AspNetCore" Version="6.7.1" />
+    <PackageReference Include="Swashbuckle.AspNetCore" Version="6.7.3" />
   </ItemGroup>
 
 </Project>
diff --git a/...onService.API.FunctionalTests/UKHO.ExternalNotificationService.API.FunctionalTests.csproj b/...onService.API.FunctionalTests/UKHO.ExternalNotificationService.API.FunctionalTests.csproj
@@ -20,17 +20,17 @@
 
   <ItemGroup>
     <PackageReference Include="Azure.Identity" Version="1.12.0" />
-    <PackageReference Include="Azure.Storage.Queues" Version="12.19.1" />
+    <PackageReference Include="Azure.Storage.Queues" Version="12.20.0" />
     <PackageReference Include="Microsoft.AspNetCore.Mvc.Testing" Version="8.0.8" />
     <PackageReference Include="Microsoft.Extensions.Configuration" Version="8.0.0" />
     <PackageReference Include="Microsoft.Extensions.Configuration.Binder" Version="8.0.2" />
     <PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="8.0.0" />
-    <PackageReference Include="NUnit" Version="4.1.0" />
+    <PackageReference Include="NUnit" Version="4.2.2" />
     <PackageReference Include="NUnit3TestAdapter" Version="4.6.0">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.10.0" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.11.1" />
     <PackageReference Include="System.Text.Json" Version="8.0.4" />
   </ItemGroup>
 

diff --git a/...alNotificationService.API.UnitTests/UKHO.ExternalNotificationService.API.UnitTests.csproj b/...alNotificationService.API.UnitTests/UKHO.ExternalNotificationService.API.UnitTests.csproj
@@ -12,12 +12,12 @@
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
     <PackageReference Include="FakeItEasy" Version="8.3.0" />
-    <PackageReference Include="NUnit" Version="4.1.0" />
+    <PackageReference Include="NUnit" Version="4.2.2" />
     <PackageReference Include="NUnit3TestAdapter" Version="4.6.0">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.10.0" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.11.1" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/...ficationService.API/UKHO.ExternalNotificationService.API/Controllers/WebhookController.cs b/...ficationService.API/UKHO.ExternalNotificationService.API/Controllers/WebhookController.cs
@@ -53,7 +53,7 @@ public virtual async Task<IActionResult> Post()
             string jsonContent = await reader.ReadToEndAsync();
             CustomCloudEvent? customCloudEvent = JsonSerializer.Deserialize<CustomCloudEvent>(jsonContent, JOptions);
 
-            _logger.LogInformation(EventIds.ENSWebhookRequestStart.ToEventId(), "External notification service webhook request started for event:{eventGridEvent} and _X-Correlation-ID:{correlationId}.", customCloudEvent, GetCurrentCorrelationId());
+            _logger.LogInformation(EventIds.ENSWebhookRequestStart.ToEventId(), "External notification service webhook request started for event:{eventGridEvent} and _X-Correlation-ID:{correlationId}.", JsonSerializer.Serialize(customCloudEvent), GetCurrentCorrelationId());
 
             if (customCloudEvent?.Type != null)
             {

diff --git a/...vice.API/UKHO.ExternalNotificationService.API/UKHO.ExternalNotificationService.API.csproj b/...vice.API/UKHO.ExternalNotificationService.API/UKHO.ExternalNotificationService.API.csproj
@@ -11,13 +11,13 @@
     <PackageReference Include="Azure.Identity" Version="1.12.0" />
     <PackageReference Include="Azure.Security.KeyVault.Secrets" Version="4.6.0" />
     <PackageReference Include="Elastic.Apm.NetCoreAll" Version="1.28.0" />
-    <PackageReference Include="FluentValidation" Version="11.9.2" />
+    <PackageReference Include="FluentValidation" Version="11.10.0" />
     <PackageReference Include="Microsoft.ApplicationInsights.AspNetCore" Version="2.22.0" />
     <PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="8.0.8" />
     <PackageReference Include="Microsoft.AspNetCore.HeaderPropagation" Version="8.0.8" />
     <PackageReference Include="Microsoft.Extensions.Configuration.Binder" Version="8.0.2" />
     <PackageReference Include="Microsoft.Extensions.Logging.AzureAppServices" Version="8.0.8" />
-    <PackageReference Include="Microsoft.Identity.Client" Version="4.63.0" />
+    <PackageReference Include="Microsoft.Identity.Client" Version="4.64.1" />
     <PackageReference Include="Serilog.Extensions.Logging.File" Version="3.0.0" />
     <PackageReference Include="System.Text.Json" Version="8.0.4" />
   </ItemGroup>

diff --git a/...ficationService.Common.UnitTests/UKHO.ExternalNotificationService.Common.UnitTests.csproj b/...ficationService.Common.UnitTests/UKHO.ExternalNotificationService.Common.UnitTests.csproj
@@ -12,8 +12,8 @@
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
     <PackageReference Include="FakeItEasy" Version="8.3.0" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.10.0" />
-    <PackageReference Include="NUnit" Version="4.1.0" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.11.1" />
+    <PackageReference Include="NUnit" Version="4.2.2" />
     <PackageReference Include="NUnit3TestAdapter" Version="4.6.0">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>

diff --git a/...ionService.API/UKHO.ExternalNotificationService.Common/Models/Request/CustomCloudEvent.cs b/...ionService.API/UKHO.ExternalNotificationService.Common/Models/Request/CustomCloudEvent.cs
@@ -7,19 +7,19 @@ namespace UKHO.ExternalNotificationService.Common.Models.Request
     public class CustomCloudEvent
     {
         [JsonPropertyName(name: "id")]
-        public string Id { get; set; } = string.Empty;
+        public string? Id { get; set; } 
         [JsonPropertyName(name: "type")]
-        public string Type { get; set; } = string.Empty;
+        public string? Type { get; set; }
         [JsonPropertyName(name: "time")]
-        public string Time { get; set; } = string.Empty;
+        public string? Time { get; set; } 
         [JsonPropertyName(name: "dataContentType")]
-        public string DataContentType { get; set; } = string.Empty;
+        public string? DataContentType { get; set; } 
         [JsonPropertyName(name: "dataSchema")]
-        public string DataSchema { get; set; } = string.Empty;
+        public string? DataSchema { get; set; } 
         [JsonPropertyName(name: "subject")]
-        public string Subject { get; set; } = string.Empty;
+        public string? Subject { get; set; } 
         [JsonPropertyName(name: "source")]
-        public string Source { get; set; } = string.Empty;
+        public string? Source { get; set; } 
         [JsonPropertyName(name: "data")]
         public object? Data { get; set; }
     }

diff --git a/...PI/UKHO.ExternalNotificationService.Common/UKHO.ExternalNotificationService.Common.csproj b/...PI/UKHO.ExternalNotificationService.Common/UKHO.ExternalNotificationService.Common.csproj
@@ -8,11 +8,11 @@
 
   <ItemGroup>
     <PackageReference Include="Azure.Identity" Version="1.12.0" />
-    <PackageReference Include="Azure.Messaging.EventGrid" Version="4.24.1" />
+    <PackageReference Include="Azure.Messaging.EventGrid" Version="4.26.0" />
     <PackageReference Include="Azure.Messaging.EventHubs" Version="5.11.5" />
     <PackageReference Include="Azure.ResourceManager.EventGrid" Version="1.0.1" />
-    <PackageReference Include="Azure.Storage.Queues" Version="12.19.1" />
-    <PackageReference Include="Azure.Storage.Blobs" Version="12.21.2" />
+    <PackageReference Include="Azure.Storage.Queues" Version="12.20.0" />
+    <PackageReference Include="Azure.Storage.Blobs" Version="12.22.0" />
     <PackageReference Include="Microsoft.Extensions.Configuration.Abstractions" Version="8.0.0" />
     <PackageReference Include="Microsoft.Extensions.Diagnostics.HealthChecks.Abstractions" Version="8.0.8" />
     <PackageReference Include="System.Net.Http" Version="4.3.4" />

diff --git a/...ce.SubscriptionService.UnitTests/UKHO.ExternalNotificationService.Webjob.UnitTests.csproj b/...ce.SubscriptionService.UnitTests/UKHO.ExternalNotificationService.Webjob.UnitTests.csproj
@@ -12,8 +12,8 @@
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
     <PackageReference Include="FakeItEasy" Version="8.3.0" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.10.0" />
-    <PackageReference Include="NUnit" Version="4.1.0" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.11.1" />
+    <PackageReference Include="NUnit" Version="4.2.2" />
     <PackageReference Include="NUnit3TestAdapter" Version="4.6.0">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>

diff --git a/...onService.SubscriptionService/UKHO.ExternalNotificationService.SubscriptionService.csproj b/...onService.SubscriptionService/UKHO.ExternalNotificationService.SubscriptionService.csproj
@@ -9,12 +9,12 @@
     <PackageReference Include="Azure.Extensions.AspNetCore.Configuration.Secrets" Version="1.3.2" />
     <PackageReference Include="Azure.Identity" Version="1.12.0" />
     <PackageReference Include="Azure.Security.KeyVault.Secrets" Version="4.6.0" />
-    <PackageReference Include="Azure.Storage.Queues" Version="12.19.1" />
-    <PackageReference Include="Elastic.Apm" Version="1.28.3" />
-    <PackageReference Include="Elastic.Apm.Azure.Storage" Version="1.28.3" />
+    <PackageReference Include="Azure.Storage.Queues" Version="12.20.0" />
+    <PackageReference Include="Elastic.Apm" Version="1.29.0" />
+    <PackageReference Include="Elastic.Apm.Azure.Storage" Version="1.29.0" />
     <PackageReference Include="Microsoft.ApplicationInsights.AspNetCore" Version="2.22.0" />
     <PackageReference Include="Microsoft.Azure.WebJobs" Version="3.0.41" />
-    <PackageReference Include="Microsoft.Azure.WebJobs.Extensions.Storage" Version="5.3.1" />
+    <PackageReference Include="Microsoft.Azure.WebJobs.Extensions.Storage" Version="5.3.2" />
     <PackageReference Include="Microsoft.Azure.WebJobs.Host.Storage" Version="5.0.1" />
     <PackageReference Include="Microsoft.Azure.WebJobs.Logging.ApplicationInsights" Version="3.0.41" />
     <PackageReference Include="Microsoft.Extensions.Configuration" Version="8.0.0" />

diff --git a/azure-pipelines.yml b/azure-pipelines.yml
@@ -45,7 +45,7 @@ variables:
   - name: UKHOAssemblyCopyright
     value: "Copyright © UK Hydrographic Office"
   - name: Container
-    value: "ukhydrographicoffice/terraform-azure-powershell-unzip:1.7.2"
+    value: "ukhydrographicoffice/terraform-azure-powershell-unzip:1.9.6"
   - name: DeploymentPool
     value: "Mare Nectaris"
   - name: WindowPool