Fix FieldRule (#2362)

* Fix FieldRule * `username` can also be a list, * `realm.name` is the field name, using an intermediate `realm` object does not work. * `metadata` is not a key: keys are of the form `metadata.key = value` * Apply suggestions from code review Co-authored-by: Laurent Saint-Félix <[email protected]> * Run `make contrib` * Update RoleMappingRule.ts Co-authored-by: Laurent Saint-Félix <[email protected]> * Address review comments --------- Co-authored-by: Laurent Saint-Félix <[email protected]> (cherry picked from commit 383d22a)
elastic · Jan 15, 2024 · e87d5e6 · e87d5e6
1 parent 6e51d84
commit e87d5e6
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 49 deletions.
diff --git a/output/schema/schema.json b/output/schema/schema.json
diff --git a/output/typescript/types.ts b/output/typescript/types.ts
diff --git a/specification/security/_types/RoleMappingRule.ts b/specification/security/_types/RoleMappingRule.ts
@@ -26,21 +26,19 @@ import { Name, Names } from '@_types/common'
 export class RoleMappingRule {
   any?: RoleMappingRule[]
   all?: RoleMappingRule[]
+  // `field` should have been defined as SingleKeyDictionary<String, ScalarValue|ScalarValue[]>
+  // However, this was initially defined as a container with a limited number of variants,
+  // and was later made non_exhaustive to limit breaking changes.
   field?: FieldRule
   except?: RoleMappingRule
 }
 
 /**
  * @variants container
+ * @non_exhaustive
  */
 export class FieldRule {
-  username?: Name
+  username?: Names
   dn?: Names
   groups?: Names
-  metadata?: UserDefinedValue
-  realm?: Realm
-}
-
-export class Realm {
-  name: Name
 }