Fix create authorization command #10947
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
ghost
assigned 
leodido
approved these changes
Jan 10, 2019
http/auth_test.go
Outdated
| @@ -387,6 +389,9 @@ func TestService_handlePostAuthorization(t *testing.T) { | |||
| }, | |||
| UserService: &mock.UserService{ | |||
| FindUserByIDFn: func(ctx context.Context, id platform.ID) (*platform.User, error) { | |||
| if !id.Valid() { | |||
| return nil, errors.New("invalid ID") | |||
There was a problem hiding this comment.
Probably you want to use platform.ErrInvalidID here :)
http/auth_test.go
Outdated
| @@ -395,6 +400,9 @@ func TestService_handlePostAuthorization(t *testing.T) { | |||
| }, | |||
| OrganizationService: &mock.OrganizationService{ | |||
| FindOrganizationByIDF: func(ctx context.Context, id platform.ID) (*platform.Organization, error) { | |||
| if !id.Valid() { | |||
| return nil, errors.New("invalid ID") | |||
|
This has some merge conflicts now, and needs to be rebased to get CI sorted out. But when I built merged locally to master and built, and took a blind guess on the merge conflicts, it appeared to fix the issue of being unable to create authorizations for other users. |
desa
force-pushed
the
fix/issue#2169
branch
2 times, most recently
from
ed35a73
to
c62895b
Compare
leodido
approved these changes
Jan 14, 2019
cmd/influx/authorization.go
Outdated
| @@ -229,6 +228,23 @@ func authorizationCreateF(cmd *cobra.Command, args []string) error { | |||
| OrgID: o.ID, | |||
| } | |||
|
|
|||
| if authorizationCreateFlags.user != "" { | |||
| // if the user flag is supplied, the set the user ID explicitly on the request | |||
There was a problem hiding this comment.
Perhaps a typo here @desa?
then set?
test(http): get user off of session in create authz test fix(http): allow user id to be specified explicitly on authorization create authorization now allows specifying user id explicitly. If no user id is specified then we use the user id from the authorizer. fix(http): use influxdb import fix(http): use platform error in http auth tests feat(cmd/influx): allow create auth command to specify user explicitly feat(http): add org id to permissions
4 tasks
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.
Link https://github.com/influxdata/platform/pull/2185
Closes #10837
Briefly describe your proposed changes:
Previously, authorizations required the users id to be set explicitly on the authorization. As of #2157 the user id is retrieved off of the authorization or session used in the http request.
We now allow users to specify an explicit user when creating authorizations. If the id is not provided, the user from the authorizer will be used.
Additionally, we now need to pass the organization id when creating an authorization.