Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

OCPBUGS-29701: Use selfsubjectreview API from frontend #13605

Merged
merged 5 commits into from Feb 26, 2024
Merged

OCPBUGS-29701: Use selfsubjectreview API from frontend #13605

merged 5 commits into from Feb 26, 2024

Conversation

jhadvig
Copy link
Member

@jhadvig jhadvig commented Feb 13, 2024 •
edited

We should be be using k8s native UserInfo type for the userm which will be returned by the SelfSubjectReview POST call.
/assign @jhadvig @TheRealJon

@openshift-ci openshift-ci bot added component/backend Related to backend component/core Related to console core functionality component/dev-console Related to dev-console approved Indicates a PR has been approved by an approver from all required OWNERS files. component/olm Related to OLM component/sdk Related to console-plugin-sdk component/shared Related to console-shared labels Feb 13, 2024
@jhadvig
Copy link
Member Author

jhadvig commented Feb 15, 2024

/hold

@openshift-ci openshift-ci bot added the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Feb 15, 2024
@jhadvig jhadvig changed the title [DO NOT MERGE] Standa selfsubjects frontend Use selfsubjectreview API from frontend Feb 19, 2024
stlaz
stlaz reviewed Feb 19, 2024
View reviewed changes
Copy link
Member

@stlaz stlaz left a comment

Choose a reason for hiding this comment

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

The golang code and the TS code that I wrote and Jakub fixed looks good to me. The last commit should probably be split and applied to the commits before it.
The rest of the TS I don't understand 🙂

frontend/packages/console-dynamic-plugin-sdk/src/app/configSetup.ts Outdated Show resolved Hide resolved
frontend/packages/console-shared/src/hooks/useUserSettings.ts Outdated Show resolved Hide resolved
frontend/packages/webterminal-plugin/src/components/cloud-shell/useCloudShellWorkspace.ts Outdated Show resolved Hide resolved
pkg/auth/auth.go Outdated Show resolved Hide resolved
pkg/graphql/resolver/k8s.go Show resolved Hide resolved
frontend/packages/console-app/console-extensions.json
@@ -319,6 +320,15 @@
}
},

