core: Remove the NewClient and Client methods of Runtime.
This is part of the runtimeX migration.
Change-Id: Ie112d144854fbe498797a7e9545200614d144222
diff --git a/services/mgmt/application/impl/acl_test.go b/services/mgmt/application/impl/acl_test.go
index 9c0d6ab..0efba13 100644
--- a/services/mgmt/application/impl/acl_test.go
+++ b/services/mgmt/application/impl/acl_test.go
@@ -70,7 +70,7 @@
defer fmt.Fprintf(stdout, "%v terminating\n", publishName)
defer vlog.VI(1).Infof("%v terminating", publishName)
defer globalRT.Cleanup()
- server, endpoint := mgmttest.NewServer(globalRT)
+ server, endpoint := mgmttest.NewServer(globalCtx)
defer server.Stop()
name := naming.JoinAddressName(endpoint, "")
@@ -91,29 +91,30 @@
}
func TestApplicationUpdateACL(t *testing.T) {
- sh, deferFn := mgmttest.CreateShellAndMountTable(t, globalRT)
+ sh, deferFn := mgmttest.CreateShellAndMountTable(t, globalCtx)
defer deferFn()
// setup mock up directory to put state in
storedir, cleanup := mgmttest.SetupRootDir(t, "application")
defer cleanup()
- selfRT := globalRT
otherRT := mgmttest.NewRuntime(t, globalRT)
defer otherRT.Cleanup()
+ otherCtx := otherRT.NewContext()
+
idp := tsecurity.NewIDProvider("root")
- // By default, selfRT and otherRT will have blessings generated based on the
+ // By default, globalRT and otherRT will have blessings generated based on the
// username/machine name running this process. Since these blessings will appear
// in ACLs, give them recognizable names.
- if err := idp.Bless(selfRT.Principal(), "self"); err != nil {
+ if err := idp.Bless(veyron2.GetPrincipal(globalCtx), "self"); err != nil {
t.Fatal(err)
}
- if err := idp.Bless(otherRT.Principal(), "other"); err != nil {
+ if err := idp.Bless(veyron2.GetPrincipal(otherCtx), "other"); err != nil {
t.Fatal(err)
}
- crDir, crEnv := mgmttest.CredentialsForChild(globalRT, "repo")
+ crDir, crEnv := mgmttest.CredentialsForChild(globalCtx, "repo")
defer os.RemoveAll(crDir)
// Make server credentials derived from the test harness.
@@ -121,7 +122,8 @@
pid := mgmttest.ReadPID(t, nms)
defer syscall.Kill(pid, syscall.SIGINT)
- otherStub := repository.ApplicationClient("repo/search/v1", otherRT.Client())
+ v1stub := repository.ApplicationClient("repo/search/v1")
+ repostub := repository.ApplicationClient("repo")
// Create example envelopes.
envelopeV1 := application.Envelope{
@@ -132,18 +134,16 @@
// Envelope putting as other should fail.
// TODO(rjkroege): Validate that it is failed with permission denied.
- if err := otherStub.Put(otherRT.NewContext(), []string{"base"}, envelopeV1); err == nil {
+ if err := v1stub.Put(otherCtx, []string{"base"}, envelopeV1); err == nil {
t.Fatalf("Put() wrongly didn't fail")
}
- // Envelope putting as self should succeed.
- selfStub := repository.ApplicationClient("repo/search/v1", selfRT.Client())
- if err := selfStub.Put(selfRT.NewContext(), []string{"base"}, envelopeV1); err != nil {
+ // Envelope putting as global should succeed.
+ if err := v1stub.Put(globalCtx, []string{"base"}, envelopeV1); err != nil {
t.Fatalf("Put() failed: %v", err)
}
- selfStub = repository.ApplicationClient("repo", selfRT.Client())
- acl, etag, err := selfStub.GetACL(selfRT.NewContext())
+ acl, etag, err := repostub.GetACL(globalCtx)
if !verror.Is(err, impl.ErrNotFound.ID) {
t.Fatalf("GetACL should have failed with ErrNotFound but was: %v", err)
}
@@ -160,11 +160,11 @@
newACL.Add("root/self", string(tag))
newACL.Add("root/other", string(tag))
}
- if err := selfStub.SetACL(selfRT.NewContext(), newACL, ""); err != nil {
+ if err := repostub.SetACL(globalCtx, newACL, ""); err != nil {
t.Fatalf("SetACL failed: %v", err)
}
- acl, etag, err = selfStub.GetACL(selfRT.NewContext())
+ acl, etag, err = repostub.GetACL(globalCtx)
if err != nil {
t.Fatalf("GetACL should not have failed: %v", err)
}
@@ -174,28 +174,27 @@
}
// Envelope putting as other should now succeed.
- if err := otherStub.Put(otherRT.NewContext(), []string{"base"}, envelopeV1); err != nil {
+ if err := v1stub.Put(otherCtx, []string{"base"}, envelopeV1); err != nil {
t.Fatalf("Put() wrongly failed: %v", err)
}
// Other takes control.
- otherStub = repository.ApplicationClient("repo/", otherRT.Client())
- acl, etag, err = otherStub.GetACL(otherRT.NewContext())
+ acl, etag, err = repostub.GetACL(otherCtx)
if err != nil {
t.Fatalf("GetACL 2 should not have failed: %v", err)
}
acl["Admin"] = access.ACL{
In: []security.BlessingPattern{"root/other"},
NotIn: []string{}}
- if err = otherStub.SetACL(otherRT.NewContext(), acl, etag); err != nil {
+ if err = repostub.SetACL(otherCtx, acl, etag); err != nil {
t.Fatalf("SetACL failed: %v", err)
}
// Self is now locked out but other isn't.
- if _, _, err = selfStub.GetACL(selfRT.NewContext()); err == nil {
+ if _, _, err = repostub.GetACL(globalCtx); err == nil {
t.Fatalf("GetACL should not have succeeded")
}
- acl, _, err = otherStub.GetACL(otherRT.NewContext())
+ acl, _, err = repostub.GetACL(otherCtx)
if err != nil {
t.Fatalf("GetACL should not have failed: %v", err)
}
@@ -222,29 +221,29 @@
}
func TestPerAppACL(t *testing.T) {
- sh, deferFn := mgmttest.CreateShellAndMountTable(t, globalRT)
+ sh, deferFn := mgmttest.CreateShellAndMountTable(t, globalCtx)
defer deferFn()
// setup mock up directory to put state in
storedir, cleanup := mgmttest.SetupRootDir(t, "application")
defer cleanup()
- selfRT := globalRT
otherRT := mgmttest.NewRuntime(t, globalRT)
defer otherRT.Cleanup()
+ otherCtx := otherRT.NewContext()
idp := tsecurity.NewIDProvider("root")
- // By default, selfRT and otherRT will have blessings generated based on the
+ // By default, globalRT and otherRT will have blessings generated based on the
// username/machine name running this process. Since these blessings will appear
// in ACLs, give them recognizable names.
- if err := idp.Bless(selfRT.Principal(), "self"); err != nil {
+ if err := idp.Bless(veyron2.GetPrincipal(globalCtx), "self"); err != nil {
t.Fatal(err)
}
- if err := idp.Bless(otherRT.Principal(), "other"); err != nil {
+ if err := idp.Bless(veyron2.GetPrincipal(otherCtx), "other"); err != nil {
t.Fatal(err)
}
- crDir, crEnv := mgmttest.CredentialsForChild(globalRT, "repo")
+ crDir, crEnv := mgmttest.CredentialsForChild(globalCtx, "repo")
defer os.RemoveAll(crDir)
// Make a server with the same credential as test harness.
@@ -260,19 +259,19 @@
}
// Upload the envelope at two different names.
- selfStub := repository.ApplicationClient("repo/search/v1", selfRT.Client())
- if err := selfStub.Put(selfRT.NewContext(), []string{"base"}, envelopeV1); err != nil {
+ v1stub := repository.ApplicationClient("repo/search/v1")
+ if err := v1stub.Put(globalCtx, []string{"base"}, envelopeV1); err != nil {
t.Fatalf("Put() failed: %v", err)
}
- selfStub = repository.ApplicationClient("repo/search/v2", selfRT.Client())
- if err := selfStub.Put(selfRT.NewContext(), []string{"base"}, envelopeV1); err != nil {
+ v2stub := repository.ApplicationClient("repo/search/v2")
+ if err := v2stub.Put(globalCtx, []string{"base"}, envelopeV1); err != nil {
t.Fatalf("Put() failed: %v", err)
}
// Self can access ACLs but other can't.
for _, path := range []string{"repo/search", "repo/search/v1", "repo/search/v2"} {
- selfStub = repository.ApplicationClient(path, selfRT.Client())
- acl, etag, err := selfStub.GetACL(selfRT.NewContext())
+ stub := repository.ApplicationClient(path)
+ acl, etag, err := stub.GetACL(globalCtx)
if !verror.Is(err, impl.ErrNotFound.ID) {
t.Fatalf("GetACL should have failed with ErrNotFound but was: %v", err)
}
@@ -282,26 +281,23 @@
if acl != nil {
t.Fatalf("GetACL got %v, expected %v", acl, nil)
}
- otherStub := repository.ApplicationClient(path, otherRT.Client())
- if _, _, err := otherStub.GetACL(otherRT.NewContext()); err == nil {
+ if _, _, err := stub.GetACL(otherCtx); err == nil {
t.Fatalf("GetACL didn't fail for other when it should have.")
}
}
// Self gives other full access only to repo/search/v1.
- selfStub = repository.ApplicationClient("repo/search/v1", selfRT.Client())
newACL := make(access.TaggedACLMap)
for _, tag := range access.AllTypicalTags() {
newACL.Add("root/self", string(tag))
newACL.Add("root/other", string(tag))
}
- if err := selfStub.SetACL(selfRT.NewContext(), newACL, ""); err != nil {
+ if err := v1stub.SetACL(globalCtx, newACL, ""); err != nil {
t.Fatalf("SetACL failed: %v", err)
}
// Other can now access this location.
- otherStub := repository.ApplicationClient("repo/search/v1", otherRT.Client())
- acl, _, err := otherStub.GetACL(otherRT.NewContext())
+ acl, _, err := v1stub.GetACL(otherCtx)
if err != nil {
t.Fatalf("GetACL should not have failed: %v", err)
}
@@ -328,58 +324,54 @@
// But other locations should be unaffected and other cannot access.
for _, path := range []string{"repo/search", "repo/search/v2"} {
- otherStub := repository.ApplicationClient(path, otherRT.Client())
- if _, _, err := otherStub.GetACL(otherRT.NewContext()); err == nil {
+ stub := repository.ApplicationClient(path)
+ if _, _, err := stub.GetACL(otherCtx); err == nil {
t.Fatalf("GetACL didn't fail for other when it should have.")
}
}
// Self gives other write perms on base.
- selfStub = repository.ApplicationClient("repo/", selfRT.Client())
+ repostub := repository.ApplicationClient("repo/")
newACL = make(access.TaggedACLMap)
for _, tag := range access.AllTypicalTags() {
newACL.Add("root/self", string(tag))
}
newACL["Write"] = access.ACL{In: []security.BlessingPattern{"root/other", "root/self"}}
- if err := selfStub.SetACL(selfRT.NewContext(), newACL, ""); err != nil {
+ if err := repostub.SetACL(globalCtx, newACL, ""); err != nil {
t.Fatalf("SetACL failed: %v", err)
}
// Other can now upload an envelope at both locations.
- for _, path := range []string{"repo/search/v1", "repo/search/v2"} {
- otherStub = repository.ApplicationClient(path, otherRT.Client())
- if err := otherStub.Put(otherRT.NewContext(), []string{"base"}, envelopeV1); err != nil {
+ for _, stub := range []repository.ApplicationClientStub{v1stub, v2stub} {
+ if err := stub.Put(otherCtx, []string{"base"}, envelopeV1); err != nil {
t.Fatalf("Put() failed: %v", err)
}
}
// But self didn't give other ACL modification permissions.
for _, path := range []string{"repo/search", "repo/search/v2"} {
- otherStub := repository.ApplicationClient(path, otherRT.Client())
- if _, _, err := otherStub.GetACL(otherRT.NewContext()); err == nil {
+ stub := repository.ApplicationClient(path)
+ if _, _, err := stub.GetACL(otherCtx); err == nil {
t.Fatalf("GetACL didn't fail for other when it should have.")
}
}
}
func TestInitialACLSet(t *testing.T) {
- sh, deferFn := mgmttest.CreateShellAndMountTable(t, globalRT)
+ sh, deferFn := mgmttest.CreateShellAndMountTable(t, globalCtx)
defer deferFn()
// Setup mock up directory to put state in.
storedir, cleanup := mgmttest.SetupRootDir(t, "application")
defer cleanup()
- selfRT := globalRT
- otherRT := mgmttest.NewRuntime(t, globalRT)
- defer otherRT.Cleanup()
idp := tsecurity.NewIDProvider("root")
// Make a recognizable principal name.
- if err := idp.Bless(selfRT.Principal(), "self"); err != nil {
+ if err := idp.Bless(veyron2.GetPrincipal(globalCtx), "self"); err != nil {
t.Fatal(err)
}
- crDir, crEnv := mgmttest.CredentialsForChild(globalRT, "repo")
+ crDir, crEnv := mgmttest.CredentialsForChild(globalCtx, "repo")
defer os.RemoveAll(crDir)
// Make an TAM for use on the command line.
@@ -402,8 +394,8 @@
defer syscall.Kill(pid, syscall.SIGINT)
// It should have the correct starting ACLs from the command line.
- selfStub := repository.ApplicationClient("repo", selfRT.Client())
- acl, _, err := selfStub.GetACL(selfRT.NewContext())
+ stub := repository.ApplicationClient("repo")
+ acl, _, err := stub.GetACL(globalCtx)
if err != nil {
t.Fatalf("GetACL should not have failed: %v", err)
}
diff --git a/services/mgmt/application/impl/impl_test.go b/services/mgmt/application/impl/impl_test.go
index 52a0dd1..f826e2f 100644
--- a/services/mgmt/application/impl/impl_test.go
+++ b/services/mgmt/application/impl/impl_test.go
@@ -20,8 +20,6 @@
// TestInterface tests that the implementation correctly implements
// the Application interface.
func TestInterface(t *testing.T) {
- ctx := globalRT.NewContext()
-
dir, prefix := "", ""
store, err := ioutil.TempDir(dir, prefix)
if err != nil {
@@ -33,7 +31,7 @@
t.Fatalf("impl.NewDispatcher() failed: %v", err)
}
- server, endpoint := mgmttest.NewServer(globalRT)
+ server, endpoint := mgmttest.NewServer(globalCtx)
defer server.Stop()
if err := server.ServeDispatcher("", dispatcher); err != nil {
@@ -58,43 +56,43 @@
}
// Test Put(), adding a number of application envelopes.
- if err := stubV1.Put(ctx, []string{"base", "media"}, envelopeV1); err != nil {
+ if err := stubV1.Put(globalCtx, []string{"base", "media"}, envelopeV1); err != nil {
t.Fatalf("Put() failed: %v", err)
}
- if err := stubV2.Put(ctx, []string{"base"}, envelopeV2); err != nil {
+ if err := stubV2.Put(globalCtx, []string{"base"}, envelopeV2); err != nil {
t.Fatalf("Put() failed: %v", err)
}
- if err := stub.Put(ctx, []string{"base", "media"}, envelopeV1); err == nil || !verror2.Is(err, impl.ErrInvalidSuffix.ID) {
+ if err := stub.Put(globalCtx, []string{"base", "media"}, envelopeV1); err == nil || !verror2.Is(err, impl.ErrInvalidSuffix.ID) {
t.Fatalf("Unexpected error: expected %v, got %v", impl.ErrInvalidSuffix, err)
}
// Test Match(), trying to retrieve both existing and non-existing
// application envelopes.
var output application.Envelope
- if output, err = stubV2.Match(ctx, []string{"base", "media"}); err != nil {
+ if output, err = stubV2.Match(globalCtx, []string{"base", "media"}); err != nil {
t.Fatalf("Match() failed: %v", err)
}
if !reflect.DeepEqual(envelopeV2, output) {
t.Fatalf("Incorrect output: expected %v, got %v", envelopeV2, output)
}
- if output, err = stubV1.Match(ctx, []string{"media"}); err != nil {
+ if output, err = stubV1.Match(globalCtx, []string{"media"}); err != nil {
t.Fatalf("Match() failed: %v", err)
}
if !reflect.DeepEqual(envelopeV1, output) {
t.Fatalf("Unexpected output: expected %v, got %v", envelopeV1, output)
}
- if _, err := stubV2.Match(ctx, []string{"media"}); err == nil || !verror2.Is(err, impl.ErrNotFound.ID) {
+ if _, err := stubV2.Match(globalCtx, []string{"media"}); err == nil || !verror2.Is(err, impl.ErrNotFound.ID) {
t.Fatalf("Unexpected error: expected %v, got %v", impl.ErrNotFound, err)
}
- if _, err := stubV2.Match(ctx, []string{}); err == nil || !verror2.Is(err, impl.ErrNotFound.ID) {
+ if _, err := stubV2.Match(globalCtx, []string{}); err == nil || !verror2.Is(err, impl.ErrNotFound.ID) {
t.Fatalf("Unexpected error: expected %v, got %v", impl.ErrNotFound, err)
}
- if _, err := stub.Match(ctx, []string{"media"}); err == nil || !verror2.Is(err, impl.ErrInvalidSuffix.ID) {
+ if _, err := stub.Match(globalCtx, []string{"media"}); err == nil || !verror2.Is(err, impl.ErrInvalidSuffix.ID) {
t.Fatalf("Unexpected error: expected %v, got %v", impl.ErrInvalidSuffix, err)
}
// Test Glob
- matches, err := testutil.GlobName(ctx, naming.JoinAddressName(endpoint, ""), "...")
+ matches, err := testutil.GlobName(globalCtx, naming.JoinAddressName(endpoint, ""), "...")
if err != nil {
t.Errorf("Unexpected Glob error: %v", err)
}
@@ -110,34 +108,34 @@
// Test Remove(), trying to remove both existing and non-existing
// application envelopes.
- if err := stubV1.Remove(ctx, "base"); err != nil {
+ if err := stubV1.Remove(globalCtx, "base"); err != nil {
t.Fatalf("Remove() failed: %v", err)
}
- if output, err = stubV1.Match(ctx, []string{"media"}); err != nil {
+ if output, err = stubV1.Match(globalCtx, []string{"media"}); err != nil {
t.Fatalf("Match() failed: %v", err)
}
- if err := stubV1.Remove(ctx, "base"); err == nil || !verror2.Is(err, impl.ErrNotFound.ID) {
+ if err := stubV1.Remove(globalCtx, "base"); err == nil || !verror2.Is(err, impl.ErrNotFound.ID) {
t.Fatalf("Unexpected error: expected %v, got %v", impl.ErrNotFound, err)
}
- if err := stub.Remove(ctx, "base"); err != nil {
+ if err := stub.Remove(globalCtx, "base"); err != nil {
t.Fatalf("Remove() failed: %v", err)
}
- if err := stubV2.Remove(ctx, "media"); err == nil || !verror2.Is(err, impl.ErrNotFound.ID) {
+ if err := stubV2.Remove(globalCtx, "media"); err == nil || !verror2.Is(err, impl.ErrNotFound.ID) {
t.Fatalf("Unexpected error: expected %v, got %v", impl.ErrNotFound, err)
}
- if err := stubV1.Remove(ctx, "media"); err != nil {
+ if err := stubV1.Remove(globalCtx, "media"); err != nil {
t.Fatalf("Remove() failed: %v", err)
}
// Finally, use Match() to test that Remove really removed the
// application envelopes.
- if _, err := stubV1.Match(ctx, []string{"base"}); err == nil || !verror2.Is(err, impl.ErrNotFound.ID) {
+ if _, err := stubV1.Match(globalCtx, []string{"base"}); err == nil || !verror2.Is(err, impl.ErrNotFound.ID) {
t.Fatalf("Unexpected error: expected %v, got %v", impl.ErrNotFound, err)
}
- if _, err := stubV1.Match(ctx, []string{"media"}); err == nil || !verror2.Is(err, impl.ErrNotFound.ID) {
+ if _, err := stubV1.Match(globalCtx, []string{"media"}); err == nil || !verror2.Is(err, impl.ErrNotFound.ID) {
t.Fatalf("Unexpected error: expected %v, got %v", impl.ErrNotFound, err)
}
- if _, err := stubV2.Match(ctx, []string{"base"}); err == nil || !verror2.Is(err, impl.ErrNotFound.ID) {
+ if _, err := stubV2.Match(globalCtx, []string{"base"}); err == nil || !verror2.Is(err, impl.ErrNotFound.ID) {
t.Fatalf("Unexpected error: expected %v, got %v", impl.ErrNotFound, err)
}
@@ -160,7 +158,7 @@
t.Fatalf("impl.NewDispatcher() failed: %v", err)
}
- server, endpoint := mgmttest.NewServer(globalRT)
+ server, endpoint := mgmttest.NewServer(globalCtx)
defer server.Stop()
if err := server.ServeDispatcher("", dispatcher); err != nil {
@@ -177,12 +175,12 @@
Binary: "/veyron/name/of/binary",
}
- if err := stubV1.Put(globalRT.NewContext(), []string{"media"}, envelopeV1); err != nil {
+ if err := stubV1.Put(globalCtx, []string{"media"}, envelopeV1); err != nil {
t.Fatalf("Put() failed: %v", err)
}
// There is content here now.
- output, err := stubV1.Match(globalRT.NewContext(), []string{"media"})
+ output, err := stubV1.Match(globalCtx, []string{"media"})
if err != nil {
t.Fatalf("Match(%v) failed: %v", "media", err)
}
@@ -198,7 +196,7 @@
t.Fatalf("impl.NewDispatcher() failed: %v", err)
}
- server, endpoint = mgmttest.NewServer(globalRT)
+ server, endpoint = mgmttest.NewServer(globalCtx)
defer server.Stop()
if err := server.ServeDispatcher("", dispatcher); err != nil {
@@ -207,7 +205,7 @@
stubV1 = repository.ApplicationClient(naming.JoinAddressName(endpoint, "search/v1"))
- output, err = stubV1.Match(globalRT.NewContext(), []string{"media"})
+ output, err = stubV1.Match(globalCtx, []string{"media"})
if err != nil {
t.Fatalf("Match(%v) failed: %v", "media", err)
}
