Merge pull request #623 from hmcts/PAY-6576-Flexible-DB

PAY-6576 Flexible DB rename
hmcts · Oct 30, 2023 · 4cb746a · 4cb746a
2 parents bdf2279 + 5e2e2a7
commit 4cb746a
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 10 deletions.
diff --git a/dependency-check-suppressions.xml b/dependency-check-suppressions.xml
@@ -1,20 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <suppressions xmlns="https://jeremylong.github.io/DependencyCheck/dependency-suppression.1.3.xsd">
     <!-- Below are the supressions added fpr False Positive CVEs -->
-    <suppress until="2023-10-30">
+    <suppress until="2023-11-30">
         <notes>
            Jackson core needs major version latest 2.12.7  not resolving current CVE issue. Same applies to json-path version 2.4.0.
             Same applies to json-smart version 2.4.10
         </notes>
         <cve>CVE-2022-45688</cve>
     </suppress>
-    <suppress until="2023-10-30">
+    <suppress until="2023-11-30">
         <notes>
             Liquibase core needs major version latest of liquibase-core. Version 4.2.2 not resolving current CVE issue
         </notes>
         <cve>CVE-2022-0839</cve>
     </suppress>
-    <suppress until="2023-10-30">
+    <suppress until="2023-11-30">
         <notes>
             This applies to spring-security-config-5.4.10, spring-security-crypto-5.4.10 and spring-security-web-5.4.10.
             Upgrade past current version required
@@ -24,40 +24,40 @@
         <cve>CVE-2023-20861</cve>
         <cve>CVE-2023-20862</cve>
     </suppress>
-    <suppress until="2023-10-30">
+    <suppress until="2023-11-30">
         <notes>
             Loggback-core version 1.2.11 has interface change and breaks code.
         </notes>
         <cve>CVE-2021-42550</cve>
     </suppress>
-    <suppress until="2023-10-30">
+    <suppress until="2023-11-30">
         <notes>
             SnakeYaml's Constructor() class does not restrict types which can be instantiated during deserialization.
         </notes>
         <cve>CVE-2022-1471</cve>
     </suppress>
-    <suppress until="2023-10-30">
+    <suppress until="2023-11-30">
         <notes>
             Jackson-databind version 2.12.7.1 in combination with postgres has interface changes in DBUtils that cause unit tests to fail.
         </notes>
         <cve>CVE-2020-36518</cve>
         <cve>CVE-2022-42003</cve>
         <cve>CVE-2022-42004</cve>
     </suppress>
-    <suppress until="2023-10-30">
+    <suppress until="2023-11-30">
         <notes>
             Postgres version 42.4.3 in combination with jackson-databind has interface changes in DBUtils that cause unit tests to fail.
         </notes>
         <cve>CVE-2022-31197</cve>
         <cve>CVE-2022-41946</cve>
     </suppress>
-    <suppress until="2023-10-30">
+    <suppress until="2023-11-30">
         <notes>
             Upgrading tomcat causes unhealthy pipeline error.
         </notes>
         <cve>CVE-2023-28708</cve>
     </suppress>
-    <suppress until="2023-10-30">
+    <suppress until="2023-11-30">
         <notes>
             spring-webmvc version 5.3.26 casues issues that fail unit test cases due it not being able to create test environment correctly.
         </notes>

diff --git a/infrastructure/main.tf b/infrastructure/main.tf
@@ -37,7 +37,7 @@ module "bar-database-v15" {
   product = var.product
   component = var.component
   business_area = "cft"
-  name = "${var.product}-${var.component}-postgres-db-v15"
+  name = join("-", [var.product, "postgres-db-v15"])
   location = var.location
   env = var.env
   pgsql_admin_username = var.postgresql_user