Skip to content

Commit bb9e6bd

Browse files
hemanttdanlysiakolawale-olanrewajuMSancaktutarsmathangi
authored
Release cut 17.2 (#554)
* RDM-7503 - Allow metadata fields in show conditions * Temp suppression * suppress temporarily * undo revert on develop * update def store develop branch preview link * RDM-7457 - SpringBoot to latest 2.2.4 (#528) * RDM-7457 - SpringBoot to latest 2.2.4 * RDM-7457 - enforcing liquibase version * RDM-7457 - enforcing liquibase version * Update dependency-check-suppressions.xml Co-authored-by: Hemanth Potipati <[email protected]> * RDM-7457 - SpringBoot to latest 2.2.4 (#528) * RDM-7457 - SpringBoot to latest 2.2.4 * RDM-7457 - enforcing liquibase version * RDM-7457 - enforcing liquibase version * Update dependency-check-suppressions.xml Co-authored-by: Hemanth Potipati <[email protected]> * RDM-7888 - fixing develop tests * RDM-7888 - CVE fixes * RDM-7888 - fixing develop tests * update wiring to use release cut of user profile api * use latest fw version for latest common def files * remove file no more in use * temporarily suppress * temporarily suppress Co-authored-by: Dan Lysiak <[email protected]> Co-authored-by: Dan Lysiak <[email protected]> Co-authored-by: Olawale Olanrewaju <[email protected]> Co-authored-by: MSancaktutar <[email protected]> Co-authored-by: Sateesh Mathangi <[email protected]>
1 parent 0496801 commit bb9e6bd

File tree

117 files changed

+3222
-269
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

117 files changed

+3222
-269
lines changed

‎Jenkinsfile_CNP‎

Lines changed: 19 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,10 @@ def secrets = [
1515
secret('ccd-caseworker-autotest-email', 'CCD_CASEWORKER_AUTOTEST_EMAIL'),
1616
secret('ccd-caseworker-autotest-password', 'CCD_CASEWORKER_AUTOTEST_PASSWORD'),
1717
secret('ccd-api-gateway-oauth2-client-secret', 'OAUTH2_CLIENT_SECRET'),
18+
secret('ccd-befta-caseworker-3-pwd', 'CCD_BEFTA_CASEWORKER_3_PWD'),
1819
],
1920
's2s-${env}': [
20-
secret('microservicekey-ccd-gw', 'CCD_GW_SERVICE_SECRET')
21+
secret('microservicekey-ccd-gw', 'BEFTA_S2S_CLIENT_SECRET')
2122
]
2223
]
2324

@@ -36,6 +37,15 @@ def vaultOverrides = [
3637
'spreview': 'saat'
3738
]
3839

40+
// Vars needed for AKS functional and smoke tests
41+
env.IDAM_URL = "https://idam-api.aat.platform.hmcts.net"
42+
env.S2S_URL = "http://rpe-service-auth-provider-aat.service.core-compute-aat.internal"
43+
env.BEFTA_S2S_CLIENT_ID = "ccd_gw"
44+
env.OAUTH2_CLIENT_ID = "ccd_gateway"
45+
env.OAUTH2_REDIRECT_URI = "https://www-ccd.aat.platform.hmcts.net/oauth2redirect"
46+
env.DEFINITION_STORE_HOST = "http://ccd-definition-store-api-pr-552.service.core-compute-preview.internal/"
47+
env.CCD_CASEWORKER_AUTOTEST_EMAIL = "[email protected]"
48+
3949

4050
withPipeline(type, product, app) {
4151
// Vars needed for functional and smoke tests run against AKS
@@ -64,4 +74,12 @@ withPipeline(type, product, app) {
6474
disableLegacyDeploymentOnAAT()
6575
disableLegacyDeployment()
6676
installCharts()
77+
78+
after('functionalTest:preview') {
79+
steps.archiveArtifacts allowEmptyArchive: true, artifacts: '**/target/cucumber/**/*'
80+
}
81+
82+
after('functionalTest:aat') {
83+
steps.archiveArtifacts allowEmptyArchive: true, artifacts: '**/target/cucumber/**/*'
84+
}
6785
}

‎Jenkinsfile_nightly‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ def secrets = [
2020
secret('ccd-api-gateway-oauth2-client-secret', 'OAUTH2_CLIENT_SECRET'),
2121
],
2222
's2s-${env}': [
23-
secret('microservicekey-ccd-gw', 'CCD_GW_SERVICE_SECRET'),
23+
secret('microservicekey-ccd-gw', 'BEFTA_S2S_CLIENT_SECRET'),
2424
]
2525
]
2626

‎Jenkinsfile_parameterized‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ def secrets = [
1717
secret('ccd-api-gateway-oauth2-client-secret', 'OAUTH2_CLIENT_SECRET'),
1818
],
1919
's2s-${env}': [
20-
secret('microservicekey-ccd-gw', 'CCD_GW_SERVICE_SECRET'),
20+
secret('microservicekey-ccd-gw', 'BEFTA_S2S_CLIENT_SECRET'),
2121
]
2222
]
2323

‎aat/.gitignore‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
/bin/

‎aat/bin/aat/features/F-000/F-000.feature‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
@F-000
2+
Feature: [SAMPLE] Get health endpoint check
3+
4+
Background:
5+
Given an appropriate test context as detailed in the test data source
6+
7+
@S-000
8+
Scenario: [SAMPLE] must return a successful response from the health endpoint
9+
When a request is prepared with appropriate values
10+
And it is submitted to call the [Health Endpoint] operation of [CCD Definition Store]
11+
Then a positive response is received
12+
And the response [has the 200 OK code]
13+
And the response has all other details as expected

‎aat/build.gradle‎

Lines changed: 26 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
apply plugin: 'com.github.spacialcircumstances.gradle-cucumber-reporting'
12
dependencies {
23
compile group: 'uk.gov.hmcts.reform', name: 'service-auth-provider-client', version: '2.0.0'
34
compile group: 'org.awaitility', name: 'awaitility', version: '3.1.6'
@@ -6,7 +7,7 @@ dependencies {
67
sourceSets {
78
aat {
89
java {
9-
srcDir('${rootDir}/src/aat/java')
10+
srcDir('src/aat/java')
1011
compileClasspath += main.output
1112
runtimeClasspath += main.output
1213
}
@@ -33,6 +34,14 @@ task smoke(type: Test) {
3334
useJUnitPlatform {
3435
includeTags 'smoke'
3536
}
37+
38+
doFirst {
39+
javaexec {
40+
main = "uk.gov.hmcts.ccd.definitionstore.befta.TestDataLoaderMain"
41+
classpath += sourceSets.aat.runtimeClasspath + sourceSets.main.output + sourceSets.test.output
42+
args = ['']
43+
}
44+
}
3645
}
3746

3847
task functional(type: Test) {
@@ -47,8 +56,23 @@ task functional(type: Test) {
4756
setClasspath(sourceSets.aat.runtimeClasspath)
4857
include "uk/gov/hmcts/ccd/definitionstore/tests/functional/**"
4958
useJUnitPlatform()
50-
}
59+
60+
generateCucumberReports.enabled = false
5161

62+
doFirst {
63+
generateCucumberReports.enabled = true
64+
javaexec {
65+
main = "uk.gov.hmcts.ccd.definitionstore.befta.DefinitionStoreBeftaMain"
66+
classpath += configurations.cucumberRuntime + sourceSets.aat.runtimeClasspath + sourceSets.main.output + sourceSets.test.output
67+
args = ['--plugin', "json:${rootDir}/target/cucumber.json", '--tags', 'not @Ignore', '--glue',
68+
'uk.gov.hmcts.befta.player', 'src/aat/resources/features']
69+
}
70+
}
71+
}
72+
cucumberReports {
73+
outputDir = file("${rootDir}/target/cucumber")
74+
reports = files("${rootDir}/target/cucumber.json")
75+
}
5276
bootJar {
5377
enabled = false
5478
}

‎aat/src/aat/java/uk/gov/hmcts/ccd/definitionstore/befta/DefinitionStoreBeftaMain.java‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
package uk.gov.hmcts.ccd.definitionstore.befta;
2+
3+
import uk.gov.hmcts.befta.BeftaMain;
4+
5+
public class DefinitionStoreBeftaMain extends BeftaMain {
6+
7+
public static void main(String[] args) {
8+
BeftaMain.main(args, new DefinitionStoreTestAutomationAdapter());
9+
}
10+
11+
}

‎aat/src/aat/java/uk/gov/hmcts/ccd/definitionstore/befta/DefinitionStoreTestAutomationAdapter.java‎

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
package uk.gov.hmcts.ccd.definitionstore.befta;
2+
3+
import io.restassured.RestAssured;
4+
import uk.gov.hmcts.befta.BeftaMain;
5+
import uk.gov.hmcts.befta.DefaultTestAutomationAdapter;
6+
import uk.gov.hmcts.befta.dse.ccd.TestDataLoaderToDefinitionStore;
7+
8+
public class DefinitionStoreTestAutomationAdapter extends DefaultTestAutomationAdapter {
9+
10+
public static final String DEFAULT_DEFINITIONS_PATH = "uk/gov/hmcts/befta/dse/ccd/definitions/";
11+
12+
private TestDataLoaderToDefinitionStore loader = new TestDataLoaderToDefinitionStore(this, DEFAULT_DEFINITIONS_PATH,
13+
BeftaMain.getConfig().getTestUrl());
14+
15+
@Override
16+
public void doLoadTestData() {
17+
RestAssured.useRelaxedHTTPSValidation();
18+
loader.addCcdRoles();
19+
loader.importDefinitions();
20+
}
21+
22+
}

‎aat/src/aat/java/uk/gov/hmcts/ccd/definitionstore/befta/TestDataLoaderMain.java‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
package uk.gov.hmcts.ccd.definitionstore.befta;
2+
3+
public final class TestDataLoaderMain {
4+
private TestDataLoaderMain(){ }
5+
6+
public static void main(String[] args) {
7+
new DefinitionStoreTestAutomationAdapter().loadTestDataIfNecessary();
8+
}
9+
}

‎aat/src/aat/java/uk/gov/hmcts/ccd/definitionstore/tests/AATHelper.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -45,11 +45,11 @@ public String getCaseworkerAutoTestPassword() {
4545
}
4646

4747
public String getGatewayServiceName() {
48-
return Env.require("CCD_GW_SERVICE_NAME");
48+
return Env.require("BEFTA_S2S_CLIENT_ID");
4949
}
5050

5151
public String getGatewayServiceSecret() {
52-
return Env.require("CCD_GW_SERVICE_SECRET");
52+
return Env.require("BEFTA_S2S_CLIENT_SECRET");
5353
}
5454

5555
public IdamHelper getIdamHelper() {

0 commit comments

Comments
 (0)