Merge "x/ref: Flatten services/security/groups."
diff --git a/cmd/servicerunner/main.go b/cmd/servicerunner/main.go
index 3df6a21..58d8311 100644
--- a/cmd/servicerunner/main.go
+++ b/cmd/servicerunner/main.go
@@ -21,7 +21,7 @@
"v.io/x/ref/lib/signals"
"v.io/x/ref/profiles"
identityd "v.io/x/ref/services/identity/modules"
- mounttable "v.io/x/ref/services/mounttable/lib"
+ "v.io/x/ref/services/mounttable/mounttablelib"
"v.io/x/ref/test/expect"
"v.io/x/ref/test/modules"
)
@@ -45,9 +45,9 @@
if err != nil {
return fmt.Errorf("root failed: %v", err)
}
- mt, err := mounttable.NewMountTableDispatcher("")
+ mt, err := mounttablelib.NewMountTableDispatcher("")
if err != nil {
- return fmt.Errorf("mounttable.NewMountTableDispatcher failed: %s", err)
+ return fmt.Errorf("mounttablelib.NewMountTableDispatcher failed: %s", err)
}
eps, err := server.Listen(lspec)
if err != nil {
diff --git a/examples/rps/rpsbot/impl_test.go b/examples/rps/rpsbot/impl_test.go
index 420e0f2..d321a31 100644
--- a/examples/rps/rpsbot/impl_test.go
+++ b/examples/rps/rpsbot/impl_test.go
@@ -22,7 +22,7 @@
"v.io/v23/options"
"v.io/v23/rpc"
"v.io/x/ref/examples/rps"
- mounttable "v.io/x/ref/services/mounttable/lib"
+ "v.io/x/ref/services/mounttable/mounttablelib"
"v.io/x/ref/test"
"v.io/x/ref/test/modules"
)
@@ -38,9 +38,9 @@
if err != nil {
return fmt.Errorf("root failed: %v", err)
}
- mt, err := mounttable.NewMountTableDispatcher("")
+ mt, err := mounttablelib.NewMountTableDispatcher("")
if err != nil {
- return fmt.Errorf("mounttable.NewMountTableDispatcher failed: %s", err)
+ return fmt.Errorf("mounttablelib.NewMountTableDispatcher failed: %s", err)
}
eps, err := server.Listen(lspec)
if err != nil {
diff --git a/profiles/internal/naming/namespace/acl_test.go b/profiles/internal/naming/namespace/acl_test.go
index 74e60c2..e7ef23c 100644
--- a/profiles/internal/naming/namespace/acl_test.go
+++ b/profiles/internal/naming/namespace/acl_test.go
@@ -17,7 +17,7 @@
"v.io/v23/security/access"
_ "v.io/x/ref/profiles"
- service "v.io/x/ref/services/mounttable/lib"
+ "v.io/x/ref/services/mounttable/mounttablelib"
"v.io/x/ref/test"
"v.io/x/ref/test/testutil"
)
@@ -57,7 +57,7 @@
// Create a new mounttable service.
func newMT(t *testing.T, ctx *context.T) (func(), string) {
- estr, stopFunc, err := service.StartServers(ctx, v23.GetListenSpec(ctx), "", "", "")
+ estr, stopFunc, err := mounttablelib.StartServers(ctx, v23.GetListenSpec(ctx), "", "", "")
if err != nil {
t.Fatalf("r.NewServer: %s", err)
}
diff --git a/profiles/internal/naming/namespace/all_test.go b/profiles/internal/naming/namespace/all_test.go
index 3c5fbb8..ec3ad92 100644
--- a/profiles/internal/naming/namespace/all_test.go
+++ b/profiles/internal/naming/namespace/all_test.go
@@ -24,7 +24,7 @@
_ "v.io/x/ref/profiles"
inamespace "v.io/x/ref/profiles/internal/naming/namespace"
- mtlib "v.io/x/ref/services/mounttable/lib"
+ "v.io/x/ref/services/mounttable/mounttablelib"
"v.io/x/ref/test"
"v.io/x/ref/test/testutil"
)
@@ -184,7 +184,7 @@
}
func runMT(t *testing.T, ctx *context.T, mountPoint string) *serverEntry {
- mtd, err := mtlib.NewMountTableDispatcher("")
+ mtd, err := mounttablelib.NewMountTableDispatcher("")
if err != nil {
boom(t, "NewMountTableDispatcher returned error: %v", err)
}
diff --git a/profiles/internal/rpc/resolve_test.go b/profiles/internal/rpc/resolve_test.go
index a143c3a..ef41e60 100644
--- a/profiles/internal/rpc/resolve_test.go
+++ b/profiles/internal/rpc/resolve_test.go
@@ -25,7 +25,7 @@
inaming "v.io/x/ref/profiles/internal/naming"
irpc "v.io/x/ref/profiles/internal/rpc"
grt "v.io/x/ref/profiles/internal/rt"
- mounttable "v.io/x/ref/services/mounttable/lib"
+ "v.io/x/ref/services/mounttable/mounttablelib"
"v.io/x/ref/test/expect"
"v.io/x/ref/test/modules"
)
@@ -75,9 +75,9 @@
return fmt.Errorf("root failed: %v", err)
}
mp := ""
- mt, err := mounttable.NewMountTableDispatcher("")
+ mt, err := mounttablelib.NewMountTableDispatcher("")
if err != nil {
- return fmt.Errorf("mounttable.NewMountTableDispatcher failed: %s", err)
+ return fmt.Errorf("mounttablelib.NewMountTableDispatcher failed: %s", err)
}
eps, err := server.Listen(lspec)
if err != nil {
diff --git a/profiles/internal/rpc/test/client_test.go b/profiles/internal/rpc/test/client_test.go
index 681e072..6db0f38 100644
--- a/profiles/internal/rpc/test/client_test.go
+++ b/profiles/internal/rpc/test/client_test.go
@@ -26,7 +26,7 @@
_ "v.io/x/ref/profiles"
inaming "v.io/x/ref/profiles/internal/naming"
irpc "v.io/x/ref/profiles/internal/rpc"
- mounttable "v.io/x/ref/services/mounttable/lib"
+ "v.io/x/ref/services/mounttable/mounttablelib"
"v.io/x/ref/test"
"v.io/x/ref/test/expect"
"v.io/x/ref/test/modules"
@@ -44,9 +44,9 @@
if err != nil {
return fmt.Errorf("root failed: %v", err)
}
- mt, err := mounttable.NewMountTableDispatcher("")
+ mt, err := mounttablelib.NewMountTableDispatcher("")
if err != nil {
- return fmt.Errorf("mounttable.NewMountTableDispatcher failed: %s", err)
+ return fmt.Errorf("mounttablelib.NewMountTableDispatcher failed: %s", err)
}
eps, err := server.Listen(lspec)
if err != nil {
diff --git a/services/mgmt/device/starter/starter.go b/services/mgmt/device/starter/starter.go
index a854f24..e29386e 100644
--- a/services/mgmt/device/starter/starter.go
+++ b/services/mgmt/device/starter/starter.go
@@ -20,7 +20,7 @@
"v.io/x/ref/services/mgmt/device/config"
"v.io/x/ref/services/mgmt/device/impl"
"v.io/x/ref/services/mgmt/lib/acls"
- mounttable "v.io/x/ref/services/mounttable/lib"
+ "v.io/x/ref/services/mounttable/mounttablelib"
"v.io/v23"
"v.io/v23/context"
@@ -293,9 +293,9 @@
}
func startMounttable(ctx *context.T, n NamespaceArgs) (string, func(), error) {
- mtName, stopMT, err := mounttable.StartServers(ctx, n.ListenSpec, n.Name, n.Neighborhood, n.AccessListFile)
+ mtName, stopMT, err := mounttablelib.StartServers(ctx, n.ListenSpec, n.Name, n.Neighborhood, n.AccessListFile)
if err != nil {
- vlog.Errorf("mounttable.StartServers(%#v) failed: %v", n, err)
+ vlog.Errorf("mounttablelib.StartServers(%#v) failed: %v", n, err)
} else {
vlog.Infof("Local mounttable (%v) published as %q", mtName, n.Name)
}
diff --git a/services/mgmt/lib/testutil/modules.go b/services/mgmt/lib/testutil/modules.go
index 9fa84fc..1544b32 100644
--- a/services/mgmt/lib/testutil/modules.go
+++ b/services/mgmt/lib/testutil/modules.go
@@ -21,7 +21,7 @@
"v.io/x/lib/vlog"
"v.io/x/ref/envvar"
- mounttable "v.io/x/ref/services/mounttable/lib"
+ "v.io/x/ref/services/mounttable/mounttablelib"
"v.io/x/ref/test/modules"
"v.io/x/ref/test/testutil"
)
@@ -47,9 +47,9 @@
if err != nil {
return fmt.Errorf("root failed: %v", err)
}
- mt, err := mounttable.NewMountTableDispatcher("")
+ mt, err := mounttablelib.NewMountTableDispatcher("")
if err != nil {
- return fmt.Errorf("mounttable.NewMountTableDispatcher failed: %s", err)
+ return fmt.Errorf("mounttablelib.NewMountTableDispatcher failed: %s", err)
}
eps, err := server.Listen(lspec)
if err != nil {
diff --git a/services/mounttable/mounttabled/mounttable.go b/services/mounttable/mounttabled/mounttable.go
index 0318179..d2afd5a 100644
--- a/services/mounttable/mounttabled/mounttable.go
+++ b/services/mounttable/mounttabled/mounttable.go
@@ -15,7 +15,7 @@
"v.io/x/ref/lib/signals"
_ "v.io/x/ref/profiles/roaming"
- mounttable "v.io/x/ref/services/mounttable/lib"
+ "v.io/x/ref/services/mounttable/mounttablelib"
)
var (
@@ -28,9 +28,9 @@
ctx, shutdown := v23.Init()
defer shutdown()
- name, stop, err := mounttable.StartServers(ctx, v23.GetListenSpec(ctx), *mountName, *nhName, *aclFile)
+ name, stop, err := mounttablelib.StartServers(ctx, v23.GetListenSpec(ctx), *mountName, *nhName, *aclFile)
if err != nil {
- vlog.Errorf("mounttable.StartServers failed: %v", err)
+ vlog.Errorf("mounttablelib.StartServers failed: %v", err)
os.Exit(1)
}
defer stop()
diff --git a/services/mounttable/lib/collection_test_interface.vdl b/services/mounttable/mounttablelib/collection_test_interface.vdl
similarity index 96%
rename from services/mounttable/lib/collection_test_interface.vdl
rename to services/mounttable/mounttablelib/collection_test_interface.vdl
index 876164e..2795079 100644
--- a/services/mounttable/lib/collection_test_interface.vdl
+++ b/services/mounttable/mounttablelib/collection_test_interface.vdl
@@ -2,7 +2,7 @@
// Use of this source code is governed by a BSD-style
// license that can be found in the LICENSE file.
-package mounttable
+package mounttablelib
type Collection interface {
// Export sets the value for a name. Overwrite controls the behavior when
diff --git a/services/mounttable/lib/collection_test_interface.vdl.go b/services/mounttable/mounttablelib/collection_test_interface.vdl.go
similarity index 98%
rename from services/mounttable/lib/collection_test_interface.vdl.go
rename to services/mounttable/mounttablelib/collection_test_interface.vdl.go
index 71b5369..ba3f3ed 100644
--- a/services/mounttable/lib/collection_test_interface.vdl.go
+++ b/services/mounttable/mounttablelib/collection_test_interface.vdl.go
@@ -5,7 +5,7 @@
// This file was auto-generated by the vanadium vdl tool.
// Source: collection_test_interface.vdl
-package mounttable
+package mounttablelib
import (
// VDL system imports
@@ -130,7 +130,7 @@
// descCollection hides the desc to keep godoc clean.
var descCollection = rpc.InterfaceDesc{
Name: "Collection",
- PkgPath: "v.io/x/ref/services/mounttable/lib",
+ PkgPath: "v.io/x/ref/services/mounttable/mounttablelib",
Methods: []rpc.MethodDesc{
{
Name: "Export",
diff --git a/services/mounttable/lib/collectionserver_test.go b/services/mounttable/mounttablelib/collectionserver_test.go
similarity index 98%
rename from services/mounttable/lib/collectionserver_test.go
rename to services/mounttable/mounttablelib/collectionserver_test.go
index c803fc1..c3cada7 100644
--- a/services/mounttable/lib/collectionserver_test.go
+++ b/services/mounttable/mounttablelib/collectionserver_test.go
@@ -2,7 +2,7 @@
// Use of this source code is governed by a BSD-style
// license that can be found in the LICENSE file.
-package mounttable
+package mounttablelib
import (
"sync"
diff --git a/services/mounttable/lib/mounttable.go b/services/mounttable/mounttablelib/mounttable.go
similarity index 99%
rename from services/mounttable/lib/mounttable.go
rename to services/mounttable/mounttablelib/mounttable.go
index f4e059f..c7a803d 100644
--- a/services/mounttable/lib/mounttable.go
+++ b/services/mounttable/mounttablelib/mounttable.go
@@ -2,7 +2,7 @@
// Use of this source code is governed by a BSD-style
// license that can be found in the LICENSE file.
-package mounttable
+package mounttablelib
import (
"encoding/json"
@@ -25,7 +25,7 @@
"v.io/x/lib/vlog"
)
-const pkgPath = "v.io/x/ref/services/mounttable/lib"
+const pkgPath = "v.io/x/ref/services/mounttable/mounttablelib"
var (
errMalformedAddress = verror.Register(pkgPath+".errMalformedAddress", verror.NoRetry, "{1:}{2:} malformed address {3} for mounted server {4}{:_}")
diff --git a/services/mounttable/lib/mounttable_test.go b/services/mounttable/mounttablelib/mounttable_test.go
similarity index 99%
rename from services/mounttable/lib/mounttable_test.go
rename to services/mounttable/mounttablelib/mounttable_test.go
index a156f10..72e3fcf 100644
--- a/services/mounttable/lib/mounttable_test.go
+++ b/services/mounttable/mounttablelib/mounttable_test.go
@@ -2,7 +2,7 @@
// Use of this source code is governed by a BSD-style
// license that can be found in the LICENSE file.
-package mounttable
+package mounttablelib
import (
"errors"
diff --git a/services/mounttable/lib/neighborhood.go b/services/mounttable/mounttablelib/neighborhood.go
similarity index 99%
rename from services/mounttable/lib/neighborhood.go
rename to services/mounttable/mounttablelib/neighborhood.go
index a757414..15e2d4f 100644
--- a/services/mounttable/lib/neighborhood.go
+++ b/services/mounttable/mounttablelib/neighborhood.go
@@ -2,7 +2,7 @@
// Use of this source code is governed by a BSD-style
// license that can be found in the LICENSE file.
-package mounttable
+package mounttablelib
import (
"net"
diff --git a/services/mounttable/lib/neighborhood_test.go b/services/mounttable/mounttablelib/neighborhood_test.go
similarity index 98%
rename from services/mounttable/lib/neighborhood_test.go
rename to services/mounttable/mounttablelib/neighborhood_test.go
index 8175954..75d1b34 100644
--- a/services/mounttable/lib/neighborhood_test.go
+++ b/services/mounttable/mounttablelib/neighborhood_test.go
@@ -2,7 +2,7 @@
// Use of this source code is governed by a BSD-style
// license that can be found in the LICENSE file.
-package mounttable
+package mounttablelib
import (
"fmt"
diff --git a/services/mounttable/lib/serverlist.go b/services/mounttable/mounttablelib/serverlist.go
similarity index 98%
rename from services/mounttable/lib/serverlist.go
rename to services/mounttable/mounttablelib/serverlist.go
index 294fe60..0738a94 100644
--- a/services/mounttable/lib/serverlist.go
+++ b/services/mounttable/mounttablelib/serverlist.go
@@ -2,7 +2,7 @@
// Use of this source code is governed by a BSD-style
// license that can be found in the LICENSE file.
-package mounttable
+package mounttablelib
import (
"container/list"
diff --git a/services/mounttable/lib/serverlist_test.go b/services/mounttable/mounttablelib/serverlist_test.go
similarity index 98%
rename from services/mounttable/lib/serverlist_test.go
rename to services/mounttable/mounttablelib/serverlist_test.go
index 2b9fd19..b17ffd0 100644
--- a/services/mounttable/lib/serverlist_test.go
+++ b/services/mounttable/mounttablelib/serverlist_test.go
@@ -2,7 +2,7 @@
// Use of this source code is governed by a BSD-style
// license that can be found in the LICENSE file.
-package mounttable
+package mounttablelib
import (
"reflect"
diff --git a/services/mounttable/lib/servers.go b/services/mounttable/mounttablelib/servers.go
similarity index 98%
rename from services/mounttable/lib/servers.go
rename to services/mounttable/mounttablelib/servers.go
index 8c56d47..77f358c 100644
--- a/services/mounttable/lib/servers.go
+++ b/services/mounttable/mounttablelib/servers.go
@@ -2,7 +2,7 @@
// Use of this source code is governed by a BSD-style
// license that can be found in the LICENSE file.
-package mounttable
+package mounttablelib
import (
"net"
diff --git a/services/mounttable/lib/tamg.go b/services/mounttable/mounttablelib/tamg.go
similarity index 98%
rename from services/mounttable/lib/tamg.go
rename to services/mounttable/mounttablelib/tamg.go
index 568852e..c421205 100644
--- a/services/mounttable/lib/tamg.go
+++ b/services/mounttable/mounttablelib/tamg.go
@@ -2,7 +2,7 @@
// Use of this source code is governed by a BSD-style
// license that can be found in the LICENSE file.
-package mounttable
+package mounttablelib
import (
"strconv"
diff --git a/services/mounttable/lib/testdata/invalid.acl b/services/mounttable/mounttablelib/testdata/invalid.acl
similarity index 100%
rename from services/mounttable/lib/testdata/invalid.acl
rename to services/mounttable/mounttablelib/testdata/invalid.acl
diff --git a/services/mounttable/lib/testdata/noRoot.acl b/services/mounttable/mounttablelib/testdata/noRoot.acl
similarity index 100%
rename from services/mounttable/lib/testdata/noRoot.acl
rename to services/mounttable/mounttablelib/testdata/noRoot.acl
diff --git a/services/mounttable/lib/testdata/test.acl b/services/mounttable/mounttablelib/testdata/test.acl
similarity index 100%
rename from services/mounttable/lib/testdata/test.acl
rename to services/mounttable/mounttablelib/testdata/test.acl
diff --git a/services/mounttable/lib/v23_internal_test.go b/services/mounttable/mounttablelib/v23_internal_test.go
similarity index 93%
rename from services/mounttable/lib/v23_internal_test.go
rename to services/mounttable/mounttablelib/v23_internal_test.go
index 8b6b541..1d210b4 100644
--- a/services/mounttable/lib/v23_internal_test.go
+++ b/services/mounttable/mounttablelib/v23_internal_test.go
@@ -4,7 +4,7 @@
// This file was auto-generated via go generate.
// DO NOT UPDATE MANUALLY
-package mounttable
+package mounttablelib
import "testing"
import "os"
diff --git a/services/wsprd/app/app_test.go b/services/wsprd/app/app_test.go
index c6ea428..a03c05f 100644
--- a/services/wsprd/app/app_test.go
+++ b/services/wsprd/app/app_test.go
@@ -27,7 +27,7 @@
"v.io/x/ref/profiles"
vsecurity "v.io/x/ref/security"
- mounttable "v.io/x/ref/services/mounttable/lib"
+ "v.io/x/ref/services/mounttable/mounttablelib"
"v.io/x/ref/services/wsprd/lib"
"v.io/x/ref/services/wsprd/lib/testwriter"
"v.io/x/ref/services/wsprd/rpc/server"
@@ -123,7 +123,7 @@
}
func startMountTableServer(ctx *context.T) (rpc.Server, naming.Endpoint, error) {
- mt, err := mounttable.NewMountTableDispatcher("")
+ mt, err := mounttablelib.NewMountTableDispatcher("")
if err != nil {
return nil, nil, err
}
diff --git a/services/wsprd/browspr/browspr_test.go b/services/wsprd/browspr/browspr_test.go
index 0eb0df4..0d99fb9 100644
--- a/services/wsprd/browspr/browspr_test.go
+++ b/services/wsprd/browspr/browspr_test.go
@@ -22,7 +22,7 @@
"v.io/v23/vom"
"v.io/x/ref/profiles"
- mounttable "v.io/x/ref/services/mounttable/lib"
+ "v.io/x/ref/services/mounttable/mounttablelib"
"v.io/x/ref/services/wsprd/app"
"v.io/x/ref/services/wsprd/lib"
"v.io/x/ref/test"
@@ -31,7 +31,7 @@
//go:generate v23 test generate
func startMounttable(ctx *context.T) (rpc.Server, naming.Endpoint, error) {
- mt, err := mounttable.NewMountTableDispatcher("")
+ mt, err := mounttablelib.NewMountTableDispatcher("")
if err != nil {
return nil, nil, err
}
