Perform release

.github/workflows/dotnet.yml

@@ -17,7 +17,7 @@ jobs:
     - name: Setup .NET
       uses: actions/setup-dotnet@v3
       with:
-        dotnet-version: 7.0.x
+        dotnet-version: 8.0.x
     - name: Restore dependencies
       run: dotnet restore
     - name: Build

.github/workflows/load-testing.yml

@@ -35,6 +35,7 @@ jobs:
       TF_VAR_cpd_gf_password: ${{secrets.TF_CPD_GF_PASSWORD}}
       TF_VAR_cpd_gf_plugins: ${{secrets.TF_VAR_CPD_GF_PLUGINS}}
       TF_VAR_cpd_gf_image_tag: ${{vars.TF_VAR_CPD_GF_IMAGE_TAG}}
+      TF_VAR_whitelist_ips: ${{vars.TF_VAR_WHITELIST_IPS}}
       TF_VAR_vcs_tag: ${{github.event.release.tag_name}}
       TF_WORKSPACE: Load-Test
       SITE_URL: https://20.107.65.156/

.github/workflows/terraform-destroy.yml

@@ -46,6 +46,7 @@ jobs:
       TF_VAR_cpd_gf_password: ${{secrets.TF_CPD_GF_PASSWORD}}
       TF_VAR_cpd_gf_plugins: ${{secrets.TF_VAR_CPD_GF_PLUGINS}}
       TF_VAR_cpd_gf_image_tag: ${{vars.TF_VAR_CPD_GF_IMAGE_TAG}}
+      TF_VAR_whitelist_ips: ${{vars.TF_VAR_WHITELIST_IPS}}
       TF_VAR_vcs_tag: ${{github.event.release.tag_name}}
       TF_WORKSPACE: ${{inputs.workspace}}
 

.github/workflows/terraform-plan.yml

@@ -49,6 +49,7 @@ jobs:
       TF_VAR_cpd_gf_password: ${{secrets.TF_CPD_GF_PASSWORD}}
       TF_VAR_cpd_gf_plugins: ${{secrets.TF_VAR_CPD_GF_PLUGINS}}
       TF_VAR_cpd_gf_image_tag: ${{vars.TF_VAR_CPD_GF_IMAGE_TAG}}
+      TF_VAR_whitelist_ips: ${{vars.TF_VAR_WHITELIST_IPS}}
       TF_VAR_vcs_tag: ${{github.event.release.tag_name}}
       TF_WORKSPACE: ${{inputs.workspace}}
 

.github/workflows/terraform.yml

@@ -49,6 +49,7 @@ jobs:
       TF_VAR_cpd_gf_password: ${{secrets.TF_CPD_GF_PASSWORD}}
       TF_VAR_cpd_gf_plugins: ${{secrets.TF_VAR_CPD_GF_PLUGINS}}
       TF_VAR_cpd_gf_image_tag: ${{vars.TF_VAR_CPD_GF_IMAGE_TAG}}
+      TF_VAR_whitelist_ips: ${{vars.TF_VAR_WHITELIST_IPS}}
       TF_VAR_vcs_tag: ${{github.event.release.tag_name}}
       TF_WORKSPACE: ${{inputs.workspace}}
 

Childrens-Social-Care-CPD-Tests/AntiforgeryTokenController.cs

