added sync support in multiple files

Signed-off-by: Moshe Beladev <[email protected]>

Author: moshebe

.gitignore

@@ -3,6 +3,7 @@ __debug_bin
 flagd
 .vscode
 dist/
+.idea
 
 # ignore generated code
 pkg/generated/*.gen.*

cmd/start.go

@@ -23,7 +23,7 @@ var (
 	serviceProvider   string
 	syncProvider      string
 	evaluator         string
-	uri               string
+	uri               []string
 	httpServicePort   int32
 	socketServicePath string
 	bearerToken       string
@@ -46,26 +46,30 @@ func findService(name string) (service.IService, error) {
 	return v, nil
 }
 
-func findSync(name string) (sync.ISync, error) {
-	registeredSync := map[string]sync.ISync{
-		"filepath": &sync.FilePathSync{
-			URI: uri,
-		},
-		"remote": &sync.HTTPSync{
-			URI:         uri,
-			BearerToken: bearerToken,
-			Client: &http.Client{
-				Timeout: time.Second * 10,
+func findSync(name string) ([]sync.ISync, error) {
+	results := make([]sync.ISync, 0, len(uri))
+	for _, u := range uri {
+		registeredSync := map[string]sync.ISync{
+			"filepath": &sync.FilePathSync{
+				URI: u,
 			},
-		},
-	}
-	v, ok := registeredSync[name]
-	if !ok {
-		return nil, errors.New("no sync-provider set")
+			"remote": &sync.HTTPSync{
+				URI:         u,
+				BearerToken: bearerToken,
+				Client: &http.Client{
+					Timeout: time.Second * 10,
+				},
+			},
+		}
+		v, ok := registeredSync[name]
+		if !ok {
+			return nil, errors.New("no sync-provider set")
+		}
+		results = append(results, v)
+		log.Debugf("Using %s sync-provider on %q\n", name, u)
 	}
 
-	log.Debugf("Using %s sync-provider\n", name)
-	return v, nil
+	return results, nil
 }
 
 func findEvaluator(name string) (eval.IEvaluator, error) {
@@ -98,7 +102,7 @@ var startCmd = &cobra.Command{
 		serviceImpl = foundService
 
 		// Configure sync-provider impl--------------------------------------------
-		var syncImpl sync.ISync
+		var syncImpl []sync.ISync
 		foundSync, err := findSync(syncProvider)
 		if err != nil {
 			log.Errorf("Unable to find sync '%s'", syncProvider)
@@ -148,8 +152,9 @@ func init() {
 		&syncProvider, "sync-provider", "y", "filepath", "Set a sync provider e.g. filepath or remote")
 	startCmd.Flags().StringVarP(
 		&evaluator, "evaluator", "e", "json", "Set an evaluator e.g. json")
-	startCmd.Flags().StringVarP(
-		&uri, "uri", "f", "", "Set a sync provider uri to read data from this can be a filepath or url")
+	startCmd.Flags().StringSliceVarP(
+		&uri, "uri", "f", []string{}, "Set a sync provider uri to read data from this can be a filepath or url")
+
 	startCmd.Flags().StringVarP(
 		&bearerToken, "bearer-token", "b", "", "Set a bearer token to use for remote sync")
 

config/samples/example_flags_secondary.json

@@ -0,0 +1,36 @@
+{
+  "flags": {
+    "myBoolFlag": {
+      "state": "ENABLED",
+      "variants": {
+        "on": true,
+        "off": false
+      },
+      "defaultVariant": "off"
+    },
+    "isColorGreen": {
+      "state": "ENABLED",
+      "variants": {
+        "on": true,
+        "off": false
+      },
+      "defaultVariant": "off",
+      "targeting": {
+        "if": [
+          {
+            "==": [
+              {
+                "var": [
+                  "color"
+                ]
+              },
+              "yellow"
+            ]
+          },
+          "on",
+          "off"
+        ]
+      }
+    }
+  }
+}

pkg/eval/json_evaluator.go

@@ -50,7 +50,7 @@ func (je *JSONEvaluator) SetState(state string) error {
 	if err != nil {
 		return fmt.Errorf("unmarshal new state: %w", err)
 	}
-	je.state.Merge(newFlags)
+	je.state = je.state.Merge(newFlags)
 
 	return nil
 }

pkg/runtime/runtime.go

@@ -26,23 +26,19 @@ func updateState(syncr sync.ISync) error {
 	return nil
 }
 
-func Start(ctx context.Context, syncr sync.ISync, server service.IService, evaluator eval.IEvaluator) {
-	ev = evaluator
-
+func startSyncer(ctx context.Context, notifier chan sync.INotify, syncr sync.ISync) {
 	if err := updateState(syncr); err != nil {
 		log.Error(err)
 	}
 
-	syncNotifier := make(chan sync.INotify)
-
-	go syncr.Notify(syncNotifier)
+	go syncr.Notify(notifier)
 
 	go func() {
 		for {
 			select {
 			case <-ctx.Done():
 				return
-			case w := <-syncNotifier:
+			case w := <-notifier:
 				switch w.GetEvent().EventType {
 				case sync.EEventTypeCreate:
 					log.Info("New configuration created")
@@ -60,6 +56,16 @@ func Start(ctx context.Context, syncr sync.ISync, server service.IService, evalu
 			}
 		}
 	}()
+}
+
+func Start(ctx context.Context, syncr []sync.ISync, server service.IService, evaluator eval.IEvaluator) {
+	ev = evaluator
+
+	syncNotifier := make(chan sync.INotify)
+
+	for _, s := range syncr {
+		startSyncer(ctx, syncNotifier, s)
+	}
 
 	go func() { _ = server.Serve(ctx, ev) }()
 }