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.

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

[JANSA] Fix oidcAuthIntrospectionURL/oidcClientSecret description #609

Merged
merged 1 commit into from
Aug 10, 2020

Conversation

simaishi
Copy link
Contributor

@simaishi simaishi commented Aug 6, 2020

Follow up for #582 (backport of #571) - looks like that PR added description to wrong variables.

@simaishi simaishi changed the title Fix oidcAuthIntrospectionURL/oidcClientSecret description [JANSA] Fix oidcAuthIntrospectionURL/oidcClientSecret description Aug 6, 2020
@miq-bot
Copy link
Member

miq-bot commented Aug 6, 2020

Checked commit simaishi@f27fa1d with ruby 2.5.7, rubocop 0.69.0, haml-lint 0.28.0, and yamllint
2 files checked, 1 offense detected

**

  • 💣 💥 🔥 🚒 - Linter/Yaml - missing config files

@simaishi
Copy link
Contributor Author

@abellotti can you please review?

// Only used with the openid-connect authentication type.
// If not specified, the operator will attempt to fetch its value from the
// "token_introspection_endpoint" field in the Provider metadata at the
// OIDCProviderURL provided.
// +optional
OIDCOAuthIntrospectionURL string `json:"oidcAuthIntrospectionURL"`
// Secret name containing the OIDC client id and secret
// Only used with the openid-connect authentication type
Copy link
Member

Choose a reason for hiding this comment

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

why is there a diff here ?

Copy link
Contributor Author

@simaishi simaishi Aug 10, 2020

Choose a reason for hiding this comment

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

Because #582 updated the description at wrong places.

In the original PR for master branch (#571), oidcAuthIntrospectionURL wad updated. But in the Jansa specific PR (#582), oidcClientSecret was updated instead.

So this PR is putting back oidcClientSecret to what it was before #582 and also updating oidcAuthIntrospectionURL to what it should be now.

I noticed this because backporting #606 to jansa branch conflicted.

@abellotti
Copy link
Member

this is fine other than the question about that one diff. Also, this will be updated when #606 gets merged to Jansa.

@simaishi
Copy link
Contributor Author

simaishi commented Aug 10, 2020

this is fine other than the question about that one diff. Also, this will be updated when #606 gets merged to Jansa.

#606 will only change token_introspection_endpoint to introspection_endpoint. Also, unless description is fixed first, #606 will conflict and I won't be able to backport.

@abellotti abellotti self-assigned this Aug 10, 2020
@abellotti abellotti merged commit 9b5b044 into ManageIQ:jansa Aug 10, 2020
@simaishi simaishi deleted the jansa_fix_auth_description branch August 10, 2020 19:35
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants