github-mirrors/kibana
1
0
Fork 0
mirror of https://github.com/elastic/kibana.git synced 2025-04-24 09:48:58 -04:00
Code Issues Projects Releases Packages Wiki Activity

[Fleet] Fix branch conditions to check against main and add skip version check config option (#116530) (#116787)

Browse source
This commit is contained in:
Kibana Machine 2021-10-29 15:32:25 -04:00 • committed by GitHub
parent 69cb2d3e2c
commit 4e9b77906c
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 16 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

3
x-pack/plugins/fleet/common/types/index.ts
View file

@ -32,6 +32,9 @@ export interface FleetConfigType {
packages?: PreconfiguredPackage[];
outputs?: PreconfiguredOutput[];
agentIdVerificationEnabled?: boolean;
developer?: {
disableRegistryVersionCheck?: boolean;
};
}
// Calling Object.entries(PackagesGroupedByStatus) gave `status: string`

4
x-pack/plugins/fleet/server/index.ts
View file

@ -120,6 +120,10 @@ export const config: PluginConfigDescriptor = {
agentPolicies: PreconfiguredAgentPoliciesSchema,
outputs: PreconfiguredOutputsSchema,
agentIdVerificationEnabled: schema.boolean({ defaultValue: true }),
developer: schema.object({
// TODO: change default to false as soon as EPR issue fixed. Blocker for 8.0.
disableRegistryVersionCheck: schema.boolean({ defaultValue: true }),
}),
}),
};

4
x-pack/plugins/fleet/server/mocks/index.ts
View file

@ -57,8 +57,8 @@ export const createAppContextStartContractMock = (): MockedFleetAppContext => {
agentIdVerificationEnabled: true,
},
config$,
kibanaVersion: '8.0.0',
kibanaBranch: 'master',
kibanaVersion: '8.99.0', // Fake version :)
kibanaBranch: 'main',
};
};

7
x-pack/plugins/fleet/server/services/epm/registry/index.ts
View file

@ -140,6 +140,13 @@ export async function fetchFile(filePath: string): Promise<Response> {
}
function setKibanaVersion(url: URL) {
// TODO: change default to false as soon as EPR issue fixed. Blocker for 8.0.
const disableVersionCheck =
appContextService.getConfig()?.developer?.disableRegistryVersionCheck ?? true;
if (disableVersionCheck) {
return;
}
const kibanaVersion = appContextService.getKibanaVersion().split('-')[0]; // may be x.y.z-SNAPSHOT
const kibanaBranch = appContextService.getKibanaBranch();