/juju

Merge "user-domain" feature branch into develop. #7099

Merged
merged 13 commits into from Mar 15, 2017

Conversation

Reviewers

@frankban frankban

@urosj urosj

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
4 participants
@rogpeppe @jujubot @frankban @urosj
@rogpeppe
Owner

rogpeppe commented Mar 15, 2017

This adds the capability to specify a required user
domain for users, and alters the juju login command
so that it knows about public controllers.

rogpeppe and others added some commits Jan 24, 2017

@rogpeppe
cmd/modelcmd: support JUJU_USER_DOMAIN 
This can be used to select an alternative authentication
domain when authenticating using an external identity
manager.

We also clean up the tests a little by using IsolationSuite
instead of the deprecated FakeJujuXDGDataHomeSuite,
and unexport some fields from APIContext that aren't
used.
4da1f06
@jujubot
Merge pull request #6862 from rogpeppe/123-user-domain 
cmd/modelcmd: support JUJU_USER_DOMAIN

This can be used to select an alternative authentication
domain when authenticating using an external identity
manager.

We also clean up the tests a little by using IsolationSuite
instead of the deprecated FakeJujuXDGDataHomeSuite,
and unexport some fields from APIContext that aren't
used.
ed5aa57
@rogpeppe
Merge remote-tracking branch 'origin/develop' into HEAD
bde32d7
@jujubot
Merge pull request #6965 from rogpeppe/126-user-domain-merge-master 
merge origin/develop

Merge the latest origin/develop commit into this feature branch.
No conflicts worth talking about.
105ffe4
@rogpeppe
cmd/juju/user: implement controller login 
This is the first stage of a process that will eventually
deprecate juju register in favour of juju login.

Much of the new code in juju login is copied from
juju register.
aa41f51
@jujubot
Merge pull request #6964 from rogpeppe/125-login-controller 
cmd/juju/user: implement controller login

This is the first stage of a process that will eventually
deprecate juju register in favour of juju login.

Much of the new code in juju login is copied from
juju register.

To QA, try "juju login --host some-public-controller-address",
which should do the same thing as "juju register some-public-controller-address".
You could also try changing the table in getKnownControllerDomains
and doing "juju login some-alias".
2042d3b
@rogpeppe
Merge remote-tracking branch 'origin/develop' into HEAD
ef14b82
@jujubot
Merge pull request #7079 from rogpeppe/133-user-domain-merge-develop 
merge develop branch

This merges the latest develop tip into the user-domain feature branch.
No conflicts.
8457f15
@rogpeppe
cmd/juju/user: consult external directory server to find out host nam… 
…es for public controllers
71b4dbd
@jujubot
Merge pull request #7087 from rogpeppe/135-login-external-dirserver 
cmd/juju/user: consult external directory server to find out host names for public controllers

This allows us to set up global aliases for public controllers.
4c179a6
@rogpeppe
cmd/juju/user: set controller name properly
e83f06d
@jujubot
Merge pull request #7092 from rogpeppe/136-fix-login-set-controller 
cmd/juju/user: set controller name properly

Because the controller wasn't being set, the ListControllers
call was failing. The tests still passed because the ListControllers
call was entirely mocked.

Also make a backwardly incompatible change so that the old
"juju login $user" behaviour is no longer the default - to log in as
a user, the "--user" (or "-u") flag is required.
e699e58
@rogpeppe
Merge "user-domain" feature branch into develop. 
This adds the capability to specify a required user
domain for users, and alters the juju login command
so that it knows about public controllers.
28c8e3b
@urosj

urosj approved these changes Mar 15, 2017
View changes

LGTM (it is a merge from feature branch)

@rogpeppe
Owner

rogpeppe commented Mar 15, 2017

$$merge$$
@jujubot
Contributor

jujubot commented Mar 15, 2017

Status: merge request accepted. Url: http://juju-ci.vapour.ws:8080/job/github-merge-juju

@jujubot jujubot merged commit e00baf3 into juju:develop Mar 15, 2017

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