Rename subtype CONFIG to POLICY (I don't think this string is ever se…

…nt by agent, though)
elastic · Aug 14, 2020 · 3c91e01 · 3c91e01
1 parent 11f1832
commit 3c91e01
Show file tree

Hide file tree

Showing 6 changed files with 12 additions and 12 deletions.
diff --git a/x-pack/plugins/ingest_manager/common/openapi/spec_oas3.json b/x-pack/plugins/ingest_manager/common/openapi/spec_oas3.json
@@ -3387,7 +3387,7 @@
                     "events": [
                       {
                         "type": "ACTION_RESULT",
-                        "subtype": "CONFIG",
+                        "subtype": "POLICY",
                         "timestamp": "2019-01-04T14:32:03.36764-05:00",
                         "action_id": "51c6ad1e-a9c0-4c70-80da-99a5c51eedaf",
                         "agent_id": "a6f14bd2-1a2a-481c-9212-9494d064ffdf",
@@ -4199,7 +4199,7 @@
               "RUNNING",
               "STARTING",
               "IN_PROGRESS",
-              "CONFIG",
+              "POLICY",
               "FAILED",
               "STOPPING",
               "STOPPED",

diff --git a/x-pack/plugins/ingest_manager/common/types/models/agent.ts b/x-pack/plugins/ingest_manager/common/types/models/agent.ts
@@ -49,7 +49,7 @@ export interface NewAgentEvent {
   | 'RUNNING'
     | 'STARTING'
     | 'IN_PROGRESS'
-    | 'CONFIG'
+    | 'POLICY'
     | 'FAILED'
     | 'STOPPING'
     | 'STOPPED'

diff --git a/.../applications/ingest_manager/sections/fleet/agent_details_page/components/type_labels.tsx b/.../applications/ingest_manager/sections/fleet/agent_details_page/components/type_labels.tsx
@@ -63,7 +63,7 @@ export const SUBTYPE_LABEL: { [key in AgentEvent['subtype']]: JSX.Element } = {
       />
     </EuiBadge>
   ),
-  CONFIG: (
+  POLICY: (
     <EuiBadge color="hollow">
       <FormattedMessage
         id="xpack.ingestManager.agentEventSubtype.policyLabel"

diff --git a/x-pack/plugins/ingest_manager/server/routes/agent/acks_handlers.test.ts b/x-pack/plugins/ingest_manager/server/routes/agent/acks_handlers.test.ts
@@ -20,7 +20,7 @@ describe('test acks schema', () => {
     expect(() =>
       AckEventSchema.validate({
         type: 'ACTION_RESULT',
-        subtype: 'CONFIG',
+        subtype: 'POLICY',
         timestamp: '2019-01-04T14:32:03.36764-05:00',
         agent_id: 'agent',
         message: 'hello',
@@ -31,7 +31,7 @@ describe('test acks schema', () => {
     expect(
       AckEventSchema.validate({
         type: 'ACTION_RESULT',
-        subtype: 'CONFIG',
+        subtype: 'POLICY',
         timestamp: '2019-01-04T14:32:03.36764-05:00',
         agent_id: 'agent',
         action_id: 'actionId',
@@ -60,7 +60,7 @@ describe('test acks handlers', () => {
         events: [
           {
             type: 'ACTION_RESULT',
-            subtype: 'CONFIG',
+            subtype: 'POLICY',
             timestamp: '2019-01-04T14:32:03.36764-05:00',
             action_id: 'action1',
             agent_id: 'agent',

diff --git a/x-pack/plugins/ingest_manager/server/services/agents/acks.test.ts b/x-pack/plugins/ingest_manager/server/services/agents/acks.test.ts
@@ -74,7 +74,7 @@ describe('test agent acks services', () => {
       [
         {
           type: 'ACTION_RESULT',
-          subtype: 'CONFIG',
+          subtype: 'POLICY',
           timestamp: '2019-01-04T14:32:03.36764-05:00',
           action_id: 'action1',
           agent_id: 'id',
@@ -212,7 +212,7 @@ describe('test agent acks services', () => {
       [
         {
           type: 'ACTION_RESULT',
-          subtype: 'CONFIG',
+          subtype: 'POLICY',
           timestamp: '2019-01-04T14:32:03.36764-05:00',
           action_id: 'action1',
           agent_id: 'id',
@@ -355,7 +355,7 @@ describe('test agent acks services', () => {
       [
         {
           type: 'ACTION_RESULT',
-          subtype: 'CONFIG',
+          subtype: 'POLICY',
           timestamp: '2019-01-04T14:32:03.36764-05:00',
           action_id: 'action1',
           agent_id: 'id',
@@ -392,7 +392,7 @@ describe('test agent acks services', () => {
         [
           ({
             type: 'ACTION_RESULT',
-            subtype: 'CONFIG',
+            subtype: 'POLICY',
             timestamp: '2019-01-04T14:32:03.36764-05:00',
             action_id: 'action2',
             agent_id: 'id',

diff --git a/x-pack/plugins/ingest_manager/server/types/models/agent.ts b/x-pack/plugins/ingest_manager/server/types/models/agent.ts
@@ -26,7 +26,7 @@ const AgentEventBase = {
       schema.literal('RUNNING'),
       schema.literal('STARTING'),
       schema.literal('IN_PROGRESS'),
-      schema.literal('CONFIG'),
+      schema.literal('POLICY'),
       schema.literal('FAILED'),
       schema.literal('STOPPING'),
       schema.literal('STOPPED'),