syncbased: move ValidateId inside NewService
Addresses Adam's comment on v.io/c/22910
Change-Id: I68feadf8c71ff2b84efb143ffa76b4aa98542692
diff --git a/services/syncbase/server/service.go b/services/syncbase/server/service.go
index b25d1bd..2349561 100644
--- a/services/syncbase/server/service.go
+++ b/services/syncbase/server/service.go
@@ -199,6 +199,9 @@
}
if newService && opts.InitialDB != (wire.Id{}) {
+ if err := pubutil.ValidateId(opts.InitialDB); err != nil {
+ return nil, err
+ }
// TODO(ivanpi): If service initialization fails after putting the service
// perms but before finishing initial database creation, initial database
// will never be created because service perms existence is used as a marker
diff --git a/services/syncbase/syncbaselib/serve.go b/services/syncbase/syncbaselib/serve.go
index dea394a..a409e6d 100644
--- a/services/syncbase/syncbaselib/serve.go
+++ b/services/syncbase/syncbaselib/serve.go
@@ -14,7 +14,6 @@
"v.io/v23/options"
"v.io/v23/rpc"
wire "v.io/v23/services/syncbase"
- pubutil "v.io/v23/syncbase/util"
"v.io/x/ref/lib/dispatcher"
"v.io/x/ref/lib/security/securityflag"
"v.io/x/ref/services/syncbase/server"
@@ -61,9 +60,6 @@
if initialDB, err = wire.ParseId(opts.InitialDB); err != nil {
ctx.Fatalf("ParseId(%s) failed: %v", opts.InitialDB, err)
}
- if err := pubutil.ValidateId(initialDB); err != nil {
- ctx.Fatalf("ValidateId(%v) failed: %v", initialDB, err)
- }
}
service, err := server.NewService(ctx, server.ServiceOptions{
Perms: perms,
