[8.6] [Fleet] fix for apm not found in epr + prerelease flag (#147257) (#147335)

# Backport This will backport the following commits from `main` to `8.6`: - [[Fleet] fix for apm not found in epr + prerelease flag (#147257)](https://github.com/elastic/kibana/pull/147257)  ### Questions ? Please refer to the [Backport tool documentation](https://github.com/sqren/backport)  Co-authored-by: Julia Bardi <90178898+juliaElastic@users.noreply.github.com>
2025-04-24 17:59:23 -04:00 · 2022-12-12 06:11:12 -05:00 · 2022-12-12 06:11:12 -05:00 · 34e5a4642d
commit 34e5a4642d
parent a24e1283e0
9 changed files with 85 additions and 19 deletions
--- a/x-pack/plugins/fleet/public/applications/fleet/sections/agent_policy/create_package_policy_page/index.tsx
+++ b/x-pack/plugins/fleet/public/applications/fleet/sections/agent_policy/create_package_policy_page/index.tsx
@ -4,10 +4,12 @@
 * 2.0; you may not use this file except in compliance with the Elastic License
 * 2.0.
 */
-import React from 'react';
+import React, { useEffect } from 'react';
 import { useMemo } from 'react';
 import { useLocation, useRouteMatch } from 'react-router-dom';

+import { useGetSettings } from '../../../hooks';
+
 import type { AddToPolicyParams, EditPackagePolicyFrom } from './types';

 import { CreatePackagePolicySinglePage } from './single_page_layout';
@ -22,6 +24,17 @@ export const CreatePackagePolicyPage: React.FC<{}> = () => {
    () => queryParams.get('policyId') ?? undefined,
    [queryParams]
  );
+  const [prerelease, setPrerelease] = React.useState<boolean>(false);
+
+  const { data: settings } = useGetSettings();
+
+  useEffect(() => {
+    const isEnabled = Boolean(settings?.item.prerelease_integrations_enabled);
+    if (settings?.item) {
+      setPrerelease(isEnabled);
+    }
+  }, [settings?.item]);
+
  /**
   * Please note: policyId can come from one of two sources. The URL param (in the URL path) or
   * in the query params (?policyId=foo).
@ -39,6 +52,7 @@ export const CreatePackagePolicyPage: React.FC<{}> = () => {
  const pageParams = {
    from,
    queryParamsPolicyId,
+    prerelease,
  };

  if (useMultiPageLayout) {
--- a/x-pack/plugins/fleet/public/applications/fleet/sections/agent_policy/create_package_policy_page/multi_page_layout/index.tsx
+++ b/x-pack/plugins/fleet/public/applications/fleet/sections/agent_policy/create_package_policy_page/multi_page_layout/index.tsx
@ -52,6 +52,7 @@ const standaloneSteps = [addIntegrationStep, installAgentStep, confirmDataStep];
 export const CreatePackagePolicyMultiPage: CreatePackagePolicyParams = ({
  from,
  queryParamsPolicyId,
+  prerelease,
 }) => {
  const { params } = useRouteMatch<AddToPolicyParams>();
  const { pkgkey, policyId, integration } = params;
@ -70,7 +71,7 @@ export const CreatePackagePolicyMultiPage: CreatePackagePolicyParams = ({
    data: packageInfoData,
    error: packageInfoError,
    isLoading: isPackageInfoLoading,
-  } = useGetPackageInfoByKey(pkgName, pkgVersion, { prerelease: true, full: true });
+  } = useGetPackageInfoByKey(pkgName, pkgVersion, { prerelease, full: true });

  const {
    agentPolicy,
--- a/x-pack/plugins/fleet/public/applications/fleet/sections/agent_policy/create_package_policy_page/single_page_layout/index.test.tsx
+++ b/x-pack/plugins/fleet/public/applications/fleet/sections/agent_policy/create_package_policy_page/single_page_layout/index.test.tsx
@ -109,7 +109,11 @@ describe('when on the package policy create page', () => {
  const render = (queryParamsPolicyId?: string) =>
    (renderResult = testRenderer.render(
      <Route path={FLEET_ROUTING_PATHS.add_integration_to_policy}>
-        <CreatePackagePolicySinglePage from="package" queryParamsPolicyId={queryParamsPolicyId} />
+        <CreatePackagePolicySinglePage
+          from="package"
+          queryParamsPolicyId={queryParamsPolicyId}
+          prerelease={false}
+        />
      </Route>
    ));
  let mockPackageInfo: any;
--- a/x-pack/plugins/fleet/public/applications/fleet/sections/agent_policy/create_package_policy_page/single_page_layout/index.tsx
+++ b/x-pack/plugins/fleet/public/applications/fleet/sections/agent_policy/create_package_policy_page/single_page_layout/index.tsx
@ -73,6 +73,7 @@ const CustomEuiBottomBar = styled(EuiBottomBar)`
 export const CreatePackagePolicySinglePage: CreatePackagePolicyParams = ({
  from,
  queryParamsPolicyId,
+  prerelease,
 }) => {
  const {
    agents: { enabled: isFleetEnabled },
@ -99,7 +100,7 @@ export const CreatePackagePolicySinglePage: CreatePackagePolicyParams = ({
    data: packageInfoData,
    error: packageInfoError,
    isLoading: isPackageInfoLoading,
-  } = useGetPackageInfoByKey(pkgName, pkgVersion, { full: true, prerelease: true });
+  } = useGetPackageInfoByKey(pkgName, pkgVersion, { full: true, prerelease });
  const packageInfo = useMemo(() => {
    if (packageInfoData && packageInfoData.item) {
      return packageInfoData.item;
--- a/x-pack/plugins/fleet/public/applications/fleet/sections/agent_policy/create_package_policy_page/types.ts
+++ b/x-pack/plugins/fleet/public/applications/fleet/sections/agent_policy/create_package_policy_page/types.ts
@ -32,4 +32,5 @@ export interface AddToPolicyParams {
 export type CreatePackagePolicyParams = React.FunctionComponent<{
  from: EditPackagePolicyFrom;
  queryParamsPolicyId?: string;
+  prerelease: boolean;
 }>;
--- a/x-pack/plugins/fleet/public/applications/fleet/sections/agent_policy/edit_package_policy_page/index.tsx
+++ b/x-pack/plugins/fleet/public/applications/fleet/sections/agent_policy/edit_package_policy_page/index.tsx
@ -35,6 +35,7 @@ import {
  sendGetPackageInfoByKey,
  sendUpgradePackagePolicyDryRun,
  useAuthz,
+  useGetSettings,
 } from '../../../hooks';
 import {
  useBreadcrumbs as useIntegrationsBreadcrumbs,
@ -129,6 +130,17 @@ export const EditPackagePolicyForm = memo<{

  const canWriteIntegrationPolicies = useAuthz().integrations.writeIntegrationPolicies;

+  const [prerelease, setPrerelease] = React.useState<boolean>(false);
+
+  const { data: settings } = useGetSettings();
+
+  useEffect(() => {
+    const isEnabled = Boolean(settings?.item.prerelease_integrations_enabled);
+    if (settings?.item) {
+      setPrerelease(isEnabled);
+    }
+  }, [settings?.item]);
+
  useEffect(() => {
    if (forceUpgrade) {
      setIsUpgrade(true);
@ -266,7 +278,7 @@ export const EditPackagePolicyForm = memo<{
            const { data: packageData } = await sendGetPackageInfoByKey(
              _packageInfo!.name,
              _packageInfo!.version,
-              { prerelease: true, full: true }
+              { prerelease, full: true }
            );

            if (packageData?.item) {
@ -293,7 +305,7 @@ export const EditPackagePolicyForm = memo<{
      setIsLoadingData(false);
    };
    getData();
-  }, [policyId, packagePolicyId, isUpgrade]);
+  }, [policyId, packagePolicyId, isUpgrade, prerelease]);

  // Retrieve agent count
  const [agentCount, setAgentCount] = useState<number>(0);
--- a/x-pack/plugins/fleet/server/services/epm/packages/get.ts
+++ b/x-pack/plugins/fleet/server/services/epm/packages/get.ts
@ -23,7 +23,12 @@ import type {
  GetCategoriesRequest,
 } from '../../../../common/types';
 import type { Installation, PackageInfo } from '../../../types';
-import { FleetError, PackageFailedVerificationError, PackageNotFoundError } from '../../../errors';
+import {
+  FleetError,
+  PackageFailedVerificationError,
+  PackageNotFoundError,
+  RegistryResponseError,
+} from '../../../errors';
 import { appContextService } from '../..';
 import * as Registry from '../registry';
 import { getEsPackage } from '../archive/storage';
@ -305,8 +310,16 @@ export async function getPackageFromSource(options: {
    if (res) {
      logger.debug(`retrieved package ${pkgName}-${pkgVersion} from cache`);
    } else {
-      res = await Registry.getPackage(pkgName, pkgVersion, { ignoreUnverified });
-      logger.debug(`retrieved package ${pkgName}-${pkgVersion} from registry`);
+      try {
+        res = await Registry.getPackage(pkgName, pkgVersion, { ignoreUnverified });
+        logger.debug(`retrieved package ${pkgName}-${pkgVersion} from registry`);
+      } catch (err) {
+        if (err instanceof RegistryResponseError && err.status === 404) {
+          res = await Registry.getBundledArchive(pkgName, pkgVersion);
+        } else {
+          throw err;
+        }
+      }
    }
  }
  if (!res) {
--- a/x-pack/plugins/fleet/server/services/epm/registry/index.ts
+++ b/x-pack/plugins/fleet/server/services/epm/registry/index.ts
@ -184,24 +184,33 @@ export async function fetchInfo(
    return res;
  } catch (err) {
    if (err instanceof RegistryResponseError && err.status === 404) {
-      // Check bundled packages in case the exact package being requested is available on disk
-      const bundledPackage = await getBundledPackageByName(pkgName);
-
-      if (bundledPackage && bundledPackage.version === pkgVersion) {
-        const archivePackage = await generatePackageInfoFromArchiveBuffer(
-          bundledPackage.buffer,
-          'application/zip'
-        );
-
+      const archivePackage = await getBundledArchive(pkgName, pkgVersion);
+      if (archivePackage) {
        return archivePackage.packageInfo;
      }
-
      throw new PackageNotFoundError(`${pkgName}@${pkgVersion} not found`);
    }
    throw err;
  }
 }

+export async function getBundledArchive(
+  pkgName: string,
+  pkgVersion: string
+): Promise<{ paths: string[]; packageInfo: ArchivePackage } | undefined> {
+  // Check bundled packages in case the exact package being requested is available on disk
+  const bundledPackage = await getBundledPackageByName(pkgName);
+
+  if (bundledPackage && bundledPackage.version === pkgVersion) {
+    const archivePackage = await generatePackageInfoFromArchiveBuffer(
+      bundledPackage.buffer,
+      'application/zip'
+    );
+
+    return archivePackage;
+  }
+}
+
 export async function getFile(
  pkgName: string,
  pkgVersion: string,
--- a/x-pack/test/fleet_api_integration/apis/epm/install_bundled.ts
+++ b/x-pack/test/fleet_api_integration/apis/epm/install_bundled.ts
@ -100,6 +100,17 @@ export default function (providerContext: FtrProviderContext) {

        expect(updateResponse.body._meta.install_source).to.be('bundled');
      });
+
+      it('should load package archive from bundled package', async () => {
+        await bundlePackage('nginx-1.2.1');
+
+        const response = await supertest
+          .get(`/api/fleet/epm/packages/nginx/1.2.1?full=true`)
+          .expect(200);
+
+        expect(response.body.item.name).to.eql('nginx');
+        expect(response.body.item.version).to.eql('1.2.1');
+      });
    });

    describe('with registry', () => {