fix package policy being able save support_cloud_connector error

Author: Omolola-Akinleye

x-pack/platform/plugins/shared/fleet/common/services/simplified_package_policy_helper.ts

@@ -52,6 +52,7 @@ export interface SimplifiedPackagePolicy {
   vars?: SimplifiedVars;
   inputs?: SimplifiedInputs;
   supports_agentless?: boolean | null;
+  supports_cloud_connector?: boolean | null;
   additional_datastreams_permissions?: string[];
 }
 

x-pack/platform/plugins/shared/fleet/server/routes/package_policy/handlers.ts

@@ -416,6 +416,8 @@ export const updatePackagePolicyHandler: FleetRequestHandler<
         inputs: restOfBody.inputs ?? packagePolicyInputs,
         vars: restOfBody.vars ?? packagePolicy.vars,
         supports_agentless: restOfBody.supports_agentless ?? packagePolicy.supports_agentless,
+        supports_cloud_connector:
+          restOfBody.supports_cloud_connector ?? packagePolicy.supports_cloud_connector,
       } as NewPackagePolicy;
 
       if (overrides) {

x-pack/platform/plugins/shared/fleet/server/saved_objects/index.ts

@@ -671,6 +671,7 @@ export const getSavedObjectTypes = (
           policy_id: { type: 'keyword' },
           policy_ids: { type: 'keyword' },
           output_id: { type: 'keyword' },
+          cloud_connector_id: { type: 'keyword' },
           package: {
             properties: {
               name: { type: 'keyword' },
@@ -691,6 +692,7 @@ export const getSavedObjectTypes = (
           secret_references: { properties: { id: { type: 'keyword' } } },
           overrides: { type: 'flattened', index: false },
           supports_agentless: { type: 'boolean' },
+          supports_cloud_connector: { type: 'boolean' },
           revision: { type: 'integer' },
           updated_at: { type: 'date' },
           updated_by: { type: 'keyword' },
@@ -892,6 +894,17 @@ export const getSavedObjectTypes = (
             },
           ],
         },
+        '20': {
+          changes: [
+            {
+              type: 'mappings_addition',
+              addedMappings: {
+                cloud_connector_id: { type: 'keyword' },
+                supports_cloud_connector: { type: 'boolean' },
+              },
+            },
+          ],
+        },
       },
       migrations: {
         '7.10.0': migratePackagePolicyToV7100,
@@ -929,6 +942,7 @@ export const getSavedObjectTypes = (
           policy_id: { type: 'keyword' },
           policy_ids: { type: 'keyword' },
           output_id: { type: 'keyword' },
+          cloud_connector_id: { type: 'keyword' },
           package: {
             properties: {
               name: { type: 'keyword' },
@@ -949,6 +963,7 @@ export const getSavedObjectTypes = (
           secret_references: { properties: { id: { type: 'keyword' } } },
           overrides: { type: 'flattened', index: false },
           supports_agentless: { type: 'boolean' },
+          supports_cloud_connector: { type: 'boolean' },
           revision: { type: 'integer' },
           updated_at: { type: 'date' },
           updated_by: { type: 'keyword' },
@@ -1009,6 +1024,17 @@ export const getSavedObjectTypes = (
             },
           ],
         },
+        '6': {
+          changes: [
+            {
+              type: 'mappings_addition',
+              addedMappings: {
+                supports_cloud_connector: { type: 'boolean' },
+                cloud_connector_id: { type: 'keyword' },
+              },
+            },
+          ],
+        },
       },
     },
     [PACKAGES_SAVED_OBJECT_TYPE]: {

x-pack/platform/plugins/shared/fleet/server/services/cloud_connector/index.ts

@@ -59,6 +59,7 @@ import {
   DATA_STREAM_TYPE_VAR_NAME,
   OTEL_COLLECTOR_INPUT_TYPE,
 } from '../../common/constants';
+import { SUPPORTED_CLOUD_CONNECTOR_VARS } from '../../common/constants/cloud_connector';
 import type {
   PostDeletePackagePoliciesResponse,
   UpgradePackagePolicyResponse,
@@ -77,6 +78,7 @@ import type {
   AgentPolicy,
   PackagePolicyAssetsMap,
   CloudProvider,
+  CloudConnectorVarsRecord,
 } from '../../common/types';
 import {
   FleetError,
@@ -171,7 +173,6 @@ import {
   _packagePoliciesBulkUpgrade,
   _packagePoliciesUpgrade,
 } from './package_policies/upgrade';
-import { extractCloudVarsFromPackagePolicy } from './cloud_connector';
 
 export type InputsOverride = Partial<NewPackagePolicyInput> & {
   vars?: Array<NewPackagePolicyInput['vars'] & { name: string }>;
@@ -235,6 +236,25 @@ export function _normalizePackagePolicyKuery(savedObjectType: string, kuery: str
   }
 }
 
+export const extractCloudVarsFromPackagePolicy = (
+  packagePolicy: NewPackagePolicy
+): CloudConnectorVarsRecord | null => {
+  for (const input of packagePolicy.inputs) {
+    if (input.enabled && input.streams.length > 0) {
+      const vars = input.streams.find((stream) => stream.enabled)?.vars;
+      if (vars) {
+        return Object.entries(vars)
+          .filter(([key, _value]) => SUPPORTED_CLOUD_CONNECTOR_VARS.includes(key))
+          .reduce((acc, [key, value]) => {
+            acc[key] = value;
+            return acc;
+          }, {} as CloudConnectorVarsRecord);
+      }
+    }
+  }
+  return null;
+};
+
 class PackagePolicyClientImpl implements PackagePolicyClient {
   protected getLogger(...childContextPaths: string[]): Logger {
     return appContextService.getLogger().get('PackagePolicyClient', ...childContextPaths);
@@ -420,10 +440,7 @@ class PackagePolicyClientImpl implements PackagePolicyClient {
         secretReferences = secretsRes.secretReferences;
 
         inputs = enrichedPackagePolicy.inputs as PackagePolicyInput[];
-        if (
-          agentPolicies[0].agentless?.cloud_connectors?.enabled &&
-          enrichedPackagePolicy.package?.name !== 'system'
-        ) {
+        if (enrichedPackagePolicy.supports_cloud_connector) {
           const cloudConnectorVars = extractCloudVarsFromPackagePolicy(enrichedPackagePolicy);
           if (cloudConnectorVars) {
             try {
@@ -2155,6 +2172,7 @@ class PackagePolicyClientImpl implements PackagePolicyClient {
           inputs: newPolicy.inputs[0]?.streams ? newPolicy.inputs : inputs,
           vars: newPolicy.vars || newPP.vars,
           supports_agentless: newPolicy.supports_agentless,
+          supports_cloud_connector: newPolicy.supports_cloud_connector,
           additional_datastreams_permissions: newPolicy.additional_datastreams_permissions,
         };
       }