Merge pull request #26 from AnchorFree/event_selector_tasks

Added YAML support to event selector configuration
AnchorFree · Sep 13, 2019 · 7bdcdb5 · 7bdcdb5
2 parents 67cf094 + 82d2dd9
commit 7bdcdb5
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/pkg/event_selector/event_selector.go b/pkg/event_selector/event_selector.go
@@ -1,7 +1,7 @@
 package event_selector
 
 import (
-	"encoding/json"
+	"gopkg.in/yaml.v2"
 	"sync"
 
 	"github.com/anchorfree/data-go/pkg/consul"
@@ -40,7 +40,7 @@ func (es *EventSelector) RunConfigWatcher() error {
 
 func (es *EventSelector) updateConfig(rawConfig []byte) error {
 	selectors := &Selectors{}
-	err := json.Unmarshal(rawConfig, selectors)
+	err := yaml.Unmarshal(rawConfig, selectors)
 	if err != nil {
 		return err
 	}

diff --git a/pkg/event_selector/selectors_config.go b/pkg/event_selector/selectors_config.go
@@ -1,10 +1,10 @@
 package event_selector
 
 type Selectors struct {
-	Selectors []Selector `json:"selectors"`
+	Selectors []Selector `yaml:"selectors"`
 }
 
 type Selector struct {
-	TargetTopic string            `json:"target_topic"`
-	Matching    map[string]string `json:"matching"`
+	TargetTopic string            `yaml:"target_topic"`
+	Matching    map[string]string `yaml:"matching"`
 }