From 89ccb8110dd181403165334f431db42ad574e9d7 Mon Sep 17 00:00:00 2001
From: "A.Unger" <zyxancf@gmail.com>
Date: Thu, 12 Nov 2020 09:30:14 +0100
Subject: [PATCH] external service registration aware of different registries

---
 ocis/pkg/config/config.go                | 14 +++++++-------
 storage/pkg/service/external/external.go | 20 +++++++++++++++++---
 2 files changed, 24 insertions(+), 10 deletions(-)

diff --git a/ocis/pkg/config/config.go b/ocis/pkg/config/config.go
index 50f2d802c..bf8f96c42 100644
--- a/ocis/pkg/config/config.go
+++ b/ocis/pkg/config/config.go
@@ -60,13 +60,13 @@ type TokenManager struct {
 
 // Config combines all available configuration parts.
 type Config struct {
-	File     string
-	Registry string
-	Log      Log
-	Debug    Debug
-	HTTP     HTTP
-	GRPC     GRPC
-	Tracing  Tracing
+	File         string
+	Registry     string
+	Log          Log
+	Debug        Debug
+	HTTP         HTTP
+	GRPC         GRPC
+	Tracing      Tracing
 	TokenManager TokenManager
 
 	Accounts      *accounts.Config
diff --git a/storage/pkg/service/external/external.go b/storage/pkg/service/external/external.go
index 9238d3b1b..80aef834d 100644
--- a/storage/pkg/service/external/external.go
+++ b/storage/pkg/service/external/external.go
@@ -2,8 +2,13 @@ package external
 
 import (
 	"context"
+	"os"
+	"strings"
 	"time"
 
+	etcdr "github.com/micro/go-micro/v2/registry/etcd"
+	mdnsr "github.com/micro/go-micro/v2/registry/mdns"
+
 	"github.com/micro/go-micro/v2/broker"
 	"github.com/micro/go-micro/v2/registry"
 	"github.com/owncloud/ocis/ocis-pkg/log"
@@ -24,6 +29,16 @@ func RegisterGRPCEndpoint(ctx context.Context, serviceID, uuid, addr string, log
 	node.Metadata["transport"] = "grpc"
 	node.Metadata["protocol"] = "grpc"
 
+	addresses := strings.Split(os.Getenv("MICRO_REGISTRY_ADDRESS"), ",")
+	var r registry.Registry
+
+	switch os.Getenv("MICRO_REGISTRY") {
+	case "etcd":
+		r = etcdr.NewRegistry(registry.Addrs(addresses...))
+	default:
+		r = mdnsr.NewRegistry()
+	}
+
 	service := &registry.Service{
 		Name:      serviceID,
 		Version:   "",
@@ -31,11 +46,10 @@ func RegisterGRPCEndpoint(ctx context.Context, serviceID, uuid, addr string, log
 		Endpoints: make([]*registry.Endpoint, 0),
 	}
 
-	rOpts := []registry.RegisterOption{registry.RegisterTTL(time.Minute)}
-
 	logger.Info().Msgf("registering external service %v@%v", node.Id, node.Address)
 
-	if err := registry.Register(service, rOpts...); err != nil {
+	rOpts := []registry.RegisterOption{registry.RegisterTTL(time.Minute)}
+	if err := r.Register(service, rOpts...); err != nil {
 		logger.Fatal().Err(err).Msgf("Registration error for external service %v", serviceID)
 	}