Reorg ILM (#456)

philkra · web-flow · commit d33afe4eb398 · 2021-05-10T11:57:09.000+02:00
diff --git a/output/schema/schema.json b/output/schema/schema.json
@@ -81000,7 +81000,7 @@
     {
       "kind": "interface",
       "name": {
-        "name": "LifecycleAction",
+        "name": "Action",
         "namespace": "ilm._types"
       },
       "properties": []
@@ -81030,7 +81030,7 @@
                 "value": {
                   "kind": "instance_of",
                   "type": {
-                    "name": "LifecycleAction",
+                    "name": "Action",
                     "namespace": "ilm._types"
                   }
                 }
@@ -81139,8 +81139,8 @@
           "type": {
             "kind": "instance_of",
             "type": {
-              "name": "string",
-              "namespace": "internal"
+              "name": "Name",
+              "namespace": "_types"
             }
           }
         }
@@ -81597,7 +81597,7 @@
     {
       "kind": "interface",
       "name": {
-        "name": "LifecyclePolicy",
+        "name": "Lifecycle",
         "namespace": "ilm.get_lifecycle"
       },
       "properties": [
@@ -81697,7 +81697,7 @@
           {
             "kind": "instance_of",
             "type": {
-              "name": "LifecyclePolicy",
+              "name": "Lifecycle",
               "namespace": "ilm.get_lifecycle"
             }
           }
@@ -81992,8 +81992,8 @@
               "value": {
                 "kind": "instance_of",
                 "type": {
-                  "name": "string",
-                  "namespace": "internal"
+                  "name": "IndexName",
+                  "namespace": "_types"
                 }
               }
             }
diff --git a/output/typescript/types.ts b/output/typescript/types.ts
@@ -7923,11 +7923,11 @@ export interface GraphExploreResponse {
   vertices: GraphVertex[]
 }
 
-export interface IlmLifecycleAction {
+export interface IlmAction {
 }
 
 export interface IlmPhase {
-  actions: Record<string, IlmLifecycleAction> | string[]
+  actions: Record<string, IlmAction> | string[]
   min_age?: Time
 }
 
@@ -7940,7 +7940,7 @@ export interface IlmPhases {
 
 export interface IlmPolicy {
   phases: IlmPhases
-  name?: string
+  name?: Name
 }
 
 export interface IlmDeleteLifecycleRequest extends RequestBase {
@@ -7995,7 +7995,7 @@ export interface IlmExplainLifecycleResponse {
   indices: Record<IndexName, IlmExplainLifecycleLifecycleExplain> | IlmExplainLifecycleLifecycleExplainProject
 }
 
-export interface IlmGetLifecycleLifecyclePolicy {
+export interface IlmGetLifecycleLifecycle {
   modified_date: DateString
   policy: IlmPolicy
   version: VersionNumber
@@ -8006,7 +8006,7 @@ export interface IlmGetLifecycleRequest extends RequestBase {
   policy_id?: Id
 }
 
-export interface IlmGetLifecycleResponse extends DictionaryResponseBase<string, IlmGetLifecycleLifecyclePolicy> {
+export interface IlmGetLifecycleResponse extends DictionaryResponseBase<string, IlmGetLifecycleLifecycle> {
 }
 
 export interface IlmGetStatusRequest extends RequestBase {
@@ -8049,7 +8049,7 @@ export interface IlmRemovePolicyRequest extends RequestBase {
 }
 
 export interface IlmRemovePolicyResponse {
-  failed_indexes: string[]
+  failed_indexes: IndexName[]
   has_failures: boolean
 }
 
diff --git a/specification/cluster/_types/ClusterStateIndexLifecycle.ts b/specification/cluster/_types/ClusterStateIndexLifecycle.ts
@@ -18,7 +18,7 @@
  */
 
 import { LifecycleOperationMode } from '@_types/Lifecycle'
-import { Phases } from '@ilm/_types/Phases'
+import { Phases } from '@ilm/_types/Phase'
 import { Dictionary } from '@spec_utils/Dictionary'
 import { HttpHeaders, IndexName, VersionNumber } from '@_types/common'
 import { long } from '@_types/Numeric'
diff --git a/specification/ilm/_types/LifecycleAction.ts b/specification/ilm/_types/LifecycleAction.ts
diff --git a/specification/ilm/_types/Phase.ts b/specification/ilm/_types/Phase.ts
@@ -19,9 +19,17 @@
 
 import { Dictionary } from '@spec_utils/Dictionary'
 import { Time } from '@_types/Time'
-import { LifecycleAction } from './LifecycleAction'
 
 export class Phase {
-  actions: Dictionary<string, LifecycleAction> | string[]
+  actions: Dictionary<string, Action> | string[]
   min_age?: Time
 }
+
+export class Phases {
+  cold?: Phase
+  delete?: Phase
+  hot?: Phase
+  warm?: Phase
+}
+
+export class Action {}
diff --git a/specification/ilm/_types/Phases.ts b/specification/ilm/_types/Phases.ts
diff --git a/specification/ilm/_types/Policy.ts b/specification/ilm/_types/Policy.ts
@@ -17,9 +17,10 @@
  * under the License.
  */
 
-import { Phases } from './Phases'
+import { Name } from '@_types/common'
+import { Phases } from './Phase'
 
 export class Policy {
   phases: Phases
-  name?: string
+  name?: Name
 }
diff --git a/specification/ilm/delete_lifecycle/DeleteLifecycleRequest.ts b/specification/ilm/delete_lifecycle/DeleteLifecycleRequest.ts
@@ -30,6 +30,4 @@ export interface Request extends RequestBase {
     policy?: Name
     policy_id: Id
   }
-  query_parameters?: {}
-  body?: {}
 }
diff --git a/specification/ilm/explain_lifecycle/ExplainLifecycleRequest.ts b/specification/ilm/explain_lifecycle/ExplainLifecycleRequest.ts
@@ -33,5 +33,4 @@ export interface Request extends RequestBase {
     only_errors?: boolean
     only_managed?: boolean
   }
-  body?: {}
 }
diff --git a/specification/ilm/explain_lifecycle/ExplainLifecycleResponse.ts b/specification/ilm/explain_lifecycle/ExplainLifecycleResponse.ts
@@ -19,19 +19,10 @@
 
 import { Dictionary } from '@spec_utils/Dictionary'
 import { IndexName } from '@_types/common'
-import { LifecycleExplain } from './LifecycleExplain'
+import { LifecycleExplain, LifecycleExplainProject } from './types'
 
 export class Response {
   body: {
     indices: Dictionary<IndexName, LifecycleExplain> | LifecycleExplainProject
   }
 }
-
-export class LifecycleExplainProject {
-  project: LifecycleExplainProjectSummary
-}
-
-export class LifecycleExplainProjectSummary {
-  index: IndexName
-  managed: boolean
-}
diff --git a/specification/ilm/explain_lifecycle/types.ts b/specification/ilm/explain_lifecycle/types.ts
@@ -47,3 +47,12 @@ export class LifecycleExplainPhaseExecution {
   version: VersionNumber
   modified_date_in_millis: EpochMillis
 }
+
+export class LifecycleExplainProject {
+  project: LifecycleExplainProjectSummary
+}
+
+export class LifecycleExplainProjectSummary {
+  index: IndexName
+  managed: boolean
+}
diff --git a/specification/ilm/get_lifecycle/GetLifecycleRequest.ts b/specification/ilm/get_lifecycle/GetLifecycleRequest.ts
@@ -30,6 +30,4 @@ export interface Request extends RequestBase {
     policy?: Name
     policy_id?: Id
   }
-  query_parameters?: {}
-  body?: {}
 }
diff --git a/specification/ilm/get_lifecycle/GetLifecycleResponse.ts b/specification/ilm/get_lifecycle/GetLifecycleResponse.ts
@@ -18,6 +18,6 @@
  */
 
 import { DictionaryResponseBase } from '@_types/Base'
-import { LifecyclePolicy } from './LifecyclePolicy'
+import { Lifecycle } from './types'
 
-export class Response extends DictionaryResponseBase<string, LifecyclePolicy> {}
+export class Response extends DictionaryResponseBase<string, Lifecycle> {}
diff --git a/specification/ilm/get_lifecycle/types.ts b/specification/ilm/get_lifecycle/types.ts
@@ -21,7 +21,7 @@ import { Policy } from '@ilm/_types/Policy'
 import { VersionNumber } from '@_types/common'
 import { DateString } from '@_types/Time'
 
-export class LifecyclePolicy {
+export class Lifecycle {
   modified_date: DateString
   policy: Policy
   version: VersionNumber
diff --git a/specification/ilm/get_status/GetIlmStatusRequest.ts b/specification/ilm/get_status/GetIlmStatusRequest.ts
@@ -24,7 +24,4 @@ import { RequestBase } from '@_types/Base'
  * @since 6.6.0
  * @stability TODO
  */
-export interface Request extends RequestBase {
-  query_parameters?: {}
-  body?: {}
-}
+export interface Request extends RequestBase {}
diff --git a/specification/ilm/move_to_step/MoveToStepRequest.ts b/specification/ilm/move_to_step/MoveToStepRequest.ts
@@ -19,7 +19,7 @@
 
 import { RequestBase } from '@_types/Base'
 import { IndexName } from '@_types/common'
-import { StepKey } from './StepKey'
+import { StepKey } from './types'
 
 /**
  * @rest_spec_name ilm.move_to_step
@@ -30,7 +30,6 @@ export interface Request extends RequestBase {
   path_parts?: {
     index: IndexName
   }
-  query_parameters?: {}
   body?: {
     current_step?: StepKey
     next_step?: StepKey
diff --git a/specification/ilm/move_to_step/types.ts b/specification/ilm/move_to_step/types.ts
diff --git a/specification/ilm/put_lifecycle/PutLifecycleRequest.ts b/specification/ilm/put_lifecycle/PutLifecycleRequest.ts
@@ -31,7 +31,6 @@ export interface Request extends RequestBase {
     policy?: Name
     policy_id?: Id
   }
-  query_parameters?: {}
   body?: {
     policy?: Policy
   }
diff --git a/specification/ilm/remove_policy/RemovePolicyRequest.ts b/specification/ilm/remove_policy/RemovePolicyRequest.ts
@@ -29,6 +29,4 @@ export interface Request extends RequestBase {
   path_parts?: {
     index: IndexName
   }
-  query_parameters?: {}
-  body?: {}
 }
diff --git a/specification/ilm/remove_policy/RemovePolicyResponse.ts b/specification/ilm/remove_policy/RemovePolicyResponse.ts
@@ -17,6 +17,11 @@
  * under the License.
  */
 
+import { IndexName } from '@_types/common'
+
 export class Response {
-  body: { failed_indexes: string[]; has_failures: boolean }
+  body: {
+    failed_indexes: IndexName[]
+    has_failures: boolean
+  }
 }
diff --git a/specification/ilm/retry/RetryIlmRequest.ts b/specification/ilm/retry/RetryIlmRequest.ts
@@ -29,6 +29,4 @@ export interface Request extends RequestBase {
   path_parts?: {
     index: IndexName
   }
-  query_parameters?: {}
-  body?: {}
 }
diff --git a/specification/xpack/usage/types.ts b/specification/xpack/usage/types.ts
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-import { Phases } from '@ilm/_types/Phases'
+import { Phases } from '@ilm/_types/Phase'
 import { Statistics } from '@slm/_types/SnapshotLifecycle'
 import { Dictionary } from '@spec_utils/Dictionary'
 import { ByteSize, EmptyObject, Field, Name } from '@_types/common'

Original file line number	Diff line number	Diff line change
`@@ -81000,7 +81000,7 @@`
`81000`	`81000`	`{`
`81001`	`81001`	`"kind": "interface",`
`81002`	`81002`	`"name": {`
`81003`		`- "name": "LifecycleAction",`
	`81003`	`+ "name": "Action",`
`81004`	`81004`	`"namespace": "ilm._types"`
`81005`	`81005`	`},`
`81006`	`81006`	`"properties": []`
`@@ -81030,7 +81030,7 @@`
`81030`	`81030`	`"value": {`
`81031`	`81031`	`"kind": "instance_of",`
`81032`	`81032`	`"type": {`
`81033`		`- "name": "LifecycleAction",`
	`81033`	`+ "name": "Action",`
`81034`	`81034`	`"namespace": "ilm._types"`
`81035`	`81035`	`}`
`81036`	`81036`	`}`
`@@ -81139,8 +81139,8 @@`
`81139`	`81139`	`"type": {`
`81140`	`81140`	`"kind": "instance_of",`
`81141`	`81141`	`"type": {`
`81142`		`- "name": "string",`
`81143`		`- "namespace": "internal"`
	`81142`	`+ "name": "Name",`
	`81143`	`+ "namespace": "_types"`
`81144`	`81144`	`}`
`81145`	`81145`	`}`
`81146`	`81146`	`}`
`@@ -81597,7 +81597,7 @@`
`81597`	`81597`	`{`
`81598`	`81598`	`"kind": "interface",`
`81599`	`81599`	`"name": {`
`81600`		`- "name": "LifecyclePolicy",`
	`81600`	`+ "name": "Lifecycle",`
`81601`	`81601`	`"namespace": "ilm.get_lifecycle"`
`81602`	`81602`	`},`
`81603`	`81603`	`"properties": [`
`@@ -81697,7 +81697,7 @@`
`81697`	`81697`	`{`
`81698`	`81698`	`"kind": "instance_of",`
`81699`	`81699`	`"type": {`
`81700`		`- "name": "LifecyclePolicy",`
	`81700`	`+ "name": "Lifecycle",`
`81701`	`81701`	`"namespace": "ilm.get_lifecycle"`
`81702`	`81702`	`}`
`81703`	`81703`	`}`
`@@ -81992,8 +81992,8 @@`
`81992`	`81992`	`"value": {`
`81993`	`81993`	`"kind": "instance_of",`
`81994`	`81994`	`"type": {`
`81995`		`- "name": "string",`
`81996`		`- "namespace": "internal"`
	`81995`	`+ "name": "IndexName",`
	`81996`	`+ "namespace": "_types"`
`81997`	`81997`	`}`
`81998`	`81998`	`}`
`81999`	`81999`	`}`
Original file line number	Diff line number	Diff line change
`@@ -7923,11 +7923,11 @@ export interface GraphExploreResponse {`
`7923`	`7923`	`vertices: GraphVertex[]`
`7924`	`7924`	`}`
`7925`	`7925`
`7926`		`-export interface IlmLifecycleAction {`
	`7926`	`+export interface IlmAction {`
`7927`	`7927`	`}`
`7928`	`7928`
`7929`	`7929`	`export interface IlmPhase {`
`7930`		`- actions: Record<string, IlmLifecycleAction> \| string[]`
	`7930`	`+ actions: Record<string, IlmAction> \| string[]`
`7931`	`7931`	`min_age?: Time`
`7932`	`7932`	`}`
`7933`	`7933`
`@@ -7940,7 +7940,7 @@ export interface IlmPhases {`
`7940`	`7940`
`7941`	`7941`	`export interface IlmPolicy {`
`7942`	`7942`	`phases: IlmPhases`
`7943`		`- name?: string`
	`7943`	`+ name?: Name`
`7944`	`7944`	`}`
`7945`	`7945`
`7946`	`7946`	`export interface IlmDeleteLifecycleRequest extends RequestBase {`
`@@ -7995,7 +7995,7 @@ export interface IlmExplainLifecycleResponse {`
`7995`	`7995`	`indices: Record<IndexName, IlmExplainLifecycleLifecycleExplain> \| IlmExplainLifecycleLifecycleExplainProject`
`7996`	`7996`	`}`
`7997`	`7997`
`7998`		`-export interface IlmGetLifecycleLifecyclePolicy {`
	`7998`	`+export interface IlmGetLifecycleLifecycle {`
`7999`	`7999`	`modified_date: DateString`
`8000`	`8000`	`policy: IlmPolicy`
`8001`	`8001`	`version: VersionNumber`
`@@ -8006,7 +8006,7 @@ export interface IlmGetLifecycleRequest extends RequestBase {`
`8006`	`8006`	`policy_id?: Id`
`8007`	`8007`	`}`
`8008`	`8008`
`8009`		`-export interface IlmGetLifecycleResponse extends DictionaryResponseBase<string, IlmGetLifecycleLifecyclePolicy> {`
	`8009`	`+export interface IlmGetLifecycleResponse extends DictionaryResponseBase<string, IlmGetLifecycleLifecycle> {`
`8010`	`8010`	`}`
`8011`	`8011`
`8012`	`8012`	`export interface IlmGetStatusRequest extends RequestBase {`
`@@ -8049,7 +8049,7 @@ export interface IlmRemovePolicyRequest extends RequestBase {`
`8049`	`8049`	`}`
`8050`	`8050`
`8051`	`8051`	`export interface IlmRemovePolicyResponse {`
`8052`		`- failed_indexes: string[]`
	`8052`	`+ failed_indexes: IndexName[]`
`8053`	`8053`	`has_failures: boolean`
`8054`	`8054`	`}`
`8055`	`8055`
Original file line number	Diff line number	Diff line change
`@@ -30,6 +30,4 @@ export interface Request extends RequestBase {`
`30`	`30`	`policy?: Name`
`31`	`31`	`policy_id: Id`
`32`	`32`	`}`
`33`		`- query_parameters?: {}`
`34`		`- body?: {}`
`35`	`33`	`}`
Original file line number	Diff line number	Diff line change
`@@ -33,5 +33,4 @@ export interface Request extends RequestBase {`
`33`	`33`	`only_errors?: boolean`
`34`	`34`	`only_managed?: boolean`
`35`	`35`	`}`
`36`		`- body?: {}`
`37`	`36`	`}`
Original file line number	Diff line number	Diff line change
`@@ -31,7 +31,6 @@ export interface Request extends RequestBase {`
`31`	`31`	`policy?: Name`
`32`	`32`	`policy_id?: Id`
`33`	`33`	`}`
`34`		`- query_parameters?: {}`
`35`	`34`	`body?: {`
`36`	`35`	`policy?: Policy`
`37`	`36`	`}`
Original file line number	Diff line number	Diff line change
`@@ -29,6 +29,4 @@ export interface Request extends RequestBase {`
`29`	`29`	`path_parts?: {`
`30`	`30`	`index: IndexName`
`31`	`31`	`}`
`32`		`- query_parameters?: {}`
`33`		`- body?: {}`
`34`	`32`	`}`