hmcts
diff --git a/‎Jenkinsfile_CNP‎
Lines changed: 7 additions & 1 deletion b/‎Jenkinsfile_CNP‎
Lines changed: 7 additions & 1 deletion
diff --git a/‎Jenkinsfile_nightly‎
Lines changed: 13 additions & 3 deletions b/‎Jenkinsfile_nightly‎
Lines changed: 13 additions & 3 deletions
diff --git a/‎build.gradle‎
Lines changed: 1 addition & 0 deletions b/‎build.gradle‎
Lines changed: 1 addition & 0 deletions
diff --git a/‎charts/ccpay-refunds-api/values.preview.template.yaml‎
Lines changed: 1 addition & 0 deletions b/‎charts/ccpay-refunds-api/values.preview.template.yaml‎
Lines changed: 1 addition & 0 deletions
@@ -17,7 +17,10 @@ def secrets = [
     secret('paybubble-idam-client-secret', 'OIDC_CLIENT_SECRET'),
     secret('refunds-api-client-secret', 'REFUND_SERVICE_ACCOUNT_CLIENT_SECRET'),
     secret('refunds-api-user-password', 'REFUND_SERVICE_ACCOUNT_PASSWORD'),
-    secret('paybubble-idam-client-secret','IDAM_PAYBUBBLE_CLIENT_SECRET')
+    secret('paybubble-idam-client-secret','IDAM_PAYBUBBLE_CLIENT_SECRET'),
+    secret('notifications-email-apikey', 'NOTIFY_API_KEY'),
+    secret('probate-caseworker-username', 'PROBATE_CASE_WORKER_USER_NAME'),
+    secret('probate-caseworker-password', 'PROBATE_CASE_WORKER_PASSWORD')
   ]
 ]
 
@@ -124,12 +127,14 @@ withPipeline(type, product, app) {
 
   before('functionalTest:aat') {
     env.TEST_URL_PAYMENT = 'http://payment-api-aat.service.core-compute-aat.internal'
+    env.BULKSCAN_API_URL = 'http://ccpay-bulkscanning-api-aat.service.core-compute-aat.internal'
     println """\
                 Using TEST_URL_PAYMENT: ${env.TEST_URL_PAYMENT}""".stripIndent()
   }
 
   before('functionalTest:preview') {
     env.TEST_URL_PAYMENT = "https://payment-api-ccpay-refunds-api-pr-${CHANGE_ID}.preview.platform.hmcts.net"
+    env.BULKSCAN_API_URL = "https://ccpay-bulkscanning-api-ccpay-refunds-api-pr-${CHANGE_ID}.preview.platform.hmcts.net"
     println """\
                 Using TEST_URL_PAYMENT: ${env.TEST_URL_PAYMENT}""".stripIndent()
   }
@@ -152,6 +157,7 @@ withPipeline(type, product, app) {
     env.PAYMENT_API_URL = "https://payment-api-ccpay-refunds-api-pr-${CHANGE_ID}.preview.platform.hmcts.net"
     env.NOTIFICATION_API_URL = "https://ccpay-notifications-service-ccpay-refunds-api-pr-${CHANGE_ID}.preview.platform.hmcts.net"
     env.REFUND_API_URL = "https://ccpay-refunds-api-pr-${CHANGE_ID}.preview.platform.hmcts.net"
+    env.BULKSCAN_API_URL = "https://ccpay-bulkscanning-api-ccpay-refunds-api-pr-${CHANGE_ID}.preview.platform.hmcts.net"
   }
 }
 
