Dev/merge main into develop

DevDeployment/src/Modules/MockWebApp/main.tf

@@ -35,6 +35,10 @@ resource "azurerm_windows_web_app" "mock_webapp_service" {
     type = "SystemAssigned"
   }
 
+  lifecycle {
+    ignore_changes = [ virtual_network_subnet_id ]
+  }
+
   https_only = true
 } 
 
@@ -80,6 +84,10 @@ resource "azurerm_windows_web_app" "pks_mock_webapp_service" {
     type = "SystemAssigned"
   }
 
+  lifecycle {
+    ignore_changes = [ virtual_network_subnet_id ]
+  }
+
   https_only = true
 } 
 

DevDeployment/src/Modules/WebApp/main.tf

@@ -31,6 +31,10 @@ resource "azurerm_windows_web_app" "webapp_service" {
     type = "SystemAssigned"
   }
 
+  lifecycle {
+    ignore_changes = [ virtual_network_subnet_id ]
+  }
+
   https_only = true
 }
 

DevDeployment/src/azure.tf

@@ -2,11 +2,11 @@ terraform {
   required_providers {
     azurerm = {
       source  = "hashicorp/azurerm"
-      version = "=3.1.0"
+      version = "=3.116.0"
     }
   }
 
-  required_version = "=1.1.9"
+  required_version = "=1.9.6"
   backend "azurerm" {
     container_name = "tfstate"
     key            = "posterraform.deployment.tfplan"

DevDeployment/src/main.tf

@@ -84,6 +84,7 @@ module "webapp_service" {
     "ELASTIC_APM_ENVIRONMENT"                                  = local.env_name
     "ELASTIC_APM_SERVICE_NAME"                                 = "POS Web Job"
     "ELASTIC_APM_API_KEY"                                      = var.elastic_apm_api_key
+    "BessStorageConfiguration:ContainerName"                   = var.BessContainerName
   }
   tags                                                         = local.tags
   allowed_ips                                                  = var.allowed_ips

DevDeployment/src/variables.tf

@@ -58,14 +58,18 @@ variable "elastic_apm_server_url" {
 variable "elastic_apm_api_key" {
 }
 
-variable "permitdecryptionhardwareid" {
+variable "agent_2204_subnet" {
   type = string
 }
 
-variable "agent_2204_subnet" {
+variable "agent_prd_subnet" {
   type = string
 }
 
-variable "agent_prd_subnet" {
+variable "permitdecryptionhardwareid" {
+  type = string
+}
+
+variable "BessContainerName" {
   type = string
 }

DevDeployment/templates/continuous-deployment.yml

@@ -28,6 +28,7 @@ steps:
       TF_VAR_agent_2204_subnet: $(agent2204SubnetId)
       TF_VAR_agent_prd_subnet: $(agentprdSubnetId)
       TF_VAR_agent_subscription_id: $(agentSubscriptionId)
+      TF_VAR_BessContainerName: $(BessContainerForWebjob)
 
   - task: FileTransform@2
     displayName: "File Transform: Mock API WebApp"

NVDSuppressions.xml

@@ -453,4 +453,23 @@
    ]]></notes>
    <vulnerabilityName>CVE-2024-30105</vulnerabilityName>
 </suppress>
+<suppress>
+   <notes><![CDATA[
+   file name: Azure.Core.dll
+   ]]></notes>
+   <cve>CVE-2024-43591</cve>
+</suppress>
+<suppress>
+   <notes><![CDATA[
+   file name: Microsoft.Extensions.Caching.Memory:8.0.0
+   ]]></notes>
+   <vulnerabilityName>CVE-2024-43483</vulnerabilityName>
+</suppress>
+<suppress>
+	  <notes><![CDATA[
+	  file name: System.Text.Json:6.0.0
+	  file name: System.Text.Json:8.0.0
+	  ]]></notes>
+	  <vulnerabilityName>CVE-2024-43485</vulnerabilityName>
+</suppress>
 </suppressions>

QALiveDeployment/src/Modules/Storage/main.tf

@@ -35,4 +35,4 @@ resource "azurerm_storage_account" "bess_storage" {
 resource "azurerm_storage_container" "bess_config_container" {
   name                  = var.container_name
   storage_account_name  = azurerm_storage_account.bess_storage.name  
-}
+}

QALiveDeployment/src/Modules/Webapp/main.tf

@@ -31,6 +31,10 @@ resource "azurerm_windows_web_app" "webapp_service" {
     type = "SystemAssigned"
   }
 
+  lifecycle {
+    ignore_changes = [ virtual_network_subnet_id ]
+  }
+
   https_only = true
 } 
 

QALiveDeployment/src/azure.tf

@@ -2,11 +2,11 @@ terraform {
   required_providers {
     azurerm = {
       source  = "hashicorp/azurerm"
-      version = "=3.1.0"
+      version = "=3.116.0"
     }
   }
 
-  required_version = "=1.1.9"
+  required_version = "=1.9.6"
   backend "azurerm" {
     container_name = "tfstate"
     key            = "posterraform.deployment.tfplan"

QALiveDeployment/src/main.tf

@@ -53,6 +53,7 @@ module "webapp_service" {
     "ELASTIC_APM_ENVIRONMENT"                                  = local.env_name
     "ELASTIC_APM_SERVICE_NAME"                                 = "POS Web Job"
     "ELASTIC_APM_API_KEY"                                      = var.elastic_apm_api_key
+    "BessStorageConfiguration:ContainerName"                   = var.BessContainerName
   }
   tags                                                         = local.tags
   allowed_ips                                                  = var.allowed_ips

QALiveDeployment/src/variables.tf

@@ -65,3 +65,7 @@ variable "agent_2204_subnet" {
 variable "agent_prd_subnet" {
   type = string
 }
+
+variable "BessContainerName" {
+  type = string
+}

QALiveDeployment/templates/continuous-deployment.yml

@@ -27,6 +27,7 @@ steps:
       TF_VAR_agent_2204_subnet: $(agent2204SubnetId)
       TF_VAR_agent_prd_subnet: $(agentprdSubnetId)
       TF_VAR_agent_subscription_id: $(agentSubscriptionId)
+      TF_VAR_BessContainerName: $(BessContainerForWebjob)
 
   - task: FileTransform@2
     displayName: "File Transform: POS Config"

UKHO.FmEssFssMock.API/UKHO.FmEssFssMock.API/Data/9F19B71E-2DCA-42FD-B7DD-A68792A2AA27/Permit.txt

@@ -0,0 +1,13 @@
+Key ID,Key,Name,Edition,Created,Issued,Expired,Status
+1,A606B7FD60,AU220150,8,11/07/2023,11/07/2023,,1:Active
+2,A606B7FD60,AU220150,9,11/07/2023,11/07/2023,,2:Next
+3,DE41383A9E,AU5PTL01,1,11/07/2023,11/07/2023,,1:Active
+4,DE41383A9E,AU5PTL01,2,11/07/2023,11/07/2023,,2:Next
+5,E9B56DDDD5,CA570182,3,11/07/2023,11/07/2023,,1:Active
+6,E9B56DDDD5,CA570182,4,11/07/2023,11/07/2023,,2:Next
+7,DE41383A9E,CA570226,3,11/07/2023,11/07/2023,,1:Active
+8,DE41383A9E,CA570226,4,11/07/2023,11/07/2023,,2:Next
+9,7A14379C9F,CN484220,6,11/07/2023,11/07/2023,,1:Active
+10,7A14379C9F,CN484220,7,11/07/2023,11/07/2023,,2:Next
+11,A606B7FD60,GB301910,10,11/07/2023,11/07/2023,,1:Active
+12,A606B7FD60,GB301910,11,11/07/2023,11/07/2023,,2:Next

UKHO.FmEssFssMock.API/UKHO.FmEssFssMock.API/Enums/Batch.cs

@@ -74,6 +74,9 @@ public enum Batch
         EssEmptyBatch = 23,
 
         [Description("d0635e6c-81ae-4acb-9129-1a69f9ee58d2")]
-        BessEmptyBatch = 24
+        BessEmptyBatch = 24,
+
+        [Description("9f19b71e-2dca-42fd-b7dd-a68792a2aa27")]
+        BessNoneReadmeBatch = 25
     }
 }

UKHO.FmEssFssMock.API/UKHO.FmEssFssMock.API/Services/FileShareService.cs

@@ -25,10 +25,12 @@ public class FileShareService
                                             Batch.BessBaseZipBatch,
                                             Batch.BessChangeZipBatch,
                                             Batch.BessUpdateZipBatch,
-                                            Batch.BessEmptyBatch
+                                            Batch.BessEmptyBatch,
+                                            Batch.BessNoneReadmeBatch
                                      };
 
-        private readonly Enum[] aioBatchTypes = {
+        private readonly Enum[] aioBatchTypes = new Enum[]
+                                     {
                                             Batch.AioBaseCDZipIsoSha1Batch,
                                             Batch.AioUpdateZipBatch,
                                             Batch.EssAioBaseZipBatch,
@@ -96,7 +98,7 @@ public BatchDetail GetBatchDetails(string batchId, string homeDirectoryPath)
             }
 
             //BESS - batch attributes from Queue message - start
-
+            Batch batchEnu = EnumHelper.GetValueFromDescription<Batch>(batchId);
             if (bessBatchTypes.Contains(EnumHelper.GetValueFromDescription<Batch>(batchId)))
             {
                 ConfigQueueMessage message = new()

UKHO.FmEssFssMock.API/UKHO.FmEssFssMock.API/UKHO.FmEssFssMock.API.csproj

@@ -84,6 +84,12 @@
     <None Update="Data\5581CA8C-27A8-42EC-86D2-BEF6915C2992\V01X01.zip">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </None>
+    <None Update="Data\9F19B71E-2DCA-42FD-B7DD-A68792A2AA27\BESS_PortOfIndia.zip">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </None>
+    <None Update="Data\9F19B71E-2DCA-42FD-B7DD-A68792A2AA27\Permit.txt">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </None>
     <None Update="Data\A7FB95F0-B3FF-4EF2-9B76-A74C7D3C3C8F\BESConfig.zip">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </None>

UKHO.PeriodicOutputService/UKHO.BESS.API.FunctionalTests/FunctionalTests/BespokeExchangeSetService/DownloadBespokeExchangeSet.cs

@@ -36,6 +36,7 @@ public void Setup()
         [TestCase("s57", "UPDATE", "AVCS", "fa741049-7a78-4ec3-8737-1b3fb8d1cc3f", "KEY_TEXT")]
         [TestCase("s63", "BASE", "BLANK", "a7fb95f0-b3ff-4ef2-9b76-a74c7d3c3c8f", "PERMIT_XML")]
         [TestCase("s63", "CHANGE", "businessUnit eq 'AVCS-BESSets' and filename eq 'README.TXT' and $batch(Content) eq 'Bespoke README'", "5581ca8c-27a8-42ec-86d2-bef6915c2992", "PERMIT_XML")]
+        [TestCase("s57", "UPDATE", "NONE", "9F19B71E-2DCA-42FD-B7DD-A68792A2AA27", "KEY_TEXT")]
         public async Task WhenIUploadAConfigWithCorrectDetails_ThenBespokeExchangeSetShouldBeDownloaded(string exchangeSetStandard, string type, string readMeSearchFilter, string batchId, string keyFileType)
         {
             HttpResponseMessage response = await BessUploadFileHelper.UploadConfigFile(testConfiguration.bessConfig.BaseUrl, testConfiguration.bessConfig.ValidConfigPath, testConfiguration.sharedKeyConfig.Key, exchangeSetStandard, type, readMeSearchFilter, keyFileType);
@@ -46,6 +47,7 @@ public async Task WhenIUploadAConfigWithCorrectDetails_ThenBespokeExchangeSetSho
             expectedResultReadme.Should().Be(true);
             var expectedResultSerial = FssBatchHelper.CheckInfoFolderAndSerialEncInBessExchangeSet(downloadFolderPath, type);
             expectedResultSerial.Should().Be(true);
+            FssBatchHelper.VerifyCatalogContents(downloadFolderPath, readMeSearchFilter);
             HttpResponseMessage expectedResult = await fssEndPointHelper.CheckBatchDetails(batchId);
             await FssBatchHelper.VerifyBessBatchDetails(expectedResult);
             string? batchFolderPath = Path.GetDirectoryName(downloadFolderPath);

UKHO.PeriodicOutputService/UKHO.BESS.API.FunctionalTests/Helpers/FssBatchHelper.cs

@@ -191,11 +191,16 @@ public static bool CheckFilesInDownloadedZip(string? downloadFolderPath, string
         /// This method is used to check the README.TXT
         /// </summary>
         /// <param name="downloadFolderPath">Sets the path of the folder where the required file is downloaded</param>
-        /// <param name="readMeSearchFilter">Sets the value of the Readme File type based on Config out of AVCS, BLANK or {Query}</param>
+        /// <param name="readMeSearchFilter">Sets the value of the Readme File type based on Config out of AVCS, BLANK, NONE or {Query}</param>
         /// <returns></returns>
         public static bool CheckReadMeInBessExchangeSet(string? downloadFolderPath, string? readMeSearchFilter)
         {
-            string[] readMeFileContent = File.ReadAllLines(Path.Combine(downloadFolderPath!, testConfiguration.exchangeSetDetails.ExchangeSetEncRootFolder!, testConfiguration.exchangeSetDetails.ExchangeReadMeFile!));
+            var path = Path.Combine(downloadFolderPath!, testConfiguration.exchangeSetDetails.ExchangeSetEncRootFolder!);
+            if (readMeSearchFilter!.Equals("NONE"))
+            {
+                return !File.Exists(Path.Combine(path, testConfiguration.exchangeSetDetails.ExchangeReadMeFile!));
+            }
+            string[] readMeFileContent = File.ReadAllLines(Path.Combine(path, testConfiguration.exchangeSetDetails.ExchangeReadMeFile!));
             string readMeType;
             switch (readMeSearchFilter)
             {
@@ -413,5 +418,25 @@ public static bool VerifyPermitFile(string? downloadFolderPath, string? keyFileT
             }
             return false;
         }
+
+        /// <summary>
+        /// This method is use to validate the content of CATALOG.031 details
+        /// </summary>
+        /// <param name="downloadFolderPath">Sets the path of the folder where the required file is downloaded</param>
+        /// <param name="readMeSearchFilter">Sets the value of the Readme File type based on Config out of AVCS, BLANK, NONE or {Query}</param>
+        public static void VerifyCatalogContents(string? downloadFolderPath, string? readMeSearchFilter)
+        {
+            var catalogFilePath = Path.Combine(downloadFolderPath!, testConfiguration.exchangeSetDetails.ExchangeSetEncRootFolder!, testConfiguration.exchangeSetDetails.ExchangeSetCatalogueFile!);
+            var catalogFileContent = File.ReadAllText(catalogFilePath);
+            bool containsReadMeFile = catalogFileContent.Contains(testConfiguration.exchangeSetDetails.ExchangeReadMeFile!);
+            if (readMeSearchFilter!.Equals("NONE"))
+            {
+                containsReadMeFile.Should().BeFalse();
+            }
+            else
+            {
+                containsReadMeFile.Should().BeTrue();
+            }
+        }
     }
 }

UKHO.PeriodicOutputService/UKHO.BESS.API.FunctionalTests/appsettings.json

@@ -26,7 +26,7 @@
   "BessStorageConfiguration": {
     "ConnectionString": "",
     "ContainerName": "bess-configs-ft",
-        "TableName": "bessproductversiondetails",
+    "TableName": "bessproductversiondetails",
     "QueueName": "bess-fulfillment"
   },
   "AzureWebJobsStorage": "",