services/identity: Reorganize identityd to only expose the binaries
and modules subcommand. Move everything else into internal.
We move TestIdentityd modules subcommand into identity package
to allow us to unexpose most of the implementation.
MultiPart: 1/3
Change-Id: If084f2156c556f2eee11c934ef257e79406953fa
diff --git a/cmd/principal/bless.go b/cmd/principal/bless.go
index ba432a4..3656853 100644
--- a/cmd/principal/bless.go
+++ b/cmd/principal/bless.go
@@ -18,7 +18,6 @@
"v.io/v23/security"
"v.io/x/lib/vlog"
"v.io/x/ref/services/identity"
- "v.io/x/ref/services/identity/oauth"
)
func exchangeMacaroonForBlessing(ctx *context.T, macaroonChan <-chan string) (security.Blessings, error) {
@@ -133,7 +132,7 @@
}
func seekBlessingsURL(blessServerURL, redirectURL, state string) (string, error) {
- baseURL, err := url.Parse(joinURL(blessServerURL, oauth.SeekBlessingsRoute))
+ baseURL, err := url.Parse(joinURL(blessServerURL, identity.SeekBlessingsRoute))
if err != nil {
return "", fmt.Errorf("failed to parse url: %v", err)
}
diff --git a/cmd/servicerunner/main.go b/cmd/servicerunner/main.go
index a9ab523..03b8544 100644
--- a/cmd/servicerunner/main.go
+++ b/cmd/servicerunner/main.go
@@ -14,6 +14,7 @@
"v.io/x/ref/lib/flags/consts"
"v.io/x/ref/lib/signals"
"v.io/x/ref/profiles"
+ identityd "v.io/x/ref/services/identity/modules"
"v.io/x/ref/test/expect"
"v.io/x/ref/test/modules"
"v.io/x/ref/test/modules/core"
@@ -88,7 +89,7 @@
panicOnError(err)
panicOnError(updateVars(h, vars, "WSPR_ADDR"))
- h, err = sh.Start(core.TestIdentitydCommand, nil, "--veyron.tcp.protocol=ws", "--veyron.tcp.address=127.0.0.1:0", "--veyron.proxy=test/proxy", "--host=localhost", "--httpaddr=localhost:0")
+ h, err = sh.Start(identityd.TestIdentitydCommand, nil, "--veyron.tcp.protocol=ws", "--veyron.tcp.address=127.0.0.1:0", "--veyron.proxy=test/proxy", "--host=localhost", "--httpaddr=localhost:0")
panicOnError(err)
panicOnError(updateVars(h, vars, "TEST_IDENTITYD_NAME", "TEST_IDENTITYD_HTTP_ADDR"))
diff --git a/services/identity/const.go b/services/identity/const.go
new file mode 100644
index 0000000..7775ec0
--- /dev/null
+++ b/services/identity/const.go
@@ -0,0 +1,9 @@
+package identity
+
+import (
+ "v.io/x/ref/services/identity/internal/oauth"
+)
+
+// This file contains constants that need to be exported to users of the identity service.
+
+const SeekBlessingsRoute = oauth.SeekBlessingsRoute
diff --git a/services/identity/identity.vdl b/services/identity/identity.vdl
index 102026c..133f829 100644
--- a/services/identity/identity.vdl
+++ b/services/identity/identity.vdl
@@ -28,3 +28,12 @@
// to return a blessing for the client.
Bless(macaroon string) (blessing security.WireBlessings | error)
}
+
+// BlessingRootResponse is the struct representing the JSON response provided
+// by the "blessing-root" route of the identity service.
+type BlessingRootResponse struct {
+ // Names of the blessings.
+ Names []string
+ // Base64 der-encoded public key.
+ PublicKey string
+}
diff --git a/services/identity/identity.vdl.go b/services/identity/identity.vdl.go
index 9902d26..8dc6460 100644
--- a/services/identity/identity.vdl.go
+++ b/services/identity/identity.vdl.go
@@ -9,11 +9,30 @@
"v.io/v23"
"v.io/v23/context"
"v.io/v23/rpc"
+ "v.io/v23/vdl"
// VDL user imports
"v.io/v23/security"
)
+// BlessingRootResponse is the struct representing the JSON response provided
+// by the "blessing-root" route of the identity service.
+type BlessingRootResponse struct {
+ // Names of the blessings.
+ Names []string
+ // Base64 der-encoded public key.
+ PublicKey string
+}
+
+func (BlessingRootResponse) __VDLReflect(struct {
+ Name string "v.io/x/ref/services/identity.BlessingRootResponse"
+}) {
+}
+
+func init() {
+ vdl.Register((*BlessingRootResponse)(nil))
+}
+
// OAuthBlesserClientMethods is the client interface
// containing OAuthBlesser methods.
//
diff --git a/services/identity/identityd/main.go b/services/identity/identityd/main.go
index 83ca1d3..a9b9ff1 100644
--- a/services/identity/identityd/main.go
+++ b/services/identity/identityd/main.go
@@ -14,13 +14,13 @@
"v.io/x/lib/vlog"
_ "v.io/x/ref/profiles/static"
- "v.io/x/ref/services/identity/auditor"
- "v.io/x/ref/services/identity/blesser"
- "v.io/x/ref/services/identity/caveats"
- "v.io/x/ref/services/identity/oauth"
- "v.io/x/ref/services/identity/revocation"
- "v.io/x/ref/services/identity/server"
- "v.io/x/ref/services/identity/util"
+ "v.io/x/ref/services/identity/internal/auditor"
+ "v.io/x/ref/services/identity/internal/blesser"
+ "v.io/x/ref/services/identity/internal/caveats"
+ "v.io/x/ref/services/identity/internal/oauth"
+ "v.io/x/ref/services/identity/internal/revocation"
+ "v.io/x/ref/services/identity/internal/server"
+ "v.io/x/ref/services/identity/internal/util"
)
var (
diff --git a/services/identity/identityd_test/main.go b/services/identity/identityd_test/main.go
index d7cec63..9a94c12 100644
--- a/services/identity/identityd_test/main.go
+++ b/services/identity/identityd_test/main.go
@@ -11,13 +11,13 @@
"v.io/x/lib/vlog"
_ "v.io/x/ref/profiles/static"
- "v.io/x/ref/services/identity/auditor"
- "v.io/x/ref/services/identity/blesser"
- "v.io/x/ref/services/identity/caveats"
- "v.io/x/ref/services/identity/oauth"
- "v.io/x/ref/services/identity/revocation"
- "v.io/x/ref/services/identity/server"
- "v.io/x/ref/services/identity/util"
+ "v.io/x/ref/services/identity/internal/auditor"
+ "v.io/x/ref/services/identity/internal/blesser"
+ "v.io/x/ref/services/identity/internal/caveats"
+ "v.io/x/ref/services/identity/internal/oauth"
+ "v.io/x/ref/services/identity/internal/revocation"
+ "v.io/x/ref/services/identity/internal/server"
+ "v.io/x/ref/services/identity/internal/util"
)
var (
diff --git a/services/identity/auditor/blessing_auditor.go b/services/identity/internal/auditor/blessing_auditor.go
similarity index 100%
rename from services/identity/auditor/blessing_auditor.go
rename to services/identity/internal/auditor/blessing_auditor.go
diff --git a/services/identity/auditor/blessing_auditor_test.go b/services/identity/internal/auditor/blessing_auditor_test.go
similarity index 100%
rename from services/identity/auditor/blessing_auditor_test.go
rename to services/identity/internal/auditor/blessing_auditor_test.go
diff --git a/services/identity/auditor/mock_auditor.go b/services/identity/internal/auditor/mock_auditor.go
similarity index 100%
rename from services/identity/auditor/mock_auditor.go
rename to services/identity/internal/auditor/mock_auditor.go
diff --git a/services/identity/auditor/sql_database.go b/services/identity/internal/auditor/sql_database.go
similarity index 100%
rename from services/identity/auditor/sql_database.go
rename to services/identity/internal/auditor/sql_database.go
diff --git a/services/identity/auditor/sql_database_test.go b/services/identity/internal/auditor/sql_database_test.go
similarity index 100%
rename from services/identity/auditor/sql_database_test.go
rename to services/identity/internal/auditor/sql_database_test.go
diff --git a/services/identity/blesser/macaroon.go b/services/identity/internal/blesser/macaroon.go
similarity index 92%
rename from services/identity/blesser/macaroon.go
rename to services/identity/internal/blesser/macaroon.go
index 82e95cc..638a98c 100644
--- a/services/identity/blesser/macaroon.go
+++ b/services/identity/internal/blesser/macaroon.go
@@ -5,8 +5,8 @@
"time"
"v.io/x/ref/services/identity"
- "v.io/x/ref/services/identity/oauth"
- "v.io/x/ref/services/identity/util"
+ "v.io/x/ref/services/identity/internal/oauth"
+ "v.io/x/ref/services/identity/internal/util"
"v.io/v23/rpc"
"v.io/v23/security"
diff --git a/services/identity/blesser/macaroon_test.go b/services/identity/internal/blesser/macaroon_test.go
similarity index 95%
rename from services/identity/blesser/macaroon_test.go
rename to services/identity/internal/blesser/macaroon_test.go
index 28c8376..0babad5 100644
--- a/services/identity/blesser/macaroon_test.go
+++ b/services/identity/internal/blesser/macaroon_test.go
@@ -6,8 +6,8 @@
"testing"
"time"
- "v.io/x/ref/services/identity/oauth"
- "v.io/x/ref/services/identity/util"
+ "v.io/x/ref/services/identity/internal/oauth"
+ "v.io/x/ref/services/identity/internal/util"
"v.io/v23/security"
"v.io/v23/vom"
diff --git a/services/identity/blesser/oauth.go b/services/identity/internal/blesser/oauth.go
similarity index 95%
rename from services/identity/blesser/oauth.go
rename to services/identity/internal/blesser/oauth.go
index 25b186c..bebfe01 100644
--- a/services/identity/blesser/oauth.go
+++ b/services/identity/internal/blesser/oauth.go
@@ -6,9 +6,9 @@
"time"
"v.io/x/ref/services/identity"
- "v.io/x/ref/services/identity/oauth"
- "v.io/x/ref/services/identity/revocation"
- "v.io/x/ref/services/identity/util"
+ "v.io/x/ref/services/identity/internal/oauth"
+ "v.io/x/ref/services/identity/internal/revocation"
+ "v.io/x/ref/services/identity/internal/util"
"v.io/v23/rpc"
"v.io/v23/security"
diff --git a/services/identity/blesser/oauth_test.go b/services/identity/internal/blesser/oauth_test.go
similarity index 96%
rename from services/identity/blesser/oauth_test.go
rename to services/identity/internal/blesser/oauth_test.go
index 9e4c394..d00a15c 100644
--- a/services/identity/blesser/oauth_test.go
+++ b/services/identity/internal/blesser/oauth_test.go
@@ -5,7 +5,7 @@
"testing"
"time"
- "v.io/x/ref/services/identity/oauth"
+ "v.io/x/ref/services/identity/internal/oauth"
"v.io/v23/security"
)
diff --git a/services/identity/blesser/util_test.go b/services/identity/internal/blesser/util_test.go
similarity index 100%
rename from services/identity/blesser/util_test.go
rename to services/identity/internal/blesser/util_test.go
diff --git a/services/identity/caveats/browser_caveat_selector.go b/services/identity/internal/caveats/browser_caveat_selector.go
similarity index 100%
rename from services/identity/caveats/browser_caveat_selector.go
rename to services/identity/internal/caveats/browser_caveat_selector.go
diff --git a/services/identity/caveats/caveat_factory.go b/services/identity/internal/caveats/caveat_factory.go
similarity index 97%
rename from services/identity/caveats/caveat_factory.go
rename to services/identity/internal/caveats/caveat_factory.go
index 50e437b..51bda64 100644
--- a/services/identity/caveats/caveat_factory.go
+++ b/services/identity/internal/caveats/caveat_factory.go
@@ -4,7 +4,7 @@
"fmt"
"time"
- "v.io/x/ref/services/identity/revocation"
+ "v.io/x/ref/services/identity/internal/revocation"
"v.io/v23/security"
)
diff --git a/services/identity/caveats/caveat_selector.go b/services/identity/internal/caveats/caveat_selector.go
similarity index 100%
rename from services/identity/caveats/caveat_selector.go
rename to services/identity/internal/caveats/caveat_selector.go
diff --git a/services/identity/caveats/mock_caveat_selector.go b/services/identity/internal/caveats/mock_caveat_selector.go
similarity index 100%
rename from services/identity/caveats/mock_caveat_selector.go
rename to services/identity/internal/caveats/mock_caveat_selector.go
diff --git a/services/identity/handlers/blessing_root.go b/services/identity/internal/handlers/blessing_root.go
similarity index 86%
rename from services/identity/handlers/blessing_root.go
rename to services/identity/internal/handlers/blessing_root.go
index 773fe7d..1e2753c 100644
--- a/services/identity/handlers/blessing_root.go
+++ b/services/identity/internal/handlers/blessing_root.go
@@ -8,7 +8,7 @@
"v.io/v23/security"
"v.io/v23/vom"
- "v.io/x/ref/services/identity/util"
+ "v.io/x/ref/services/identity/internal/util"
)
// BlessingRoot is an http.Handler implementation that renders the server's
@@ -17,13 +17,6 @@
P security.Principal
}
-type BlessingRootResponse struct {
- // Names of the blessings.
- Names []string `json:"names"`
- // Base64 der-encoded public key.
- PublicKey string `json:"publicKey"`
-}
-
// Cached response so we don't have to bless and encode every time somebody
// hits this route.
var cachedResponseJson []byte
@@ -66,10 +59,18 @@
//}
str := base64.URLEncoding.EncodeToString(der)
- res, err := json.Marshal(BlessingRootResponse{
+ // TODO(suharshs): Ideally this struct would be BlessingRootResponse but vdl does
+ // not currently allow field annotations. Once those are allowed, then use that
+ // here.
+ rootInfo := struct {
+ Names []string `json:"names"`
+ PublicKey string `json:"publicKey"`
+ }{
Names: names,
PublicKey: str,
- })
+ }
+
+ res, err := json.Marshal(rootInfo)
if err != nil {
util.HTTPServerError(w, err)
return
diff --git a/services/identity/handlers/handlers_test.go b/services/identity/internal/handlers/handlers_test.go
similarity index 94%
rename from services/identity/handlers/handlers_test.go
rename to services/identity/internal/handlers/handlers_test.go
index d66b245..64c5596 100644
--- a/services/identity/handlers/handlers_test.go
+++ b/services/identity/internal/handlers/handlers_test.go
@@ -11,6 +11,7 @@
"v.io/v23/security"
+ "v.io/x/ref/services/identity"
tsecurity "v.io/x/ref/test/security"
)
@@ -25,7 +26,7 @@
t.Fatal(err)
}
dec := json.NewDecoder(response.Body)
- var res BlessingRootResponse
+ var res identity.BlessingRootResponse
if err := dec.Decode(&res); err != nil {
t.Fatal(err)
}
diff --git a/services/identity/oauth/googleoauth.go b/services/identity/internal/oauth/googleoauth.go
similarity index 100%
rename from services/identity/oauth/googleoauth.go
rename to services/identity/internal/oauth/googleoauth.go
diff --git a/services/identity/oauth/handler.go b/services/identity/internal/oauth/handler.go
similarity index 98%
rename from services/identity/oauth/handler.go
rename to services/identity/internal/oauth/handler.go
index 2fe7778..52f9fa9 100644
--- a/services/identity/oauth/handler.go
+++ b/services/identity/internal/oauth/handler.go
@@ -33,10 +33,10 @@
"v.io/v23/security"
"v.io/v23/vom"
"v.io/x/lib/vlog"
- "v.io/x/ref/services/identity/auditor"
- "v.io/x/ref/services/identity/caveats"
- "v.io/x/ref/services/identity/revocation"
- "v.io/x/ref/services/identity/util"
+ "v.io/x/ref/services/identity/internal/auditor"
+ "v.io/x/ref/services/identity/internal/caveats"
+ "v.io/x/ref/services/identity/internal/revocation"
+ "v.io/x/ref/services/identity/internal/util"
)
const (
diff --git a/services/identity/oauth/mockoauth.go b/services/identity/internal/oauth/mockoauth.go
similarity index 100%
rename from services/identity/oauth/mockoauth.go
rename to services/identity/internal/oauth/mockoauth.go
diff --git a/services/identity/oauth/oauth_provider.go b/services/identity/internal/oauth/oauth_provider.go
similarity index 100%
rename from services/identity/oauth/oauth_provider.go
rename to services/identity/internal/oauth/oauth_provider.go
diff --git a/services/identity/oauth/utils.go b/services/identity/internal/oauth/utils.go
similarity index 100%
rename from services/identity/oauth/utils.go
rename to services/identity/internal/oauth/utils.go
diff --git a/services/identity/oauth/utils_test.go b/services/identity/internal/oauth/utils_test.go
similarity index 100%
rename from services/identity/oauth/utils_test.go
rename to services/identity/internal/oauth/utils_test.go
diff --git a/services/identity/oauth/view_blessings_template.go b/services/identity/internal/oauth/view_blessings_template.go
similarity index 100%
rename from services/identity/oauth/view_blessings_template.go
rename to services/identity/internal/oauth/view_blessings_template.go
diff --git a/services/identity/revocation/caveat.vdl b/services/identity/internal/revocation/caveat.vdl
similarity index 100%
rename from services/identity/revocation/caveat.vdl
rename to services/identity/internal/revocation/caveat.vdl
diff --git a/services/identity/revocation/caveat.vdl.go b/services/identity/internal/revocation/caveat.vdl.go
similarity index 100%
rename from services/identity/revocation/caveat.vdl.go
rename to services/identity/internal/revocation/caveat.vdl.go
diff --git a/services/identity/revocation/mock_revocation_manager.go b/services/identity/internal/revocation/mock_revocation_manager.go
similarity index 100%
rename from services/identity/revocation/mock_revocation_manager.go
rename to services/identity/internal/revocation/mock_revocation_manager.go
diff --git a/services/identity/revocation/revocation_manager.go b/services/identity/internal/revocation/revocation_manager.go
similarity index 100%
rename from services/identity/revocation/revocation_manager.go
rename to services/identity/internal/revocation/revocation_manager.go
diff --git a/services/identity/revocation/revocation_test.go b/services/identity/internal/revocation/revocation_test.go
similarity index 100%
rename from services/identity/revocation/revocation_test.go
rename to services/identity/internal/revocation/revocation_test.go
diff --git a/services/identity/revocation/sql_database.go b/services/identity/internal/revocation/sql_database.go
similarity index 100%
rename from services/identity/revocation/sql_database.go
rename to services/identity/internal/revocation/sql_database.go
diff --git a/services/identity/revocation/sql_database_test.go b/services/identity/internal/revocation/sql_database_test.go
similarity index 100%
rename from services/identity/revocation/sql_database_test.go
rename to services/identity/internal/revocation/sql_database_test.go
diff --git a/services/identity/server/identityd.go b/services/identity/internal/server/identityd.go
similarity index 96%
rename from services/identity/server/identityd.go
rename to services/identity/internal/server/identityd.go
index 72c62f2..d6bfe6b 100644
--- a/services/identity/server/identityd.go
+++ b/services/identity/internal/server/identityd.go
@@ -24,13 +24,13 @@
"v.io/x/ref/lib/signals"
"v.io/x/ref/security/audit"
- "v.io/x/ref/services/identity/auditor"
- "v.io/x/ref/services/identity/blesser"
- "v.io/x/ref/services/identity/caveats"
- "v.io/x/ref/services/identity/handlers"
- "v.io/x/ref/services/identity/oauth"
- "v.io/x/ref/services/identity/revocation"
- "v.io/x/ref/services/identity/util"
+ "v.io/x/ref/services/identity/internal/auditor"
+ "v.io/x/ref/services/identity/internal/blesser"
+ "v.io/x/ref/services/identity/internal/caveats"
+ "v.io/x/ref/services/identity/internal/handlers"
+ "v.io/x/ref/services/identity/internal/oauth"
+ "v.io/x/ref/services/identity/internal/revocation"
+ "v.io/x/ref/services/identity/internal/util"
services "v.io/x/ref/services/security"
"v.io/x/ref/services/security/discharger"
)
diff --git a/services/identity/util/certs.go b/services/identity/internal/util/certs.go
similarity index 100%
rename from services/identity/util/certs.go
rename to services/identity/internal/util/certs.go
diff --git a/services/identity/util/classify.go b/services/identity/internal/util/classify.go
similarity index 100%
rename from services/identity/util/classify.go
rename to services/identity/internal/util/classify.go
diff --git a/services/identity/util/classify_test.go b/services/identity/internal/util/classify_test.go
similarity index 100%
rename from services/identity/util/classify_test.go
rename to services/identity/internal/util/classify_test.go
diff --git a/services/identity/util/common_test.go b/services/identity/internal/util/common_test.go
similarity index 100%
rename from services/identity/util/common_test.go
rename to services/identity/internal/util/common_test.go
diff --git a/services/identity/util/csrf.go b/services/identity/internal/util/csrf.go
similarity index 100%
rename from services/identity/util/csrf.go
rename to services/identity/internal/util/csrf.go
diff --git a/services/identity/util/csrf_test.go b/services/identity/internal/util/csrf_test.go
similarity index 100%
rename from services/identity/util/csrf_test.go
rename to services/identity/internal/util/csrf_test.go
diff --git a/services/identity/util/doc.go b/services/identity/internal/util/doc.go
similarity index 100%
rename from services/identity/util/doc.go
rename to services/identity/internal/util/doc.go
diff --git a/services/identity/util/macaroon.go b/services/identity/internal/util/macaroon.go
similarity index 100%
rename from services/identity/util/macaroon.go
rename to services/identity/internal/util/macaroon.go
diff --git a/services/identity/util/macaroon_test.go b/services/identity/internal/util/macaroon_test.go
similarity index 100%
rename from services/identity/util/macaroon_test.go
rename to services/identity/internal/util/macaroon_test.go
diff --git a/services/identity/util/write.go b/services/identity/internal/util/write.go
similarity index 100%
rename from services/identity/util/write.go
rename to services/identity/internal/util/write.go
diff --git a/services/identity/util/write_test.go b/services/identity/internal/util/write_test.go
similarity index 100%
rename from services/identity/util/write_test.go
rename to services/identity/internal/util/write_test.go
diff --git a/test/modules/core/test_identityd.go b/services/identity/modules/test_identityd.go
similarity index 84%
rename from test/modules/core/test_identityd.go
rename to services/identity/modules/test_identityd.go
index 1bcf4d8..e75647f 100644
--- a/test/modules/core/test_identityd.go
+++ b/services/identity/modules/test_identityd.go
@@ -10,14 +10,15 @@
"v.io/v23"
- "v.io/x/ref/services/identity/auditor"
- "v.io/x/ref/services/identity/blesser"
- "v.io/x/ref/services/identity/caveats"
- "v.io/x/ref/services/identity/oauth"
- "v.io/x/ref/services/identity/revocation"
- "v.io/x/ref/services/identity/server"
- "v.io/x/ref/services/identity/util"
+ "v.io/x/ref/services/identity/internal/auditor"
+ "v.io/x/ref/services/identity/internal/blesser"
+ "v.io/x/ref/services/identity/internal/caveats"
+ "v.io/x/ref/services/identity/internal/oauth"
+ "v.io/x/ref/services/identity/internal/revocation"
+ "v.io/x/ref/services/identity/internal/server"
+ "v.io/x/ref/services/identity/internal/util"
"v.io/x/ref/test/modules"
+ "v.io/x/ref/test/modules/core"
)
var (
@@ -26,8 +27,12 @@
tlsconfig = flag.CommandLine.String("tlsconfig", "", "Comma-separated list of TLS certificate and private key files. This must be provided.")
)
+const (
+ TestIdentitydCommand = "test_identityd"
+)
+
func init() {
- modules.RegisterChild(TestIdentitydCommand, Usage(flag.CommandLine), startTestIdentityd)
+ modules.RegisterChild(TestIdentitydCommand, core.Usage(flag.CommandLine), startTestIdentityd)
}
func startTestIdentityd(stdin io.Reader, stdout, stderr io.Writer, env map[string]string, args ...string) error {
diff --git a/services/wsprd/browspr/browspr.vdl b/services/wsprd/browspr/browspr.vdl
index 66eae99..57a8065 100644
--- a/services/wsprd/browspr/browspr.vdl
+++ b/services/wsprd/browspr/browspr.vdl
@@ -2,25 +2,18 @@
import(
"v.io/x/ref/services/wsprd/account"
+ "v.io/x/ref/services/identity"
)
type StartMessage struct {
Identityd string
- IdentitydBlessingRoot blessingRoot
+ IdentitydBlessingRoot identity.BlessingRootResponse
Proxy string
NamespaceRoot string
LogLevel int32
LogModule string
}
-// Copied from
-// v.io/x/ref/services/identity/handlers/blessing_root.go, since
-// depcop prohibits importing that package.
-type blessingRoot struct {
- Names []string
- PublicKey string
-}
-
type AssociateAccountMessage struct {
Account string
Origin string
diff --git a/services/wsprd/browspr/browspr.vdl.go b/services/wsprd/browspr/browspr.vdl.go
index 9043f80..dc26188 100644
--- a/services/wsprd/browspr/browspr.vdl.go
+++ b/services/wsprd/browspr/browspr.vdl.go
@@ -8,12 +8,13 @@
"v.io/v23/vdl"
// VDL user imports
+ "v.io/x/ref/services/identity"
"v.io/x/ref/services/wsprd/account"
)
type StartMessage struct {
Identityd string
- IdentitydBlessingRoot blessingRoot
+ IdentitydBlessingRoot identity.BlessingRootResponse
Proxy string
NamespaceRoot string
LogLevel int32
@@ -25,19 +26,6 @@
}) {
}
-// Copied from
-// v.io/x/ref/services/identity/handlers/blessing_root.go, since
-// depcop prohibits importing that package.
-type blessingRoot struct {
- Names []string
- PublicKey string
-}
-
-func (blessingRoot) __VDLReflect(struct {
- Name string "v.io/x/ref/services/wsprd/browspr.blessingRoot"
-}) {
-}
-
type AssociateAccountMessage struct {
Account string
Origin string
@@ -98,7 +86,6 @@
func init() {
vdl.Register((*StartMessage)(nil))
- vdl.Register((*blessingRoot)(nil))
vdl.Register((*AssociateAccountMessage)(nil))
vdl.Register((*CreateAccountMessage)(nil))
vdl.Register((*CleanupMessage)(nil))
diff --git a/test/modules/core/core.go b/test/modules/core/core.go
index eba9ca9..a9f3e9f 100644
--- a/test/modules/core/core.go
+++ b/test/modules/core/core.go
@@ -56,11 +56,10 @@
SleepCommand = "sleep"
TimeCommand = "time"
// Subprocesses
- EchoServerCommand = "echoServer"
- EchoClientCommand = "echoClient"
- RootMTCommand = "root"
- MTCommand = "mt"
- LSCommand = "ls"
- ProxyServerCommand = "proxyd"
- TestIdentitydCommand = "test_identityd"
+ EchoServerCommand = "echoServer"
+ EchoClientCommand = "echoClient"
+ RootMTCommand = "root"
+ MTCommand = "mt"
+ LSCommand = "ls"
+ ProxyServerCommand = "proxyd"
)
