Skip to content

Commit

Permalink
[Fleet] De-dupe setting kibana.version constraint in get package requ…
Browse files Browse the repository at this point in the history
…est to EPR (#114376) (#114931)

Co-authored-by: Jen Huang <its.jenetic@gmail.com>
  • Loading branch information
kibanamachine and jen-huang authored Oct 14, 2021
1 parent a4b5ec4 commit 099c691
Showing 1 changed file with 2 additions and 6 deletions.
8 changes: 2 additions & 6 deletions x-pack/plugins/fleet/server/services/epm/registry/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -96,16 +96,12 @@ export async function fetchList(params?: SearchParams): Promise<RegistrySearchRe

export async function fetchFindLatestPackage(packageName: string): Promise<RegistrySearchResult> {
const registryUrl = getRegistryUrl();
const kibanaVersion = appContextService.getKibanaVersion().split('-')[0]; // may be x.y.z-SNAPSHOT
const kibanaBranch = appContextService.getKibanaBranch();
const url = new URL(
`${registryUrl}/search?package=${packageName}&internal=true&experimental=true`
);

// on master, request all packages regardless of version
if (kibanaVersion && kibanaBranch !== 'master') {
url.searchParams.set('kibana.version', kibanaVersion);
}
setKibanaVersion(url);

const res = await fetchUrl(url.toString());
const searchResults = JSON.parse(res);
if (searchResults.length) {
Expand Down

0 comments on commit 099c691

Please sign in to comment.