Merge lp:~axwalk/juju-core/lp1274780-osuser-fallback into lp:~go-bot/juju-core/trunk
Proposed by
Andrew Wilkins
Status: | Merged |
---|---|
Approved by: | Andrew Wilkins |
Approved revision: | no longer in the source branch. |
Merged at revision: | 2326 |
Proposed branch: | lp:~axwalk/juju-core/lp1274780-osuser-fallback |
Merge into: | lp:~go-bot/juju-core/trunk |
Prerequisite: | lp:~axwalk/juju-core/local-provider-testability |
Diff against target: |
120 lines (+63/-4) 3 files modified
provider/local/environprovider.go (+9/-1) provider/local/environprovider_test.go (+53/-3) provider/local/export_test.go (+1/-0) |
To merge this branch: | bzr merge lp:~axwalk/juju-core/lp1274780-osuser-fallback |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Juju Engineering | Pending | ||
Review via email: mp+204173@code.launchpad.net |
Commit message
provider/local: fall back to os/user if $USER=""
If $USER is unset/empty, then fall back to os/user.
If that fails, then return an error.
Fixes lp:1274780
Description of the change
provider/local: fall back to os/user if $USER=""
If $USER is unset/empty, then fall back to os/user.
If that fails, then return an error.
Fixes lp:1274780
To post a comment you must log in.
Reviewers: mp+204173_ code.launchpad. net,
Message:
Please take a look.
Description:
provider/local: fall back to os/user if $USER=""
If $USER is unset/empty, then fall back to os/user.
If that fails, then return an error.
Fixes lp:1274780
https:/ /code.launchpad .net/~axwalk/ juju-core/ lp1274780- osuser- fallback/ +merge/ 204173
Requires: /code.launchpad .net/~axwalk/ juju-core/ local-provider- testability/ +merge/ 204169
https:/
(do not edit description out of merge proposal)
Please review this at https:/ /codereview. appspot. com/58970043/
Affected files (+62, -1 lines): local/environpr ovider. go local/environpr ovider_ test.go local/export_ test.go
A [revision details]
M provider/
M provider/
M provider/
Index: [revision details]
=== added file '[revision details]'
--- [revision details] 2012-01-01 00:00:00 +0000
+++ [revision details] 2012-01-01 00:00:00 +0000
@@ -0,0 +1,2 @@
+Old revision: <email address hidden>
+New revision: <email address hidden>
Index: provider/ local/environpr ovider. go local/environpr ovider. go' local/environpr ovider. go 2014-01-31 08:44:08 +0000 local/environpr ovider. go 2014-01-31 09:04:29 +0000 s()["namespace" ].(string) ; namespace "%s-%s" , os.Getenv("USER"), cfg.Name()) "%s-%s" , username, cfg.Name()) map[string] interface{ }{"namespace" : namespace})
=== modified file 'provider/
--- provider/
+++ provider/
@@ -51,8 +51,16 @@
// for backwards compatibility: older versions did not store the namespace
// in config.
if namespace, _ := cfg.UnknownAttr
== "" {
+ username := os.Getenv("USER")
+ if username == "" {
+ u, err := userCurrent()
+ if err != nil {
+ return nil, fmt.Errorf("failed to determine username for
namespace: %v", err)
+ }
+ username = u.Username
+ }
var err error
- namespace = fmt.Sprintf(
+ namespace = fmt.Sprintf(
cfg, err = cfg.Apply(
if err != nil {
return nil, fmt.Errorf("failed to create namespace: %v", err)
Index: provider/ local/environpr ovider_ test.go local/environpr ovider_ test.go' local/environpr ovider_ test.go 2014-01-31 08:44:08 +0000 local/environpr ovider_ test.go 2014-01-31 09:04:29 +0000
=== modified file 'provider/
--- provider/
+++ provider/
@@ -4,6 +4,9 @@
package local_test
import ( com/loggo/ loggo" net/gocheck"
+ "errors"
+ "os/user"
+
"github.
gc "launchpad.
@@ -229,3 +232,50 @@ space(c *gc.C) { local.DetectApt Proxies, func() (osenv. ProxySettings, error) { ings{}, nil New(config. UseDefaults, map[string] interface{ }{ Provider( "local" )
}
}
}
+
+func (s *prepareSuite) TestPrepareName
+ s.PatchValue(
+ return osenv.ProxySett
+ })
+ basecfg, err := config.
+ "type": "local",
+ "name": "test",
+ })
+ provider, err := environs.
+ c.Assert(err, gc.IsNil)
+
+ type test struct {
+ userEnv string
+ userOS string
+ userOSErr error
+ namespace string
+ err string
+ }
+ tests := []test{{
+ userEnv: "someone",
+ userOS: "other",
+ namespace: "someone-test",
+ }, {
+ userOS: "other",
+ namespace: "other-test",
+ }, {
+ userOSErr: errors.New("oh noes"),
+ err: "failed to determine username for namespace: oh noes",
+ }}
+
+ for i, test := range ...