Refactor Authenticator to remove const manipulations #16869
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
bdunne
requested changes
Jan 23, 2018
app/models/authenticator.rb
Outdated
| if authenticator | ||
| [:mode, "authentication type, #{config[:mode].inspect}, invalid. Should be one of: #{valid_modes.join(", ")}"] | ||
| else | ||
| authenticator.validate_config |
There was a problem hiding this comment.
Shouldn't this be the other way around? Otherwise you'll get undefined method 'validate_config' for 'nil', right?
app/models/authenticator.rb
Outdated
| hash[name] = authenticator_class_for(name) || force_load_authenticator_for(name) | ||
| authenticator = self.for(config) | ||
| if authenticator | ||
| [:mode, "authentication type, #{config[:mode].inspect}, invalid. Should be one of: #{valid_modes.join(", ")}"] |
There was a problem hiding this comment.
Maybe this can return [...] unless authenticator
Fryguy
force-pushed
the
refactor_authenticator_to_remove_require_nested
branch
from
ced98f2
to
9d83e12
Compare
After ManageIQ#16867, the DescendantLoader now works properly with non-AR models such as the Authenticator. Much of the code in the Authenticator, such as require_nested and force_load_authenticator_for is just workarounds over the issues from DescendantLoader, so these can be removed. Additionally, the only caller of the authenticator_class was the validator, so this commit moves the validation code into the Authenticator class directly, allow us to make all of those authenticator_class methods private. Fixes https://bugzilla.redhat.com/show_bug.cgi?id=1537299
Fryguy
force-pushed
the
refactor_authenticator_to_remove_require_nested
branch
from
9d83e12
to
dad746d
Compare
|
Checked commit Fryguy@dad746d with ruby 2.3.3, rubocop 0.52.0, haml-lint 0.20.0, and yamllint 1.10.0 |
simaishi
pushed a commit
that referenced
this pull request
Jan 23, 2018
…e_require_nested Refactor Authenticator to remove const manipulations (cherry picked from commit 61e7ea9) Fixes https://bugzilla.redhat.com/show_bug.cgi?id=1537788
|
Gaprindashvili backport details: |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
After #16867, the
DescendantLoader now works properly with non-AR models such as the
Authenticator. Much of the code in the Authenticator, such as
require_nested and force_load_authenticator_for is just workarounds
over the issues from DescendantLoader, so these can be removed.
Additionally, the only caller of the authenticator_class was the
validator, so this commit moves the validation code into the
Authenticator class directly, allow us to make all of those
authenticator_class methods private.
Fixes https://bugzilla.redhat.com/show_bug.cgi?id=1537299
@jrafanie Please review
cc @jvlcek @bdunne