Merge lp:~cmars/juju-core/1.18-resolve-cs-series into lp:juju-core/1.18

[Casey Marshall]

Ported r2559 from trunk to 1.18

For the deploy and upgradecharm commands, when a series is not provided, and a
default-series is not set in the environment config, the client will resolve
the series with the charm store, through the state server. If the client is
working with a 1.16 state server, it will resolve the series directly with the
charm store.

Existing environments will have a default-series, so they should have no
change in series selection.

New environments will continue to support the default-series config setting,
but it can be omitted, and is not set by default.

Ported r2559 from trunk to 1.18

For the deploy and upgradecharm commands, when a series is not provided, and a
default-series is not set in the environment config, the client will resolve
the series with the charm store, through the state server. If the client is
working with a 1.16 state server, it will resolve the series directly with the
charm store.

Existing environments will have a default-series, so they should have no
change in series selection.

New environments will continue to support the default-series config setting,
but it can be omitted, and is not set by default.

https://codereview.appspot.com/84190043/

[Casey Marshall (cmars)]

Reviewers: mp+214097_code.launchpad.net,

Message:
Please take a look.

Description:
Ported r2559 from trunk to 1.18

For the deploy and upgradecharm commands, when a series is not provided,
and a
default-series is not set in the environment config, the client will
resolve
the series with the charm store, through the state server. If the client
is
working with a 1.16 state server, it will resolve the series directly
with the
charm store.

Existing environments will have a default-series, so they should have no
change in series selection.

New environments will continue to support the default-series config
setting,
but it can be omitted, and is not set by default.

https://code.launchpad.net/~cmars/juju-core/1.18-resolve-cs-series/+merge/214097

(do not edit description out of merge proposal)

Please review this at https://codereview.appspot.com/84190043/

Affected files (+448, -150 lines):
   A [revision details]
   M charm/charm.go
   M charm/charm_test.go
   M charm/url.go
   M charm/url_test.go
   M cmd/juju/addmachine.go
   M cmd/juju/bootstrap_test.go
   M cmd/juju/common.go
   M cmd/juju/deploy.go
   M cmd/juju/environment_test.go
   M cmd/juju/publish.go
   M cmd/juju/upgradecharm.go
   M cmd/juju/upgradejuju_test.go
   M cmd/plugins/juju-metadata/imagemetadata.go
   M cmd/plugins/juju-metadata/imagemetadata_test.go
   M environs/bootstrap/bootstrap_test.go
   M environs/bootstrap/synctools.go
   M environs/config/config.go
   M environs/config/config_test.go
   M environs/jujutest/livetests.go
   M environs/testing/tools.go
   M juju/apiconn_test.go
   M juju/testing/conn.go
   M juju/testing/instance.go
   M provider/azure/environ_test.go
   M provider/common/bootstrap.go
   M provider/dummy/environs.go
   M provider/ec2/ec2.go
   M provider/ec2/live_test.go
   M provider/ec2/local_test.go
   M provider/joyent/environ.go
   M provider/openstack/provider.go
   M state/api/client.go
   M state/api/params/params.go
   M state/apiserver/client/client.go
   M state/apiserver/client/client_test.go
   M testing/environ.go
   M worker/provisioner/container_initialisation_test.go
   M worker/provisioner/kvm-broker_test.go
   M worker/provisioner/lxc-broker_test.go
   M worker/provisioner/provisioner_test.go

[Casey Marshall (cmars)]

This is a cherry-pick of r2559 from trunk.

Original trunk proposal, for context:
https://codereview.appspot.com/80280043/

PTAL & thanks,
-Casey

https://codereview.appspot.com/84190043/

[Ian Booth (wallyworld)]

Cherry pick looks ok.
Only reviewed for obvious backporting errors as original work was
approved.

https://codereview.appspot.com/84190043/

[Casey Marshall (cmars)]

Please take a look.

https://codereview.appspot.com/84190043/

[Casey Marshall (cmars)]

On 2014/04/09 22:49:16, cmars wrote:
> Please take a look.

lbox picked up the wrong branch here, please ignore.

https://codereview.appspot.com/84190043/

=== modified file 'cmd/juju/common.go'
--- cmd/juju/common.go	2014-04-03 19:11:11 +0000
+++ cmd/juju/common.go	2014-04-09 22:48:20 +0000
@@ -4,6 +4,8 @@
 package main
 
 import (
+	"fmt"
+
 	"launchpad.net/juju-core/charm"
 	"launchpad.net/juju-core/cmd"
 	"launchpad.net/juju-core/environs"
@@ -65,6 +67,12 @@
 	}
 	// Otherwise, look up the best supported series for this charm
 	if series == "" {
+		if ref.Schema == "local" {
+			possibleUrl := &charm.URL{Reference: ref, Series: "precise"}
+			logger.Errorf(`The series is not specified in the environment (default-series) or with the charm. Did you mean:
+	%s`, possibleUrl.String())
+			return nil, fmt.Errorf("cannot resolve series for charm: %q", ref)
+		}
 		return client.ResolveCharm(ref)
 	}
 	return &charm.URL{Reference: ref, Series: series}, nil
 
=== modified file 'cmd/juju/deploy.go'
--- cmd/juju/deploy.go	2014-04-03 19:11:11 +0000
+++ cmd/juju/deploy.go	2014-04-09 22:48:20 +0000
@@ -34,8 +34,7 @@
 
 const deployDoc = `
 <charm name> can be a charm URL, or an unambiguously condensed form of it;
-assuming a current default series of "precise", the following forms will be
-accepted.
+assuming a current series of "precise", the following forms will be accepted:
 
 For cs:precise/mysql
   mysql
@@ -44,12 +43,16 @@
 For cs:~user/precise/mysql
   cs:~user/mysql
 
-For local:precise/mysql
-  local:mysql
+The current series is determined first by the default-series environment
+setting, followed by the preferred series for the charm in the charm store.
 
-In all cases, a versioned charm URL will be expanded as expected (for example,
+In these cases, a versioned charm URL will be expanded as expected (for example,
 mysql-33 becomes cs:precise/mysql-33).
 
+However, for local charms, when the default-series is not specified in the
+environment, one must specify the series. For example:
+  local:precise/mysql
+
 <service name>, if omitted, will be derived from <charm name>.
 
 Constraints can be specified when using deploy by specifying the --constraints
 
=== modified file 'provider/local/environprovider.go'
--- provider/local/environprovider.go	2014-04-01 21:11:50 +0000
+++ provider/local/environprovider.go	2014-04-09 22:48:20 +0000
@@ -256,6 +256,10 @@
     #
     # network-bridge: lxcbr0
 
+    # The default series to deploy the state-server and charms on.
+    #
+    # default-series: precise
+
 `[1:]
 }