Skip to content
This repository has been archived by the owner on Apr 4, 2023. It is now read-only.

Prevent overwriting the DevWorkspace in-cluster object by a flattened Devfile #1346

Merged
merged 4 commits into from
May 9, 2022

Conversation

azatsarynnyy
Copy link
Member

@azatsarynnyy azatsarynnyy commented May 3, 2022

Signed-off-by: Artem Zatsarynnyi [email protected]

What does this PR do?

The PR fixes the problem of overwriting the DevWorkspace in-cluster object by a flattened Devfile
when adding/removing a project or changing a project's git configuration, e.g. adding another remote repository.

Screenshot/screencast of this PR

What issues does this PR fix or reference?

it's a quick fix for eclipse-che/che#21244

How to test this PR?

  1. Start a workspace via factory link che-url/#https://github.com/azatsarynnyy/che-editor-test
  2. Use ctrl+shift+p to Git: Add Remote... and enter e.g. https://github.com/golang/example.git
  3. Check the Devfile. It should not be changed.

PR Checklist

As the author of this Pull Request I made sure that:

Reviewers

Reviewers, please comment how you tested the PR when approving it.

Happy Path Channel

HAPPY_PATH_CHANNEL=stable

@azatsarynnyy azatsarynnyy changed the title fix: prevent overwriting the DevWorkspace in-cluster object by a flat… [WIP] Prevent overwriting the DevWorkspace in-cluster object by a flattened Devfile May 3, 2022
Copy link
Contributor

@benoitf benoitf left a comment

Choose a reason for hiding this comment

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

probably some tests to fix

Signed-off-by: Artem Zatsarynnyi <[email protected]>
Signed-off-by: Artem Zatsarynnyi <[email protected]>
Signed-off-by: Artem Zatsarynnyi <[email protected]>
@codecov
Copy link

codecov bot commented May 3, 2022

Codecov Report

Merging #1346 (1bcd7b7) into main (c299f59) will increase coverage by 3.79%.
The diff coverage is 37.99%.

@@            Coverage Diff             @@
##             main    #1346      +/-   ##
==========================================
+ Coverage   32.78%   36.58%   +3.79%     
==========================================
  Files         290      330      +40     
  Lines        9885    11331    +1446     
  Branches     1457     1568     +111     
==========================================
+ Hits         3241     4145     +904     
- Misses       6641     7181     +540     
- Partials        3        5       +2     
Impacted Files Coverage Δ
...theia-about/src/browser/about-che-theia-dialog.tsx 0.00% <0.00%> (ø)
...credentials/src/browser/che-credentials-service.ts 0.00% <0.00%> (ø)
...entials/src/browser/credentials-frontend-module.ts 0.00% <0.00%> (ø)
...eia-credentials/src/common/credentials-protocol.ts 0.00% <0.00%> (ø)
...eia-credentials/src/node/che-credentials-server.ts 0.00% <0.00%> (ø)
...s/src/node/che-theia-credentials-backend-module.ts 0.00% <0.00%> (ø)
...ashboard/src/browser/che-theia-dashboard-module.ts 0.00% <0.00%> (ø)
...ia-dashboard/src/browser/theia-dashboard-client.ts 0.00% <0.00%> (ø)
...rowser/src/browser/che-mini-browser-environment.ts 0.00% <0.00%> (ø)
...in-ext/src/browser/che-sidecar-file-system-main.ts 100.00% <ø> (ø)
... and 294 more

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 39511b7...1bcd7b7. Read the comment docs.

@azatsarynnyy azatsarynnyy marked this pull request as ready for review May 9, 2022 13:37
@azatsarynnyy azatsarynnyy changed the title [WIP] Prevent overwriting the DevWorkspace in-cluster object by a flattened Devfile Prevent overwriting the DevWorkspace in-cluster object by a flattened Devfile May 9, 2022
@azatsarynnyy azatsarynnyy merged commit c58f5bd into main May 9, 2022
@azatsarynnyy azatsarynnyy deleted the disable-git-hooks branch May 9, 2022 13:38
@che-bot che-bot added this to the 7.49 milestone May 9, 2022
azatsarynnyy added a commit that referenced this pull request May 9, 2022
… Devfile (#1346)

* fix: prevent overwriting the DevWorkspace in-cluster object by a flattened Devfile

Signed-off-by: Artem Zatsarynnyi <[email protected]>
azatsarynnyy added a commit that referenced this pull request May 9, 2022
… Devfile (#1346) (#1347)

* fix: prevent overwriting the DevWorkspace in-cluster object by a flattened Devfile

Signed-off-by: Artem Zatsarynnyi <[email protected]>
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants