[Ingest Manager] Allow prerelease in package version #74452

jonathan-buttner · 2020-08-05T21:56:03Z

This PR switches the parsing of package keys (e.g. endpoint-0.13.0) to not use split() but instead look for the first occurrence of the dash delimiter.

Working prerelease

Package key failures

jfsiii · 2020-08-06T00:23:44Z

x-pack/plugins/ingest_manager/server/services/epm/registry/index.ts

+  const pkgName = pkgkey.substr(0, pkgkey.indexOf('-'));
+  // this will return the entire string if `indexOf` return -1
+  const pkgVersion = pkgkey.substr(pkgkey.indexOf('-') + 1);
+  return { pkgName, pkgVersion };


I don't think it should accept an empty name or version.

I also think we should ensure the version is valid semver https://github.com/npm/node-semver#usage

Thanks for the comment @jfsiii, how about if I check if the pkgName is an empty string and throw an error?

For the pkgVersion I can do the same thing, semver.valid(pkgVersion) and if not throw an error?

elasticmachine · 2020-08-06T15:40:42Z

Pinging @elastic/ingest-management (Team:Ingest Management)

jonathan-buttner · 2020-08-06T15:42:35Z

src/dev/precommit_hook/casing_check_config.js

@@ -71,6 +71,8 @@ export const IGNORE_FILE_GLOBS = [
  'x-pack/plugins/apm/e2e/**/*',

  'x-pack/plugins/maps/server/fonts/**/*',
+  // packages for the ingest manager's api integration tests could be valid semver which has dashes
+  'x-pack/test/ingest_manager_api_integration/apis/fixtures/test_packages/**/*',


@jfsiii @skh @neptunian @nchaulet this is so we can have a valid semver as the package directory name with a dash in it. Should this only cover the packages directory? Or would it be useful if it was higher up like:
'x-pack/test/ingest_manager_api_integration/apis/fixtures/**/* ?

let's start here and lift it up later if we need to

tylersmalley

Pre-commit hook changes look good.

jfsiii

Thanks for adding the function & tests

jfsiii · 2020-08-06T20:53:52Z

src/dev/precommit_hook/casing_check_config.js

@@ -71,6 +71,8 @@ export const IGNORE_FILE_GLOBS = [
  'x-pack/plugins/apm/e2e/**/*',

  'x-pack/plugins/maps/server/fonts/**/*',
+  // packages for the ingest manager's api integration tests could be valid semver which has dashes
+  'x-pack/test/ingest_manager_api_integration/apis/fixtures/test_packages/**/*',


let's start here and lift it up later if we need to

jfsiii · 2020-08-06T20:58:24Z

x-pack/test/ingest_manager_api_integration/apis/epm/install_prerelease.ts

+    after(async () => {
+      if (server.enabled) {
+        // remove the package just in case it being installed will affect other tests
+        await deletePackage(supertest, pkgkey);


I'd prefer to call the delete API here rather than coupling the tests to one another, but it's not a blocker

Ah ok, I'll switch it back 👍

…lease

kibanamachine · 2020-08-10T15:14:55Z

💚 Build Succeeded

continuous-integration/kibana-ci/pull-request
Commit: 2385cc9

Build metrics

✅ unchanged

History

💚 Build #67029 succeeded 0086f08
💚 Build #66971 succeeded c1f6919
💚 Build #66778 succeeded 22c86c8

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

* Allow prerelease in version * Adding integration test for prerelease version of a package * Tests for invalid package key * Removing inter-test dependency

…-task * master: (42 commits) Allow any hostname for chromium proxy bypass (elastic#74693) [ML] ML on Kibana Management: Add ability to pass a group ID filter to job management page (elastic#74533) [Metrics UI] Fix No Data preview pluralization (elastic#74399) [Bug][Security_Solution][Telemetry] Capitalize S in macOS (elastic#74688) Remove karma tests from legacy maps (elastic#74668) [Ingest Manager] stop creating events-* index pattern and placeholder index (elastic#74683) [Enterprise Search] Update the browser/document title on plugin navigation (elastic#74392) [visualizations] Add i18n translation for 'No results found' (elastic#74619) [maps] convert vector style properties to TS (elastic#74553) bump geckodriver binary to 0.27 (elastic#74638) fix: update apm agents to catch abort requests (elastic#74658) [Security Solution] Resolver children pagination (elastic#74603) add memoryStatus to df analytics page and analytics table in management (elastic#74570) [Ingest Manager] Allow prerelease in package version (elastic#74452) [App Arch]: remove legacy karma tests (elastic#74599) [i18n] revert reverted changes (elastic#74633) [Lens] Clear out all attribute properties before updating (elastic#74483) [Uptime] Fix full reloads while navigating to alert/ml (elastic#73796) Index pattern field class refactor (elastic#73180) [ML] Functional tests - stabilize DFA job type check (elastic#74631) ...

* master: (339 commits) [Ingest Node Pipelines] Sentence-case processor names (elastic#74645) Bump angular dependency from 1.7.9 to 1.8.0 (elastic#74482) [ML] Fixing schema for custom rule conditions (elastic#74676) [ML] Refactor in preparation for new es client (elastic#74552) [ML] Adding initial file analysis overrides (elastic#74376) Allow any hostname for chromium proxy bypass (elastic#74693) [ML] ML on Kibana Management: Add ability to pass a group ID filter to job management page (elastic#74533) [Metrics UI] Fix No Data preview pluralization (elastic#74399) [Bug][Security_Solution][Telemetry] Capitalize S in macOS (elastic#74688) Remove karma tests from legacy maps (elastic#74668) [Ingest Manager] stop creating events-* index pattern and placeholder index (elastic#74683) [Enterprise Search] Update the browser/document title on plugin navigation (elastic#74392) [visualizations] Add i18n translation for 'No results found' (elastic#74619) [maps] convert vector style properties to TS (elastic#74553) bump geckodriver binary to 0.27 (elastic#74638) fix: update apm agents to catch abort requests (elastic#74658) [Security Solution] Resolver children pagination (elastic#74603) add memoryStatus to df analytics page and analytics table in management (elastic#74570) [Ingest Manager] Allow prerelease in package version (elastic#74452) [App Arch]: remove legacy karma tests (elastic#74599) ...

Allow prerelease in version

22c86c8

jonathan-buttner added v8.0.0 release_note:skip Skip the PR/issue when compiling release notes v7.10.0 Team:Fleet Team label for Observability Data Collection Fleet team labels Aug 5, 2020

jonathan-buttner requested review from jfsiii, skh, ruflin, nchaulet and neptunian August 5, 2020 21:56

jfsiii reviewed Aug 6, 2020

View reviewed changes

Adding integration test for prerelease version of a package

d7aa024

jonathan-buttner marked this pull request as ready for review August 6, 2020 15:40

jonathan-buttner requested a review from a team August 6, 2020 15:40

jonathan-buttner requested a review from a team as a code owner August 6, 2020 15:40

jonathan-buttner commented Aug 6, 2020

View reviewed changes

Tests for invalid package key

c1f6919

tylersmalley approved these changes Aug 6, 2020

View reviewed changes

Fixing merge conflicts

0086f08

jfsiii approved these changes Aug 6, 2020

View reviewed changes

neptunian approved these changes Aug 6, 2020

View reviewed changes

skh approved these changes Aug 10, 2020

View reviewed changes

jonathan-buttner added 2 commits August 10, 2020 09:19

Removing inter-test dependency

a108028

Merge branch 'master' of github.com:elastic/kibana into support-prere…

2385cc9

…lease

jonathan-buttner merged commit b4b6428 into elastic:master Aug 10, 2020

jonathan-buttner deleted the support-prerelease branch August 10, 2020 15:18

jonathan-buttner mentioned this pull request Aug 10, 2020

[7.x] [Ingest Manager] Allow prerelease in package version (#74452) #74670

Merged

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

[Ingest Manager] Allow prerelease in package version #74452

[Ingest Manager] Allow prerelease in package version #74452

jonathan-buttner commented Aug 5, 2020 •

edited

Loading

jfsiii Aug 6, 2020

jonathan-buttner Aug 6, 2020 •

edited

Loading

elasticmachine commented Aug 6, 2020

jonathan-buttner Aug 6, 2020

jfsiii Aug 6, 2020

tylersmalley left a comment

jfsiii left a comment

jfsiii Aug 6, 2020

jfsiii Aug 6, 2020

jonathan-buttner Aug 6, 2020

kibanamachine commented Aug 10, 2020

[Ingest Manager] Allow prerelease in package version #74452

[Ingest Manager] Allow prerelease in package version #74452

Conversation

jonathan-buttner commented Aug 5, 2020 • edited Loading

jfsiii Aug 6, 2020

Choose a reason for hiding this comment

jonathan-buttner Aug 6, 2020 • edited Loading

Choose a reason for hiding this comment

elasticmachine commented Aug 6, 2020

jonathan-buttner Aug 6, 2020

Choose a reason for hiding this comment

jfsiii Aug 6, 2020

Choose a reason for hiding this comment

tylersmalley left a comment

Choose a reason for hiding this comment

jfsiii left a comment

Choose a reason for hiding this comment

jfsiii Aug 6, 2020

Choose a reason for hiding this comment

jfsiii Aug 6, 2020

Choose a reason for hiding this comment

jonathan-buttner Aug 6, 2020

Choose a reason for hiding this comment

kibanamachine commented Aug 10, 2020

💚 Build Succeeded

Build metrics

History

jonathan-buttner commented Aug 5, 2020 •

edited

Loading

jonathan-buttner Aug 6, 2020 •

edited

Loading