@@ -42,15 +42,8 @@ public sealed class AntiforgeryTokenController : Controller
     [Route(GetUrl)]
     public IActionResult GetAntiforgeryTokens([FromServices] IAntiforgery antiforgery, [FromServices] IOptions<AntiforgeryOptions> options)
     {
-        if (antiforgery == null)
-        {
-            throw new ArgumentNullException(nameof(antiforgery));
-        }
-
-        if (options == null)
-        {
-            throw new ArgumentNullException(nameof(options));
-        }
+        ArgumentNullException.ThrowIfNull(antiforgery);
+        ArgumentNullException.ThrowIfNull(options);
 
         AntiforgeryTokenSet tokens = antiforgery.GetTokens(HttpContext);
 

Childrens-Social-Care-CPD-Tests/Childrens-Social-Care-CPD-Tests.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
 
   <PropertyGroup>
-    <TargetFramework>net7.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <RootNamespace>Childrens_Social_Care_CPD_Tests</RootNamespace>
     <Nullable>disable</Nullable>
     <IsPackable>false</IsPackable>

Childrens-Social-Care-CPD-Tests/Configuration/ApplicationConfigurationTests.cs

@@ -1,5 +1,6 @@
 using Childrens_Social_Care_CPD.Configuration;
 using Microsoft.Extensions.Configuration;
+using NSubstitute.Extensions;
 using System;
 using System.Collections.Generic;
 
@@ -15,6 +16,7 @@ public class ApplicationConfigurationTests
     public void Setup()
     {
         _configuration = Substitute.For<IConfiguration>();
+        _configuration.ReturnsForAll((string)null);
         _sut = new ApplicationConfiguration(_configuration);
     }
 
@@ -26,7 +28,7 @@ public void Returns_ContentfulGraphqlConnectionString_Value()
         _configuration["CPD_CONTENTFUL_ENVIRONMENT"].Returns("foo");
 
         // act
-        var actual = _sut.ContentfulGraphqlConnectionString.Value;
+        var actual = _sut.ContentfulGraphqlConnectionString;
 
         // assert
         actual.Should().Be($"https://graphql.contentful.com/content/v1/spaces/foo/environments/foo");
@@ -39,7 +41,7 @@ public void Returns_ContentfulPreviewHost_Value()
         var value = "preview.contentful.com";
 
         // act
-        var actual = _sut.ContentfulPreviewHost.Value;
+        var actual = _sut.ContentfulPreviewHost;
 
         // assert
         actual.Should().Be(value);
@@ -50,7 +52,11 @@ public void Returns_ContentfulPreviewHost_Value()
         get
         {
             // Set values
+            yield return ("CPD_AZURE_DATA_PROTECTION_CONTAINER_NAME", (ApplicationConfiguration sut) => sut.AzureDataProtectionContainerName, "foo", "foo");
             yield return ("CPD_AZURE_ENVIRONMENT", (ApplicationConfiguration sut) => sut.AzureEnvironment, "foo", "foo");
+            yield return ("CPD_AZURE_MANAGED_IDENTITY_ID", (ApplicationConfiguration sut) => sut.AzureManagedIdentityId, "foo", "foo");
+            yield return ("CPD_AZURE_STORAGE_ACCOUNT", (ApplicationConfiguration sut) => sut.AzureStorageAccount, "foo", "foo");
+            yield return ("CPD_AZURE_STORAGE_ACCOUNT_URI_FORMAT_STRING", (ApplicationConfiguration sut) => sut.AzureStorageAccountUriFormatString, "foo", "foo");
             yield return ("CPD_CLARITY", (ApplicationConfiguration sut) => sut.ClarityProjectId, "foo", "foo");
             yield return ("CPD_DELIVERY_KEY", (ApplicationConfiguration sut) => sut.ContentfulDeliveryApiKey, "foo", "foo");
             yield return ("CPD_CONTENTFUL_ENVIRONMENT", (ApplicationConfiguration sut) => sut.ContentfulEnvironment, "foo", "foo");
@@ -65,22 +71,27 @@ public void Returns_ContentfulPreviewHost_Value()
             yield return ("CPD_SEARCH_CLIENT_API_KEY", (ApplicationConfiguration sut) => sut.SearchApiKey, "foo", "foo");
             yield return ("CPD_SEARCH_ENDPOINT", (ApplicationConfiguration sut) => sut.SearchEndpoint, "foo", "foo");
             yield return ("CPD_SEARCH_INDEX_NAME", (ApplicationConfiguration sut) => sut.SearchIndexName, "foo", "foo");
+
             // Default values
-            yield return ("CPD_AZURE_ENVIRONMENT", (ApplicationConfiguration sut) => sut.AzureEnvironment, null, "");
-            yield return ("CPD_CLARITY", (ApplicationConfiguration sut) => sut.ClarityProjectId, null, "");
-            yield return ("CPD_DELIVERY_KEY", (ApplicationConfiguration sut) => sut.ContentfulDeliveryApiKey, null, "");
-            yield return ("CPD_CONTENTFUL_ENVIRONMENT", (ApplicationConfiguration sut) => sut.ContentfulEnvironment, null, "");
-            yield return ("CPD_PREVIEW_KEY", (ApplicationConfiguration sut) => sut.ContentfulPreviewId, null, "");
-            yield return ("CPD_SPACE_ID", (ApplicationConfiguration sut) => sut.ContentfulSpaceId, null, "");
-            yield return ("CPD_GOOGLEANALYTICSTAG", (ApplicationConfiguration sut) => sut.GoogleTagManagerKey, null, "");
-            yield return ("CPD_INSTRUMENTATION_CONNECTIONSTRING", (ApplicationConfiguration sut) => sut.AppInsightsConnectionString, null, "");
-            yield return ("VCS-REF", (ApplicationConfiguration sut) => sut.GitHash, null, "");
-            yield return ("VCS-TAG", (ApplicationConfiguration sut) => sut.AppVersion, null, "");
+            yield return ("CPD_AZURE_DATA_PROTECTION_CONTAINER_NAME", (ApplicationConfiguration sut) => sut.AzureDataProtectionContainerName, null, null);
+            yield return ("CPD_AZURE_ENVIRONMENT", (ApplicationConfiguration sut) => sut.AzureEnvironment, null, null);
+            yield return ("CPD_AZURE_MANAGED_IDENTITY_ID", (ApplicationConfiguration sut) => sut.AzureManagedIdentityId, null, null);
+            yield return ("CPD_AZURE_STORAGE_ACCOUNT", (ApplicationConfiguration sut) => sut.AzureStorageAccount, null, null);
+            yield return ("CPD_AZURE_STORAGE_ACCOUNT_URI_FORMAT_STRING", (ApplicationConfiguration sut) => sut.AzureStorageAccountUriFormatString, null, null);
+            yield return ("CPD_CLARITY", (ApplicationConfiguration sut) => sut.ClarityProjectId, null, null);
+            yield return ("CPD_DELIVERY_KEY", (ApplicationConfiguration sut) => sut.ContentfulDeliveryApiKey, null, null);
+            yield return ("CPD_CONTENTFUL_ENVIRONMENT", (ApplicationConfiguration sut) => sut.ContentfulEnvironment, null, null);
+            yield return ("CPD_PREVIEW_KEY", (ApplicationConfiguration sut) => sut.ContentfulPreviewId, null, null);
+            yield return ("CPD_SPACE_ID", (ApplicationConfiguration sut) => sut.ContentfulSpaceId, null, null);
+            yield return ("CPD_GOOGLEANALYTICSTAG", (ApplicationConfiguration sut) => sut.GoogleTagManagerKey, null, null);
+            yield return ("CPD_INSTRUMENTATION_CONNECTIONSTRING", (ApplicationConfiguration sut) => sut.AppInsightsConnectionString, null, null);
+            yield return ("VCS-REF", (ApplicationConfiguration sut) => sut.GitHash, null, null);
+            yield return ("VCS-TAG", (ApplicationConfiguration sut) => sut.AppVersion, null, null);
             yield return ("CPD_DISABLE_SECURE_COOKIES", (ApplicationConfiguration sut) => sut.DisableSecureCookies, null, false);
             yield return ("CPD_FEATURE_POLLING_INTERVAL", (ApplicationConfiguration sut) => sut.FeaturePollingInterval, null, 0);
-            yield return ("CPD_SEARCH_CLIENT_API_KEY", (ApplicationConfiguration sut) => sut.SearchApiKey, null, "");
-            yield return ("CPD_SEARCH_ENDPOINT", (ApplicationConfiguration sut) => sut.SearchEndpoint, null, "");
-            yield return ("CPD_SEARCH_INDEX_NAME", (ApplicationConfiguration sut) => sut.SearchIndexName, null, "");
+            yield return ("CPD_SEARCH_CLIENT_API_KEY", (ApplicationConfiguration sut) => sut.SearchApiKey, null, null);
+            yield return ("CPD_SEARCH_ENDPOINT", (ApplicationConfiguration sut) => sut.SearchEndpoint, null, null);
+            yield return ("CPD_SEARCH_INDEX_NAME", (ApplicationConfiguration sut) => sut.SearchIndexName, null, null);
         }
     }
 
