[Workspace] Fix: keep disallowed types when importing with overwrite

[SuZhou-Joe]

Description

When importing data sources and configuration into a workspace with overwrite: true, we will prevent the creation of such objects. However, to ensure that objects dependent on the disallowed ones continue to function properly, we must leave their references untouched.

How the changes can keep the references untouched.

When user tries to import with overwrite: true, the logic will go into https://github.com/opensearch-project/OpenSearch-Dashboards/blob/main/src/core/server/saved_objects/import/check_conflicts.ts#L90, and in order to keep the references untouched, we just need to make sure the logic won't go into the branch of https://github.com/opensearch-project/OpenSearch-Dashboards/blob/main/src/core/server/saved_objects/import/check_conflicts.ts#L105 , which sets a new id reference to the current item. And the result it is consumed comes from the savedObjectsClient.checkConflicts(), which can be wrapped by savedObjectsClientWrapper mechanism to intercept special logic on specific objects.

Issues Resolved

Screenshot

Before fix

After fix

Testing the changes

There is a integration test case, named checkConflicts when importing disallowed types inside src/plugins/workspace/server/saved_objects/integration_tests/saved_objects_wrapper_for_check_workspace_conflict.test.ts to cover this case.

Changelog

• fix: keep disallowed types when importing with overwrite

Check List

• All tests pass
  • yarn test:jest
  • yarn test:jest_integration
• New functionality includes testing.
• New functionality has been documented.
• Update CHANGELOG.md
• Commits are signed per the DCO using --signoff

[codecov]

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 67.81%. Comparing base (460428c) to head (1df34d1).

Additional details and impacted files

@@            Coverage Diff             @@
##             main    #6668      +/-   ##
==========================================
+ Coverage   67.79%   67.81%   +0.02%     
==========================================
  Files        3413     3413              
  Lines       66755    66770      +15     
  Branches    10861    10864       +3     
==========================================
+ Hits        45254    45282      +28     
+ Misses      18857    18845      -12     
+ Partials     2644     2643       -1     

Flag	Coverage Δ
Linux_1	33.21% <100.00%> (+0.02%)	⬆️
Linux_2	55.63% <ø> (ø)
Linux_3	45.24% <ø> (ø)
Linux_4	34.91% <ø> (ø)
Windows_1	33.26% <100.00%> (+0.04%)	⬆️
Windows_2	55.59% <ø> (ø)
Windows_3	45.26% <ø> (ø)
Windows_4	34.91% <ø> (ø)

Flags with carried forward coverage won't be shown. Click here to find out more.

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

[ruanyl]

we must leave their references untouched.

@SuZhou-Joe could you help me to understand how this PR addressed the above issue?

[SuZhou-Joe]

@ruanyl Sure, updated in the description and thanks for calling it out. It requires some context to figure the whole flow out.

[Hailong-am]

nit: this line could move out the forEach loop

[Hailong-am]

nit: return is not needed here

[kavilla]

+1 @Hailong-am comments>

For clarification, we are talking about keeping the disallowed types in the destination workspace right?

Approving because seems fine to me