TBR renaming v.io/core/veyron to v.io/x/ref
(and getting rid of unused shell scripts)
MultiPart: 5/13
Change-Id: I09d9df0f4dc7df3d5ca5588513be27b08fe1fd4a
diff --git a/security/GO.PACKAGE b/security/GO.PACKAGE
index ab90b80..d5e1168 100644
--- a/security/GO.PACKAGE
+++ b/security/GO.PACKAGE
@@ -1,7 +1,7 @@
{
"dependencies": {
"incoming": [
- {"allow": "v.io/core/veyron/security/..."},
+ {"allow": "v.io/x/ref/security/..."},
{"allow": "...", "comment": "dependencies on veyron/security are temporarily allowed"}
]
}
diff --git a/security/agent/agent_test.go b/security/agent/agent_test.go
index 821033b..327b7a3 100644
--- a/security/agent/agent_test.go
+++ b/security/agent/agent_test.go
@@ -10,13 +10,13 @@
"testing"
"time"
- "v.io/core/veyron/lib/expect"
- "v.io/core/veyron/lib/modules"
- "v.io/core/veyron/lib/testutil"
- tsecurity "v.io/core/veyron/lib/testutil/security"
- _ "v.io/core/veyron/profiles"
- "v.io/core/veyron/security/agent"
- "v.io/core/veyron/security/agent/server"
+ "v.io/x/ref/lib/expect"
+ "v.io/x/ref/lib/modules"
+ "v.io/x/ref/lib/testutil"
+ tsecurity "v.io/x/ref/lib/testutil/security"
+ _ "v.io/x/ref/profiles"
+ "v.io/x/ref/security/agent"
+ "v.io/x/ref/security/agent/server"
"v.io/v23"
"v.io/v23/context"
diff --git a/security/agent/agent_v23_test.go b/security/agent/agent_v23_test.go
index fe1e0e5..03100ce 100644
--- a/security/agent/agent_v23_test.go
+++ b/security/agent/agent_v23_test.go
@@ -9,7 +9,7 @@
"runtime"
"strings"
- "v.io/core/veyron/lib/testutil/v23tests"
+ "v.io/x/ref/lib/testutil/v23tests"
)
//go:generate v23 test generate
@@ -17,7 +17,7 @@
func V23TestTestPassPhraseUse(i *v23tests.T) {
// Test passphrase handling.
- bin := i.BuildGoPkg("v.io/core/veyron/security/agent/agentd")
+ bin := i.BuildGoPkg("v.io/x/ref/security/agent/agentd")
credentials := "VEYRON_CREDENTIALS=" + i.NewTempDir()
// Create the passphrase
@@ -51,8 +51,8 @@
func V23TestAllPrincipalMethods(i *v23tests.T) {
// Test all methods of the principal interface.
// (Errors are printed to STDERR)
- agentBin := i.BuildGoPkg("v.io/core/veyron/security/agent/agentd")
- principalBin := i.BuildGoPkg("v.io/core/veyron/security/agent/test_principal")
+ agentBin := i.BuildGoPkg("v.io/x/ref/security/agent/agentd")
+ principalBin := i.BuildGoPkg("v.io/x/ref/security/agent/test_principal")
credentials := "VEYRON_CREDENTIALS=" + i.NewTempDir()
agent := agentBin.WithEnv(credentials).Start(principalBin.Path())
@@ -60,7 +60,7 @@
}
func buildAndRunPingpongServer(i *v23tests.T, rootMTArg string) *v23tests.Binary {
- pingpongBin := i.BuildGoPkg("v.io/core/veyron/security/agent/pingpong")
+ pingpongBin := i.BuildGoPkg("v.io/x/ref/security/agent/pingpong")
pingpongServer := pingpongBin.Start("--server", rootMTArg)
// Make sure pingpong is up and running.
pingpongServer.ExpectRE(".*Listening at.*", -1)
@@ -77,8 +77,8 @@
rootMT, _ := i.GetVar("NAMESPACE_ROOT")
rootMTArg := "--veyron.namespace.root=" + rootMT
- agentBin := i.BuildGoPkg("v.io/core/veyron/security/agent/agentd")
- testChildBin := i.BuildGoPkg("v.io/core/veyron/security/agent/test_child")
+ agentBin := i.BuildGoPkg("v.io/x/ref/security/agent/agentd")
+ testChildBin := i.BuildGoPkg("v.io/x/ref/security/agent/test_child")
credentials := "VEYRON_CREDENTIALS=" + i.NewTempDir()
// Test running a single app.
@@ -126,8 +126,8 @@
rootMTArg := "--veyron.namespace.root=" + ns
- agentBin := i.BuildGoPkg("v.io/core/veyron/security/agent/agentd")
- vrun := i.BuildGoPkg("v.io/core/veyron/tools/vrun")
+ agentBin := i.BuildGoPkg("v.io/x/ref/security/agent/agentd")
+ vrun := i.BuildGoPkg("v.io/x/ref/tools/vrun")
pingpongBin := buildAndRunPingpongServer(i, rootMTArg)
credentials := "VEYRON_CREDENTIALS=" + i.NewTempDir()
diff --git a/security/agent/agentd/main.go b/security/agent/agentd/main.go
index 73cede6..6e5111a 100644
--- a/security/agent/agentd/main.go
+++ b/security/agent/agentd/main.go
@@ -12,12 +12,12 @@
"golang.org/x/crypto/ssh/terminal"
- "v.io/core/veyron/lib/flags/consts"
- vsignals "v.io/core/veyron/lib/signals"
- _ "v.io/core/veyron/profiles"
- vsecurity "v.io/core/veyron/security"
- "v.io/core/veyron/security/agent"
- "v.io/core/veyron/security/agent/server"
+ "v.io/x/ref/lib/flags/consts"
+ vsignals "v.io/x/ref/lib/signals"
+ _ "v.io/x/ref/profiles"
+ vsecurity "v.io/x/ref/security"
+ "v.io/x/ref/security/agent"
+ "v.io/x/ref/security/agent/server"
"v.io/v23"
"v.io/v23/security"
diff --git a/security/agent/cache/cache.go b/security/agent/cache/cache.go
index 3acf943..5ba167c 100644
--- a/security/agent/cache/cache.go
+++ b/security/agent/cache/cache.go
@@ -6,11 +6,11 @@
"fmt"
"sync"
- "v.io/core/veyron/security/agent/lru"
"v.io/v23/context"
"v.io/v23/ipc"
"v.io/v23/security"
"v.io/x/lib/vlog"
+ "v.io/x/ref/security/agent/lru"
)
const (
diff --git a/security/agent/cache/cache_test.go b/security/agent/cache/cache_test.go
index 9025fb2..78ad231 100644
--- a/security/agent/cache/cache_test.go
+++ b/security/agent/cache/cache_test.go
@@ -5,9 +5,9 @@
"reflect"
"sync"
"testing"
- tsecurity "v.io/core/veyron/lib/testutil/security"
- isecurity "v.io/core/veyron/security"
"v.io/v23/security"
+ tsecurity "v.io/x/ref/lib/testutil/security"
+ isecurity "v.io/x/ref/security"
)
func createRoots() (security.PublicKey, security.BlessingRoots, *cachedRoots) {
diff --git a/security/agent/client.go b/security/agent/client.go
index 92a33ab..f8cb435 100644
--- a/security/agent/client.go
+++ b/security/agent/client.go
@@ -7,8 +7,6 @@
"net"
"os"
- "v.io/core/veyron/lib/unixfd"
- "v.io/core/veyron/security/agent/cache"
"v.io/v23/context"
"v.io/v23/ipc"
"v.io/v23/naming"
@@ -16,6 +14,8 @@
"v.io/v23/security"
"v.io/v23/vtrace"
"v.io/x/lib/vlog"
+ "v.io/x/ref/lib/unixfd"
+ "v.io/x/ref/security/agent/cache"
)
// FdVarName is the name of the environment variable containing
diff --git a/security/agent/keymgr/client.go b/security/agent/keymgr/client.go
index 219cea1..aa4b248 100644
--- a/security/agent/keymgr/client.go
+++ b/security/agent/keymgr/client.go
@@ -8,13 +8,13 @@
"strconv"
"sync"
- "v.io/core/veyron/lib/unixfd"
- "v.io/core/veyron/security/agent/server"
"v.io/v23/context"
"v.io/v23/verror"
+ "v.io/x/ref/lib/unixfd"
+ "v.io/x/ref/security/agent/server"
)
-const pkgPath = "v.io/core/veyron/security/agent/keymgr"
+const pkgPath = "v.io/x/ref/security/agent/keymgr"
// Errors
var (
diff --git a/security/agent/keymgr/keymgr_test.go b/security/agent/keymgr/keymgr_test.go
index 91525e6..c055e2c 100644
--- a/security/agent/keymgr/keymgr_test.go
+++ b/security/agent/keymgr/keymgr_test.go
@@ -8,10 +8,10 @@
"syscall"
"testing"
- "v.io/core/veyron/lib/testutil"
- _ "v.io/core/veyron/profiles"
- "v.io/core/veyron/security/agent"
- "v.io/core/veyron/security/agent/server"
+ "v.io/x/ref/lib/testutil"
+ _ "v.io/x/ref/profiles"
+ "v.io/x/ref/security/agent"
+ "v.io/x/ref/security/agent/server"
"v.io/v23"
"v.io/v23/context"
diff --git a/security/agent/pingpong/main.go b/security/agent/pingpong/main.go
index 86f2567..66b07b4 100644
--- a/security/agent/pingpong/main.go
+++ b/security/agent/pingpong/main.go
@@ -11,9 +11,9 @@
"v.io/v23/security"
"v.io/x/lib/vlog"
- "v.io/core/veyron/lib/signals"
- "v.io/core/veyron/lib/testutil"
- _ "v.io/core/veyron/profiles"
+ "v.io/x/ref/lib/signals"
+ "v.io/x/ref/lib/testutil"
+ _ "v.io/x/ref/profiles"
)
var runServer = flag.Bool("server", false, "Whether to run in server mode")
diff --git a/security/agent/pingpong/wire.vdl.go b/security/agent/pingpong/wire.vdl.go
index b4b6461..ede4f0c 100644
--- a/security/agent/pingpong/wire.vdl.go
+++ b/security/agent/pingpong/wire.vdl.go
@@ -117,7 +117,7 @@
// descPingPong hides the desc to keep godoc clean.
var descPingPong = ipc.InterfaceDesc{
Name: "PingPong",
- PkgPath: "v.io/core/veyron/security/agent/pingpong",
+ PkgPath: "v.io/x/ref/security/agent/pingpong",
Doc: "// Simple service used in the agent tests.",
Methods: []ipc.MethodDesc{
{
diff --git a/security/agent/server/server.go b/security/agent/server/server.go
index 78e9ace..1879093 100644
--- a/security/agent/server/server.go
+++ b/security/agent/server/server.go
@@ -14,8 +14,6 @@
"strconv"
"sync"
- "v.io/core/veyron/lib/unixfd"
- vsecurity "v.io/core/veyron/security"
"v.io/v23"
"v.io/v23/context"
"v.io/v23/ipc"
@@ -23,11 +21,13 @@
"v.io/v23/security"
"v.io/v23/verror"
"v.io/x/lib/vlog"
+ "v.io/x/ref/lib/unixfd"
+ vsecurity "v.io/x/ref/security"
)
const PrincipalHandleByteSize = sha512.Size
-const pkgPath = "v.io/core/veyron/security/agent/server"
+const pkgPath = "v.io/x/ref/security/agent/server"
// Errors
var (
diff --git a/security/agent/server/sharing_test.go b/security/agent/server/sharing_test.go
index 6b25166..a4114c5 100644
--- a/security/agent/server/sharing_test.go
+++ b/security/agent/server/sharing_test.go
@@ -3,7 +3,7 @@
import (
"testing"
- _ "v.io/core/veyron/profiles"
+ _ "v.io/x/ref/profiles"
)
func doRead(c chan struct{}) string {
diff --git a/security/agent/server/wire.vdl.go b/security/agent/server/wire.vdl.go
index 65f1fc2..2f23811 100644
--- a/security/agent/server/wire.vdl.go
+++ b/security/agent/server/wire.vdl.go
@@ -471,7 +471,7 @@
// descAgent hides the desc to keep godoc clean.
var descAgent = ipc.InterfaceDesc{
Name: "Agent",
- PkgPath: "v.io/core/veyron/security/agent/server",
+ PkgPath: "v.io/x/ref/security/agent/server",
Methods: []ipc.MethodDesc{
{
Name: "Bless",
diff --git a/security/agent/test_child/main.go b/security/agent/test_child/main.go
index 03e5ab6..3a1e41b 100644
--- a/security/agent/test_child/main.go
+++ b/security/agent/test_child/main.go
@@ -8,7 +8,7 @@
"os/exec"
"syscall"
- "v.io/core/veyron/lib/flags/consts"
+ "v.io/x/ref/lib/flags/consts"
)
var (
diff --git a/security/agent/test_principal/main.go b/security/agent/test_principal/main.go
index f69c3d9..1f53d99 100644
--- a/security/agent/test_principal/main.go
+++ b/security/agent/test_principal/main.go
@@ -9,10 +9,10 @@
"reflect"
"runtime"
- "v.io/core/veyron/lib/testutil"
- _ "v.io/core/veyron/profiles"
"v.io/v23"
"v.io/v23/security"
+ "v.io/x/ref/lib/testutil"
+ _ "v.io/x/ref/profiles"
)
func newKey() security.PublicKey {
diff --git a/security/agent/testchild.sh b/security/agent/testchild.sh
deleted file mode 100755
index 76b2124..0000000
--- a/security/agent/testchild.sh
+++ /dev/null
@@ -1,18 +0,0 @@
-#!/bin/bash
-
-# Helper script for testing two binaries under the same agent.
-
-source "$(go list -f {{.Dir}} v.io/core/shell/lib)/shell_test.sh"
-
-main() {
- if [[ -n "${VEYRON_CREDENTIALS}" ]]; then
- shell_test::fail "line ${LINENO}: identity preserved"
- fi
- PINGPONG_BIN="$(shell_test::build_go_binary 'v.io/core/veyron/security/agent/pingpong')"
- shell_test::start_server "${PINGPONG_BIN}" --server
- "${PINGPONG_BIN}" || shell_test::fail "line ${LINENO}: ping"
-
- shell_test::pass
-}
-
-main "$@"
diff --git a/security/agent/v23_test.go b/security/agent/v23_test.go
index f50ab25..bdcc989 100644
--- a/security/agent/v23_test.go
+++ b/security/agent/v23_test.go
@@ -10,9 +10,9 @@
import "testing"
import "os"
-import "v.io/core/veyron/lib/modules"
-import "v.io/core/veyron/lib/testutil"
-import "v.io/core/veyron/lib/testutil/v23tests"
+import "v.io/x/ref/lib/modules"
+import "v.io/x/ref/lib/testutil"
+import "v.io/x/ref/lib/testutil/v23tests"
func init() {
modules.RegisterChild("getPrincipalAndHang", ``, getPrincipalAndHang)
diff --git a/security/audit/auditor_test.go b/security/audit/auditor_test.go
index fbabac4..6cec327 100644
--- a/security/audit/auditor_test.go
+++ b/security/audit/auditor_test.go
@@ -4,7 +4,7 @@
"testing"
"time"
- "v.io/core/veyron/security/audit"
+ "v.io/x/ref/security/audit"
)
func TestEntryString(t *testing.T) {
diff --git a/security/audit/principal_test.go b/security/audit/principal_test.go
index 1c06253..c4a63b5 100644
--- a/security/audit/principal_test.go
+++ b/security/audit/principal_test.go
@@ -10,8 +10,8 @@
"testing"
"time"
- "v.io/core/veyron/security/audit"
"v.io/v23/security"
+ "v.io/x/ref/security/audit"
)
func TestAuditingPrincipal(t *testing.T) {
diff --git a/security/blessingroots.go b/security/blessingroots.go
index c06fe6a..c2527bd 100644
--- a/security/blessingroots.go
+++ b/security/blessingroots.go
@@ -7,7 +7,7 @@
"sort"
"sync"
- "v.io/core/veyron/security/serialization"
+ "v.io/x/ref/security/serialization"
"v.io/v23/security"
)
diff --git a/security/blessingstore.go b/security/blessingstore.go
index 39cb079..8306959 100644
--- a/security/blessingstore.go
+++ b/security/blessingstore.go
@@ -11,7 +11,7 @@
"sort"
"sync"
- "v.io/core/veyron/security/serialization"
+ "v.io/x/ref/security/serialization"
"v.io/v23/security"
"v.io/x/lib/vlog"
diff --git a/security/flag/flag.go b/security/flag/flag.go
index 54dbf8e..49af27e 100644
--- a/security/flag/flag.go
+++ b/security/flag/flag.go
@@ -11,7 +11,7 @@
"v.io/v23/security"
"v.io/v23/services/security/access"
- "v.io/core/veyron/lib/flags"
+ "v.io/x/ref/lib/flags"
)
var authFlags *flags.Flags
diff --git a/security/flag/flag_test.go b/security/flag/flag_test.go
index 68095fc..05c15aa 100644
--- a/security/flag/flag_test.go
+++ b/security/flag/flag_test.go
@@ -12,8 +12,8 @@
"v.io/v23/security"
"v.io/v23/services/security/access"
- "v.io/core/veyron/lib/modules"
- tsecurity "v.io/core/veyron/lib/testutil/security"
+ "v.io/x/ref/lib/modules"
+ tsecurity "v.io/x/ref/lib/testutil/security"
)
//go:generate v23 test generate
diff --git a/security/flag/v23_internal_test.go b/security/flag/v23_internal_test.go
index 7d6e1a3..9a2e9f0 100644
--- a/security/flag/v23_internal_test.go
+++ b/security/flag/v23_internal_test.go
@@ -10,8 +10,8 @@
import "testing"
import "os"
-import "v.io/core/veyron/lib/modules"
-import "v.io/core/veyron/lib/testutil"
+import "v.io/x/ref/lib/modules"
+import "v.io/x/ref/lib/testutil"
func init() {
modules.RegisterChild("tamFromFlag", ``, tamFromFlag)
diff --git a/security/serialization/serialization_test.go b/security/serialization/serialization_test.go
index 0b3cfd6..3167841 100644
--- a/security/serialization/serialization_test.go
+++ b/security/serialization/serialization_test.go
@@ -14,8 +14,8 @@
"strings"
"testing"
- "v.io/core/veyron/lib/testutil"
- "v.io/core/veyron/security/serialization"
+ "v.io/x/ref/lib/testutil"
+ "v.io/x/ref/security/serialization"
"v.io/v23/security"
)
diff --git a/security/serialization/types.vdl.go b/security/serialization/types.vdl.go
index db10bba..0cde1a1 100644
--- a/security/serialization/types.vdl.go
+++ b/security/serialization/types.vdl.go
@@ -16,14 +16,14 @@
}
func (SignedHeader) __VDLReflect(struct {
- Name string "v.io/core/veyron/security/serialization.SignedHeader"
+ Name string "v.io/x/ref/security/serialization.SignedHeader"
}) {
}
type HashCode [32]byte
func (HashCode) __VDLReflect(struct {
- Name string "v.io/core/veyron/security/serialization.HashCode"
+ Name string "v.io/x/ref/security/serialization.HashCode"
}) {
}
@@ -47,7 +47,7 @@
SignedDataHash struct{ Value HashCode }
// __SignedDataReflect describes the SignedData union type.
__SignedDataReflect struct {
- Name string "v.io/core/veyron/security/serialization.SignedData"
+ Name string "v.io/x/ref/security/serialization.SignedData"
Type SignedData
Union struct {
Signature SignedDataSignature
diff --git a/security/storage.go b/security/storage.go
index 80cbcc7..4a94972 100644
--- a/security/storage.go
+++ b/security/storage.go
@@ -4,9 +4,9 @@
"fmt"
"io"
- "v.io/core/veyron/security/serialization"
"v.io/v23/security"
"v.io/v23/vom"
+ "v.io/x/ref/security/serialization"
)
func encodeAndStore(obj interface{}, data, signature io.WriteCloser, signer serialization.Signer) error {
