From e341eaf84ba9c7cb3a9fb0224317f2caa660c9b2 Mon Sep 17 00:00:00 2001
From: Paul Tavares <56442535+paul-tavares@users.noreply.github.com>
Date: Fri, 24 Jul 2020 09:02:23 -0400
Subject: [PATCH] [INGEST_MANAGER] Make package config name blank for endpoint
 on Package Config create (#73082)

* Make package config name blank for endpoint
* Added functional tests on endpoint side
---
 .../step_define_package_config.tsx                 | 14 +++++++++++---
 .../apps/endpoint/policy_list.ts                   |  5 +++++
 .../ingest_manager_create_package_config_page.ts   |  7 +++++++
 3 files changed, 23 insertions(+), 3 deletions(-)

diff --git a/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_config/create_package_config_page/step_define_package_config.tsx b/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_config/create_package_config_page/step_define_package_config.tsx
index a04d023ebcc48..f487b4e5235e7 100644
--- a/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_config/create_package_config_page/step_define_package_config.tsx
+++ b/x-pack/plugins/ingest_manager/public/applications/ingest_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
index a4b3a51c49513..0c5e15ed4104c 100644
--- 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/x-pack/test/security_solution_endpoint/page_objects/ingest_manager_create_package_config_page.ts b/x-pack/test/security_solution_endpoint/page_objects/ingest_manager_create_package_config_page.ts
index dd3fc637a3d6c..dfdb528b7362c 100644
--- a/x-pack/test/security_solution_endpoint/page_objects/ingest_manager_create_package_config_page.ts
+++ b/x-pack/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