From af5d0d3bab4be00255d78af652a3ae1e9156fdef Mon Sep 17 00:00:00 2001 From: "A.Unger" Date: Tue, 14 Apr 2020 19:32:54 +0200 Subject: [PATCH 1/5] rename micro/ -> server/ --- pkg/{micro => server}/grpc/grpc.go | 0 pkg/{micro => server}/grpc/options.go | 0 2 files changed, 0 insertions(+), 0 deletions(-) rename pkg/{micro => server}/grpc/grpc.go (100%) rename pkg/{micro => server}/grpc/options.go (100%) diff --git a/pkg/micro/grpc/grpc.go b/pkg/server/grpc/grpc.go similarity index 100% rename from pkg/micro/grpc/grpc.go rename to pkg/server/grpc/grpc.go diff --git a/pkg/micro/grpc/options.go b/pkg/server/grpc/options.go similarity index 100% rename from pkg/micro/grpc/options.go rename to pkg/server/grpc/options.go From 48c2b7eed5f2017ff2ed08850bc99a33ed88cffa Mon Sep 17 00:00:00 2001 From: "A.Unger" Date: Tue, 14 Apr 2020 19:35:27 +0200 Subject: [PATCH 2/5] remove unused struct --- pkg/account/accounts.go | 6 ------ 1 file changed, 6 deletions(-) diff --git a/pkg/account/accounts.go b/pkg/account/accounts.go index a9c997a9cc..19df2cf85c 100644 --- a/pkg/account/accounts.go +++ b/pkg/account/accounts.go @@ -25,9 +25,3 @@ type Manager interface { // List all records List() ([]*proto.Record, error) } - -// Record is an entry in the account storage -type Record struct { - Key string - Value []byte -} From a957a50e6863a2b503b94e15afa0c7be462b9c76 Mon Sep 17 00:00:00 2001 From: "A.Unger" Date: Tue, 14 Apr 2020 19:37:57 +0200 Subject: [PATCH 3/5] update import path --- pkg/command/server.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkg/command/server.go b/pkg/command/server.go index 0ce9fa874a..b96f9a3959 100644 --- a/pkg/command/server.go +++ b/pkg/command/server.go @@ -8,7 +8,7 @@ import ( "github.com/micro/cli/v2" "github.com/oklog/run" "github.com/owncloud/ocis-accounts/pkg/config" - "github.com/owncloud/ocis-accounts/pkg/micro/grpc" + "github.com/owncloud/ocis-accounts/pkg/server/grpc" oclog "github.com/owncloud/ocis-pkg/v2/log" ) From 4205b9ff1b6a6317eecbbaf6f68b4cffcd0264dc Mon Sep 17 00:00:00 2001 From: "A.Unger" Date: Thu, 16 Apr 2020 09:23:57 +0200 Subject: [PATCH 4/5] rename grpc.go -> server.go --- pkg/server/grpc/{grpc.go => server.go} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename pkg/server/grpc/{grpc.go => server.go} (100%) diff --git a/pkg/server/grpc/grpc.go b/pkg/server/grpc/server.go similarity index 100% rename from pkg/server/grpc/grpc.go rename to pkg/server/grpc/server.go From 13cac8ae87eb74ada1fa7c1524ea994e63435064 Mon Sep 17 00:00:00 2001 From: "A.Unger" Date: Thu, 16 Apr 2020 09:24:17 +0200 Subject: [PATCH 5/5] rename options.go -> option.go --- pkg/server/grpc/{options.go => option.go} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename pkg/server/grpc/{options.go => option.go} (100%) diff --git a/pkg/server/grpc/options.go b/pkg/server/grpc/option.go similarity index 100% rename from pkg/server/grpc/options.go rename to pkg/server/grpc/option.go