From 4d6830b7f6fa3b22330f59538a0d5dc572de4029 Mon Sep 17 00:00:00 2001 From: Nicolas Chaulet Date: Thu, 7 Apr 2022 10:32:31 -0400 Subject: [PATCH] [Fleet] Do not provide instruction to setup an http Fleet server (#129371) (cherry picked from commit eff1e0c114ab8b2f44326290e91ca4b51f29ba13) --- .../cypress/integration/fleet_startup.spec.ts | 2 +- .../fleet_server_on_prem_instructions.tsx | 4 +-- .../components/install_command_utils.test.ts | 33 +++++++------------ .../components/install_command_utils.ts | 2 -- 4 files changed, 14 insertions(+), 27 deletions(-) diff --git a/x-pack/plugins/fleet/cypress/integration/fleet_startup.spec.ts b/x-pack/plugins/fleet/cypress/integration/fleet_startup.spec.ts index 5c14ee1df6d4e6..1505754635bcb2 100644 --- a/x-pack/plugins/fleet/cypress/integration/fleet_startup.spec.ts +++ b/x-pack/plugins/fleet/cypress/integration/fleet_startup.spec.ts @@ -88,7 +88,7 @@ describe('Fleet startup', () => { cy.getBySel('agentPolicyDropdown'); // verify fleet server enroll command contains created policy id - cy.getBySel('fleetServerHostInput').type('http://localhost:8220'); + cy.getBySel('fleetServerHostInput').type('https://localhost:8220'); cy.getBySel('fleetServerAddHostBtn').click(); cy.getBySel('fleetServerGenerateServiceTokenBtn').click(); cy.get('.euiCodeBlock__code').contains('--fleet-server-policy=fleet-server-policy'); diff --git a/x-pack/plugins/fleet/public/applications/fleet/sections/agents/agent_requirements_page/components/fleet_server_on_prem_instructions.tsx b/x-pack/plugins/fleet/public/applications/fleet/sections/agents/agent_requirements_page/components/fleet_server_on_prem_instructions.tsx index 0c24579acf9f09..1eef74180fdd38 100644 --- a/x-pack/plugins/fleet/public/applications/fleet/sections/agents/agent_requirements_page/components/fleet_server_on_prem_instructions.tsx +++ b/x-pack/plugins/fleet/public/applications/fleet/sections/agents/agent_requirements_page/components/fleet_server_on_prem_instructions.tsx @@ -51,7 +51,7 @@ import { PlatformSelector } from '../../../../../../components/enrollment_instru import type { CommandsByPlatform } from './install_command_utils'; import { getInstallCommandForPlatform } from './install_command_utils'; -const URL_REGEX = /^(https?):\/\/[^\s$.?#].[^\s]*$/gm; +const URL_REGEX = /^(https):\/\/[^\s$.?#].[^\s]*$/gm; const REFRESH_INTERVAL = 10000; type DeploymentMode = 'production' | 'quickstart'; @@ -379,7 +379,7 @@ export const AddFleetServerHostStepContent = ({ } else { setError( i18n.translate('xpack.fleet.fleetServerSetup.addFleetServerHostInvalidUrlError', { - defaultMessage: 'Invalid URL', + defaultMessage: 'Valid https URL required.', }) ); return false; diff --git a/x-pack/plugins/fleet/public/applications/fleet/sections/agents/agent_requirements_page/components/install_command_utils.test.ts b/x-pack/plugins/fleet/public/applications/fleet/sections/agents/agent_requirements_page/components/install_command_utils.test.ts index dd8913c49907ff..774b7871f03532 100644 --- a/x-pack/plugins/fleet/public/applications/fleet/sections/agents/agent_requirements_page/components/install_command_utils.test.ts +++ b/x-pack/plugins/fleet/public/applications/fleet/sections/agents/agent_requirements_page/components/install_command_utils.test.ts @@ -15,8 +15,7 @@ describe('getInstallCommandForPlatform', () => { expect(res.linux).toMatchInlineSnapshot(` "sudo ./elastic-agent install \\\\ --fleet-server-es=http://elasticsearch:9200 \\\\ - --fleet-server-service-token=service-token-1 \\\\ - --fleet-server-insecure-http" + --fleet-server-service-token=service-token-1" `); }); @@ -26,8 +25,7 @@ describe('getInstallCommandForPlatform', () => { expect(res.mac).toMatchInlineSnapshot(` "sudo ./elastic-agent install \\\\ --fleet-server-es=http://elasticsearch:9200 \\\\ - --fleet-server-service-token=service-token-1 \\\\ - --fleet-server-insecure-http" + --fleet-server-service-token=service-token-1" `); }); @@ -37,8 +35,7 @@ describe('getInstallCommandForPlatform', () => { expect(res.windows).toMatchInlineSnapshot(` ".\\\\elastic-agent.exe install \` --fleet-server-es=http://elasticsearch:9200 \` - --fleet-server-service-token=service-token-1 \` - --fleet-server-insecure-http" + --fleet-server-service-token=service-token-1" `); }); @@ -48,8 +45,7 @@ describe('getInstallCommandForPlatform', () => { expect(res.rpm).toMatchInlineSnapshot(` "sudo elastic-agent enroll \\\\ --fleet-server-es=http://elasticsearch:9200 \\\\ - --fleet-server-service-token=service-token-1 \\\\ - --fleet-server-insecure-http" + --fleet-server-service-token=service-token-1" `); }); @@ -59,8 +55,7 @@ describe('getInstallCommandForPlatform', () => { expect(res.deb).toMatchInlineSnapshot(` "sudo elastic-agent enroll \\\\ --fleet-server-es=http://elasticsearch:9200 \\\\ - --fleet-server-service-token=service-token-1 \\\\ - --fleet-server-insecure-http" + --fleet-server-service-token=service-token-1" `); }); @@ -78,8 +73,7 @@ describe('getInstallCommandForPlatform', () => { "sudo ./elastic-agent install \\\\ --fleet-server-es=http://elasticsearch:9200 \\\\ --fleet-server-service-token=service-token-1 \\\\ - --fleet-server-es-ca-trusted-fingerprint=fingerprint123456 \\\\ - --fleet-server-insecure-http" + --fleet-server-es-ca-trusted-fingerprint=fingerprint123456" `); }); }); @@ -96,8 +90,7 @@ describe('getInstallCommandForPlatform', () => { "sudo ./elastic-agent install \\\\ --fleet-server-es=http://elasticsearch:9200 \\\\ --fleet-server-service-token=service-token-1 \\\\ - --fleet-server-policy=policy-1 \\\\ - --fleet-server-insecure-http" + --fleet-server-policy=policy-1" `); }); @@ -112,8 +105,7 @@ describe('getInstallCommandForPlatform', () => { "sudo ./elastic-agent install \\\\ --fleet-server-es=http://elasticsearch:9200 \\\\ --fleet-server-service-token=service-token-1 \\\\ - --fleet-server-policy=policy-1 \\\\ - --fleet-server-insecure-http" + --fleet-server-policy=policy-1" `); }); @@ -128,8 +120,7 @@ describe('getInstallCommandForPlatform', () => { ".\\\\elastic-agent.exe install \` --fleet-server-es=http://elasticsearch:9200 \` --fleet-server-service-token=service-token-1 \` - --fleet-server-policy=policy-1 \` - --fleet-server-insecure-http" + --fleet-server-policy=policy-1" `); }); @@ -144,8 +135,7 @@ describe('getInstallCommandForPlatform', () => { "sudo elastic-agent enroll \\\\ --fleet-server-es=http://elasticsearch:9200 \\\\ --fleet-server-service-token=service-token-1 \\\\ - --fleet-server-policy=policy-1 \\\\ - --fleet-server-insecure-http" + --fleet-server-policy=policy-1" `); }); @@ -160,8 +150,7 @@ describe('getInstallCommandForPlatform', () => { "sudo elastic-agent enroll \\\\ --fleet-server-es=http://elasticsearch:9200 \\\\ --fleet-server-service-token=service-token-1 \\\\ - --fleet-server-policy=policy-1 \\\\ - --fleet-server-insecure-http" + --fleet-server-policy=policy-1" `); }); }); diff --git a/x-pack/plugins/fleet/public/applications/fleet/sections/agents/agent_requirements_page/components/install_command_utils.ts b/x-pack/plugins/fleet/public/applications/fleet/sections/agents/agent_requirements_page/components/install_command_utils.ts index f5413f44e81afa..b73eb547b6ddf2 100644 --- a/x-pack/plugins/fleet/public/applications/fleet/sections/agents/agent_requirements_page/components/install_command_utils.ts +++ b/x-pack/plugins/fleet/public/applications/fleet/sections/agents/agent_requirements_page/components/install_command_utils.ts @@ -42,8 +42,6 @@ export function getInstallCommandForPlatform( } commandArguments.push(['fleet-server-cert', '']); commandArguments.push(['fleet-server-cert-key', '']); - } else { - commandArguments.push(['fleet-server-insecure-http']); } const commandArgumentsStr = (platform?: string) => {