DTSAM-487 Remove Old ASB - Default to New ASB (#2101)

* DTSAM-487 Remove Old ASB - Default to New ASB * CRDTopicConsumer and JRDTopicConsumer replaced by CRDTopicConsumerNew and JRDTopicConsumerNew in smoke test
hmcts · Sep 18, 2024 · 7ab08dc · 7ab08dc
1 parent 75154a3
commit 7ab08dc
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 8 deletions.
diff --git a/charts/am-org-role-mapping-service/values.preview.template.yaml b/charts/am-org-role-mapping-service/values.preview.template.yaml
@@ -41,8 +41,6 @@ java:
     LAUNCH_DARKLY_ENV: pr
     AMQP_SHARED_ACCESS_KEY_NAME: RootManageSharedAccessKey
     AMQP_HOST: "am-sb-preview.servicebus.windows.net"
-    AMQP_JRD_NEW_ASB_ENABLED: true
-    AMQP_CRD_NEW_ASB_ENABLED: false
     CRD_SUBSCRIPTION_NAME: "{{ .Release.Name}}-asb-crd-topic"
     JRD_SUBSCRIPTION_NAME: "{{ .Release.Name}}-asb-jrd-topic"
     CRD_TOPIC_NAME: "{{ .Release.Name}}-asb-crd-topic"

diff --git a/src/main/resources/application.yaml b/src/main/resources/application.yaml
@@ -144,13 +144,13 @@ amqp:
   host: ${AMQP_HOST:test}
   sharedAccessKeyName: ${AMQP_SHARED_ACCESS_KEY_NAME:test}
   crd:
-    newAsb: ${AMQP_CRD_NEW_ASB_ENABLED:false}
+    newAsb: ${AMQP_CRD_NEW_ASB_ENABLED:true}
     enabled: ${AMQP_ENABLED:true}
     sharedAccessKeyValue: ${AMQP_CRD_SHARED_ACCESS_KEY_VALUE:test}
     topic: ${CRD_TOPIC_NAME:test}
     subscription: ${CRD_SUBSCRIPTION_NAME:test}
   jrd:
-    newAsb: ${AMQP_JRD_NEW_ASB_ENABLED:false}
+    newAsb: ${AMQP_JRD_NEW_ASB_ENABLED:true}
     enabled: ${AMQP_ENABLED:true}
     sharedAccessKeyValue: ${AMQP_JRD_SHARED_ACCESS_KEY_VALUE:test}
     topic: ${JRD_TOPIC_NAME:test}

diff --git a/src/smokeTest/java/uk/gov/hmcts/reform/orgrolemapping/SmokeTest.java b/src/smokeTest/java/uk/gov/hmcts/reform/orgrolemapping/SmokeTest.java
@@ -18,9 +18,9 @@
 import org.springframework.http.HttpStatus;
 import uk.gov.hmcts.reform.orgrolemapping.config.servicebus.CRDMessagingConfiguration;
 import uk.gov.hmcts.reform.orgrolemapping.config.servicebus.JRDMessagingConfiguration;
-import uk.gov.hmcts.reform.orgrolemapping.servicebus.CRDTopicConsumer;
+import uk.gov.hmcts.reform.orgrolemapping.servicebus.CRDTopicConsumerNew;
 import uk.gov.hmcts.reform.orgrolemapping.servicebus.CRDTopicPublisher;
-import uk.gov.hmcts.reform.orgrolemapping.servicebus.JRDTopicConsumer;
+import uk.gov.hmcts.reform.orgrolemapping.servicebus.JRDTopicConsumerNew;
 import uk.gov.hmcts.reform.orgrolemapping.servicebus.JRDTopicPublisher;
 
 @RunWith(SpringIntegrationSerenityRunner.class)
@@ -40,10 +40,10 @@ public class SmokeTest {
     UserTokenProviderConfig config;
 
     @MockBean
-    private CRDTopicConsumer crdTopicConsumer;
+    private CRDTopicConsumerNew crdTopicConsumerNew;
 
     @MockBean
-    private JRDTopicConsumer jrdTopicConsumer;
+    private JRDTopicConsumerNew jrdTopicConsumerNew;
 
     @MockBean
     private CRDTopicPublisher crdTopicPublisher;