Merge pull request #408 from hmlanigan/start-of-v10

#408

Remove "cs" has a valid schema for a charm url. Part of removing charm store support from juju. Includes removal of "http" and "https" as they are resolved to a "cs".

Given this is a breaking change, update the package revision to 10.

All unit tests should pass, including the new one testing "cs" is not a valid schema.

base_test.go

@@ -13,7 +13,7 @@ import (
 	"github.com/juju/utils/v3/arch"
 	gc "gopkg.in/check.v1"
 
-	"github.com/juju/charm/v9"
+	"github.com/juju/charm/v10"
 )
 
 type baseSuite struct {

bundle_test.go

@@ -8,7 +8,7 @@ import (
 	jc "github.com/juju/testing/checkers"
 	gc "gopkg.in/check.v1"
 
-	"github.com/juju/charm/v9"
+	"github.com/juju/charm/v10"
 )
 
 var _ = gc.Suite(&BundleSuite{})
@@ -59,21 +59,21 @@ func checkWordpressBundle(c *gc.C, b charm.Bundle, path string) {
 	mysqlCharm := readCharmDir(c, "mysql")
 
 	bd := b.Data()
-	c.Assert(bd.RequiredCharms(), jc.DeepEquals, []string{"cs:mysql", "cs:wordpress"})
+	c.Assert(bd.RequiredCharms(), jc.DeepEquals, []string{"ch:mysql", "ch:wordpress"})
 
 	charms := map[string]charm.Charm{
-		"cs:wordpress": wordpressCharm,
-		"cs:mysql":     mysqlCharm,
+		"ch:wordpress": wordpressCharm,
+		"ch:mysql":     mysqlCharm,
 	}
 	err := bd.VerifyWithCharms(verifyOk, nil, nil, charms)
 	c.Assert(err, gc.IsNil)
 
 	c.Assert(bd.Applications, jc.DeepEquals, map[string]*charm.ApplicationSpec{
 		"wordpress": {
-			Charm: "cs:wordpress",
+			Charm: "ch:wordpress",
 		},
 		"mysql": {
-			Charm:    "cs:mysql",
+			Charm:    "ch:mysql",
 			NumUnits: 1,
 		},
 	})

bundlearchive_test.go

@@ -12,7 +12,7 @@ import (
 	jc "github.com/juju/testing/checkers"
 	gc "gopkg.in/check.v1"
 
-	"github.com/juju/charm/v9"
+	"github.com/juju/charm/v10"
 )
 
 var _ = gc.Suite(&BundleArchiveSuite{})

bundledata.go

@@ -640,9 +640,6 @@ func (verifier *bundleDataVerifier) verifyApplications() {
 				verifier.addErrorf("cannot specify revision in %q, please use revision", curl.String())
 			}
 			if app.Revision != nil {
-				if CharmStore.Matches(curl.Schema) && curl.Revision != -1 && curl.Revision != *app.Revision {
-					verifier.addErrorf("application %q has 2 different revisions specified, please choose 1", name)
-				}
 				if CharmHub.Matches(curl.Schema) && app.Channel == "" {
 					verifier.addErrorf("application %q with a revision requires a channel for future upgrades, please use channel", name)
 				}