Skip to content

Commit 4e7f024

Browse files
committed
use any-sync acl service
1 parent e1aab87 commit 4e7f024

File tree

7 files changed

+34
-801
lines changed

7 files changed

+34
-801
lines changed

acl/acl.go

-103
This file was deleted.

acl/acl_test.go

-135
This file was deleted.

acl/object.go

-94
This file was deleted.

cmd/coordinator/coordinator.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ import (
1111
"syscall"
1212
"time"
1313

14+
"github.com/anyproto/any-sync/acl"
1415
"github.com/anyproto/any-sync/app"
1516
"github.com/anyproto/any-sync/app/logger"
1617
"github.com/anyproto/any-sync/consensus/consensusclient"
@@ -26,7 +27,6 @@ import (
2627
"go.uber.org/zap"
2728

2829
"github.com/anyproto/any-sync-coordinator/account"
29-
"github.com/anyproto/any-sync-coordinator/acl"
3030
"github.com/anyproto/any-sync-coordinator/config"
3131
"github.com/anyproto/any-sync-coordinator/coordinator"
3232
"github.com/anyproto/any-sync-coordinator/coordinatorlog"

coordinator/coordinator.go

+3-3
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ import (
66
"time"
77

88
"github.com/anyproto/any-sync/accountservice"
9+
"github.com/anyproto/any-sync/acl"
910
"github.com/anyproto/any-sync/app"
1011
"github.com/anyproto/any-sync/app/logger"
1112
"github.com/anyproto/any-sync/commonspace"
@@ -20,7 +21,6 @@ import (
2021
"go.uber.org/zap"
2122
"storj.io/drpc"
2223

23-
"github.com/anyproto/any-sync-coordinator/acl"
2424
"github.com/anyproto/any-sync-coordinator/config"
2525
"github.com/anyproto/any-sync-coordinator/coordinatorlog"
2626
"github.com/anyproto/any-sync-coordinator/deletionlog"
@@ -61,7 +61,7 @@ type coordinator struct {
6161
metric metric.Metric
6262
fileLimit filelimit.FileLimit
6363
deletionLog deletionlog.DeletionLog
64-
acl acl.Acl
64+
acl acl.AclService
6565
}
6666

6767
func (c *coordinator) Init(a *app.App) (err error) {
@@ -75,7 +75,7 @@ func (c *coordinator) Init(a *app.App) (err error) {
7575
c.metric = a.MustComponent(metric.CName).(metric.Metric)
7676
c.fileLimit = a.MustComponent(filelimit.CName).(filelimit.FileLimit)
7777
c.deletionLog = app.MustComponent[deletionlog.DeletionLog](a)
78-
c.acl = app.MustComponent[acl.Acl](a)
78+
c.acl = app.MustComponent[acl.AclService](a)
7979
return coordinatorproto.DRPCRegisterCoordinator(a.MustComponent(server.CName).(drpc.Mux), h)
8080
}
8181

0 commit comments

Comments
 (0)