{
Copy link
Member

Choose a reason for hiding this comment

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

is this piece necessary?

Copy link
Member Author

Choose a reason for hiding this comment

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

it is, we needed to remove the oauth details page so it only part of console the the oauth api is installed on the cluster.

@jhadvig jhadvig mentioned this pull request Feb 19, 2024
Closed
@jhadvig
Copy link
Member Author

jhadvig commented Feb 19, 2024

/hold cancel

@openshift-ci openshift-ci bot removed the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Feb 19, 2024
@openshift-ci openshift-ci bot added the kind/i18n Indicates issue or PR relates to internationalization or has content that needs to be translated label Feb 19, 2024
TheRealJon
TheRealJon reviewed Feb 19, 2024
View reviewed changes
frontend/packages/console-dynamic-plugin-sdk/src/app/core/reducers/coreSelectors.ts Outdated Show resolved Hide resolved
frontend/public/actions/features.ts Outdated Show resolved Hide resolved
frontend/public/actions/features.ts Outdated Show resolved Hide resolved
frontend/packages/console-app/src/components/oauth-config/IdentityProviders.tsx Outdated Show resolved Hide resolved
frontend/run.log Outdated Show resolved Hide resolved
pkg/graphql/resolver/k8s.go Outdated Show resolved Hide resolved
TheRealJon
TheRealJon approved these changes Feb 19, 2024
View reviewed changes
Copy link
Member

@TheRealJon TheRealJon left a comment

Choose a reason for hiding this comment

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

/lgtm

@openshift-ci openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label Feb 19, 2024
@TheRealJon
Copy link
Member

/lgtm cancel

Looks like there's probably some lint issues

@openshift-ci openshift-ci bot removed the lgtm Indicates that a PR is ready to be merged. label Feb 19, 2024
@openshift-ci-robot
Copy link
Contributor

/hold

Revision f962f00 was retested 3 times: holding

@openshift-ci openshift-ci bot added the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Feb 22, 2024
@stlaz
Copy link
Member

stlaz commented Feb 22, 2024

Timed out retrying after 30000ms: Expected to find content: 'You are logged in as a temporary administrative user. Update the cluster OAuth configuration to allow others to log in.' within the element: <div.co-global-notifications> but never did
seems like a legit fail

@openshift-ci openshift-ci bot removed the lgtm Indicates that a PR is ready to be merged. label Feb 22, 2024
@jhadvig
Copy link
Member Author

jhadvig commented Feb 22, 2024

/hold cancel

@openshift-ci openshift-ci bot removed the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Feb 22, 2024
@stlaz
Copy link
Member

stlaz commented Feb 22, 2024

/lgtm

@openshift-ci openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label Feb 22, 2024
@openshift-ci OpenShift CI
Copy link
Contributor

openshift-ci bot commented Feb 22, 2024

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: jhadvig, stlaz, TheRealJon

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

The pull request process is described here

Needs approval from an approver in each of these files:

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

@openshift-ci-robot
Copy link
Contributor

/retest-required

Remaining retests: 0 against base HEAD b269fa3 and 2 for PR HEAD ce45035 in total

@openshift-ci-robot
Copy link
Contributor

/retest-required

Remaining retests: 0 against base HEAD e3c8666 and 1 for PR HEAD ce45035 in total

@openshift-ci-robot
Copy link
Contributor

/retest-required

Remaining retests: 0 against base HEAD ea77e7b and 0 for PR HEAD ce45035 in total

@openshift-ci-robot
Copy link
Contributor

/hold

Revision ce45035 was retested 3 times: holding

@openshift-ci openshift-ci bot added the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Feb 23, 2024
@jhadvig
Copy link
Member Author

jhadvig commented Feb 25, 2024

/retest

@jhadvig
Copy link
Member Author

jhadvig commented Feb 26, 2024

/hold cancel

@openshift-ci openshift-ci bot removed the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Feb 26, 2024
@jhadvig
Copy link
Member Author

jhadvig commented Feb 26, 2024

/cherry-pick release-4.15

@openshift-cherrypick-robot
Copy link

@jhadvig: once the present PR merges, I will cherry-pick it on top of release-4.15 in a new PR and assign it to you.

In response to this:

/cherry-pick release-4.15

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

@openshift-ci OpenShift CI
Copy link
Contributor

openshift-ci bot commented Feb 26, 2024

@jhadvig: all tests passed!

Full PR test history. Your PR dashboard.

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository. I understand the commands that are listed here.

@openshift-merge-bot openshift-merge-bot bot merged commit b86f733 into openshift:master Feb 26, 2024
6 checks passed
@openshift-ci-robot
Copy link
Contributor

@jhadvig: Jira Issue OCPBUGS-29701: All pull requests linked via external trackers have merged:

Jira Issue OCPBUGS-29701 has been moved to the MODIFIED state.

In response to this:

We should be be using k8s native UserInfo type for the userm which will be returned by the SelfSubjectReview POST call.
/assign @jhadvig @TheRealJon

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the openshift-eng/jira-lifecycle-plugin repository.

@openshift-cherrypick-robot
Copy link

@jhadvig: #13605 failed to apply on top of branch "release-4.15":

Applying: use selfsubjectreview API from frontend
Applying: Add graphql POST SelfSubjectReview query
Applying: Use dynamic plugin for oauth config details page
Using index info to reconstruct a base tree...
M	frontend/packages/console-app/console-extensions.json
M	frontend/packages/console-app/package.json
M	frontend/public/locales/en/public.json
Falling back to patching base and 3-way merge...
Auto-merging frontend/public/locales/en/public.json
Auto-merging frontend/packages/console-app/package.json
CONFLICT (content): Merge conflict in frontend/packages/console-app/package.json
Auto-merging frontend/packages/console-app/console-extensions.json
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0003 Use dynamic plugin for oauth config details page
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".

In response to this:

/cherry-pick release-4.15

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

@jhadvig jhadvig mentioned this pull request Feb 26, 2024
Merged
@openshift-bot
Copy link
Contributor

[ART PR BUILD NOTIFIER]

This PR has been included in build openshift-enterprise-console-container-v4.16.0-202402261210.p0.gb86f733.assembly.stream.el8 for distgit openshift-enterprise-console.
All builds following this will include this PR.

@openshift-merge-robot
Copy link
Contributor

Fix included in accepted release 4.16.0-0.nightly-2024-02-29-062601

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@stlaz stlaz stlaz left review comments

@spadgett spadgett spadgett left review comments

@TheRealJon TheRealJon TheRealJon approved these changes

@christianvogt christianvogt Awaiting requested review from christianvogt

@jeff-phillips-18 jeff-phillips-18 Awaiting requested review from jeff-phillips-18

@yapei yapei Awaiting requested review from yapei

Assignees

@stlaz stlaz

@TheRealJon TheRealJon

Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. component/backend Related to backend component/core Related to console core functionality component/dev-console Related to dev-console component/olm Related to OLM component/sdk Related to console-plugin-sdk component/shared Related to console-shared jira/valid-bug Indicates that a referenced Jira bug is valid for the branch this PR is targeting. jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. kind/i18n Indicates issue or PR relates to internationalization or has content that needs to be translated lgtm Indicates that a PR is ready to be merged.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
10 participants
@jhadvig @TheRealJon @openshift-ci-robot @deads2k @sjenning @stlaz @openshift-cherrypick-robot @openshift-bot @openshift-merge-robot @spadgett