PI-1822 Remove DeliusConnectionProvider (#3062)

* PI-1822 Remove DeliusConnectionProvider This appears to have stopped working recently, so I've re-enabled setting the client id via a logon trigger instead: ministryofjustice/hmpps-delius-pipelines#783 * Remove app insights filter
ministryofjustice · Jan 22, 2024 · fd268b3 · fd268b3
1 parent e1bde40
commit fd268b3
Show file tree

Hide file tree

Showing 46 changed files with 10 additions and 587 deletions.
diff --git a/...dit/src/main/kotlin/uk/gov/justice/digital/hmpps/audit/config/ConnectionProviderConfig.kt b/...dit/src/main/kotlin/uk/gov/justice/digital/hmpps/audit/config/ConnectionProviderConfig.kt
diff --git a/libs/audit/src/main/kotlin/uk/gov/justice/digital/hmpps/audit/service/OptimisationTables.kt b/libs/audit/src/main/kotlin/uk/gov/justice/digital/hmpps/audit/service/OptimisationTables.kt
@@ -1,11 +1,13 @@
 package uk.gov.justice.digital.hmpps.audit.service
 
+import org.springframework.context.annotation.Condition
+import org.springframework.context.annotation.ConditionContext
 import org.springframework.context.annotation.Conditional
+import org.springframework.core.type.AnnotatedTypeMetadata
 import org.springframework.jdbc.core.JdbcTemplate
 import org.springframework.stereotype.Service
 import org.springframework.transaction.support.TransactionSynchronization
 import org.springframework.transaction.support.TransactionSynchronizationManager
-import uk.gov.justice.digital.hmpps.audit.config.OracleCondition
 
 @Service
 class OptimisationTables(private val optimisationTablesRebuild: OptimisationTablesRebuild?) {
@@ -25,3 +27,10 @@ class OptimisationTablesRebuild(private val jdbcTemplate: JdbcTemplate) {
         })
     }
 }
+
+class OracleCondition : Condition {
+    override fun matches(context: ConditionContext, metadata: AnnotatedTypeMetadata): Boolean {
+        val url = context.environment.getProperty("spring.datasource.url")
+        return url?.startsWith("jdbc:oracle") ?: false && !context.environment.acceptsProfiles { it.test("oracle") }
+    }
+}
diff --git a/...audit/src/main/kotlin/uk/gov/justice/digital/hmpps/datasource/DeliusConnectionProvider.kt b/...audit/src/main/kotlin/uk/gov/justice/digital/hmpps/datasource/DeliusConnectionProvider.kt
diff --git a/...t/src/test/kotlin/uk/gov/justice/digital/hmpps/datasource/DeliusConnectionProviderTest.kt b/...t/src/test/kotlin/uk/gov/justice/digital/hmpps/datasource/DeliusConnectionProviderTest.kt
diff --git a/projects/accredited-programmes-and-oasys/applicationinsights.json b/projects/accredited-programmes-and-oasys/applicationinsights.json
@@ -34,17 +34,6 @@
           ],
           "percentage": 0
         },
-        {
-          "telemetryType": "dependency",
-          "attributes": [
-            {
-              "key": "db.statement",
-              "value": ".*CLIENT_IDENTIFIER.*",
-              "matchType": "regexp"
-            }
-          ],
-          "percentage": 0
-        },
         {
           "telemetryType": "dependency",
           "attributes": [

diff --git a/projects/approved-premises-and-delius/applicationinsights.json b/projects/approved-premises-and-delius/applicationinsights.json
@@ -34,17 +34,6 @@
           ],
           "percentage": 0
         },
-        {
-          "telemetryType": "dependency",
-          "attributes": [
-            {
-              "key": "db.statement",
-              "value": ".*CLIENT_IDENTIFIER.*",
-              "matchType": "regexp"
-            }
-          ],
-          "percentage": 0
-        },
         {
           "telemetryType": "dependency",
           "attributes": [

diff --git a/projects/approved-premises-and-oasys/applicationinsights.json b/projects/approved-premises-and-oasys/applicationinsights.json
@@ -34,17 +34,6 @@
           ],
           "percentage": 0
         },
-        {
-          "telemetryType": "dependency",
-          "attributes": [
-            {
-              "key": "db.statement",
-              "value": ".*CLIENT_IDENTIFIER.*",
-              "matchType": "regexp"
-            }
-          ],
-          "percentage": 0
-        },
         {
           "telemetryType": "dependency",
           "attributes": [

diff --git a/projects/arns-and-delius/applicationinsights.json b/projects/arns-and-delius/applicationinsights.json
@@ -34,17 +34,6 @@
           ],
           "percentage": 0
         },
-        {
-          "telemetryType": "dependency",
-          "attributes": [
-            {
-              "key": "db.statement",
-              "value": ".*CLIENT_IDENTIFIER.*",
-              "matchType": "regexp"
-            }
-          ],
-          "percentage": 0
-        },
         {
           "telemetryType": "dependency",
           "attributes": [

diff --git a/projects/assessment-summary-and-delius/applicationinsights.json b/projects/assessment-summary-and-delius/applicationinsights.json
@@ -34,17 +34,6 @@
           ],
           "percentage": 0
         },
-        {
-          "telemetryType": "dependency",
-          "attributes": [
-            {
-              "key": "db.statement",
-              "value": ".*CLIENT_IDENTIFIER.*",
-              "matchType": "regexp"
-            }
-          ],
-          "percentage": 0
-        },
         {
           "telemetryType": "dependency",
           "attributes": [

diff --git a/projects/cas2-and-delius/applicationinsights.json b/projects/cas2-and-delius/applicationinsights.json
@@ -34,17 +34,6 @@
           ],
           "percentage": 0
         },
-        {
-          "telemetryType": "dependency",
-          "attributes": [
-            {
-              "key": "db.statement",
-              "value": ".*CLIENT_IDENTIFIER.*",
-              "matchType": "regexp"
-            }
-          ],
-          "percentage": 0
-        },
         {
           "telemetryType": "dependency",
           "attributes": [

diff --git a/projects/cas3-and-delius/applicationinsights.json b/projects/cas3-and-delius/applicationinsights.json
@@ -34,17 +34,6 @@
           ],
           "percentage": 0
         },
-        {
-          "telemetryType": "dependency",
-          "attributes": [
-            {
-              "key": "db.statement",
-              "value": ".*CLIENT_IDENTIFIER.*",
-              "matchType": "regexp"
-            }
-          ],
-          "percentage": 0
-        },
         {
           "telemetryType": "dependency",
           "attributes": [

diff --git a/projects/court-case-and-delius/applicationinsights.json b/projects/court-case-and-delius/applicationinsights.json
@@ -34,17 +34,6 @@
           ],
           "percentage": 0
         },
-        {
-          "telemetryType": "dependency",
-          "attributes": [
-            {
-              "key": "db.statement",
-              "value": ".*CLIENT_IDENTIFIER.*",
-              "matchType": "regexp"
-            }
-          ],
-          "percentage": 0
-        },
         {
           "telemetryType": "dependency",
           "attributes": [

diff --git a/projects/create-and-vary-a-licence-and-delius/applicationinsights.json b/projects/create-and-vary-a-licence-and-delius/applicationinsights.json
@@ -34,17 +34,6 @@
           ],
           "percentage": 0
         },
-        {
-          "telemetryType": "dependency",
-          "attributes": [
-            {
-              "key": "db.statement",
-              "value": ".*CLIENT_IDENTIFIER.*",
-              "matchType": "regexp"
-            }
-          ],
-          "percentage": 0
-        },
         {
           "telemetryType": "dependency",
           "attributes": [

diff --git a/projects/custody-key-dates-and-delius/applicationinsights.json b/projects/custody-key-dates-and-delius/applicationinsights.json
@@ -34,17 +34,6 @@
           ],
           "percentage": 0
         },
-        {
-          "telemetryType": "dependency",
-          "attributes": [
-            {
-              "key": "db.statement",
-              "value": ".*CLIENT_IDENTIFIER.*",
-              "matchType": "regexp"
-            }
-          ],
-          "percentage": 0
-        },
         {
           "telemetryType": "dependency",
           "attributes": [

diff --git a/projects/domain-events-and-delius/applicationinsights.json b/projects/domain-events-and-delius/applicationinsights.json
@@ -37,17 +37,6 @@
           ],
           "percentage": 0
         },
-        {
-          "telemetryType": "dependency",
-          "attributes": [
-            {
-              "key": "db.statement",
-              "value": ".*CLIENT_IDENTIFIER.*",
-              "matchType": "regexp"
-            }
-          ],
-          "percentage": 0
-        },
         {
           "telemetryType": "dependency",
           "attributes": [

diff --git a/projects/dps-and-delius/applicationinsights.json b/projects/dps-and-delius/applicationinsights.json
@@ -34,17 +34,6 @@
           ],
           "percentage": 0
         },
-        {
-          "telemetryType": "dependency",
-          "attributes": [
-            {
-              "key": "db.statement",
-              "value": ".*CLIENT_IDENTIFIER.*",
-              "matchType": "regexp"
-            }
-          ],
-          "percentage": 0
-        },
         {
           "telemetryType": "dependency",
           "attributes": [

diff --git a/projects/effective-proposal-framework-and-delius/applicationinsights.json b/projects/effective-proposal-framework-and-delius/applicationinsights.json
@@ -34,17 +34,6 @@
           ],
           "percentage": 0
         },
-        {
-          "telemetryType": "dependency",
-          "attributes": [
-            {
-              "key": "db.statement",
-              "value": ".*CLIENT_IDENTIFIER.*",
-              "matchType": "regexp"
-            }
-          ],
-          "percentage": 0
-        },
         {
           "telemetryType": "dependency",
           "attributes": [