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

Adding SSO to External Logging link #550

Merged
merged 1 commit into from
Mar 30, 2017

Conversation

enoodle
Copy link

@enoodle enoodle commented Mar 2, 2017

This will attempt to use the /auth/sso-setup and /auth/sso-login endpoints that are available to the openshift-auth-proxy. In case of a failure this will fall back to the non sso behavior.

[1]fabric8io/openshift-auth-proxy#11

res = http.request(Net::HTTP::Get.new(url.request_uri))
rescue Errno::ECONNREFUSED, SocketError => _e
javascript_flash(:text => _("Cannot access '#{url.hostname}'. " \
"Make sure that the logging route is accessible"),
Copy link
Contributor

Choose a reason for hiding this comment

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

You cannot use #{} inside a gettext string. You need to change this to:

_("Cannot access '%{hostname}'. Make sure that the logging route is accessible") % {:hostname => url.hostname}

Copy link
Author

Choose a reason for hiding this comment

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

@mzazrivec 👍 changed

@enoodle enoodle changed the title Adding SSO to External Logging link [WIP] Adding SSO to External Logging link Mar 6, 2017
@miq-bot miq-bot added the wip label Mar 6, 2017
@enoodle enoodle force-pushed the common_logging_sso branch 2 times, most recently from 2ebe7a8 to 4e3f750 Compare March 29, 2017 11:48
@enoodle enoodle changed the title [WIP] Adding SSO to External Logging link Adding SSO to External Logging link Mar 29, 2017
@miq-bot miq-bot removed the wip label Mar 29, 2017
@enoodle
Copy link
Author

enoodle commented Mar 29, 2017

@mzazrivec I made the requested change, PTAL.
@himdel @martinpovolny please review

@miq-bot
Copy link
Member

miq-bot commented Mar 29, 2017

Checked commit enoodle@25082a8 with ruby 2.2.6, rubocop 0.47.1, and haml-lint 0.20.0
1 file checked, 0 offenses detected
Everything looks good. 👍

@mzazrivec mzazrivec self-assigned this Mar 30, 2017
@mzazrivec mzazrivec added this to the Sprint 58 Ending Apr 10, 2017 milestone Mar 30, 2017
@mzazrivec mzazrivec merged commit 815b8e4 into ManageIQ:master Mar 30, 2017
@enoodle
Copy link
Author

enoodle commented Apr 19, 2017

simaishi pushed a commit that referenced this pull request Apr 19, 2017
@simaishi
Copy link
Contributor

Fine backport details:

$ git log -1
commit df145678c473dd4f5f169637ae966766ce963d9c
Author: Milan Zázrivec <mzazrivec@redhat.com>
Date:   Thu Mar 30 13:01:19 2017 +0200

    Merge pull request #550 from enoodle/common_logging_sso
    
    Adding SSO to External Logging link
    (cherry picked from commit 815b8e472f95f54443e799486486351c350d04e9)
    
    https://bugzilla.redhat.com/show_bug.cgi?id=1443714

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants