From 951a441f658804d1bcadb99cc286fa6fd2ddfcb7 Mon Sep 17 00:00:00 2001
From: "A.Unger" <zyxancf@gmail.com>
Date: Wed, 11 Nov 2020 15:52:13 +0100
Subject: [PATCH] cleanup old comments

---
 accounts/pkg/service/v0/permissions.go | 2 --
 accounts/pkg/service/v0/service.go     | 3 ---
 accounts/pkg/service/v0/settings.go    | 2 --
 ocis-pkg/service/grpc/service.go       | 2 +-
 ocs/pkg/service/v0/service.go          | 2 --
 proxy/pkg/command/server.go            | 2 --
 6 files changed, 1 insertion(+), 12 deletions(-)

diff --git a/accounts/pkg/service/v0/permissions.go b/accounts/pkg/service/v0/permissions.go
index bb45a3be9..177bb5faa 100644
--- a/accounts/pkg/service/v0/permissions.go
+++ b/accounts/pkg/service/v0/permissions.go
@@ -27,8 +27,6 @@ const (
 
 // RegisterPermissions registers permissions for account management and group management with the settings service.
 func RegisterPermissions(l *olog.Logger) {
-	// TODO this won't work with a registry other than mdns. Look into Micro's client initialization.
-	// https://github.com/owncloud/ocis-proxy/issues/38
 	service := settings.NewBundleService("com.owncloud.api.settings", grpc.DefaultClient)
 
 	permissionRequests := generateAccountManagementPermissionsRequests()
diff --git a/accounts/pkg/service/v0/service.go b/accounts/pkg/service/v0/service.go
index 983a9d17d..5896f50c1 100644
--- a/accounts/pkg/service/v0/service.go
+++ b/accounts/pkg/service/v0/service.go
@@ -16,7 +16,6 @@ import (
 	idxcfg "github.com/owncloud/ocis/ocis-pkg/indexer/config"
 	idxerrs "github.com/owncloud/ocis/ocis-pkg/indexer/errors"
 
-	//mclient "github.com/micro/go-micro/v2/client"
 	"github.com/owncloud/ocis/accounts/pkg/config"
 	"github.com/owncloud/ocis/accounts/pkg/proto/v0"
 	"github.com/owncloud/ocis/ocis-pkg/log"
@@ -36,8 +35,6 @@ func New(opts ...Option) (s *Service, err error) {
 
 	roleService := options.RoleService
 	if roleService == nil {
-		// https://github.com/owncloud/ocis-proxy/issues/38
-		// TODO this won't work with a registry other than mdns. Look into Micro's client initialization.
 		roleService = settings.NewRoleService("com.owncloud.api.settings", grpc.DefaultClient)
 	}
 	roleManager := options.RoleManager
diff --git a/accounts/pkg/service/v0/settings.go b/accounts/pkg/service/v0/settings.go
index 3d16d37a7..339a7f725 100644
--- a/accounts/pkg/service/v0/settings.go
+++ b/accounts/pkg/service/v0/settings.go
@@ -15,8 +15,6 @@ const (
 
 // RegisterSettingsBundles pushes the settings bundle definitions for this extension to the ocis-settings service.
 func RegisterSettingsBundles(l *olog.Logger) {
-	// TODO this won't work with a registry other than mdns. Look into Micro's client initialization.
-	// https://github.com/owncloud/ocis-proxy/issues/38
 	service := settings.NewBundleService("com.owncloud.api.settings", grpc.DefaultClient)
 
 	bundleRequests := []settings.SaveBundleRequest{
diff --git a/ocis-pkg/service/grpc/service.go b/ocis-pkg/service/grpc/service.go
index 77b9d6e33..8cbd3e5be 100644
--- a/ocis-pkg/service/grpc/service.go
+++ b/ocis-pkg/service/grpc/service.go
@@ -31,7 +31,7 @@ func newGrpcClient() mclient.Client {
 
 	c := grpc.NewClient(
 		mclient.RequestTimeout(10*time.Second),
-		mclient.Registry(r), // this is a workaround and will force clients to ONLY use etcd as the registry. This needs to be configurable
+		mclient.Registry(r),
 	)
 	return c
 }
diff --git a/ocs/pkg/service/v0/service.go b/ocs/pkg/service/v0/service.go
index c59a64e3a..3d9d0a1d7 100644
--- a/ocs/pkg/service/v0/service.go
+++ b/ocs/pkg/service/v0/service.go
@@ -39,8 +39,6 @@ func NewService(opts ...Option) Service {
 
 	roleService := options.RoleService
 	if roleService == nil {
-		// https://github.com/owncloud/ocis-proxy/issues/38
-		// TODO this won't work with a registry other than mdns. Look into Micro's client initialization.
 		roleService = settings.NewRoleService("com.owncloud.api.settings", ogrpc.DefaultClient)
 	}
 	roleManager := options.RoleManager
diff --git a/proxy/pkg/command/server.go b/proxy/pkg/command/server.go
index cfd2d1f4f..6afc03bf4 100644
--- a/proxy/pkg/command/server.go
+++ b/proxy/pkg/command/server.go
@@ -252,8 +252,6 @@ func loadMiddlewares(ctx context.Context, l log.Logger, cfg *config.Config) alic
 		middleware.PreSignedURLConfig(cfg.PreSignedURL),
 	)
 
-	// TODO this won't work with a registry other than mdns. Look into Micro's client initialization.
-	// https://github.com/owncloud/ocis/proxy/issues/38
 	accounts := acc.NewAccountsService("com.owncloud.api.accounts", ogrpc.DefaultClient)
 	roles := settings.NewRoleService("com.owncloud.api.settings", ogrpc.DefaultClient)