Merge pull request #8077 from hmlanigan/bug1721604

fix bug 1721604

## Description of change

Juju bootstrap cli results should be the same as running bootstrap interactive.  If bootstrap, cli only, doesn't specify a region, but finds one to use, use it for config too.

## QA steps

One:
1. set region config for an openstack cloud, suggest network since you can't bootstrap without it most of the time.
2. juju bootstrap <openstack-cloud>

Two:
bootstrap a cloud without regions, such as localhost

## Documentation changes

n/a

## Bug reference

https://bugs.launchpad.net/juju/+bug/1721604

cmd/juju/commands/bootstrap.go

@@ -408,6 +408,10 @@ func (c *bootstrapCommand) Run(ctx *cmd.Context) (resultErr error) {
 	if c.controllerName == "" {
 		c.controllerName = defaultControllerName(cloud.Name, region.Name)
 	}
+	// set a Region so it's config can be found below.
+	if c.Region == "" {
+		c.Region = region.Name
+	}
 
 	config, err := c.bootstrapConfigs(ctx, cloud, provider)
 	if err != nil {

cmd/juju/commands/bootstrap_test.go

@@ -711,6 +711,19 @@ func (s *BootstrapSuite) TestBootstrapAttributesInheritedOverDefaults(c *gc.C) {
 	})
 }
 
+func (s *BootstrapSuite) TestBootstrapRegionConfigNoRegionSpecified(c *gc.C) {
+	resetJujuXDGDataHome(c)
+
+	var bootstrap fakeBootstrapFuncs
+	s.PatchValue(&getBootstrapFuncs, func() BootstrapInterface {
+		return &bootstrap
+	})
+
+	_, err := cmdtesting.RunCommand(c, s.newBootstrapCommand(), "dummy-cloud-dummy-region-config")
+	c.Assert(err, gc.Equals, cmd.ErrSilent)
+	c.Assert(bootstrap.args.ControllerInheritedConfig["secret"], gc.Equals, "region-test")
+}
+
 func (s *BootstrapSuite) TestBootstrapRegionConfigAttributesOverCloudConfig(c *gc.C) {
 	/* Test that cloud config attributes are overwritten by region config
 	   attributes by setting both to something different in the config setup.
@@ -1692,24 +1705,25 @@ func (s *BootstrapSuite) TestBootstrapPrintClouds(c *gc.C) {
 	c.Assert(err, jc.ErrorIsNil)
 	c.Assert(cmdtesting.Stdout(ctx), jc.DeepEquals, `
 You can bootstrap on these clouds. See ‘--regions <cloud>’ for all regions.
-Cloud                           Credentials  Default Region
-aws                             fred         us-west-1
-                                mary         
-aws-china                                    
-aws-gov                                      
-azure                                        
-azure-china                                  
-cloudsigma                                   
-google                                       
-joyent                                       
-oracle                                       
-rackspace                                    
-localhost                                    
-dummy-cloud                     joe          home
-dummy-cloud-with-config                      
-dummy-cloud-with-region-config               
-dummy-cloud-without-regions                  
-many-credentials-no-auth-types               
+Cloud                            Credentials  Default Region
+aws                              fred         us-west-1
+                                 mary         
+aws-china                                     
+aws-gov                                       
+azure                                         
+azure-china                                   
+cloudsigma                                    
+google                                        
+joyent                                        
+oracle                                        
+rackspace                                     
+localhost                                     
+dummy-cloud                      joe          home
+dummy-cloud-dummy-region-config               
+dummy-cloud-with-config                       
+dummy-cloud-with-region-config                
+dummy-cloud-without-regions                   
+many-credentials-no-auth-types                
 
 You will need to have a credential if you want to bootstrap on a cloud, see
 ‘juju autoload-credentials’ and ‘juju add-credential’. The first credential
@@ -1856,22 +1870,14 @@ clouds:
             region-2:
     dummy-cloud-without-regions:
         type: dummy
-    dummy-cloud-with-region-config:
+    dummy-cloud-dummy-region-config:
         type: dummy
         regions:
             region-1:
             region-2:
-        config:
-            network: cloud-network
         region-config:
             region-1:
-                network: region-network
-    dummy-cloud-with-config:
-        type: dummy
-        config:
-            broken: Bootstrap
-            controller: not-a-bool
-            use-floating-ip: true
+                secret: region-test
     dummy-cloud-with-region-config:
         type: dummy
         regions:
@@ -1882,6 +1888,12 @@ clouds:
         region-config:
             region-1:
                 network: region-network
+    dummy-cloud-with-config:
+        type: dummy
+        config:
+            broken: Bootstrap
+            controller: not-a-bool
+            use-floating-ip: true
     many-credentials-no-auth-types:
         type: many-credentials
 `[1:]), 0644)