[Search Connectors] - Remove duplicate agent policy when connector is created as an integration

x-pack/solutions/search/plugins/search_connectors/server/services/index.test.ts

@@ -301,7 +301,7 @@ describe('AgentlessConnectorsInfraService', () => {
       expect(policies[1].agent_policy_ids).toBe(thirdPackagePolicy.policy_ids);
     });
 
-    test('Skips policies that have missing fields', async () => {
+    test('Returns policies that have missing connector_id and connector_name but not service_type', async () => {
       const firstPackagePolicy = createPackagePolicyMock();
       firstPackagePolicy.id = 'this-is-package-policy-id';
       firstPackagePolicy.policy_ids = ['this-is-agent-policy-id'];
@@ -325,13 +325,28 @@ describe('AgentlessConnectorsInfraService', () => {
         } as PackagePolicyInput,
       ];
 
+      const thirdPackagePolicy = createPackagePolicyMock();
+      thirdPackagePolicy.inputs = [
+        {
+          type: 'connectors-py',
+          compiled_input: {
+            connector_id: '000002',
+            service_type: 'github',
+          },
+        } as PackagePolicyInput,
+      ];
+
       packagePolicyService.fetchAllItems.mockResolvedValue(
-        getMockPolicyFetchAllItems([[firstPackagePolicy], [secondPackagePolicy]])
+        getMockPolicyFetchAllItems([
+          [firstPackagePolicy],
+          [secondPackagePolicy],
+          [thirdPackagePolicy],
+        ])
       );
 
       const policies = await service.getConnectorPackagePolicies();
 
-      expect(policies.length).toBe(0);
+      expect(policies.length).toBe(2);
     });
   });
   describe('deployConnector', () => {
@@ -579,6 +594,20 @@ describe('module', () => {
     is_deleted: false,
   };
 
+  const confluenceConnector: ConnectorMetadata = {
+    id: '000004',
+    name: 'Confluence Connector',
+    service_type: 'confluence',
+    is_deleted: false,
+  };
+
+  const confluenceConnectorEmptySettings: ConnectorMetadata = {
+    id: '',
+    name: '',
+    service_type: 'confluence',
+    is_deleted: false,
+  };
+
   const deleted = (connector: ConnectorMetadata): ConnectorMetadata => {
     return {
       id: connector.id,
@@ -606,6 +635,12 @@ describe('module', () => {
     connector_settings: mysqlConnector,
   };
 
+  const confluencePackagePolicy: PackagePolicyMetadata = {
+    package_policy_id: '000004',
+    agent_policy_ids: [],
+    connector_settings: confluenceConnectorEmptySettings,
+  };
+
   describe('getPoliciesToDelete', () => {
     test('Returns one policy if connector has been soft-deleted', async () => {
       const policiesToDelete = getPoliciesToDelete(
@@ -688,5 +723,14 @@ describe('module', () => {
       expect(missingConnectors).toContain(sharepointConnector);
       expect(missingConnectors).toContain(mysqlConnector);
     });
+
+    test('Returns none if Policy is created without a connector_id or connector_name', async () => {
+      const missingConnectors = getConnectorsToDeploy(
+        [githubPackagePolicy, sharepointPackagePolicy, mysqlPackagePolicy, confluencePackagePolicy],
+        [githubConnector, sharepointConnector, mysqlConnector, confluenceConnector]
+      );
+
+      expect(missingConnectors.length).toBe(0);
+    });
   });
 });

x-pack/solutions/search/plugins/search_connectors/server/services/index.ts

@@ -106,8 +106,8 @@ export class AgentlessConnectorsInfraService {
               }
 
               if (input.compiled_input.connector_id == null) {
-                this.logger.debug(`Policy ${policy.id} is missing connector_id, skipping`);
-                continue;
+                this.logger.debug(`Policy ${policy.id} is missing connector_id`);
+                // No need to skip, that's fine
               }
 
               if (input.compiled_input.connector_name == null) {
@@ -265,7 +265,11 @@ export const getConnectorsToDeploy = (
 
     // If no package policies reference this connector by id then it should be deployed
     if (
-      packagePolicies.every((packagePolicy) => packagePolicy.connector_settings.id !== connector.id)
+      packagePolicies.every(
+        (packagePolicy) =>
+          connector.id !== packagePolicy.connector_settings.id &&
+          connector.id !== packagePolicy.package_policy_id
+      )
     ) {
       results.push(connector);
     }