sensorlog_lite: Replace blessing slashes with colons.
Change-Id: I3cac42e08f15a02c9994763b635bb0b6bd9856cb
diff --git a/go/src/v.io/x/sensorlog/README.md b/go/src/v.io/x/sensorlog/README.md
index 82059e7..734d822 100644
--- a/go/src/v.io/x/sensorlog/README.md
+++ b/go/src/v.io/x/sensorlog/README.md
@@ -85,4 +85,4 @@
The internal state of the master Syncbase can be examined using `sb`:
- $ V23_CREDENTIALS=<creds> ${JIRI_ROOT}/release/go/bin/vbecome -name sl/client/main ${JIRI_ROOT}/release/go/bin/sb -service /$(dig $(hostname) +short):8202/sl/client/main/syncbased sh sensorlog_lite sldb
+ $ V23_CREDENTIALS=<creds> ${JIRI_ROOT}/release/go/bin/vbecome -name sl:client:main ${JIRI_ROOT}/release/go/bin/sb -service /$(dig $(hostname) +short):8202/sl/client/main/syncbased sh sensorlog_lite sldb
diff --git a/go/src/v.io/x/sensorlog/internal/measure/syncgroup_test.go b/go/src/v.io/x/sensorlog/internal/measure/syncgroup_test.go
index f38ef39..d447fa6 100644
--- a/go/src/v.io/x/sensorlog/internal/measure/syncgroup_test.go
+++ b/go/src/v.io/x/sensorlog/internal/measure/syncgroup_test.go
@@ -19,7 +19,7 @@
)
func TestCreateSyncgroup(t *testing.T) {
- _, ctxMeasured, sbName, _, cleanup := sbtu.SetupOrDieCustom("one", "one/sb", nil)
+ _, ctxMeasured, sbName, _, cleanup := sbtu.SetupOrDieCustom("one", "one:sb", nil)
defer cleanup()
// Open app/db (create both) as measured.
@@ -29,7 +29,7 @@
}
devId := "measured1"
- admin := "root/two"
+ admin := "root:two"
syncMts := []string{}
// Creating the syncgroup should succeed.
@@ -51,11 +51,11 @@
// measured should have dropped privileges on <StreamDefTable>/<devId>.
expectPerms, err := access.ReadPermissions(bytes.NewBufferString(`{
- "Admin":{"In":["root/two"]},
- "Read":{"In":["root/two", "root/one"]},
- "Write":{"In":["root/two"]},
- "Debug":{"In":["root/two"]},
- "Resolve":{"In":["root/two", "root/one"]}
+ "Admin":{"In":["root:two"]},
+ "Read":{"In":["root:two", "root:one"]},
+ "Write":{"In":["root:two"]},
+ "Debug":{"In":["root:two"]},
+ "Resolve":{"In":["root:two", "root:one"]}
}`))
if err != nil {
t.Fatalf("ReadPermissions should have succeeded, got error: %v", err)
diff --git a/go/src/v.io/x/sensorlog/internal/sbutil/syncbase_test.go b/go/src/v.io/x/sensorlog/internal/sbutil/syncbase_test.go
index 543daa5..8b4155a 100644
--- a/go/src/v.io/x/sensorlog/internal/sbutil/syncbase_test.go
+++ b/go/src/v.io/x/sensorlog/internal/sbutil/syncbase_test.go
@@ -18,7 +18,7 @@
)
func TestCreateOrOpenDB(t *testing.T) {
- _, ctxOwner, sbName, rootPrincipal, cleanup := sbtu.SetupOrDieCustom("one", "one/sb", nil)
+ _, ctxOwner, sbName, rootPrincipal, cleanup := sbtu.SetupOrDieCustom("one", "one:sb", nil)
defer cleanup()
ctxGuest := sbtu.NewCtx(ctxOwner, rootPrincipal, "two")
@@ -55,10 +55,10 @@
}
// Expect db permissions with full access for owner, resolve only for others.
expectPerms, err := access.ReadPermissions(bytes.NewBufferString(`{
- "Admin":{"In":["root/one"]},
- "Read":{"In":["root/one"]},
- "Write":{"In":["root/one"]},
- "Debug":{"In":["root/one"]},
+ "Admin":{"In":["root:one"]},
+ "Read":{"In":["root:one"]},
+ "Write":{"In":["root:one"]},
+ "Debug":{"In":["root:one"]},
"Resolve":{"In":["..."]}
}`))
if err != nil {
@@ -66,7 +66,7 @@
}
if perms, _, err := dbOwner.GetPermissions(ctxOwner); err != nil {
t.Errorf("GetPermissions should have succeeded, got error: %v", err)
- } else if got, want := perms, expectPerms; !reflect.DeepEqual(got, want) {
+ } else if got, want := perms.Normalize(), expectPerms.Normalize(); !reflect.DeepEqual(got, want) {
t.Errorf("Unexpected database permissions: got %v, want %v", got, want)
}
// Check that all tables exist.
@@ -79,7 +79,7 @@
}
func TestTablePermissions(t *testing.T) {
- _, ctxOwner, sbName, _, cleanup := sbtu.SetupOrDieCustom("one", "one/sb", nil)
+ _, ctxOwner, sbName, _, cleanup := sbtu.SetupOrDieCustom("one", "one:sb", nil)
defer cleanup()
// Open app/db (create both) as owner.
@@ -89,19 +89,19 @@
}
expectPermsFull, err := access.ReadPermissions(bytes.NewBufferString(`{
- "Admin":{"In":["root/one"]},
- "Read":{"In":["root/one"]},
- "Write":{"In":["root/one"]},
- "Debug":{"In":["root/one"]},
+ "Admin":{"In":["root:one"]},
+ "Read":{"In":["root:one"]},
+ "Write":{"In":["root:one"]},
+ "Debug":{"In":["root:one"]},
"Resolve":{"In":["..."]}
}`))
if err != nil {
t.Fatalf("ReadPermissions should have succeeded, got error: %v", err)
}
expectPermsReadOnly, err := access.ReadPermissions(bytes.NewBufferString(`{
- "Admin":{"In":["root/one"]},
- "Read":{"In":["root/one"]},
- "Debug":{"In":["root/one"]},
+ "Admin":{"In":["root:one"]},
+ "Read":{"In":["root:one"]},
+ "Debug":{"In":["root:one"]},
"Resolve":{"In":["..."]}
}`))
if err != nil {
diff --git a/go/src/v.io/x/sensorlog/scripts/runner_lib.sh b/go/src/v.io/x/sensorlog/scripts/runner_lib.sh
index 6c551cd..c503c91 100644
--- a/go/src/v.io/x/sensorlog/scripts/runner_lib.sh
+++ b/go/src/v.io/x/sensorlog/scripts/runner_lib.sh
@@ -27,7 +27,7 @@
}
export -f gen_uuid
-readonly BLESSING_CHAIN_SEPARATOR='/'
+readonly BLESSING_CHAIN_SEPARATOR=':'
# Converts name to blessing extension.
# name_to_blessing NAME
