Swap bootstrap controller and cloud args

wallyworld · wallyworld · commit 41e07f9fc0cb · 2016-10-13T14:41:46.000+10:00
diff --git a/cmd/juju/commands/bootstrap.go b/cmd/juju/commands/bootstrap.go
@@ -7,7 +7,6 @@ import (
 	"bufio"
 	"fmt"
 	"os"
-	"os/user"
 	"sort"
 	"strings"
 
@@ -97,10 +96,12 @@ Examples:
     juju bootstrap
     juju bootstrap --clouds
     juju bootstrap --regions aws
-    juju bootstrap joe-us-east1 google
-    juju bootstrap --config=~/config-rs.yaml joe-syd rackspace
-    juju bootstrap --config agent-version=1.25.3 joe-us-east-1 aws
-    juju bootstrap --config bootstrap-timeout=1200 joe-eastus azure
+    juju bootstrap aws
+    juju bootstrap aws/us-east-1
+    juju bootstrap google joe-us-east1
+    juju bootstrap --config=~/config-rs.yaml rackspace joe-syd
+    juju bootstrap --config agent-version=1.25.3 aws joe-us-east-1
+    juju bootstrap --config bootstrap-timeout=1200 azure joe-eastus
 
 See also:
     add-credentials
@@ -232,17 +233,16 @@ func (c *bootstrapCommand) Init(args []string) (err error) {
 		// no args or flags, go interactive.
 		c.interactive = true
 		return nil
-	case 1:
-		// The user must specify both positional arguments: the controller name,
-		// and the cloud name (optionally with region specified).
-		return errors.New("controller name and cloud name are required")
 	}
-	c.controllerName = args[0]
-	c.Cloud = args[1]
+	c.Cloud = args[0]
 	if i := strings.IndexRune(c.Cloud, '/'); i > 0 {
 		c.Cloud, c.Region = c.Cloud[:i], c.Cloud[i+1:]
 	}
-	return cmd.CheckEmpty(args[2:])
+	if len(args) > 1 {
+		c.controllerName = args[1]
+		return cmd.CheckEmpty(args[2:])
+	}
+	return nil
 }
 
 // BootstrapInterface provides bootstrap functionality that Run calls to support cleaner testing.
@@ -470,6 +470,9 @@ func (c *bootstrapCommand) Run(ctx *cmd.Context) (resultErr error) {
 		)
 		return cmd.ErrSilent
 	}
+	if c.controllerName == "" {
+		c.controllerName = defaultControllerName(c.Cloud, region.Name)
+	}
 
 	controllerModelUUID, err := utils.NewUUID()
 	if err != nil {
@@ -859,11 +862,7 @@ func (c *bootstrapCommand) runInteractive(ctx *cmd.Context) error {
 		}
 	}
 
-	var username string
-	if u, err := user.Current(); err == nil {
-		username = u.Username
-	}
-	defName := defaultControllerName(username, c.Cloud, c.Region, cloud)
+	defName := defaultControllerName(c.Cloud, c.Region)
 
 	c.controllerName, err = queryName(defName, scanner, ctx.Stdout)
 	if err != nil {
diff --git a/cmd/juju/commands/bootstrap_interactive.go b/cmd/juju/commands/bootstrap_interactive.go
@@ -91,15 +91,11 @@ func queryRegion(cloud string, regions []jujucloud.Region, scanner *bufio.Scanne
 	return regionName, nil
 }
 
-func defaultControllerName(username, cloudname, region string, cloud *jujucloud.Cloud) string {
-	name := cloudname
-	if len(cloud.Regions) > 1 {
-		name = region
-	}
-	if username == "" {
-		return name
+func defaultControllerName(cloudname, region string) string {
+	if region == "" {
+		return cloudname
 	}
-	return username + "-" + name
+	return cloudname + "-" + region
 }
 
 func queryName(defName string, scanner *bufio.Scanner, w io.Writer) (string, error) {
diff --git a/cmd/juju/commands/bootstrap_interactive_test.go b/cmd/juju/commands/bootstrap_interactive_test.go
@@ -42,7 +42,7 @@ func (BSInteractSuite) TestInitBuildAgent(c *gc.C) {
 func (BSInteractSuite) TestInitArg(c *gc.C) {
 	cmd := &bootstrapCommand{}
 	err := jujutesting.InitCommand(cmd, []string{"foo"})
-	c.Assert(err, gc.ErrorMatches, "controller name and cloud name are required")
+	c.Assert(err, jc.ErrorIsNil)
 	c.Assert(cmd.interactive, jc.IsFalse)
 }
 
diff --git a/cmd/juju/commands/bootstrap_test.go b/cmd/juju/commands/bootstrap_test.go

Original file line number	Diff line number	Diff line change
`@@ -91,15 +91,11 @@ func queryRegion(cloud string, regions []jujucloud.Region, scanner *bufio.Scanne`
`91`	`91`	`return regionName, nil`
`92`	`92`	`}`
`93`	`93`
`94`		`-func defaultControllerName(username, cloudname, region string, cloud *jujucloud.Cloud) string {`
`95`		`- name := cloudname`
`96`		`- if len(cloud.Regions) > 1 {`
`97`		`- name = region`
`98`		`- }`
`99`		`- if username == "" {`
`100`		`- return name`
	`94`	`+func defaultControllerName(cloudname, region string) string {`
	`95`	`+ if region == "" {`
	`96`	`+ return cloudname`
`101`	`97`	`}`
`102`		`- return username + "-" + name`
	`98`	`+ return cloudname + "-" + region`
`103`	`99`	`}`
`104`	`100`
`105`	`101`	`func queryName(defName string, scanner *bufio.Scanner, w io.Writer) (string, error) {`
Original file line number	Diff line number	Diff line change
`@@ -42,7 +42,7 @@ func (BSInteractSuite) TestInitBuildAgent(c *gc.C) {`
`42`	`42`	`func (BSInteractSuite) TestInitArg(c *gc.C) {`
`43`	`43`	`cmd := &bootstrapCommand{}`
`44`	`44`	`err := jujutesting.InitCommand(cmd, []string{"foo"})`
`45`		`- c.Assert(err, gc.ErrorMatches, "controller name and cloud name are required")`
	`45`	`+ c.Assert(err, jc.ErrorIsNil)`
`46`	`46`	`c.Assert(cmd.interactive, jc.IsFalse)`
`47`	`47`	`}`
`48`	`48`