DodoApp: Support dev virtual machines
Change-Id: Ib7641adb5be477bdde7cd9a06df4b45aa65a1c01
diff --git a/core/installer/schema.go b/core/installer/schema.go
index b02f3b7..04955b1 100644
--- a/core/installer/schema.go
+++ b/core/installer/schema.go
@@ -231,8 +231,17 @@
case cue.StringKind:
if role == "vpnauthkey" {
meta := map[string]string{}
- usernameAttr := v.Attribute("usernameField")
- meta["usernameField"] = strings.ToLower(usernameAttr.Contents())
+ usernameFieldAttr := v.Attribute("usernameField")
+ if usernameFieldAttr.Err() == nil {
+ meta["usernameField"] = strings.ToLower(usernameFieldAttr.Contents())
+ }
+ usernameAttr := v.Attribute("username")
+ if usernameAttr.Err() == nil {
+ meta["username"] = strings.ToLower(usernameAttr.Contents())
+ }
+ if len(meta) != 1 {
+ return nil, fmt.Errorf("invalid vpn auth key field meta: %+v", meta)
+ }
return basicSchema{name, KindVPNAuthKey, true, meta}, nil
} else {
return basicSchema{name, KindString, false, nil}, nil