Align the git services skip-oauth flag with oauth-1 providers

[vinokurig]

What does this PR do?

Use includes filter to handle the bitbucket-server oauth 2 provider. The bitbucket server oauth2 provider name is 'bitbucket', but the corresponding 'skip oauth' item is 'bitbucket-server'.

What issues does this PR fix or reference?

eclipse-che/che#22723

Is it tested? How?

1. Deploy che from the che-server PR image: quay.io/eclipse/che-server:pr-624
2. Register Bitbucket Server oauth2 provider.
3. Start a workspace from the Bitbucket-Server repo
4. Reject the Bitbucket-Server authorisation page.
5. Go to User Preferences -> Git Services tab, see: the authorisation flag is set to skip authorisation warning.
6. Click the three dot icon of the Bitbucket item and clear the skip authorisation flag.
7. Delete the workspace and start the workspace from the Bitbucket-Server again, accept the authorisation page, see: the skip authorisation flag is set to authorised icon.

Release Notes

Docs PR

[che-bot]

Click here to review and test in web IDE:

[github-actions]

Docker image build succeeded: quay.io/eclipse/che-dashboard:pr-1020

kubectl patch command

kubectl patch -n eclipse-che "checluster/eclipse-che" --type=json -p="[{"op": "replace", "path": "/spec/components/dashboard/deployment", "value": {containers: [{image: "quay.io/eclipse/che-dashboard:pr-1020", name: che-dashboard}]}}]"

[olexii4]

@vinokurig Could you update snapshots?
yarn --cwd packages/dashboard-frontend test -u

[github-actions]

Docker image build succeeded: quay.io/eclipse/che-dashboard:pr-1020

kubectl patch command

kubectl patch -n eclipse-che "checluster/eclipse-che" --type=json -p="[{"op": "replace", "path": "/spec/components/dashboard/deployment", "value": {containers: [{image: "quay.io/eclipse/che-dashboard:pr-1020", name: che-dashboard}]}}]"

[codecov]

Codecov Report

Attention: 6 lines in your changes are missing coverage. Please review.

Comparison is base (d4ebc4a) 87.91% compared to head (346dc25) 87.99%.
Report is 6 commits behind head on main.

Files	Patch %	Lines
...src/pages/UserPreferences/GitServicesTab/index.tsx	40.00%	6 Missing ⚠️

Additional details and impacted files

@@            Coverage Diff             @@
##             main    #1020      +/-   ##
==========================================
+ Coverage   87.91%   87.99%   +0.07%     
==========================================
  Files         382      383       +1     
  Lines       39261    39321      +60     
  Branches     2593     2610      +17     
==========================================
+ Hits        34517    34599      +82     
+ Misses       4719     4697      -22     
  Partials       25       25              

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

[akurinnoy]

LGTM

[artaleks9]

Verified on Eclipse Che with quay.io/eclipse/che-server:pr-624 and quay.io/eclipse/che-dashboard:pr-1020 - works as expected.

[openshift-ci]

[APPROVALNOTIFIER] This PR is NOT APPROVED

This pull-request has been approved by: akurinnoy, artaleks9, olexii4, vinokurig

The full list of commands accepted by this bot can be found here.

Needs approval from an approver in each of these files:

• OWNERS

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

[openshift-ci]

New changes are detected. LGTM label has been removed.

[github-actions]

Docker image build succeeded: quay.io/eclipse/che-dashboard:pr-1020

kubectl patch command

kubectl patch -n eclipse-che "checluster/eclipse-che" --type=json -p="[{"op": "replace", "path": "/spec/components/dashboard/deployment", "value": {containers: [{image: "quay.io/eclipse/che-dashboard:pr-1020", name: che-dashboard}]}}]"

[github-actions]

Docker image build succeeded: quay.io/eclipse/che-dashboard:pr-1020

kubectl patch command

kubectl patch -n eclipse-che "checluster/eclipse-che" --type=json -p="[{"op": "replace", "path": "/spec/components/dashboard/deployment", "value": {containers: [{image: "quay.io/eclipse/che-dashboard:pr-1020", name: che-dashboard}]}}]"

[github-actions]

Docker image build succeeded: quay.io/eclipse/che-dashboard:pr-1020

kubectl patch command

kubectl patch -n eclipse-che "checluster/eclipse-che" --type=json -p="[{"op": "replace", "path": "/spec/components/dashboard/deployment", "value": {containers: [{image: "quay.io/eclipse/che-dashboard:pr-1020", name: che-dashboard}]}}]"

[github-actions]

Docker image build succeeded: quay.io/eclipse/che-dashboard:pr-1020

kubectl patch command

kubectl patch -n eclipse-che "checluster/eclipse-che" --type=json -p="[{"op": "replace", "path": "/spec/components/dashboard/deployment", "value": {containers: [{image: "quay.io/eclipse/che-dashboard:pr-1020", name: che-dashboard}]}}]"

[devstudio-release]

Build 3.12 :: dashboard_3.x/429: Console, Changes, Git Data

[devstudio-release]

Build 3.12 :: sync-to-downstream_3.x/5737: Console, Changes, Git Data

[devstudio-release]

Build 3.12 :: get-sources-rhpkg-container-build_3.x/5609: Console, Changes, Git Data

[devstudio-release]

Build 3.12 :: push-latest-container-to-quay_3.x/4004: Console, Changes, Git Data

[devstudio-release]

Build 3.12 :: get-sources-rhpkg-container-build_3.x/5609:

dashboard : 3.x :: Build 57753656 : quay.io/devspaces/dashboard-rhel8:3.12-10
SUCCESS; copied to quay; /DS_CI/push-latest-container-to-quay_3.x/4004 triggered

[devstudio-release]

Build 3.12 :: dashboard_3.x/429:

Upstream sync done; /DS_CI/sync-to-downstream_3.x/5737 triggered

[devstudio-release]

Build 3.12 :: update-digests_3.x/5317: Console, Changes, Git Data

[devstudio-release]

Build 3.12 :: update-digests_3.x/5317:

No new images detected: nothing to do!

[devstudio-release]

Build 3.12 :: dashboard_3.x/430: Console, Changes, Git Data

[devstudio-release]

Build 3.12 :: sync-to-downstream_3.x/5759: Console, Changes, Git Data

[devstudio-release]

Build 3.12 :: get-sources-rhpkg-container-build_3.x/5631: Console, Changes, Git Data

[devstudio-release]

Build 3.12 :: push-latest-container-to-quay_3.x/4021: Console, Changes, Git Data

[devstudio-release]

Build 3.12 :: get-sources-rhpkg-container-build_3.x/5631:

dashboard : 3.x :: Build 57777040 : quay.io/devspaces/dashboard-rhel8:3.12-11
SUCCESS; copied to quay; /DS_CI/push-latest-container-to-quay_3.x/4021 triggered

[devstudio-release]

Build 3.12 :: dashboard_3.x/430:

Upstream sync done; /DS_CI/sync-to-downstream_3.x/5759 triggered

[devstudio-release]

Build 3.12 :: update-digests_3.x/5345: Console, Changes, Git Data

[devstudio-release]

Build 3.12 :: update-digests_3.x/5345:

No new images detected: nothing to do!

[vinokurig]