@@ -89,11 +100,9 @@ public void Returns_AzureEnvironment_Value((string key, Func<ApplicationConfigur
     {
         // arrange
         _configuration[values.key].Returns(values.value);
-        var targetValue = values.property(_sut);
-        var valueProperty = targetValue.GetType().GetProperty("Value");
 
         // act
-        var actual = valueProperty.GetValue(targetValue);
+        var actual = values.property(_sut);
 
         // assert
         actual.Should().Be(values.expected);

Childrens-Social-Care-CPD-Tests/Configuration/ConfigurationInformationTests.cs

@@ -1,8 +1,5 @@
-using NUnit.Framework;
-using Childrens_Social_Care_CPD.Configuration;
-using FluentAssertions;
+using Childrens_Social_Care_CPD.Configuration;
 using System.Linq;
-using NSubstitute;
 
 namespace Childrens_Social_Care_CPD_Tests.Configuration;
 
@@ -14,14 +11,14 @@ public partial class ConfigurationInformationTests
     public void Setup()
     {
         _applicationConfiguration = Substitute.For<IApplicationConfiguration>();
-        _applicationConfiguration.AzureEnvironment.Value.Returns(ApplicationEnvironment.Development);
+        _applicationConfiguration.AzureEnvironment.Returns(ApplicationEnvironment.Development);
     }
 
     [Test]
     public void Required_Values_Are_Detected()
     {
         // arrange
-        _applicationConfiguration.AppVersion.Returns(new StringConfigSetting(() => "foo"));
+        _applicationConfiguration.AppVersion.Returns("foo");
 
         // act
         var sut = new ConfigurationInformation(_applicationConfiguration);
@@ -38,7 +35,7 @@ public void Required_Values_Are_Detected()
     public void Missing_Values_Are_Detected(string value)
     {
         // arrange
-        _applicationConfiguration.AppVersion.Returns(new StringConfigSetting(() => value));
+        _applicationConfiguration.AppVersion.Returns(value);
 
         // act
         var sut = new ConfigurationInformation(_applicationConfiguration);
@@ -53,7 +50,7 @@ public void Missing_Values_Are_Detected(string value)
     public void Extraneous_Values_Are_Detected()
     {
         // arrange
-        _applicationConfiguration.ClarityProjectId.Returns(new StringConfigSetting(() => "foo"));
+        _applicationConfiguration.ClarityProjectId.Returns("foo");
 
         // act
         var sut = new ConfigurationInformation(_applicationConfiguration);
@@ -80,8 +77,8 @@ public void Sensitive_Values_Are_Obfuscated()
     {
         // arrange
         var value = "sensitive value";
-        _applicationConfiguration.AzureEnvironment.Returns(new StringConfigSetting(() => ApplicationEnvironment.Production));
-        _applicationConfiguration.AppInsightsConnectionString.Returns(new StringConfigSetting(() => value));
+        _applicationConfiguration.AzureEnvironment.Returns(ApplicationEnvironment.Production);
+        _applicationConfiguration.AppInsightsConnectionString.Returns(value);
 
         // act
         var sut = new ConfigurationInformation(_applicationConfiguration);

Childrens-Social-Care-CPD-Tests/Configuration/FeaturesConfigBackgroundServiceTests.cs → Childrens-Social-Care-CPD-Tests/Configuration/Features/FeaturesConfigBackgroundServiceTests.cs

@@ -1,10 +1,9 @@
 using Childrens_Social_Care_CPD.Configuration;
+using Childrens_Social_Care_CPD.Configuration.Features;
 using Microsoft.Extensions.Logging;
-using NSubstitute;
-using NUnit.Framework;
 using System.Threading;
 using System.Threading.Tasks;
-namespace Childrens_Social_Care_CPD_Tests.Configuration;
+namespace Childrens_Social_Care_CPD_Tests.Configuration.Features;
 
 public class FeaturesConfigBackgroundServiceTests
 {
@@ -26,7 +25,7 @@ public void Setup()
     public async Task Calls_Updater_At_Specified_Interval(int interval)
     {
         // arrange
-        _applicationConfiguration.FeaturePollingInterval.Value.Returns(interval);
+        _applicationConfiguration.FeaturePollingInterval.Returns(interval);
         var featuresConfigBackgroundService = new FeaturesConfigBackgroundService(
             _logger,
             _applicationConfiguration,
@@ -50,7 +49,7 @@ public async Task Calls_Updater_At_Specified_Interval(int interval)
     public async Task Returns_If_Interval_Is_Zero()
     {
         // arrange
-        _applicationConfiguration.FeaturePollingInterval.Value.Returns(0);
+        _applicationConfiguration.FeaturePollingInterval.Returns(0);
         var featuresConfigBackgroundService = new FeaturesConfigBackgroundService(
             _logger,
             _applicationConfiguration,

Childrens-Social-Care-CPD-Tests/Configuration/FeaturesConfigTests.cs → Childrens-Social-Care-CPD-Tests/Configuration/Features/FeaturesConfigTests.cs

@@ -1,6 +1,4 @@
-using Childrens_Social_Care_CPD.Configuration;
-using FluentAssertions;
-using NUnit.Framework;
+using Childrens_Social_Care_CPD.Configuration.Features;
 
 namespace Childrens_Social_Care_CPD_Tests.Configuration;
 

Childrens-Social-Care-CPD-Tests/Configuration/FeaturesConfigUpdaterTests.cs → Childrens-Social-Care-CPD-Tests/Configuration/Features/FeaturesConfigUpdaterTests.cs

@@ -10,6 +10,7 @@
 using System.Threading.Tasks;
 using System.Threading;
 using NSubstitute.ExceptionExtensions;
+using Childrens_Social_Care_CPD.Configuration.Features;
 
 namespace Childrens_Social_Care_CPD_Tests.Configuration;
 

Childrens-Social-Care-CPD-Tests/ConfigurationHealthCheckTests.cs

@@ -22,7 +22,7 @@ public async Task Passes_When_All_Values_Set_And_Cookies_Are_Secured()
     {
         // arrange
         _applicationConfiguration.SetAllValid();
-        _applicationConfiguration._featurePollingInterval = "0";
+        _applicationConfiguration._featurePollingInterval = 0;
         var sut = new ConfigurationHealthCheck(_logger, _applicationConfiguration);
 
         // act
@@ -37,7 +37,7 @@ public async Task Fails_When_Disable_Cookies_Is_True()
     {
         // arrange
         _applicationConfiguration.SetAllValid();
-        _applicationConfiguration._disableSecureCookies = "true";
+        _applicationConfiguration._disableSecureCookies = true;
         var sut = new ConfigurationHealthCheck(_logger, _applicationConfiguration);
 
         // act