Add role.FromString and more tolerance

internal/role/role.go

@@ -34,23 +34,14 @@ func (r *Role) UnmarshalJSON(b []byte) error {
 	if err := json.Unmarshal(b, &roleString); err != nil {
 		return err
 	}
-	switch strings.ToLower(roleString) {
+	*r = FromString(roleString)
-	case "controlplane":
-		*r = ControlPlane
-	case "worker":
-		*r = Worker
-	case "admin":
-		*r = Admin
-	default:
-		*r = Unknown
-	}
 	return nil
 }
 
-// FromString converts a string to a Role.
+// FromString returns the Role for the given string.
 func FromString(s string) Role {
 	switch strings.ToLower(s) {
-	case "controlplane":
+	case "controlplane", "control-plane":
 		return ControlPlane
 	case "worker":
 		return Worker

internal/role/role_test.go

@@ -69,6 +69,10 @@ func TestUnmarshal(t *testing.T) {
 			json:     `"ControlPlane"`,
 			wantRole: ControlPlane,
 		},
+		"dashed ControlPlane can be unmarshaled": {
+			json:     `"Control-Plane"`,
+			wantRole: ControlPlane,
+		},
 		"lowercase controlPlane can be unmarshaled": {
 			json:     `"controlPlane"`,
 			wantRole: ControlPlane,