[SOR] use initialNamespaces when checking for conflict for `create` and `bulkCreate` by pgayvallet · Pull Request #111023 · elastic/kibana

pgayvallet · 2021-09-02T18:21:36Z

Summary

Found during #109196

Uses object.initialNamespaces when present, instead of the provided namespace, when checking for conflicts during create and bulkCreate operations

Checklist

Unit or functional tests were updated or added to match the most common scenarios

jportner

LGTM, couple of nits below. Thanks for fixing this 🙏

jportner · 2021-09-02T18:41:24Z

src/core/server/saved_objects/service/lib/repository.test.js

        });
      });

+      it(`returns error when there is a conflict with an existing multi-namespace saved object with initialNamespaces (get)`, async () => {


Suggested change

it(`returns error when there is a conflict with an existing multi-namespace saved object with initialNamespaces (get)`, async () => {

it(`returns error when there is an unresolvable conflict with an existing multi-namespace saved object when using initialNamespaces (get)`, async () => {

jportner · 2021-09-02T18:41:46Z

src/core/server/saved_objects/service/lib/repository.test.js

        expect(client.get).toHaveBeenCalled();
      });

+      it(`throws when there is a conflict with an existing multi-namespace saved object when using initialNamespaces (get)`, async () => {


Suggested change

it(`throws when there is a conflict with an existing multi-namespace saved object when using initialNamespaces (get)`, async () => {

it(`throws when there is an unresolvable conflict with an existing multi-namespace saved object when using initialNamespaces (get)`, async () => {

jportner · 2021-09-02T18:43:04Z

src/core/server/saved_objects/service/lib/repository.test.js

+    }
+    const namespaceId = namespaces[0] === 'default' ? undefined : namespaces[0];
+
+    // const namespaceId = objectNamespace === 'default' ? undefined : objectNamespace ?? namespace;


Did you forget to delete this?

Suggested change

// const namespaceId = objectNamespace === 'default' ? undefined : objectNamespace ?? namespace;

I sure did !

jportner · 2021-09-02T18:47:43Z

Note: I would say we should backport this to 7.15, but it depends on #109967 which was only backported to 7.16.
WDYT? Perhaps we need to backport that, too? I hate to do it after feature freeze but this is a pretty terrible bug IMO

Edit: then again, it only affects multi-ns objects, of which we only have ML jobs in 7.x, so maybe it's not a big deal if we don't fix this in 7.15.

kibanamachine · 2021-09-02T19:27:12Z

⏳ Build in-progress, with failures

continuous-integration/kibana-ci/pull-request
Commit: 86a806c
Storybooks Preview
This comment will update when the build is complete

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

pgayvallet · 2021-09-02T19:43:21Z

retest

…-initialNamespaces

kibanamachine · 2021-09-02T22:30:01Z

💚 Build Succeeded

Metrics [docs]

✅ unchanged

History

💚 Build #150715 succeeded ae809a2
💔 Build #150692 failed ae809a2

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

elasticmachine · 2021-09-02T23:09:45Z

Pinging @elastic/kibana-core (Team:Core)

TinaHeiligers · 2021-09-03T00:14:36Z

src/core/server/saved_objects/service/lib/repository.ts

   * @param type The type of the saved object.
   * @param id The ID of the saved object.
   * @param namespace The target namespace.
+   * @param initialNamespaces The target namespace(s) we intend to create the object in, if specified.


nit: The difference between namespace and initialNamespaces is subtle and it might be worth adding a bit more info here about when each is used.

TinaHeiligers

A small (very optional) nit, otherwise thanks for getting this done so quickly!
LGTM

…nd `bulkCreate` (elastic#111023) * use initialNamespaces when checking for conflict * nits

kibanamachine · 2021-09-03T06:30:19Z

💚 Backport successful

Status	Branch	Result
✅	7.x

This backport PR will be merged automatically after passing CI.

…nd `bulkCreate` (#111023) (#111084) * use initialNamespaces when checking for conflict * nits Co-authored-by: Pierre Gayvallet <pierre.gayvallet@gmail.com>

…eporting-to-v2 * 'master' of github.com:elastic/kibana: (65 commits) Move to vis_types folder part 2 (elastic#110574) [SOR] use initialNamespaces when checking for conflict for `create` and `bulkCreate` (elastic#111023) [Discover] Remove export* syntax (elastic#110934) [Event log][7.x] Updated event log client to search across legacy IDs (elastic#109365) [Security Solution][Detection Rules] Changes 'activated' text on rule details page (elastic#111044) [Metrics UI] Filter out APM nodes from the inventory view (elastic#110300) [package testing] Update logging and pid configuration (elastic#111059) [Dashboard] Read App State from URL on Soft Refresh (elastic#109354) Add correct roles to test user for functional tests in dashboard (elastic#110880) [DOCS] Adds Lens Inspector and minor edits (elastic#109736) [DOCS] Updates Spaces page (elastic#111005) normalize initialNamespaces (elastic#110936) [Reporting] Clean up `any` usage, reorganize server route files (elastic#110740) [Security Solution] [CTI] Fixes bug that caused Threshold and Indicator Match rules to ignore custom rule filters if a saved query was used in the rule definition. (elastic#109253) skip flaky suites: elastic#111001, elastic#111022 [Security Solution][RAC] - Update reason field text (elastic#110308) [RAC][Security Solution] Make analyzer work with EuiDataGrid full screen (elastic#110913) [Metrics UI] Add integration tests for Metric Threshold Rule and refactor to fire correctly (elastic#109971) [DOCS] Updates Discover docs (elastic#110346) [RAC] Persistent timeline fields fix (elastic#110685) ...

use initialNamespaces when checking for conflict

86a806c

pgayvallet added Team:Core Platform Core services: plugins, logging, config, saved objects, http, ES client, i18n, etc t// v7.16.0 v8.0.0 release_note:skip Skip the PR/issue when compiling release notes Feature:Saved Objects labels Sep 2, 2021

jportner approved these changes Sep 2, 2021

View reviewed changes

nits

ae809a2

Merge remote-tracking branch 'upstream/master' into kbn-xxx-SO-create…

4d1b75e

…-initialNamespaces

pgayvallet added the auto-backport Deprecated - use backport:version if exact versions are needed label Sep 2, 2021

pgayvallet marked this pull request as ready for review September 2, 2021 23:09

pgayvallet requested a review from a team as a code owner September 2, 2021 23:09

TinaHeiligers reviewed Sep 3, 2021

View reviewed changes

TinaHeiligers self-requested a review September 3, 2021 00:16

TinaHeiligers approved these changes Sep 3, 2021

View reviewed changes

pgayvallet merged commit 9d216cd into elastic:master Sep 3, 2021

kibanamachine pushed a commit to kibanamachine/kibana that referenced this pull request Sep 3, 2021

[SOR] use initialNamespaces when checking for conflict for create a…

7f6e0df

…nd `bulkCreate` (elastic#111023) * use initialNamespaces when checking for conflict * nits

kibanamachine mentioned this pull request Sep 3, 2021

[7.x] [SOR] use initialNamespaces when checking for conflict for create and bulkCreate (#111023) #111084

Merged

	it(`returns error when there is a conflict with an existing multi-namespace saved object with initialNamespaces (get)`, async () => {
	it(`returns error when there is an unresolvable conflict with an existing multi-namespace saved object when using initialNamespaces (get)`, async () => {

	it(`throws when there is a conflict with an existing multi-namespace saved object when using initialNamespaces (get)`, async () => {
	it(`throws when there is an unresolvable conflict with an existing multi-namespace saved object when using initialNamespaces (get)`, async () => {

Conversation

pgayvallet commented Sep 2, 2021 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Summary

Checklist

Uh oh!

jportner left a comment

Choose a reason for hiding this comment

Uh oh!

jportner Sep 2, 2021

Choose a reason for hiding this comment

Uh oh!

jportner Sep 2, 2021

Choose a reason for hiding this comment

Uh oh!

jportner Sep 2, 2021

Choose a reason for hiding this comment

Uh oh!

pgayvallet Sep 2, 2021

Choose a reason for hiding this comment

Uh oh!

jportner commented Sep 2, 2021 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

kibanamachine commented Sep 2, 2021

⏳ Build in-progress, with failures

Uh oh!

pgayvallet commented Sep 2, 2021

Uh oh!

kibanamachine commented Sep 2, 2021

💚 Build Succeeded

Metrics [docs]

History

Uh oh!

elasticmachine commented Sep 2, 2021

Uh oh!

TinaHeiligers Sep 3, 2021

Choose a reason for hiding this comment

Uh oh!

TinaHeiligers left a comment

Choose a reason for hiding this comment

Uh oh!

kibanamachine commented Sep 3, 2021

💚 Backport successful

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

5 participants

pgayvallet commented Sep 2, 2021 •

edited

Loading

jportner commented Sep 2, 2021 •

edited

Loading