@@ -5,11 +5,15 @@ properties([
   pipelineTriggers([cron('H 07 * * 1-5')]),
 
   parameters([
+    string(name: 'ENVIRONMENT', defaultValue: 'aat', description: 'Environment to fetch the keyvault secrets from'),
     string(name: 'URL_TO_TEST', defaultValue: 'http://ccpay-refunds-api-aat.service.core-compute-aat.internal', description: 'The URL you want to run these tests against'),
     string(name: 'TEST_URL_PAYMENT', defaultValue: 'http://payment-api-aat.service.core-compute-aat.internal', description: 'The payment app url you want to run these tests against'),
+    string(name: 'BULKSCAN_API_URL', defaultValue: 'http://ccpay-bulkscanning-api-aat.service.core-compute-aat.internal', description: 'The bulkscan app url you want to run these tests against'),
     string(name: 'IDAM_API_URL', defaultValue: 'https://idam-api.aat.platform.hmcts.net', description: 'The Idam url you want to run these tests against'),
     string(name: 'S2S_URL', defaultValue: 'http://rpe-service-auth-provider-aat.service.core-compute-aat.internal', description: 'The s2s url you want to run these tests against'),
-    string(name: 'OAUTH2_REDIRECT_URI', defaultValue: 'https://moneyclaims.aat.platform.hmcts.net', description: 'The redirect url you want to authenticate users and get idam token'),
+    string(name: 'OAUTH2_REDIRECT_URI', defaultValue: 'https://moneyclaims.aat.platform.hmcts.net', description: 'The cmc redirect url you want to authenticate users and get idam token'),
+    string(name: 'IDAM_PAYBUBBLE_REDIRECT_URI', defaultValue: 'https://paybubble.aat.platform.hmcts.net/oauth2/callback', description: 'The idam redirect url you want to authenticate users and get idam token'),
+    string(name: 'CCD_API_URL', defaultValue: 'http://ccd-data-store-api-aat.service.core-compute-aat.internal', description: 'The Idam url you want to run these tests against'),
     string(name: 'SecurityRules',
       defaultValue: 'http://raw.githubusercontent.com/hmcts/security-test-rules/master/conf/security-rules.conf',
       description: 'SecurityUrl against which rules will be executed'),
@@ -23,7 +27,7 @@ def product = "payment"
 def component = "api"
 
 def secrets = [
-  'ccpay-${env}': [
+  "ccpay-${params.ENVIRONMENT}": [
     secret('payment-s2s-secret', 'S2S_SERVICE_SECRET_PAYMENT_APP'),
     secret('cmc-service-secret', 'S2S_SERVICE_SECRET_CMC'),
     secret('paybubble-s2s-secret', 'S2S_SERVICE_SECRET_PAYBUBBLE'),
@@ -33,7 +37,10 @@ def secrets = [
     secret('paybubble-idam-client-secret', 'OIDC_CLIENT_SECRET'),
     secret('refunds-api-client-secret', 'REFUND_SERVICE_ACCOUNT_CLIENT_SECRET'),
     secret('refunds-api-user-password', 'REFUND_SERVICE_ACCOUNT_PASSWORD'),
-    secret('paybubble-idam-client-secret','IDAM_PAYBUBBLE_CLIENT_SECRET')
+    secret('paybubble-idam-client-secret','IDAM_PAYBUBBLE_CLIENT_SECRET'),
+    secret('notifications-email-apikey', 'NOTIFY_API_KEY'),
+    secret('probate-caseworker-username', 'PROBATE_CASE_WORKER_USER_NAME'),
+    secret('probate-caseworker-password', 'PROBATE_CASE_WORKER_PASSWORD')
   ]
 ]
 
@@ -53,6 +60,9 @@ withNightlyPipeline(type, product, component) {
   env.IDAM_API_URL = params.IDAM_API_URL
   env.S2S_URL = params.S2S_URL
   env.OAUTH2_REDIRECT_URI = params.OAUTH2_REDIRECT_URI
+  env.IDAM_PAYBUBBLE_REDIRECT_URI = params.IDAM_PAYBUBBLE_REDIRECT_URI
+  env.CCD_API_URL = params.CCD_API_URL
+  env.BULKSCAN_API_URL = params.BULKSCAN_API_URL
   loadVaultSecrets(secrets)
   enableSecurityScan()
   enableMutationTest()
 
@@ -285,6 +285,7 @@ dependencies {
   implementation group: 'org.springframework.security', name: 'spring-security-oauth2-client'
   implementation group: 'org.testng', name: 'testng', version: '7.11.0'
   implementation group: "io.hypersistence", name: "hypersistence-utils-hibernate-63", version: "3.11.0"
+  implementation group: 'uk.gov.service.notify', name: 'notifications-java-client', version: '5.2.1-RELEASE'
 
   compileOnly group: 'net.sourceforge.findbugs', name: 'annotations', version: '1.3.2'
   compileOnly group: 'org.projectlombok', name: 'lombok', version: versions.lombok
 
@@ -27,6 +27,7 @@ java:
     PAYMENT_API_URL: "http://${SERVICE_NAME}-payment-api"
     TEST_URL_PAYMENT: "http://${SERVICE_NAME}-payment-api"
     NOTIFICATION_API_URL: "http://${SERVICE_NAME}-ccpay-notifications-service"
+    BULKSCAN_API_URL: "http://${SERVICE_NAME}-ccpay-bulkscanning-api"
 
     # PR Pointing - these should no longer be required unless testing simultanous changes between apps.
     # PAYMENT_API_URL: "http://payment-api-pr-1376-java"
Original file line number	Diff line number	Diff line change
`@@ -17,7 +17,10 @@ def secrets = [`
`17`	`17`	`secret('paybubble-idam-client-secret', 'OIDC_CLIENT_SECRET'),`
`18`	`18`	`secret('refunds-api-client-secret', 'REFUND_SERVICE_ACCOUNT_CLIENT_SECRET'),`
`19`	`19`	`secret('refunds-api-user-password', 'REFUND_SERVICE_ACCOUNT_PASSWORD'),`
`20`		`- secret('paybubble-idam-client-secret','IDAM_PAYBUBBLE_CLIENT_SECRET')`
	`20`	`+ secret('paybubble-idam-client-secret','IDAM_PAYBUBBLE_CLIENT_SECRET'),`
	`21`	`+ secret('notifications-email-apikey', 'NOTIFY_API_KEY'),`
	`22`	`+ secret('probate-caseworker-username', 'PROBATE_CASE_WORKER_USER_NAME'),`
	`23`	`+ secret('probate-caseworker-password', 'PROBATE_CASE_WORKER_PASSWORD')`
`21`	`24`	`]`
`22`	`25`	`]`
`23`	`26`
`@@ -124,12 +127,14 @@ withPipeline(type, product, app) {`
`124`	`127`
`125`	`128`	`before('functionalTest:aat') {`
`126`	`129`	`env.TEST_URL_PAYMENT = 'http://payment-api-aat.service.core-compute-aat.internal'`
	`130`	`+ env.BULKSCAN_API_URL = 'http://ccpay-bulkscanning-api-aat.service.core-compute-aat.internal'`
`127`	`131`	`println """\`
`128`	`132`	`Using TEST_URL_PAYMENT: ${env.TEST_URL_PAYMENT}""".stripIndent()`
`129`	`133`	`}`
`130`	`134`
`131`	`135`	`before('functionalTest:preview') {`
`132`	`136`	`env.TEST_URL_PAYMENT = "https://payment-api-ccpay-refunds-api-pr-${CHANGE_ID}.preview.platform.hmcts.net"`
	`137`	`+ env.BULKSCAN_API_URL = "https://ccpay-bulkscanning-api-ccpay-refunds-api-pr-${CHANGE_ID}.preview.platform.hmcts.net"`
`133`	`138`	`println """\`
`134`	`139`	`Using TEST_URL_PAYMENT: ${env.TEST_URL_PAYMENT}""".stripIndent()`
`135`	`140`	`}`
`@@ -152,6 +157,7 @@ withPipeline(type, product, app) {`
`152`	`157`	`env.PAYMENT_API_URL = "https://payment-api-ccpay-refunds-api-pr-${CHANGE_ID}.preview.platform.hmcts.net"`
`153`	`158`	`env.NOTIFICATION_API_URL = "https://ccpay-notifications-service-ccpay-refunds-api-pr-${CHANGE_ID}.preview.platform.hmcts.net"`
`154`	`159`	`env.REFUND_API_URL = "https://ccpay-refunds-api-pr-${CHANGE_ID}.preview.platform.hmcts.net"`
	`160`	`+ env.BULKSCAN_API_URL = "https://ccpay-bulkscanning-api-ccpay-refunds-api-pr-${CHANGE_ID}.preview.platform.hmcts.net"`
`155`	`161`	`}`
`156`	`162`	`}`
`157`	`163`