etcdserver: restructure auth.Store and auth.User #3762
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
|
Alternative to #3389 |
| @@ -30,6 +29,7 @@ import ( | |||
| const testTimeout = time.Millisecond | |||
|
|
|||
| func TestMergeUser(t *testing.T) { | |||
|
|
|||
There was a problem hiding this comment.
can you remove this empty line?
jonboulle
force-pushed
the
auth
branch
2 times, most recently
from
5c3e9d7
to
8f28cce
Compare
|
@jonboulle One disadvantage of this approach is that we expose a public interface just for testing. I am not of a fan of that. But I do not have any better suggestion right now. Seems to be OK. |
|
|
||
| type PasswordStore interface { | ||
| CheckPassword(user User, password string) bool | ||
| HashPassword(password string) (string, error) | ||
| } |
There was a problem hiding this comment.
put this under Store interface? So all interfaces are at the head of the file.
|
LGTM |
This attempts to decouple password-related functions, which previously existed both in the Store and User structs, by splitting them out into a separate interface, PasswordStore. This means that they can be more easily swapped out during testing. This also changes the relevant tests to use mock password functions instead of the bcrypt-backed implementations; as a result, the tests are much faster. Before: ``` github.com/coreos/etcd/etcdserver/auth 31.495s github.com/coreos/etcd/etcdserver/etcdhttp 91.205s ``` After: ``` github.com/coreos/etcd/etcdserver/auth 1.207s github.com/coreos/etcd/etcdserver/etcdhttp 1.207s ```
|
Will merge on green. |
jonboulle
added a commit
that referenced
this pull request
Oct 30, 2015
etcdserver: restructure auth.Store and auth.User
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.
This attempts to decouple password-related functions, which previously
existed both in the Store and User structs, by splitting them out into a
separate interface, PasswordStore. This means that they can be more
easily swapped out during testing.
This also changes the relevant tests to use mock password functions
instead of the bcrypt-backed implementations; as a result, the tests are
much faster.
Before:
After: