[INGEST_MANAGER] Make package config name blank for endpoint on Packa…

…ge Config create (elastic#73082) * Make package config name blank for endpoint * Added functional tests on endpoint side
paul-tavares · Jul 24, 2020 · e8db07f · e8db07f
1 parent 42b3a79
commit e8db07f
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 3 deletions.
diff --git a/...t_manager/sections/agent_config/create_package_config_page/step_define_package_config.tsx b/...t_manager/sections/agent_config/create_package_config_page/step_define_package_config.tsx
@@ -47,9 +47,17 @@ export const StepDefinePackageConfig: React.FunctionComponent<{
         .sort();
 
       updatePackageConfig({
-        name: `${packageInfo.name}-${
-          dsWithMatchingNames.length ? dsWithMatchingNames[dsWithMatchingNames.length - 1] + 1 : 1
-        }`,
+        name:
+          // For Endpoint packages, the user must fill in the name, thus we don't attempt to generate
+          // a default one here.
+          // FIXME: Improve package configs name uniqueness - https://github.com/elastic/kibana/issues/72948
+          packageInfo.name !== 'endpoint'
+            ? `${packageInfo.name}-${
+                dsWithMatchingNames.length
+                  ? dsWithMatchingNames[dsWithMatchingNames.length - 1] + 1
+                  : 1
+              }`
+            : '',
         package: {
           name: packageInfo.name,
           title: packageInfo.title,

diff --git a/x-pack/test/security_solution_endpoint/apps/endpoint/policy_list.ts b/x-pack/test/security_solution_endpoint/apps/endpoint/policy_list.ts
@@ -131,6 +131,11 @@ export default function ({ getPageObjects, getService }: FtrProviderContext) {
         expect(endpointConfig).not.to.be(undefined);
       });
 
+      it('should have empty value for package configuration name', async () => {
+        await pageObjects.ingestManagerCreatePackageConfig.selectAgentConfig();
+        expect(await pageObjects.ingestManagerCreatePackageConfig.getPackageConfigName()).to.be('');
+      });
+
       it('should redirect user back to Policy List after a successful save', async () => {
         const newPolicyName = `endpoint policy ${Date.now()}`;
         await pageObjects.ingestManagerCreatePackageConfig.selectAgentConfig();

diff --git a/...test/security_solution_endpoint/page_objects/ingest_manager_create_package_config_page.ts b/...test/security_solution_endpoint/page_objects/ingest_manager_create_package_config_page.ts
@@ -62,6 +62,13 @@ export function IngestManagerCreatePackageConfig({
       }
     },
 
+    /**
+     * Returns the package config name currently populated on the input field
+     */
+    async getPackageConfigName() {
+      return testSubjects.getAttribute('packageConfigNameInput', 'value');
+    },
+
     /**
      * Set the name of the package config on the input field
      * @param name