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

Jump to bottom

[Ingest Management] main branch uses epr-snapshot. Others production #73555

Merged
merged 13 commits into from
Jul 30, 2020
Merged

[Ingest Management] main branch uses epr-snapshot. Others production #73555

Changes from 1 commit
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
62ba64a
Same behavior as now. Just refactored.
Jul 28, 2020
0ddafdd
main branch uses epr-snapshot. Others use prod
Jul 28, 2020
de149f8
Link some types vs repeating them
Jul 28, 2020
35fedc2
replace DEFAULT_REGISTRY_URL with getRegistryUrl in Endpoint tests
Jul 29, 2020
381bbf7
Merge branch 'master' into support-different-default-registries
elasticmachine Jul 29, 2020
4746210
Make an Endpoint test helper name more clear
Jul 29, 2020
65d2074
Merge branch 'master' into support-different-default-registries
elasticmachine Jul 29, 2020
d49f968
try/catch around getKibanaBranch
Jul 29, 2020
421f3ac
Use branch & version from package.json as fallback
Jul 30, 2020
61abba4
Merge branch 'master' into support-different-default-registries
elasticmachine Jul 30, 2020
33a98da
No guards b/c kibana{Branch,Version} have defaults
Jul 30, 2020
4c9f212
Merge branch 'master' into support-different-default-registries
elasticmachine Jul 30, 2020
86ba25a
Merge branch 'master' into support-different-default-registries
elasticmachine Jul 30, 2020
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
9 changes: 8 additions & 1 deletion x-pack/plugins/ingest_manager/server/services/epm/registry/registry_url.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,14 @@ const SNAPSHOT_REGISTRY_URL_CDN = 'https://epr-snapshot.elastic.co';
// const SNAPSHOT_REGISTRY_URL_NO_CDN = 'https://epr-snapshot.ea-web.elastic.dev';

const getDefaultRegistryUrl = (): string => {
const branch = appContextService.getKibanaBranch();
let branch;
try {
branch = appContextService.getKibanaBranch();
} catch (error) {
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Under what conditions can kibana branch not be set?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

During the test:ftr Endpoint tests. The error seems in the ftr:runner portion.

On the phone right now, but check the stack trace in #73555 (comment)

I can add details about what I saw while debugging later

It was a good reminder that those methods throw :(

// eslint-disable-next-line no-console
console.error(error);
}

if (branch === 'master') {
return SNAPSHOT_REGISTRY_URL_CDN;
} else {
Expand Down