move topic to configuration file

Author: ChanderG

cmd/mq2p.go

@@ -47,7 +47,7 @@ func main() {
 		sm.Update(mqp)
 	}
 
-	if token := c.Subscribe("topic", 0, messageHandler); token.Wait() && token.Error() != nil {
+	if token := c.Subscribe(conf.MqConfig.Topic, 0, messageHandler); token.Wait() && token.Error() != nil {
 		fmt.Println(token.Error())
 		os.Exit(1)
 	}

config.yaml

@@ -1,5 +1,6 @@
 mq:
   server: tcp://127.0.0.1:1883
+  topic: topic
 metrics:
   - mq_name: simple_metric
     prom_name: simple_metric_prom

pkg/config/config.go

@@ -16,6 +16,7 @@ type Config struct {
 
 type MqConfig struct {
 	Server string
+	Topic  string
 }
 
 // ReadConfig reads the provided file for configuration

pkg/config/config_test.go

@@ -7,16 +7,18 @@ import (
 	manager "github.ibm.com/chandergovind/mq2p/pkg/metric-manager"
 )
 
-func TestSimpleConfigNoMetrics(t *testing.T) {
+func TestSimpleConfigMQPortion(t *testing.T) {
 	assert := assert.New(t)
 
 	configString := []byte(`
 mq:
   server: dummy_server
+  topic: dummy_topic
 `)
 	cfg, err := ParseConfig(configString)
 	assert.Nil(err)
 	assert.Equal("dummy_server", cfg.MqConfig.Server)
+	assert.Equal("dummy_topic", cfg.MqConfig.Topic)
 	assert.Empty(cfg.Metrics)
 
 }