Make package policy input IDs unique

jen-huang · jen-huang · commit 4e093ba9ecac · 2022-03-09T11:26:10.000-08:00
diff --git a/x-pack/plugins/fleet/common/services/package_policies_to_agent_inputs.test.ts b/x-pack/plugins/fleet/common/services/package_policies_to_agent_inputs.test.ts
@@ -118,7 +118,7 @@ describe('Fleet - storedPackagePoliciesToAgentInputs', () => {
       ])
     ).toEqual([
       {
-        id: 'some-uuid',
+        id: 'test-logs-some-uuid',
         name: 'mock-package-policy',
         revision: 1,
         type: 'test-logs',
@@ -169,7 +169,7 @@ describe('Fleet - storedPackagePoliciesToAgentInputs', () => {
       ])
     ).toEqual([
       {
-        id: 'some-uuid',
+        id: 'test-logs-some-uuid',
         name: 'mock-package-policy',
         revision: 1,
         type: 'test-logs',
@@ -201,7 +201,7 @@ describe('Fleet - storedPackagePoliciesToAgentInputs', () => {
       ])
     ).toEqual([
       {
-        id: 'some-uuid',
+        id: 'test-logs-some-uuid',
         name: 'mock-package-policy',
         revision: 1,
         type: 'test-logs',
@@ -263,7 +263,7 @@ describe('Fleet - storedPackagePoliciesToAgentInputs', () => {
       ])
     ).toEqual([
       {
-        id: 'some-uuid',
+        id: 'test-logs-some-uuid',
         revision: 1,
         name: 'mock-package-policy',
         type: 'test-logs',
diff --git a/x-pack/plugins/fleet/common/services/package_policies_to_agent_inputs.ts b/x-pack/plugins/fleet/common/services/package_policies_to_agent_inputs.ts
@@ -26,7 +26,7 @@ export const storedPackagePoliciesToAgentInputs = (
       }
 
       const fullInput: FullAgentPolicyInput = {
-        id: packagePolicy.id || packagePolicy.name,
+        id: `${input.type}${input.policy_template ? `-${input.policy_template}-` : '-'}${packagePolicy.id}`,
         revision: packagePolicy.revision,
         name: packagePolicy.name,
         type: input.type,

Original file line number	Diff line number	Diff line change
`@@ -26,7 +26,7 @@ export const storedPackagePoliciesToAgentInputs = (`
`26`	`26`	`}`
`27`	`27`
`28`	`28`	`const fullInput: FullAgentPolicyInput = {`
`29`		`- id: packagePolicy.id \|\| packagePolicy.name,`
	`29`	+ id: `${input.type}${input.policy_template ? `-${input.policy_template}-` : '-'}${packagePolicy.id}`,
`30`	`30`	`revision: packagePolicy.revision,`
`31`	`31`	`name: packagePolicy.name,`
`32`	`32`	`type: input.type,`