[7.9] [Ingest Manager] Don't retain POST /setup results. fixes #74587 (#75372)

[jfsiii]

Backports the following commits to 7.9:

• [Ingest Manager] Don't retain POST /setup results. fixes [Ingest Manager] Plugin won't retry failed initial setup  #74587 ([Ingest Manager] Don't retain POST /setup results. fixes #74587 #75372)

[jfsiii]

@elasticmachine merge upstream

[jfsiii]

/cc @jen-huang I think I did this correctly. I use the awaitIfPending & createSetupSideEffects from master/7.x but kept the 7.9 variables/types

kibana/x-pack/plugins/ingest_manager/server/services/setup.ts

Lines 11 to 25 in 12d3a3f

	import { agentConfigService } from './agent_config';
	import { outputService } from './output';
	import { ensureInstalledDefaultPackages } from './epm/packages/install';
	import { ensureDefaultIndices } from './epm/kibana/index_pattern/install';
	import {
	packageToPackageConfig,
	PackageConfig,
	AgentConfig,
	Installation,
	Output,
	DEFAULT_AGENT_CONFIGS_PACKAGES,
	decodeCloudId,
	} from '../../common';
	import { getPackageInfo } from './epm/packages';
	import { packageConfigService } from './package_config';

kibana/x-pack/plugins/ingest_manager/server/services/setup.ts

Lines 45 to 120 in 12d3a3f

	async function createSetupSideEffects(
	soClient: SavedObjectsClientContract,
	callCluster: CallESAsCurrentUser
	): Promise<SetupStatus> {
	const [installedPackages, defaultOutput, config] = await Promise.all([
	// packages installed by default
	ensureInstalledDefaultPackages(soClient, callCluster),
	outputService.ensureDefaultOutput(soClient),
	agentConfigService.ensureDefaultAgentConfig(soClient),
	ensureDefaultIndices(callCluster),
	settingsService.getSettings(soClient).catch((e: any) => {
	if (e.isBoom && e.output.statusCode === 404) {
	const http = appContextService.getHttpSetup();
	const serverInfo = http.getServerInfo();
	const basePath = http.basePath;
	const cloud = appContextService.getCloud();
	const cloudId = cloud?.isCloudEnabled && cloud.cloudId;
	const cloudUrl = cloudId && decodeCloudId(cloudId)?.kibanaUrl;
	const flagsUrl = appContextService.getConfig()?.fleet?.kibana?.host;
	const defaultUrl = url.format({
	protocol: serverInfo.protocol,
	hostname: serverInfo.hostname,
	port: serverInfo.port,
	pathname: basePath.serverBasePath,
	});
	return settingsService.saveSettings(soClient, {
	agent_auto_upgrade: true,
	package_auto_upgrade: true,
	kibana_url: cloudUrl || flagsUrl || defaultUrl,
	});
	}
	return Promise.reject(e);
	}),
	]);
	// ensure default packages are added to the default conifg
	const configWithPackageConfigs = await agentConfigService.get(soClient, config.id, true);
	if (!configWithPackageConfigs) {
	throw new Error('Config not found');
	}
	if (
	configWithPackageConfigs.package_configs.length &&
	typeof configWithPackageConfigs.package_configs[0] === 'string'
	) {
	throw new Error('Config not found');
	}
	for (const installedPackage of installedPackages) {
	const packageShouldBeInstalled = DEFAULT_AGENT_CONFIGS_PACKAGES.some(
	(packageName) => installedPackage.name === packageName
	);
	if (!packageShouldBeInstalled) {
	continue;
	}
	const isInstalled = configWithPackageConfigs.package_configs.some(
	(d: PackageConfig | string) => {
	return typeof d !== 'string' && d.package?.name === installedPackage.name;
	}
	);
	if (!isInstalled) {
	await addPackageToConfig(
	soClient,
	callCluster,
	installedPackage,
	configWithPackageConfigs,
	defaultOutput
	);
	}
	}
	return { isIntialized: true };
	}

[kibanamachine]

💚 Build Succeeded

• continuous-integration/kibana-ci/pull-request
• Commit: 12d3a3f

Build metrics

✅ unchanged

To update your PR or re-run it, just comment with:
@elasticmachine merge upstream

[jen-huang]

I tested this locally using repro steps from #74587 and things look good 👍🏻

Code looks like it was backported correctly too. The renaming changes into master/7.x made 7.9 backports more difficult as manual updating is needed, so thanks for catching everything.