From 468dad8074c558b5247f04ff90b2b67393e8f9a0 Mon Sep 17 00:00:00 2001
From: Terence Lim <terencelimxp@gmail.com>
Date: Thu, 2 Mar 2023 18:27:53 +0800
Subject: [PATCH] More fixes

---
 .../configuration_controller_test.go          | 19 +++++++++++++------
 plugins/turing/runner/experiment_runner.go    |  1 -
 2 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/management-service/controller/configuration_controller_test.go b/management-service/controller/configuration_controller_test.go
index 227546eb..4a85a600 100644
--- a/management-service/controller/configuration_controller_test.go
+++ b/management-service/controller/configuration_controller_test.go
@@ -22,11 +22,15 @@ func (s *ConfigurationControllerTestSuite) SetupSuite() {
 
 	pubSubConfigProject := "dev"
 	pubSubConfigTopicName := "xp-update"
+	messageQueueKind := schema.MessageQueueKindPubsub
 
 	treatmentServicePluginConfiguration := schema.TreatmentServiceConfig{
-		PubSub: &schema.PubSub{
-			Project:   &pubSubConfigProject,
-			TopicName: &pubSubConfigTopicName,
+		MessageQueueConfig: &schema.MessageQueueConfig{
+			Kind: &messageQueueKind,
+			PubSub: &schema.PubSub{
+				Project:   &pubSubConfigProject,
+				TopicName: &pubSubConfigTopicName,
+			},
 		},
 		SegmenterConfig: &schema.SegmenterConfig{
 			"s2_ids": map[string]interface{}{
@@ -65,9 +69,12 @@ func (s *ConfigurationControllerTestSuite) TestGetTreatmentServicePluginConfig()
 	body, err := io.ReadAll(resp.Body)
 	s.Suite.Require().NoError(err)
 	s.Suite.Assert().JSONEq(`{"data":{
-		"pub_sub":{
-			"project":"dev",
-			"topic_name":"xp-update"
+		"message_queue_config": {
+			"kind":"pubsub",
+			"pub_sub":{
+				"project":"dev",
+				"topic_name":"xp-update"
+			}
 		},
 		"segmenter_config":{
 			"s2_ids":{
diff --git a/plugins/turing/runner/experiment_runner.go b/plugins/turing/runner/experiment_runner.go
index 6814d16a..842e2e56 100644
--- a/plugins/turing/runner/experiment_runner.go
+++ b/plugins/turing/runner/experiment_runner.go
@@ -257,7 +257,6 @@ func (er *experimentRunner) startBackgroundServices(
 			}
 		}()
 	}
-	return
 }
 
 func (er *experimentRunner) getRequestParams(