DTSAM-492 Decommission Launch Darkly

Jenkinsfile_CNP

@@ -41,7 +41,6 @@ def secrets = [
   ],
   'am-${env}': [
       secret('role-assignment-service-IDAM-CLIENT-SECRET', 'ROLE_ASSIGNMENT_IDAM_CLIENT_SECRET'),
-      secret('role-assignment-service-LD-SDK-KEY', 'LD_SDK_KEY'),
       secret('test-am-user1-befta-pwd', 'TEST_AM_USER1_BEFTA_PWD'),
       secret('test-am-user2-befta-pwd', 'TEST_AM_USER2_BEFTA_PWD'),
       secret('test-am-user3-befta-pwd', 'TEST_AM_USER3_BEFTA_PWD'),
@@ -92,13 +91,13 @@ withPipeline(type, product, component) {
     enableSlackNotifications('#am-master-builds')
   }
   if (env.BRANCH_NAME.startsWith("PR")) {
-      env.LAUNCH_DARKLY_ENV = "pr"
+      env.RAS_ENV = "pr"
   }
   else if(env.BRANCH_NAME == 'master') {
-      env.LAUNCH_DARKLY_ENV = "aat"
+      env.RAS_ENV = "aat"
   }
   else {
-      env.LAUNCH_DARKLY_ENV = env.BRANCH_NAME
+      env.RAS_ENV = env.BRANCH_NAME
   }
 
   onPR {

Jenkinsfile_nightly

@@ -28,7 +28,6 @@ def secrets = [
   ],
   'am-${env}': [
     secret('role-assignment-service-IDAM-CLIENT-SECRET', 'ROLE_ASSIGNMENT_IDAM_CLIENT_SECRET'),
-    secret('role-assignment-service-LD-SDK-KEY', 'LD_SDK_KEY'),
     secret('test-am-user1-befta-pwd', 'TEST_AM_USER1_BEFTA_PWD'),
     secret('test-am-user2-befta-pwd', 'TEST_AM_USER2_BEFTA_PWD'),
     secret('test-am-user3-befta-pwd', 'TEST_AM_USER3_BEFTA_PWD'),
@@ -52,13 +51,13 @@ def vaultOverrides = [
 
 withNightlyPipeline(type, product, component) {
   if (env.BRANCH_NAME.startsWith("PR")) {
-    env.LAUNCH_DARKLY_ENV = "pr"
+    env.RAS_ENV = "pr"
   }
   else if (env.BRANCH_NAME == 'master') {
-    env.LAUNCH_DARKLY_ENV = "aat"
+    env.RAS_ENV = "aat"
   }
   else {
-    env.LAUNCH_DARKLY_ENV = env.BRANCH_NAME
+    env.RAS_ENV = env.BRANCH_NAME
   }
 
   env.IDAM_URL = "https://idam-api.aat.platform.hmcts.net"

README.md

@@ -42,7 +42,7 @@ The following environment variables are required:
       |ROLE_ASSIGNMENT_IDAM_ADMIN_PASSWORD|Pa55word11|
       |ROLE_ASSIGNMENT_IDAM_ADMIN_SCOPE|search-user|
       |CCD_DATA_STORE_URL|http://localhost:4452|
-      |LAUNCH_DARKLY_ENV|local|
+      |RAS_ENV|local|
       |LD_SDK_KEY|"Please contact the AM team for getting this key"|
 
 ## Building the application

charts/am-role-assignment-service/Chart.yaml

@@ -3,7 +3,7 @@ appVersion: "1.0"
 description: A Helm chart for Role Assignment Service
 name: am-role-assignment-service
 home: https://github.com/hmcts/am-role-assignment-service
-version: 0.0.80
+version: 0.0.81
 maintainers:
   - name: Access Management Team
 dependencies:

charts/am-role-assignment-service/values.aat.template.yaml

@@ -11,3 +11,4 @@ java:
   environment:
     BYPASS_ORG_DROOL_RULE: true
     RUN_DB_MIGRATION_ON_STARTUP: true
+    TESTING_SUPPORT_ENABLED: true

charts/am-role-assignment-service/values.preview.template.yaml

@@ -12,8 +12,6 @@ java:
           alias: ROLE_ASSIGNMENT_IDAM_CLIENT_SECRET
         - name: role-assignment-service-IDAM-ADMIN-SECRET
           alias: ROLE_ASSIGNMENT_IDAM_ADMIN_PASSWORD
-        - name: role-assignment-service-LD-SDK-KEY
-          alias: LD_SDK_KEY
 #  overidding dev memory and cpu limits to make it match with standard limits
 #  https://github.com/hmcts/chart-java/blob/master/java/values.yaml
   devmemoryRequests: 1024Mi
@@ -30,12 +28,12 @@ java:
     ROLE_ASSIGNMENT_DB_OPTIONS: "?stringtype=unspecified"
     CCD_DATA_STORE_URL: http://ccd-data-store-api-{{ .Values.global.environment }}.service.core-compute-{{ .Values.global.environment }}.internal
     S2S_URL: http://rpe-service-auth-provider-{{ .Values.global.environment }}.service.core-compute-{{ .Values.global.environment }}.internal
-    LAUNCH_DARKLY_ENV: pr
+    RAS_ENV: pr
     ENABLE_DB_MIGRATE: true
     BYPASS_ORG_DROOL_RULE: true
     RUN_DB_MIGRATION_ON_STARTUP: true
-    RUN_LD_ON_STARTUP: true
     APPLICATION_LOGGING_LEVEL: DEBUG
+    TESTING_SUPPORT_ENABLED: true
   postgresql:
     enabled: true
     postgresqlPort: 5432

charts/am-role-assignment-service/values.yaml

@@ -24,8 +24,6 @@ java:
           alias: ROLE_ASSIGNMENT_IDAM_CLIENT_SECRET
         - name: role-assignment-service-IDAM-ADMIN-SECRET
           alias: ROLE_ASSIGNMENT_IDAM_ADMIN_PASSWORD
-        - name: role-assignment-service-LD-SDK-KEY
-          alias: LD_SDK_KEY
   environment:
     IDAM_S2S_URL: http://rpe-service-auth-provider-{{ .Values.global.environment }}.service.core-compute-{{ .Values.global.environment }}.internal
     IDAM_USER_URL: https://idam-api.{{ .Values.global.environment }}.platform.hmcts.net
@@ -37,7 +35,7 @@ java:
     S2S_URL: http://rpe-service-auth-provider-{{ .Values.global.environment }}.service.core-compute-{{ .Values.global.environment }}.internal
     OIDC_ISSUER_URL: https://forgerock-am.service.core-compute-idam-{{ .Values.global.environment }}.internal:8443/openam/oauth2/hmcts
     OPEN_ID_API_BASE_URI: https://idam-web-public.{{ .Values.global.environment }}.platform.hmcts.net/o
-    LAUNCH_DARKLY_ENV: "{{ .Values.global.environment }}"
+    RAS_ENV: "{{ .Values.global.environment }}"
     ROLE_ASSIGNMENT_IDAM_CLIENT_ID: am_role_assignment
     MICROSERVICE_NAME: am_role_assignment_service
     PACT_BROKER_FULL_URL: https://pact-broker.platform.hmcts.net
@@ -49,4 +47,4 @@ java:
     APPLICATION_LOGGING_LEVEL: INFO
     BYPASS_ORG_DROOL_RULE: false
     RUN_DB_MIGRATION_ON_STARTUP: false
-    RUN_LD_ON_STARTUP: true
+    TESTING_SUPPORT_ENABLED: false

src/contractTest/java/uk/gov/hmcts/reform/roleassignment/CreateRoleAssignmentProviderTest.java

@@ -52,7 +52,7 @@
     host = "${PACT_BROKER_URL:localhost}", port = "${PACT_BROKER_PORT:9292}", consumerVersionSelectors = {
         @VersionSelector(tag = "master")})
 @TestPropertySource(properties = {"org.request.byPassOrgDroolRule=true", "roleassignment.query.size=20",
-    "spring.cache.type=none", "launchdarkly.sdk.environment=pr", "roleassignment.query.sizeinternal=100"})
+    "spring.cache.type=none", "ras.environment=pr", "roleassignment.query.sizeinternal=100"})
 @Import(RoleAssignmentProviderTestConfiguration.class)
 @IgnoreNoPactsToVerify
 public class CreateRoleAssignmentProviderTest {

src/contractTest/java/uk/gov/hmcts/reform/roleassignment/DeleteRoleAssignmentProviderTest.java

@@ -54,7 +54,7 @@
 @PactBroker(scheme = "${PACT_BROKER_SCHEME:http}",
     host = "${PACT_BROKER_URL:localhost}", port = "${PACT_BROKER_PORT:9292}", consumerVersionSelectors = {
         @VersionSelector(tag = "master")})
-@TestPropertySource(properties = {"roleassignment.query.size=20", "launchdarkly.sdk.environment=pr",
+@TestPropertySource(properties = {"roleassignment.query.size=20", "ras.environment=pr",
     "spring.cache.type=none", "roleassignment.query.sizeinternal=100"})
 @Import(RoleAssignmentProviderTestConfiguration.class)
 @IgnoreNoPactsToVerify

src/contractTest/java/uk/gov/hmcts/reform/roleassignment/RoleAssignmentProviderTestConfiguration.java

@@ -3,11 +3,13 @@
 import org.kie.api.KieServices;
 import org.kie.api.runtime.KieContainer;
 import org.kie.api.runtime.StatelessKieSession;
+import org.mockito.Mockito;
 import org.springframework.boot.test.context.TestConfiguration;
 import org.springframework.boot.test.mock.mockito.MockBean;
 import org.springframework.cache.CacheManager;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Primary;
+import uk.gov.hmcts.reform.roleassignment.config.EnvironmentConfiguration;
 import uk.gov.hmcts.reform.roleassignment.domain.service.common.ParseRequestService;
 import uk.gov.hmcts.reform.roleassignment.domain.service.common.PersistenceService;
 import uk.gov.hmcts.reform.roleassignment.domain.service.common.PrepareResponseService;
@@ -22,6 +24,8 @@
 import uk.gov.hmcts.reform.roleassignment.util.PersistenceUtil;
 import uk.gov.hmcts.reform.roleassignment.util.SecurityUtils;
 
+import static org.mockito.Mockito.when;
+
 @TestConfiguration
 public class RoleAssignmentProviderTestConfiguration {
 
@@ -112,4 +116,12 @@ public DeleteRoleAssignmentOrchestrator deleteRoleAssignment() {
         );
     }
 
+    @Bean
+    @Primary
+    public EnvironmentConfiguration getEnvironmentConfiguration() {
+        EnvironmentConfiguration environmentConfiguration = Mockito.mock(EnvironmentConfiguration.class);
+        when(environmentConfiguration.getEnvironment()).thenReturn("pr");
+        return environmentConfiguration;
+    }
+
 }

src/functionalTest/java/uk/gov/hmcts/reform/roleassignment/befta/RasDefaultMultiSourceFeatureToggleService.java

@@ -17,7 +17,7 @@ public class RasDefaultMultiSourceFeatureToggleService extends DefaultMultiSourc
     @SuppressWarnings("unchecked")
     public ScenarioFeatureToggleInfo getToggleStatusFor(Scenario toggleable) {
         ScenarioFeatureToggleInfo scenarioFeatureToggleInfo = new ScenarioFeatureToggleInfo();
-        //@FeatureToggle(LD:feature_id_1=on) @FeatureToggle(RAS:feature_id_2=off)
+        // @FeatureToggle(RAS:feature_id_2=off)
         toggleable.getSourceTagNames().stream().filter(tag -> tag.contains(LAUNCH_DARKLY_FLAG)).forEach(tag -> {
             String domain = null;
             String id = null;

src/functionalTest/resources/features/F-000/F-000.feature

@@ -5,27 +5,6 @@ Feature: F-000 : Access Role Assignment API
     Given an appropriate test context as detailed in the test data source
 
   @S-000
-  @FeatureToggle(get-ld-flag)
-  Scenario: must access Role Assignment API
-    Given a user with [an active caseworker profile],
-    When a request is prepared with appropriate values,
-    And the request [is to be made on behalf of Role Assignment API],
-    And it is submitted to call the [Access Role Assignment API] operation of [Role Assignment API],
-    Then a positive response is received,
-    And the response has all other details as expected.
-
-  @S-120
-  @FeatureToggle(LD:get-ld-flag=on)
-  Scenario: must access Role Assignment API
-    Given a user with [an active caseworker profile],
-    When a request is prepared with appropriate values,
-    And the request [is to be made on behalf of Role Assignment API],
-    And it is submitted to call the [Access Role Assignment API] operation of [Role Assignment API],
-    Then a positive response is received,
-    And the response has all other details as expected.
-
-  @S-110
-  @FeatureToggle(LD:get-ld-flag=off)
   Scenario: must access Role Assignment API
     Given a user with [an active caseworker profile],
     When a request is prepared with appropriate values,

src/functionalTest/resources/features/F-010/F-010.feature

@@ -5,7 +5,6 @@ Feature: F-010 : Post Role Assignments Delete Query Request
     Given an appropriate test context as detailed in the test data source
 
   @S-190
-  @FeatureToggle(advance_delete_api_flag)
   Scenario: must successfully delete list of multiple queries
     Given a user with [an active IDAM profile with full permissions],
     And a successful call [to create org role assignments for actors & requester] as in [S-190_Multiple_Org_Role_Creation],
@@ -19,7 +18,6 @@ Feature: F-010 : Post Role Assignments Delete Query Request
     And a successful call [to delete role assignments just created above] as in [S-190_DeleteDataForRoleAssignmentsForOrgRoles].
 
   @S-191
-  @FeatureToggle(advance_delete_api_flag)
   Scenario: must successfully delete single Query Request
     Given a user with [an active IDAM profile with full permissions],
     And a successful call [to create org role assignments for actors & requester] as in [S-191_Multiple_Org_Role_Creation],
@@ -32,7 +30,6 @@ Feature: F-010 : Post Role Assignments Delete Query Request
     And a successful call [to delete role assignments just created above] as in [S-191_DeleteDataForRoleAssignmentsForOrgRoles].
 
   @S-192
-  @FeatureToggle(advance_delete_api_flag)
   Scenario: must successfully delete role assignments without correlation Id
     Given a user with [an active IDAM profile with full permissions],
     And a successful call [to create org role assignments for actors & requester] as in [S-192_Multiple_Org_Role_Creation],
@@ -45,7 +42,6 @@ Feature: F-010 : Post Role Assignments Delete Query Request
     And a successful call [to delete role assignments just created above] as in [S-192_DeleteDataForRoleAssignmentsForOrgRoles].
 
   @S-193
-  @FeatureToggle(advance_delete_api_flag)
   Scenario: must receive a positive response when trying to delete Role Assignments twice
     Given a user with [an active IDAM profile with full permissions],
     And a successful call [to create org role assignments for actors & requester] as in [S-193_Multiple_Org_Role_Creation],
@@ -62,7 +58,6 @@ Feature: F-010 : Post Role Assignments Delete Query Request
   #env.BEFTA_RESPONSE_HEADER_CHECK_POLICY = "JUST_WARN"
   #So commenting out this scenario
 #  @S-194
-#  @FeatureToggle(advance_delete_api_flag)
 #  Scenario: must successfully receive the delete records count in headers
 #    Given a user with [an active IDAM profile with full permissions],
 #    And a successful call [to create org role assignments for actors & requester] as in [S-106_Multiple_Org_Role_Creation],

src/integrationTest/java/uk/gov/hmcts/reform/roleassignment/config/SwaggerPublisher.java

@@ -3,6 +3,7 @@
 import org.junit.Before;
 import org.junit.Test;
 import org.mockito.MockitoAnnotations;
+import org.springframework.test.context.TestPropertySource;
 import org.springframework.test.web.servlet.MockMvc;
 import org.springframework.test.web.servlet.setup.MockMvcBuilders;
 import org.springframework.web.context.WebApplicationContext;
@@ -21,6 +22,7 @@
  * Each run of workflow .github/workflows/swagger.yml on master should automatically save and upload (if updated)
  * documentation.
  */
+@TestPropertySource(properties = {"ras.environment=pr"})
 public class SwaggerPublisher extends BaseTest {
 
     private MockMvc mockMvc;

src/integrationTest/java/uk/gov/hmcts/reform/roleassignment/controller/DroolPassAssignmentCreateAndDeleteIntegrationTest.java

@@ -30,7 +30,6 @@
 import uk.gov.hmcts.reform.roleassignment.domain.service.common.RetrieveDataService;
 import uk.gov.hmcts.reform.roleassignment.domain.service.security.IdamRoleService;
 import uk.gov.hmcts.reform.roleassignment.helper.TestDataBuilder;
-import uk.gov.hmcts.reform.roleassignment.launchdarkly.FeatureConditionEvaluation;
 import uk.gov.hmcts.reform.roleassignment.oidc.IdamRepository;
 import uk.gov.hmcts.reform.roleassignment.util.Constants;
 
@@ -39,7 +38,6 @@
 
 import java.util.List;
 
-import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.ArgumentMatchers.anyString;
 import static org.mockito.Mockito.doReturn;
 import static org.springframework.http.HttpHeaders.AUTHORIZATION;
@@ -52,7 +50,8 @@
 import static uk.gov.hmcts.reform.roleassignment.helper.TestDataBuilder.getRequestedOrgRole;
 import static uk.gov.hmcts.reform.roleassignment.util.JacksonUtils.convertValueJsonNode;
 
-@TestPropertySource(properties = {"org.request.byPassOrgDroolRule=false", "dbFeature.flags.enable=iac_jrd_1_0"})
+@TestPropertySource(properties = {"org.request.byPassOrgDroolRule=false", "dbFeature.flags.enable=iac_jrd_1_0",
+    "ras.environment=pr"})
 public class DroolPassAssignmentCreateAndDeleteIntegrationTest extends BaseTest {
 
     private static final Logger logger =
@@ -83,9 +82,6 @@ public class DroolPassAssignmentCreateAndDeleteIntegrationTest extends BaseTest
     @MockBean
     private IdamRoleService idamRoleService;
 
-    @MockBean
-    private FeatureConditionEvaluation featureConditionEvaluation;
-
     @Before
     public void setUp() throws Exception {
 
@@ -100,7 +96,6 @@ public void setUp() throws Exception {
         doReturn(roles).when(idamRoleService).getUserRoles(anyString());
         doReturn(authentication).when(securityContext).getAuthentication();
         SecurityContextHolder.setContext(securityContext);
-        doReturn(true).when(featureConditionEvaluation).preHandle(any(),any(),any());
         MockUtils.setSecurityAuthorities(authentication, MockUtils.ROLE_CASEWORKER);
         UserInfo userInfo = UserInfo.builder()
             .uid("6b36bfc6-bb21-11ea-b3de-0242ac130006")

src/integrationTest/java/uk/gov/hmcts/reform/roleassignment/controller/QueryAssignmentIntegrationTest.java

@@ -58,7 +58,7 @@
 import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.jsonPath;
 import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
 
-@TestPropertySource(properties = {"launchdarkly.sdk.environment=pr"})
+@TestPropertySource(properties = {"ras.environment=pr"})
 public class QueryAssignmentIntegrationTest extends BaseTest {
 
     private static final Logger logger = LoggerFactory.getLogger(RoleAssignmentIntegrationTest.class);

src/integrationTest/java/uk/gov/hmcts/reform/roleassignment/controller/RoleAssignmentCreateAndDeleteIntegrationTest.java

@@ -31,7 +31,6 @@
 import uk.gov.hmcts.reform.roleassignment.domain.service.common.RetrieveDataService;
 import uk.gov.hmcts.reform.roleassignment.domain.service.security.IdamRoleService;
 import uk.gov.hmcts.reform.roleassignment.helper.TestDataBuilder;
-import uk.gov.hmcts.reform.roleassignment.launchdarkly.FeatureConditionEvaluation;
 import uk.gov.hmcts.reform.roleassignment.util.Constants;
 
 import javax.inject.Inject;
@@ -40,7 +39,6 @@
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
-import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.ArgumentMatchers.anyString;
 import static org.mockito.Mockito.doReturn;
 import static org.springframework.http.HttpHeaders.AUTHORIZATION;
@@ -49,7 +47,7 @@
 import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
 import static uk.gov.hmcts.reform.roleassignment.domain.model.enums.Status.CREATE_REQUESTED;
 
-@TestPropertySource(properties = {"dbFeature.flags.enable=iac_jrd_1_0"})
+@TestPropertySource(properties = {"dbFeature.flags.enable=iac_jrd_1_0", "ras.environment=pr"})
 public class RoleAssignmentCreateAndDeleteIntegrationTest extends BaseTest {
 
     private static final Logger logger = LoggerFactory.getLogger(RoleAssignmentCreateAndDeleteIntegrationTest.class);
@@ -96,9 +94,6 @@ public class RoleAssignmentCreateAndDeleteIntegrationTest extends BaseTest {
     @MockBean
     private IdamRoleService idamRoleService;
 
-    @MockBean
-    private FeatureConditionEvaluation featureConditionEvaluation;
-
     @Before
     public void setUp() throws Exception {
         template = new JdbcTemplate(ds);
@@ -113,7 +108,6 @@ public void setUp() throws Exception {
         doReturn(roles).when(idamRoleService).getUserRoles(anyString());
         doReturn(authentication).when(securityContext).getAuthentication();
         SecurityContextHolder.setContext(securityContext);
-        doReturn(true).when(featureConditionEvaluation).preHandle(any(),any(),any());
         MockUtils.setSecurityAuthorities(authentication, MockUtils.ROLE_CASEWORKER);
         UserInfo userInfo = UserInfo.builder()
             .uid("6b36bfc6-bb21-11ea-b3de-0242ac130006")