Merge pull request #627 from hmcts/HMIS-1094-add-cert

HMIS-1094 - Add Crime Cert
hmcts · Sep 20, 2022 · 621f881 · 621f881
2 parents 3870ba4 + 9a852f2
commit 621f881
Show file tree

Hide file tree

Showing 10 changed files with 42 additions and 15 deletions.
diff --git a/infrastructure/template/api-op-crime-health-policy.xml b/infrastructure/template/api-op-crime-health-policy.xml
@@ -2,7 +2,7 @@
     <inbound>
         <base />
         <rewrite-uri template="/knock-knock" copy-unmatched-params="true" />
-        <authentication-certificate certificate-id="hmicrimecert" />
+        <authentication-certificate certificate-id="crimecert" />
         <set-header name="Authorization" exists-action="delete" />
         <set-backend-service base-url="https://#{crimeHost}#/cppi/v3/" />
     </inbound>

diff --git a/infrastructure/template/api-op-update-hearing-policy.xml b/infrastructure/template/api-op-update-hearing-policy.xml
@@ -111,7 +111,7 @@
 			</when>
 			<when condition="@(context.Request.Headers.GetValueOrDefault("Destination-System","") == "CRIME")">
 				<rewrite-uri template="/sandl-in/hearings/{hearing-id}" copy-unmatched-params="true" />
-				<authentication-certificate certificate-id="hmicrimecert" />
+				<authentication-certificate certificate-id="crimecert" />
 				<set-header name="Authorization" exists-action="delete" />
 				<set-backend-service base-url="https://#{crimeHost}#/" />
 			</when>

diff --git a/infrastructure/terraform/certificates/crime-nonprod.pfx b/infrastructure/terraform/certificates/crime-nonprod.pfx
diff --git a/infrastructure/terraform/certificates/fullchain-nopass.pfx b/infrastructure/terraform/certificates/fullchain-nopass.pfx
diff --git a/infrastructure/terraform/certificates/hmicrimecert.pfx b/infrastructure/terraform/certificates/hmicrimecert.pfx
diff --git a/infrastructure/terraform/environment/dev-hmi.tfvars b/infrastructure/terraform/environment/dev-hmi.tfvars
@@ -9,4 +9,12 @@ open_api_health_spec_content_value = "https://raw.githubusercontent.com/hmcts/re
 revision                           = "47"
 service_url                        = ""
 enable_mock_header_string          = "<set-header name=\"_EnableMocks\" exists-action=\"override\"><value>true</value></set-header>"
-virtual_network_type               = "Internal"
+virtual_network_type               = "Internal"
+
+custom_certificates = {
+  "crime" = {
+    id                   = "crimecert"
+    certificate_filename = "crime-nonprod.pfx"
+    certificate_password = "#{cert_crime_nonprod_password}#"
+  }
+}
diff --git a/infrastructure/terraform/environment/ithc-hmi.tfvars b/infrastructure/terraform/environment/ithc-hmi.tfvars
@@ -12,14 +12,9 @@ enable_mock_header_string          = "<set-header name=\"_EnableMocks\" exists-a
 virtual_network_type               = "Internal"
 
 custom_certificates = {
-  /*   "crime" = {
-    id                   = "hmicrimecert"
-    certificate_filename = "hmicrimecert.pfx"
-    certificate_password = "#{hmicrimecert_password}#"
-  }, */
-  "crimetest" = {
-    id                   = "hmicrimecert"
-    certificate_filename = "fullchain-nopass.pfx"
-    certificate_password = ""
+  "crime" = {
+    id                   = "crimecert"
+    certificate_filename = "crime-nonprod.pfx"
+    certificate_password = "#{cert_crime_nonprod_password}#"
   }
 }
diff --git a/infrastructure/terraform/environment/sbox-hmi.tfvars b/infrastructure/terraform/environment/sbox-hmi.tfvars
@@ -9,4 +9,12 @@ open_api_health_spec_content_value = "https://raw.githubusercontent.com/hmcts/re
 revision                           = "47"
 service_url                        = ""
 enable_mock_header_string          = "<set-header name=\"_EnableMocks\" exists-action=\"override\"><value>true</value></set-header>"
-virtual_network_type               = "Internal"
+virtual_network_type               = "Internal"
+
+custom_certificates = {
+  "crime" = {
+    id                   = "crimecert"
+    certificate_filename = "crime-nonprod.pfx"
+    certificate_password = "#{cert_crime_nonprod_password}#"
+  }
+}
diff --git a/infrastructure/terraform/environment/stg-hmi.tfvars b/infrastructure/terraform/environment/stg-hmi.tfvars
@@ -9,4 +9,12 @@ open_api_health_spec_content_value = "https://raw.githubusercontent.com/hmcts/re
 revision                           = "47"
 service_url                        = ""
 enable_mock_header_string          = "<set-header name=\"_EnableMocks\" exists-action=\"override\"><value>true</value></set-header>"
-virtual_network_type               = "Internal"
+virtual_network_type               = "Internal"
+
+custom_certificates = {
+  "crime" = {
+    id                   = "crimecert"
+    certificate_filename = "crime-nonprod.pfx"
+    certificate_password = "#{cert_crime_nonprod_password}#"
+  }
+}
diff --git a/infrastructure/terraform/environment/test-hmi.tfvars b/infrastructure/terraform/environment/test-hmi.tfvars
@@ -9,4 +9,12 @@ open_api_health_spec_content_value = "https://raw.githubusercontent.com/hmcts/re
 revision                           = "47"
 service_url                        = ""
 enable_mock_header_string          = "<set-header name=\"_EnableMocks\" exists-action=\"override\"><value>true</value></set-header>"
-virtual_network_type               = "Internal"
+virtual_network_type               = "Internal"
+
+custom_certificates = {
+  "crime" = {
+    id                   = "crimecert"
+    certificate_filename = "crime-nonprod.pfx"
+    certificate_password = "#{cert_crime_nonprod_password}#"
+  }
+}