x/ref: Flatten services/security/groups.
We've decided to have less hierarchy in our go packages, to make
it easier for our users to browse our packages. We'd also like
to hide libraries whenever possible, by moving them under an
"internal" directory.
Here's the renamings:
services/security/groups/README -> services/groups/README
services/security/groups/grpserverd -> services/groups/groupsd
services/security/groups/memstore -> services/groups/internal/memstore
services/security/groups/server -> services/groups/internal/server
Change-Id: I892b376501b1d7c5f943a9d29c080b8c212d0b2c
diff --git a/services/security/groups/README b/services/groups/README
similarity index 66%
rename from services/security/groups/README
rename to services/groups/README
index 4d1e921..fa22167 100644
--- a/services/security/groups/README
+++ b/services/groups/README
@@ -1,6 +1,6 @@
WORK IN PROGRESS. DO NOT DEPEND ON ANYTHING IN THIS DIRECTORY.
-This directory provides an implementation of groups.
+This directory provides an implementation of groups for managing access control.
Group support is under development. Code and interfaces in this directory may
change at any time.
diff --git a/services/security/groups/grpserverd/main.go b/services/groups/groupsd/main.go
similarity index 84%
rename from services/security/groups/grpserverd/main.go
rename to services/groups/groupsd/main.go
index b5d2c3d..39222de 100644
--- a/services/security/groups/grpserverd/main.go
+++ b/services/groups/groupsd/main.go
@@ -2,11 +2,11 @@
// Use of this source code is governed by a BSD-style
// license that can be found in the LICENSE file.
-// grpserverd is a group server daemon.
+// Daemon groupsd manages groups for access control.
package main
// Example invocation:
-// grpserverd --v23.tcp.address="127.0.0.1:0" --name=grpserverd
+// groupsd --v23.tcp.address="127.0.0.1:0" --name=groupsd
import (
"flag"
@@ -17,8 +17,8 @@
"v.io/x/ref/lib/signals"
_ "v.io/x/ref/profiles/roaming"
- "v.io/x/ref/services/security/groups/memstore"
- "v.io/x/ref/services/security/groups/server"
+ "v.io/x/ref/services/groups/internal/memstore"
+ "v.io/x/ref/services/groups/internal/server"
)
// TODO(sadovsky): Perhaps this should be one of the standard Vanadium flags.
diff --git a/services/security/groups/memstore/memstore.go b/services/groups/internal/memstore/memstore.go
similarity index 97%
rename from services/security/groups/memstore/memstore.go
rename to services/groups/internal/memstore/memstore.go
index 7785c6b..89b2825 100644
--- a/services/security/groups/memstore/memstore.go
+++ b/services/groups/internal/memstore/memstore.go
@@ -11,7 +11,7 @@
"strconv"
"sync"
- "v.io/x/ref/services/security/groups/server"
+ "v.io/x/ref/services/groups/internal/server"
)
type entry struct {
diff --git a/services/security/groups/server/doc.go b/services/groups/internal/server/doc.go
similarity index 100%
rename from services/security/groups/server/doc.go
rename to services/groups/internal/server/doc.go
diff --git a/services/security/groups/server/group.go b/services/groups/internal/server/group.go
similarity index 100%
rename from services/security/groups/server/group.go
rename to services/groups/internal/server/group.go
diff --git a/services/security/groups/server/manager.go b/services/groups/internal/server/manager.go
similarity index 100%
rename from services/security/groups/server/manager.go
rename to services/groups/internal/server/manager.go
diff --git a/services/security/groups/server/server_test.go b/services/groups/internal/server/server_test.go
similarity index 99%
rename from services/security/groups/server/server_test.go
rename to services/groups/internal/server/server_test.go
index fa308df..e9299cc 100644
--- a/services/security/groups/server/server_test.go
+++ b/services/groups/internal/server/server_test.go
@@ -19,8 +19,8 @@
"v.io/x/lib/vlog"
_ "v.io/x/ref/profiles"
- "v.io/x/ref/services/security/groups/memstore"
- "v.io/x/ref/services/security/groups/server"
+ "v.io/x/ref/services/groups/internal/memstore"
+ "v.io/x/ref/services/groups/internal/server"
"v.io/x/ref/test/testutil"
)
diff --git a/services/security/groups/server/store.go b/services/groups/internal/server/store.go
similarity index 100%
rename from services/security/groups/server/store.go
rename to services/groups/internal/server/store.go
diff --git a/services/security/groups/server/types.vdl b/services/groups/internal/server/types.vdl
similarity index 100%
rename from services/security/groups/server/types.vdl
rename to services/groups/internal/server/types.vdl
diff --git a/services/security/groups/server/types.vdl.go b/services/groups/internal/server/types.vdl.go
similarity index 91%
rename from services/security/groups/server/types.vdl.go
rename to services/groups/internal/server/types.vdl.go
index b0ffa4e..0a2eb83 100644
--- a/services/security/groups/server/types.vdl.go
+++ b/services/groups/internal/server/types.vdl.go
@@ -24,7 +24,7 @@
}
func (groupData) __VDLReflect(struct {
- Name string "v.io/x/ref/services/security/groups/server.groupData"
+ Name string "v.io/x/ref/services/groups/internal/server.groupData"
}) {
}
diff --git a/services/security/groups/server/v23_internal_test.go b/services/groups/internal/server/v23_internal_test.go
similarity index 100%
rename from services/security/groups/server/v23_internal_test.go
rename to services/groups/internal/server/v23_internal_test.go
