[Backport 8.12] Add role_templates in SecurityPutRoleMappingRequest (#…

…2359) * Add role_templates in SecurityPutRoleMappingRequest (#2357) (cherry picked from commit 4f9a95d) * Trigger CI --------- Co-authored-by: Quentin Pradet <[email protected]>
elastic · Dec 7, 2023 · d632e38 · d632e38
1 parent 94dc2d1
commit d632e38
Show file tree

Hide file tree

Showing 6 changed files with 110 additions and 73 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/RoleMapping.ts b/specification/security/_types/RoleMapping.ts
@@ -17,9 +17,9 @@
  * under the License.
  */
 
-import { RoleTemplate } from '@security/get_role/types'
 import { Metadata } from '@_types/common'
 import { RoleMappingRule } from './RoleMappingRule'
+import { RoleTemplate } from './RoleTemplate'
 
 // ES: ExpressionRoleMapping
 export class RoleMapping {

diff --git a/specification/security/_types/RoleTemplate.ts b/specification/security/_types/RoleTemplate.ts
@@ -0,0 +1,31 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+import { Script } from '@_types/Scripting'
+
+export enum TemplateFormat {
+  string = 0,
+  json = 1
+}
+
+// ES: TemplateRoleName
+export class RoleTemplate {
+  format?: TemplateFormat
+  template: Script
+}
diff --git a/specification/security/get_role/types.ts b/specification/security/get_role/types.ts
@@ -24,7 +24,7 @@ import {
 import { TransientMetadataConfig } from '@security/_types/TransientMetadataConfig'
 import { Dictionary } from '@spec_utils/Dictionary'
 import { Metadata } from '@_types/common'
-import { Script } from '@_types/Scripting'
+import { RoleTemplate } from '@security/_types/RoleTemplate'
 
 export class Role {
   cluster: string[]
@@ -40,14 +40,3 @@ export class Role {
    */
   global?: Dictionary<string, Dictionary<string, Dictionary<string, string[]>>>
 }
-
-export enum TemplateFormat {
-  string = 0,
-  json = 1
-}
-
-// ES: TemplateRoleName
-export class RoleTemplate {
-  format?: TemplateFormat
-  template: Script
-}
diff --git a/specification/security/put_role_mapping/SecurityPutRoleMappingRequest.ts b/specification/security/put_role_mapping/SecurityPutRoleMappingRequest.ts
@@ -20,6 +20,7 @@
 import { RoleMappingRule } from '@security/_types/RoleMappingRule'
 import { RequestBase } from '@_types/Base'
 import { Metadata, Name, Refresh } from '@_types/common'
+import { RoleTemplate } from '@security/_types/RoleTemplate'
 
 /**
  * @rest_spec_name security.put_role_mapping
@@ -37,6 +38,7 @@ export interface Request extends RequestBase {
     enabled?: boolean
     metadata?: Metadata
     roles?: string[]
+    role_templates?: RoleTemplate[]
     rules?: RoleMappingRule
     run_as?: string[]
   }