[Fleet] Enable package signature verification feature (#137239)

* [Fleet] Enable package verification feature * handle cases where verification_key_id is set to null
elastic · Jul 26, 2022 · fc55587 · fc55587
1 parent f903899
commit fc55587
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 1 deletion.
diff --git a/x-pack/plugins/fleet/common/experimental_features.ts b/x-pack/plugins/fleet/common/experimental_features.ts
@@ -13,7 +13,7 @@ export type ExperimentalFeatures = typeof allowedExperimentalValues;
  */
 export const allowedExperimentalValues = Object.freeze({
   createPackagePolicyMultiPageLayout: true,
-  packageVerification: false,
+  packageVerification: true,
 });
 
 type ExperimentalConfigKeys = Array<keyof ExperimentalFeatures>;

diff --git a/x-pack/test/fleet_api_integration/apis/epm/install_remove_assets.ts b/x-pack/test/fleet_api_integration/apis/epm/install_remove_assets.ts
@@ -528,6 +528,12 @@ const expectAssetsInstalled = ({
     // during a reinstall the items can change
     const sortedRes = {
       ...res.attributes,
+      // verification_key_id can be null or undefined for install or reinstall cases,
+      // kbn/expect only does strict equality so undefined is normalised to null
+      verification_key_id:
+        res.attributes.verification_key_id === undefined
+          ? null
+          : res.attributes.verification_key_id,
       installed_kibana: sortBy(res.attributes.installed_kibana, (o: AssetReference) => o.type),
       installed_es: sortBy(res.attributes.installed_es, (o: AssetReference) => o.type),
       package_assets: sortBy(res.attributes.package_assets, (o: AssetReference) => o.type),
@@ -768,6 +774,7 @@ const expectAssetsInstalled = ({
       install_source: 'registry',
       install_format_schema_version: FLEET_INSTALL_FORMAT_VERSION,
       verification_status: 'unknown',
+      verification_key_id: null,
     });
   });
 };
diff --git a/x-pack/test/fleet_api_integration/apis/epm/update_assets.ts b/x-pack/test/fleet_api_integration/apis/epm/update_assets.ts
@@ -514,6 +514,7 @@ export default function (providerContext: FtrProviderContext) {
         install_source: 'registry',
         install_format_schema_version: FLEET_INSTALL_FORMAT_VERSION,
         verification_status: 'unknown',
+        verification_key_id: null,
       });
     });
   });