From bf2dfda154591ed13cb3f82336a4ed5635fadc8c Mon Sep 17 00:00:00 2001
From: Zacqary Xeper <zacqary.xeper@elastic.co>
Date: Mon, 12 Apr 2021 13:25:57 -0500
Subject: [PATCH] Fix installing out of date integrations

---
 .../fleet/server/services/agent_policy.ts     |  1 +
 .../fleet/server/services/package_policy.ts   | 38 ++++++++++++-------
 .../fleet/server/services/preconfiguration.ts | 29 +++++++-------
 3 files changed, 41 insertions(+), 27 deletions(-)

diff --git a/x-pack/plugins/fleet/server/services/agent_policy.ts b/x-pack/plugins/fleet/server/services/agent_policy.ts
index a30c3d1cffcfb..393f95c139205 100644
--- a/x-pack/plugins/fleet/server/services/agent_policy.ts
+++ b/x-pack/plugins/fleet/server/services/agent_policy.ts
@@ -852,5 +852,6 @@ export async function addPackageToAgentPolicy(
 
   await packagePolicyService.create(soClient, esClient, newPackagePolicy, {
     bumpRevision: false,
+    skipEnsureInstalled: true,
   });
 }
diff --git a/x-pack/plugins/fleet/server/services/package_policy.ts b/x-pack/plugins/fleet/server/services/package_policy.ts
index 210c9128b1ec7..d38337a884a0d 100644
--- a/x-pack/plugins/fleet/server/services/package_policy.ts
+++ b/x-pack/plugins/fleet/server/services/package_policy.ts
@@ -60,7 +60,12 @@ class PackagePolicyService {
     soClient: SavedObjectsClientContract,
     esClient: ElasticsearchClient,
     packagePolicy: NewPackagePolicy,
-    options?: { id?: string; user?: AuthenticatedUser; bumpRevision?: boolean }
+    options?: {
+      id?: string;
+      user?: AuthenticatedUser;
+      bumpRevision?: boolean;
+      skipEnsureInstalled?: boolean;
+    }
   ): Promise<PackagePolicy> {
     // Check that its agent policy does not have a package policy with the same name
     const parentAgentPolicy = await agentPolicyService.get(soClient, packagePolicy.policy_id);
@@ -88,18 +93,25 @@ class PackagePolicyService {
 
     // Make sure the associated package is installed
     if (packagePolicy.package?.name) {
-      const [, pkgInfo] = await Promise.all([
-        ensureInstalledPackage({
-          savedObjectsClient: soClient,
-          pkgName: packagePolicy.package.name,
-          esClient,
-        }),
-        getPackageInfo({
-          savedObjectsClient: soClient,
-          pkgName: packagePolicy.package.name,
-          pkgVersion: packagePolicy.package.version,
-        }),
-      ]);
+      const pkgInfoPromise = getPackageInfo({
+        savedObjectsClient: soClient,
+        pkgName: packagePolicy.package.name,
+        pkgVersion: packagePolicy.package.version,
+      });
+
+      let pkgInfo;
+      if (options?.skipEnsureInstalled) pkgInfo = await pkgInfoPromise;
+      else {
+        const [, packageInfo] = await Promise.all([
+          ensureInstalledPackage({
+            savedObjectsClient: soClient,
+            pkgName: packagePolicy.package.name,
+            esClient,
+          }),
+          pkgInfoPromise,
+        ]);
+        pkgInfo = packageInfo;
+      }
 
       // Check if it is a limited package, and if so, check that the corresponding agent policy does not
       // already contain a package policy for this package
diff --git a/x-pack/plugins/fleet/server/services/preconfiguration.ts b/x-pack/plugins/fleet/server/services/preconfiguration.ts
index 3f8d00b4b9e76..4ceebc32d5108 100644
--- a/x-pack/plugins/fleet/server/services/preconfiguration.ts
+++ b/x-pack/plugins/fleet/server/services/preconfiguration.ts
@@ -19,11 +19,13 @@ import type {
   PreconfiguredAgentPolicy,
   PreconfiguredPackage,
 } from '../../common';
+import { PRECONFIGURATION_METADATA_INDEX } from '../constants';
 
 import { pkgToPkgKey } from './epm/registry';
 import { getInstallation } from './epm/packages';
 import { ensureInstalledPackage } from './epm/packages/install';
 import { agentPolicyService, addPackageToAgentPolicy } from './agent_policy';
+import { packagePolicyService } from './package_policy';
 
 export type InputsOverride = Partial<NewPackagePolicyInput> & {
   vars?: Array<NewPackagePolicyInput['vars'] & { name: string }>;
@@ -165,20 +167,19 @@ async function addPreconfiguredPolicyPackages(
   >,
   defaultOutput: Output
 ) {
-  return await Promise.all(
-    installedPackagePolicies.map(async ({ installedPackage, name, description, inputs }) =>
-      addPackageToAgentPolicy(
-        soClient,
-        esClient,
-        installedPackage,
-        agentPolicy,
-        defaultOutput,
-        name,
-        description,
-        (policy) => overridePackageInputs(policy, inputs)
-      )
-    )
-  );
+  // Add packages synchronously to avoid overwriting
+  for (const { installedPackage, name, description, inputs } of installedPackagePolicies) {
+    await addPackageToAgentPolicy(
+      soClient,
+      esClient,
+      installedPackage,
+      agentPolicy,
+      defaultOutput,
+      name,
+      description,
+      (policy) => overridePackageInputs(policy, inputs)
+    );
+  }
 }
 
 async function ensureInstalledPreconfiguredPackage(