wspr: Remove use of options.RuntimePrincipal from wspr.
Change-Id: Icada8c0823abe041fc39e231939a6f645eb60e11
diff --git a/services/wsprd/browspr/pipe.go b/services/wsprd/browspr/pipe.go
index 8a10dd5..dedc606 100644
--- a/services/wsprd/browspr/pipe.go
+++ b/services/wsprd/browspr/pipe.go
@@ -4,7 +4,6 @@
"encoding/json"
"fmt"
- "v.io/core/veyron2/options"
"v.io/core/veyron2/vlog"
"v.io/wspr/veyron/services/wsprd/app"
"v.io/wspr/veyron/services/wsprd/lib"
@@ -49,7 +48,7 @@
}
}
- pipe.controller, err = app.NewController(b.ctx, pipe.createWriter, b.listenSpec, b.namespaceRoots, options.RuntimePrincipal{p})
+ pipe.controller, err = app.NewController(b.ctx, pipe.createWriter, b.listenSpec, b.namespaceRoots, p)
if err != nil {
vlog.Errorf("Could not create controller: %v", err)
return nil
diff --git a/services/wsprd/wspr/pipe.go b/services/wsprd/wspr/pipe.go
index 50516bf..4af7aaa 100644
--- a/services/wsprd/wspr/pipe.go
+++ b/services/wsprd/wspr/pipe.go
@@ -9,7 +9,6 @@
"time"
"v.io/core/veyron2"
- "v.io/core/veyron2/options"
"v.io/core/veyron2/vlog"
"v.io/wspr/veyron/services/wsprd/app"
"v.io/wspr/veyron/services/wsprd/lib"
@@ -67,7 +66,7 @@
// TODO(bjornick): Send an error to the client when all of the principal stuff is set up.
}
- pipe.controller, err = app.NewController(wspr.ctx, creator, wspr.listenSpec, wspr.namespaceRoots, options.RuntimePrincipal{p})
+ pipe.controller, err = app.NewController(wspr.ctx, creator, wspr.listenSpec, wspr.namespaceRoots, p)
if err != nil {
vlog.Errorf("Could not create controller: %v", err)
http.Error(w, fmt.Sprintf("Failed to create controller: %v", err), http.StatusInternalServerError)
