Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[Fleet] Remove wrong incorrect import from fleet server host service #212918

Merged
merged 2 commits into from
Mar 4, 2025
Merged

[Fleet] Remove wrong incorrect import from fleet server host service #212918

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e173ae1
[Fleet] Remove wrong incorrect import from fleet server host service
criamico Mar 3, 2025
1da08c6
Merge branch 'main' into 207322_fleet_server_hosts_ssl_fix
elasticmachine Mar 3, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 4 additions & 8 deletions x-pack/platform/plugins/shared/fleet/server/services/fleet_server_host.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,6 @@ import type {
KibanaRequest,
} from '@kbn/core/server';

import type { Nullable } from 'tough-cookie';

import { normalizeHostsForAgents } from '../../common/services';
import {
GLOBAL_SETTINGS_SAVED_OBJECT_TYPE,
Expand Down Expand Up @@ -151,7 +149,6 @@ class FleetServerHostService {
}

public async get(soClient: SavedObjectsClientContract, id: string): Promise<FleetServerHost> {
// add code to retrieve encrypted fields
const res = await this.encryptedSoClient.get<FleetServerHostSOAttributes>(
FLEET_SERVER_HOST_SAVED_OBJECT_TYPE,
id
Expand Down Expand Up @@ -190,7 +187,6 @@ class FleetServerHostService {
};
}

// export async function deleteFleetServerHost(
public async delete(
soClient: SavedObjectsClientContract,
esClient: ElasticsearchClient,
Expand Down Expand Up @@ -243,7 +239,7 @@ class FleetServerHostService {
logger.debug(`Updating fleet server host ${id}`);

const originalItem = await this.get(soClient, id);
const updateData: Nullable<Partial<FleetServerHostSOAttributes>> = {
const updateData: Partial<FleetServerHostSOAttributes> = {
...omit(data, ['ssl', 'secrets']),
};

Expand Down Expand Up @@ -354,9 +350,9 @@ class FleetServerHostService {
);
}

// /**
// * Get the default Fleet server policy hosts or throw if it does not exists
// */
/**
* Get the default Fleet server policy hosts or throw if it does not exists
*/
public async getDefaultFleetServerHost(
soClient: SavedObjectsClientContract
): Promise<FleetServerHost | null> {
Expand Down
Loading