From 3a015ba8a020dd05f1d731760fcf2f63df2171aa Mon Sep 17 00:00:00 2001
From: rushdynajath <rushdy.najath@ukho.gov.uk>
Date: Mon, 18 Nov 2024 16:12:06 +0000
Subject: [PATCH] Prod pipeline 12 11 (#256)

* move the private end point to mould folder

* move private end point to folder level

* update the rg name to local variable

* update the env

* clean up

* clean up

* Create import.tf

* new kv for live as the name was taken already

* add NVD Suppressions

* update nvd
---
 Deployment/locals.tf |  2 +-
 NVDSuppressions.xml  | 52 ++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 53 insertions(+), 1 deletion(-)

diff --git a/Deployment/locals.tf b/Deployment/locals.tf
index 8d3d2dd0..026e4536 100644
--- a/Deployment/locals.tf
+++ b/Deployment/locals.tf
@@ -3,7 +3,7 @@ locals {
   service_name       = "erpfacade"  
   web_app_name       = "${local.service_name}-${local.env_name}-api"
   mock_web_app_name  = "${local.service_name}-${local.env_name}-sapmockservice"
-  key_vault_name     = "${local.service_name}-ukho-${local.env_name}-kv"
+  key_vault_name     = local.env_name == "live" ? "${local.service_name}-ukho-prd-kv":  "${local.service_name}-ukho-${local.env_name}-kv"
   storage_name       = "${local.service_name}${local.env_name}storage"
   container_name     = "erp-container"
   pe_identity = "erp${local.env_name}2sap"
diff --git a/NVDSuppressions.xml b/NVDSuppressions.xml
index 9b7696a1..1e10175f 100644
--- a/NVDSuppressions.xml
+++ b/NVDSuppressions.xml
@@ -930,5 +930,57 @@
     <packageUrl regex="true">^pkg:nuget/System\.Text\.Json@.*$</packageUrl>
     <vulnerabilityName>CVE-2024-43485</vulnerabilityName>
   </suppress>
+<suppress>
+   <notes><![CDATA[
+   file name: System.CodeDom:6.0.0
+   ]]></notes>
+   <packageUrl regex="true">^pkg:nuget/System\.CodeDom@.*$</packageUrl>
+   <cve>CVE-2006-4732</cve>
+   <cve>CVE-2007-0065</cve>
+   <cve>CVE-2007-2224</cve>
+   <cve>CVE-2007-2884</cve>
+   <cve>CVE-2007-4776</cve>
+   <cve>CVE-2008-0392</cve>
+   <cve>CVE-2008-3704</cve>
+   <cve>CVE-2012-0158</cve>
+   <cve>CVE-2012-1856</cve>
+   <cve>CVE-2001-0153</cve>
+</suppress>
+<suppress>
+   <notes><![CDATA[
+   file name: Azure.Identity:1.10.3
+   ]]></notes>
+   <packageUrl regex="true">^pkg:nuget/Azure\.Identity@.*$</packageUrl>
+   <vulnerabilityName>CVE-2024-29992</vulnerabilityName>
+</suppress>
+
+<suppress>
+   <notes><![CDATA[
+   file name: Microsoft.Azure.WebJobs:3.0.37
+   ]]></notes>
+   <packageUrl regex="true">^pkg:nuget/Microsoft\.Azure\.WebJobs@.*$</packageUrl>
+   <cve>CVE-2022-29149</cve>
+</suppress>
+<suppress>
+   <notes><![CDATA[
+   file name: Microsoft.Extensions.Hosting.dll
+   ]]></notes>
+   <packageUrl regex="true">^pkg:generic/Microsoft\.Extensions\.Hosting@.*$</packageUrl>
+   <cve>CVE-2020-1147</cve>
+</suppress>
+<suppress>
+   <notes><![CDATA[
+   file name: Newtonsoft.Json.dll
+   ]]></notes>
+   <packageUrl regex="true">^pkg:generic/Newtonsoft\.Json@.*$</packageUrl>
+   <cve>CVE-2024-21907</cve>
+</suppress>
+<suppress>
+   <notes><![CDATA[
+   file name: Newtonsoft.Json.dll
+   ]]></notes>
+   <packageUrl regex="true">^pkg:generic/Newtonsoft\.Json@.*$</packageUrl>
+   <cve>CVE-2024-21907</cve>
+</suppress>
  
 </suppressions>