From f906c66671ccf5d88b6396f5b37dfb8e061bae8f Mon Sep 17 00:00:00 2001 From: Nikolaj Volgushev Date: Tue, 11 Jun 2024 15:39:24 +0200 Subject: [PATCH] Remove duplicate privilege (#2611) `read_slm` was defined twice in #2547. Removing the dup. --- output/schema/schema.json | 30 +++++++++------------ output/schema/validation-errors.json | 7 ----- output/typescript/types.ts | 2 +- specification/security/_types/Privileges.ts | 4 --- 4 files changed, 13 insertions(+), 30 deletions(-) diff --git a/output/schema/schema.json b/output/schema/schema.json index b13b34f48d..ea00453bb3 100644 --- a/output/schema/schema.json +++ b/output/schema/schema.json @@ -178692,7 +178692,7 @@ } } ], - "specLocation": "security/_types/Privileges.ts#L337-L339" + "specLocation": "security/_types/Privileges.ts#L333-L335" }, { "kind": "interface", @@ -179014,12 +179014,6 @@ }, "name": "read_ilm" }, - { - "availability": { - "stack": {} - }, - "name": "read_slm" - }, { "name": "read_pipeline" }, @@ -179055,7 +179049,7 @@ "name": "ClusterPrivilege", "namespace": "security._types" }, - "specLocation": "security/_types/Privileges.ts#L41-L202" + "specLocation": "security/_types/Privileges.ts#L41-L198" }, { "kind": "interface", @@ -179176,7 +179170,7 @@ } } ], - "specLocation": "security/_types/Privileges.ts#L333-L335" + "specLocation": "security/_types/Privileges.ts#L329-L331" }, { "kind": "enum", @@ -179289,7 +179283,7 @@ "name": "IndexPrivilege", "namespace": "security._types" }, - "specLocation": "security/_types/Privileges.ts#L289-L331" + "specLocation": "security/_types/Privileges.ts#L285-L327" }, { "kind": "interface", @@ -179368,7 +179362,7 @@ } } ], - "specLocation": "security/_types/Privileges.ts#L204-L228" + "specLocation": "security/_types/Privileges.ts#L200-L224" }, { "codegenNames": [ @@ -179382,7 +179376,7 @@ "name": "IndicesPrivilegesQuery", "namespace": "security._types" }, - "specLocation": "security/_types/Privileges.ts#L254-L262", + "specLocation": "security/_types/Privileges.ts#L250-L258", "type": { "items": [ { @@ -179432,7 +179426,7 @@ } } ], - "specLocation": "security/_types/Privileges.ts#L341-L343" + "specLocation": "security/_types/Privileges.ts#L337-L339" }, { "kind": "interface", @@ -179926,7 +179920,7 @@ "name": "RoleTemplateInlineQuery", "namespace": "security._types" }, - "specLocation": "security/_types/Privileges.ts#L283-L284", + "specLocation": "security/_types/Privileges.ts#L279-L280", "type": { "items": [ { @@ -180006,7 +180000,7 @@ } ], "shortcutProperty": "source", - "specLocation": "security/_types/Privileges.ts#L276-L281" + "specLocation": "security/_types/Privileges.ts#L272-L277" }, { "kind": "interface", @@ -180030,7 +180024,7 @@ } } ], - "specLocation": "security/_types/Privileges.ts#L264-L274" + "specLocation": "security/_types/Privileges.ts#L260-L270" }, { "codegenNames": [ @@ -180042,7 +180036,7 @@ "name": "RoleTemplateScript", "namespace": "security._types" }, - "specLocation": "security/_types/Privileges.ts#L286-L287", + "specLocation": "security/_types/Privileges.ts#L282-L283", "type": { "items": [ { @@ -180272,7 +180266,7 @@ } } ], - "specLocation": "security/_types/Privileges.ts#L230-L252" + "specLocation": "security/_types/Privileges.ts#L226-L248" }, { "kind": "interface", diff --git a/output/schema/validation-errors.json b/output/schema/validation-errors.json index 7f2d942cf6..2164f23902 100644 --- a/output/schema/validation-errors.json +++ b/output/schema/validation-errors.json @@ -1279,13 +1279,6 @@ ], "response": [] }, - "security.has_privileges": { - "request": [ - "enum definition security._types:ClusterPrivilege - Duplicate enum member codegen_name 'read_slm'", - "enum definition security._types:ClusterPrivilege - Duplicate enum member name 'read_slm'" - ], - "response": [] - }, "security.oidc_authenticate": { "request": [ "Missing request & response" diff --git a/output/typescript/types.ts b/output/typescript/types.ts index 5300437e26..7be4e13eab 100644 --- a/output/typescript/types.ts +++ b/output/typescript/types.ts @@ -16787,7 +16787,7 @@ export interface SecurityClusterNode { name: Name } -export type SecurityClusterPrivilege = 'all' | 'cancel_task' | 'create_snapshot' | 'cross_cluster_replication' | 'cross_cluster_search' | 'delegate_pki' | 'grant_api_key' | 'manage' | 'manage_api_key' | 'manage_autoscaling' | 'manage_behavioral_analytics' | 'manage_ccr' | 'manage_data_frame_transforms' | 'manage_data_stream_global_retention' | 'manage_enrich' | 'manage_ilm' | 'manage_index_templates' | 'manage_inference' | 'manage_ingest_pipelines' | 'manage_logstash_pipelines' | 'manage_ml' | 'manage_oidc' | 'manage_own_api_key' | 'manage_pipeline' | 'manage_rollup' | 'manage_saml' | 'manage_search_application' | 'manage_search_query_rules' | 'manage_search_synonyms' | 'manage_security' | 'manage_service_account' | 'manage_slm' | 'manage_token' | 'manage_transform' | 'manage_user_profile' | 'manage_watcher' | 'monitor' | 'monitor_data_frame_transforms' | 'monitor_data_stream_global_retention' | 'monitor_enrich' | 'monitor_inference' | 'monitor_ml' | 'monitor_rollup' | 'monitor_snapshot' | 'monitor_text_structure' | 'monitor_transform' | 'monitor_watcher' | 'none' | 'post_behavioral_analytics_event' | 'read_ccr' | 'read_connector_secrets' | 'read_fleet_secrets' | 'read_ilm' | 'read_slm' | 'read_pipeline' | 'read_security' | 'read_slm' | 'transport_client' | 'write_connector_secrets' | 'write_fleet_secrets'| string +export type SecurityClusterPrivilege = 'all' | 'cancel_task' | 'create_snapshot' | 'cross_cluster_replication' | 'cross_cluster_search' | 'delegate_pki' | 'grant_api_key' | 'manage' | 'manage_api_key' | 'manage_autoscaling' | 'manage_behavioral_analytics' | 'manage_ccr' | 'manage_data_frame_transforms' | 'manage_data_stream_global_retention' | 'manage_enrich' | 'manage_ilm' | 'manage_index_templates' | 'manage_inference' | 'manage_ingest_pipelines' | 'manage_logstash_pipelines' | 'manage_ml' | 'manage_oidc' | 'manage_own_api_key' | 'manage_pipeline' | 'manage_rollup' | 'manage_saml' | 'manage_search_application' | 'manage_search_query_rules' | 'manage_search_synonyms' | 'manage_security' | 'manage_service_account' | 'manage_slm' | 'manage_token' | 'manage_transform' | 'manage_user_profile' | 'manage_watcher' | 'monitor' | 'monitor_data_frame_transforms' | 'monitor_data_stream_global_retention' | 'monitor_enrich' | 'monitor_inference' | 'monitor_ml' | 'monitor_rollup' | 'monitor_snapshot' | 'monitor_text_structure' | 'monitor_transform' | 'monitor_watcher' | 'none' | 'post_behavioral_analytics_event' | 'read_ccr' | 'read_connector_secrets' | 'read_fleet_secrets' | 'read_ilm' | 'read_pipeline' | 'read_security' | 'read_slm' | 'transport_client' | 'write_connector_secrets' | 'write_fleet_secrets'| string export interface SecurityCreatedStatus { created: boolean diff --git a/specification/security/_types/Privileges.ts b/specification/security/_types/Privileges.ts index 8e8756c336..6ddf56f817 100644 --- a/specification/security/_types/Privileges.ts +++ b/specification/security/_types/Privileges.ts @@ -177,10 +177,6 @@ export enum ClusterPrivilege { * @availability stack */ read_ilm, - /** - * @availability stack - */ - read_slm, read_pipeline, read_security, /**