x/ref: Flatten v23/services/security/{groups,object}
v23/services/security/groups -> v23/services/group
v23/services/security/object -> v23/services/permissions
MultiPart: 2/2
Change-Id: I6973a9720906e82d1c927fd7f0eb5594bb75a152
diff --git a/cmd/mgmt/device/publish.go b/cmd/mgmt/device/publish.go
index 7f225fa..b2e2bc8 100644
--- a/cmd/mgmt/device/publish.go
+++ b/cmd/mgmt/device/publish.go
@@ -17,7 +17,7 @@
"v.io/v23/security"
"v.io/v23/security/access"
"v.io/v23/services/mgmt/application"
- "v.io/v23/services/security/object"
+ "v.io/v23/services/permissions"
"v.io/v23/verror"
"v.io/x/lib/cmdline"
@@ -68,7 +68,7 @@
if readBlessings == "" {
return nil
}
- acl, etag, err := object.ObjectClient(von).GetPermissions(gctx)
+ acl, etag, err := permissions.ObjectClient(von).GetPermissions(gctx)
if err != nil {
// TODO(caprita): This is a workaround until we sort out the
// default AccessLists for applicationd (see issue #1317). At that
@@ -82,7 +82,7 @@
acl.Add(security.BlessingPattern(blessing), string(tag))
}
}
- if err := object.ObjectClient(von).SetPermissions(gctx, acl, etag); err != nil {
+ if err := permissions.ObjectClient(von).SetPermissions(gctx, acl, etag); err != nil {
return err
}
fmt.Fprintf(cmd.Stdout(), "Added patterns %q to Read,Resolve AccessList for %q\n", readBlessings, von)
diff --git a/services/mgmt/device/impl/debug_acls_test.go b/services/mgmt/device/impl/debug_acls_test.go
index a7bcb6b..b32b1a0 100644
--- a/services/mgmt/device/impl/debug_acls_test.go
+++ b/services/mgmt/device/impl/debug_acls_test.go
@@ -13,7 +13,7 @@
"v.io/v23/naming"
"v.io/v23/security"
"v.io/v23/security/access"
- "v.io/v23/services/security/object"
+ "v.io/v23/services/permissions"
"v.io/v23/verror"
mgmttest "v.io/x/ref/services/mgmt/lib/testutil"
@@ -21,7 +21,7 @@
)
func updateAccessList(t *testing.T, ctx *context.T, blessing, right string, name ...string) {
- accessStub := object.ObjectClient(naming.Join(name...))
+ accessStub := permissions.ObjectClient(naming.Join(name...))
acl, etag, err := accessStub.GetPermissions(ctx)
if err != nil {
t.Fatalf(testutil.FormatLogLine(2, "GetPermissions(%v) failed %v", name, err))
diff --git a/services/mgmt/repository/repository.vdl.go b/services/mgmt/repository/repository.vdl.go
index cdeec9a..9341fd1 100644
--- a/services/mgmt/repository/repository.vdl.go
+++ b/services/mgmt/repository/repository.vdl.go
@@ -20,7 +20,7 @@
"v.io/v23/security/access"
"v.io/v23/services/mgmt/application"
"v.io/v23/services/mgmt/repository"
- "v.io/v23/services/security/object"
+ "v.io/v23/services/permissions"
"v.io/x/ref/services/mgmt/profile"
)
@@ -187,7 +187,7 @@
}
func (s implApplicationServerStub) Describe__() []rpc.InterfaceDesc {
- return []rpc.InterfaceDesc{ApplicationDesc, repository.ApplicationDesc, object.ObjectDesc}
+ return []rpc.InterfaceDesc{ApplicationDesc, repository.ApplicationDesc, permissions.ObjectDesc}
}
// ApplicationDesc describes the Application interface.
diff --git a/services/security/groups/server/group.go b/services/security/groups/server/group.go
index b275a7a..51a92bb 100644
--- a/services/security/groups/server/group.go
+++ b/services/security/groups/server/group.go
@@ -8,7 +8,7 @@
"v.io/v23/rpc"
"v.io/v23/security"
"v.io/v23/security/access"
- "v.io/v23/services/security/groups"
+ "v.io/v23/services/groups"
"v.io/v23/verror"
)
diff --git a/services/security/groups/server/manager.go b/services/security/groups/server/manager.go
index aa0c7ff..af8e7d4 100644
--- a/services/security/groups/server/manager.go
+++ b/services/security/groups/server/manager.go
@@ -10,7 +10,7 @@
"v.io/v23/rpc"
"v.io/v23/security"
"v.io/v23/security/access"
- "v.io/v23/services/security/groups"
+ "v.io/v23/services/groups"
)
type manager struct {
diff --git a/services/security/groups/server/server_test.go b/services/security/groups/server/server_test.go
index ed5c490..fa308df 100644
--- a/services/security/groups/server/server_test.go
+++ b/services/security/groups/server/server_test.go
@@ -14,7 +14,7 @@
"v.io/v23/naming"
"v.io/v23/security"
"v.io/v23/security/access"
- "v.io/v23/services/security/groups"
+ "v.io/v23/services/groups"
"v.io/v23/verror"
"v.io/x/lib/vlog"
diff --git a/services/security/groups/server/types.vdl b/services/security/groups/server/types.vdl
index cefcb08..d569880 100644
--- a/services/security/groups/server/types.vdl
+++ b/services/security/groups/server/types.vdl
@@ -6,7 +6,7 @@
import (
"v.io/v23/security/access"
- "v.io/v23/services/security/groups"
+ "v.io/v23/services/groups"
)
// groupData represents the persistent state of a group. (The group name is
diff --git a/services/security/groups/server/types.vdl.go b/services/security/groups/server/types.vdl.go
index cfdafdb..b0ffa4e 100644
--- a/services/security/groups/server/types.vdl.go
+++ b/services/security/groups/server/types.vdl.go
@@ -13,7 +13,7 @@
// VDL user imports
"v.io/v23/security/access"
- "v.io/v23/services/security/groups"
+ "v.io/v23/services/groups"
)
// groupData represents the persistent state of a group. (The group name is
