Merge pull request #15061 from manadart/develop-into-3.0-dqlite

Merge develop into 3.0 dqlite

.github/workflows/cla.yml

@@ -10,6 +10,6 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Check if CLA signed
-        uses: canonical/has-signed-canonical-cla@1.1.7
+        uses: canonical/has-signed-canonical-cla@1.2.0
         with:
           accept-existing-contributors: true

api/agent/caasoperator/client.go

@@ -4,7 +4,7 @@
 package caasoperator
 
 import (
-	"github.com/juju/charm/v9"
+	"github.com/juju/charm/v10"
 	"github.com/juju/errors"
 	"github.com/juju/names/v4"
 	"github.com/juju/version/v2"

api/agent/caasoperator/client_test.go

@@ -78,7 +78,7 @@ func (s *operatorSuite) TestCharm(c *gc.C) {
 		*(result.(*params.ApplicationCharmResults)) = params.ApplicationCharmResults{
 			Results: []params.ApplicationCharmResult{{
 				Result: &params.ApplicationCharm{
-					URL:                  "cs:foo/bar-1",
+					URL:                  "ch:foo/bar-1",
 					ForceUpgrade:         true,
 					SHA256:               "fake-sha256",
 					CharmModifiedVersion: 666,
@@ -93,7 +93,7 @@ func (s *operatorSuite) TestCharm(c *gc.C) {
 	info, err := client.Charm("gitlab")
 	c.Assert(err, jc.ErrorIsNil)
 	c.Assert(info.URL, gc.NotNil)
-	c.Assert(info.URL.String(), gc.Equals, "cs:foo/bar-1")
+	c.Assert(info.URL.String(), gc.Equals, "ch:foo/bar-1")
 	c.Assert(info.SHA256, gc.Equals, "fake-sha256")
 	c.Assert(info.ForceUpgrade, jc.IsTrue)
 	c.Assert(info.CharmModifiedVersion, gc.Equals, 666)

api/agent/metricsadder/client_test.go

@@ -112,7 +112,7 @@ func (s *metricsAdderIntegrationSuite) SetUpTest(c *gc.C) {
 
 	meteredCharm := s.Factory.MakeCharm(c, &factory.CharmParams{
 		Name: "metered",
-		URL:  "cs:quantal/metered",
+		URL:  "ch:quantal/metered",
 	})
 	meteredApp := s.Factory.MakeApplication(c, &factory.ApplicationParams{
 		Charm: meteredCharm,
@@ -133,7 +133,7 @@ func (s *metricsAdderIntegrationSuite) TestAddMetricBatches(c *gc.C) {
 		Tag: s.unitTag.String(),
 		Batch: params.MetricBatch{
 			UUID:     utils.MustNewUUID().String(),
-			CharmURL: "cs:quantal/metered",
+			CharmURL: "ch:quantal/metered",
 			Created:  time.Now(),
 			Metrics:  []params.Metric{{Key: "pings", Value: "5", Time: time.Now().UTC()}},
 		},

api/agent/uniter/application_test.go

@@ -65,7 +65,7 @@ func (s *applicationSuite) apiCallerFunc(c *gc.C) basetesting.APICallerFunc {
 			c.Assert(result, gc.FitsTypeOf, &params.StringBoolResults{})
 			*(result.(*params.StringBoolResults)) = params.StringBoolResults{
 				Results: []params.StringBoolResult{{
-					Result: "cs:mysql",
+					Result: "ch:mysql",
 					Ok:     true,
 				}},
 			}
@@ -159,7 +159,7 @@ func (s *applicationSuite) TestCharmURL(c *gc.C) {
 
 	curl, force, err := app.CharmURL()
 	c.Assert(err, jc.ErrorIsNil)
-	c.Assert(curl, gc.Equals, "cs:mysql")
+	c.Assert(curl, gc.Equals, "ch:mysql")
 	c.Assert(force, jc.IsTrue)
 }
 

api/agent/uniter/charm.go

@@ -6,7 +6,7 @@ package uniter
 import (
 	"fmt"
 
-	"github.com/juju/charm/v9"
+	"github.com/juju/charm/v10"
 	"github.com/juju/errors"
 
 	"github.com/juju/juju/rpc/params"

api/agent/uniter/charm_test.go

@@ -4,7 +4,7 @@
 package uniter_test
 
 import (
-	"github.com/juju/charm/v9"
+	"github.com/juju/charm/v10"
 	"github.com/juju/names/v4"
 	jc "github.com/juju/testing/checkers"
 	gc "gopkg.in/check.v1"
@@ -35,15 +35,15 @@ func (s *charmSuite) TestCharm(c *gc.C) {
 		return nil
 	})
 	client := uniter.NewState(apiCaller, names.NewUnitTag("mysql/0"))
-	curl := charm.MustParseURL("cs:mysql")
+	curl := charm.MustParseURL("ch:mysql")
 	ch, err := client.Charm(curl)
 	c.Assert(err, jc.ErrorIsNil)
 	c.Assert(ch.URL(), jc.DeepEquals, curl)
 	c.Assert(ch.String(), gc.Equals, curl.String())
 }
 
 func (s *charmSuite) TestArchiveSha256(c *gc.C) {
-	curl := charm.MustParseURL("cs:mysql")
+	curl := charm.MustParseURL("ch:mysql")
 	apiCaller := basetesting.APICallerFunc(func(objType string, version int, id, request string, arg, result interface{}) error {
 		c.Assert(objType, gc.Equals, "Uniter")
 		c.Assert(id, gc.Equals, "")
@@ -68,7 +68,7 @@ func (s *charmSuite) TestArchiveSha256(c *gc.C) {
 }
 
 func (s *charmSuite) TestLXDProfileRequired(c *gc.C) {
-	curl := charm.MustParseURL("cs:mysql")
+	curl := charm.MustParseURL("ch:mysql")
 	apiCaller := basetesting.APICallerFunc(func(objType string, version int, id, request string, arg, result interface{}) error {
 		c.Assert(objType, gc.Equals, "Uniter")
 		c.Assert(id, gc.Equals, "")

api/agent/uniter/endpoint.go

@@ -4,7 +4,7 @@
 package uniter
 
 import (
-	"github.com/juju/charm/v9"
+	"github.com/juju/charm/v10"
 )
 
 // Endpoint represents one endpoint of a relation. It is just a wrapper

api/agent/uniter/relation.go

@@ -4,7 +4,7 @@
 package uniter
 
 import (
-	"github.com/juju/charm/v9"
+	"github.com/juju/charm/v10"
 	"github.com/juju/errors"
 	"github.com/juju/names/v4"
 

api/agent/uniter/relation_test.go

@@ -4,7 +4,7 @@
 package uniter_test
 
 import (
-	"github.com/juju/charm/v9"
+	"github.com/juju/charm/v10"
 	"github.com/juju/names/v4"
 	jc "github.com/juju/testing/checkers"
 	gc "gopkg.in/check.v1"

api/agent/uniter/relationunit_test.go

@@ -4,7 +4,7 @@
 package uniter_test
 
 import (
-	"github.com/juju/charm/v9"
+	"github.com/juju/charm/v10"
 	"github.com/juju/names/v4"
 	jc "github.com/juju/testing/checkers"
 	gc "gopkg.in/check.v1"

api/agent/uniter/unit.go

@@ -6,7 +6,7 @@ package uniter
 import (
 	"time"
 
-	"github.com/juju/charm/v9"
+	"github.com/juju/charm/v10"
 	"github.com/juju/errors"
 	"github.com/juju/names/v4"
 

api/agent/uniter/unit_test.go

@@ -6,7 +6,7 @@ package uniter_test
 import (
 	"time"
 
-	"github.com/juju/charm/v9"
+	"github.com/juju/charm/v10"
 	"github.com/juju/errors"
 	"github.com/juju/names/v4"
 	"github.com/juju/testing"
@@ -433,7 +433,7 @@ func (s *unitSuite) TestCharmURL(c *gc.C) {
 		c.Assert(result, gc.FitsTypeOf, &params.StringBoolResults{})
 		*(result.(*params.StringBoolResults)) = params.StringBoolResults{
 			Results: []params.StringBoolResult{{
-				Result: "cs:mysql",
+				Result: "ch:mysql",
 			}},
 		}
 		return nil
@@ -443,7 +443,7 @@ func (s *unitSuite) TestCharmURL(c *gc.C) {
 	unit := uniter.CreateUnit(client, names.NewUnitTag("mysql/0"))
 	curl, err := unit.CharmURL()
 	c.Assert(err, jc.ErrorIsNil)
-	c.Assert(curl, gc.Equals, "cs:mysql")
+	c.Assert(curl, gc.Equals, "ch:mysql")
 }
 
 func (s *unitSuite) TestSetCharmURL(c *gc.C) {
@@ -452,7 +452,7 @@ func (s *unitSuite) TestSetCharmURL(c *gc.C) {
 		c.Assert(request, gc.Equals, "SetCharmURL")
 		c.Assert(arg, gc.DeepEquals, params.EntitiesCharmURL{
 			Entities: []params.EntityCharmURL{
-				{Tag: "unit-mysql-0", CharmURL: "cs:mysql"},
+				{Tag: "unit-mysql-0", CharmURL: "ch:mysql"},
 			},
 		})
 		c.Assert(result, gc.FitsTypeOf, &params.ErrorResults{})
@@ -464,7 +464,7 @@ func (s *unitSuite) TestSetCharmURL(c *gc.C) {
 	client := uniter.NewState(apiCaller, names.NewUnitTag("mysql/0"))
 
 	unit := uniter.CreateUnit(client, names.NewUnitTag("mysql/0"))
-	err := unit.SetCharmURL("cs:mysql")
+	err := unit.SetCharmURL("ch:mysql")
 	c.Assert(err, gc.ErrorMatches, "biff")
 }
 
@@ -791,7 +791,7 @@ func (s *unitSuite) TestAddMetricBatch(c *gc.C) {
 	uuid := utils.MustNewUUID().String()
 	batch := params.MetricBatch{
 		UUID:     uuid,
-		CharmURL: "cs:mysql",
+		CharmURL: "ch:mysql",
 		Created:  time.Now(),
 		Metrics:  metrics,
 	}

api/agent/uniter/uniter.go

@@ -6,7 +6,7 @@ package uniter
 import (
 	"fmt"
 
-	"github.com/juju/charm/v9"
+	"github.com/juju/charm/v10"
 	"github.com/juju/errors"
 	"github.com/juju/names/v4"
 

api/base/types.go

@@ -36,6 +36,7 @@ type ModelStatus struct {
 	HostedMachineCount int
 	ApplicationCount   int
 	UnitCount          int
+	Applications       []Application
 	Machines           []Machine
 	Volumes            []Volume
 	Filesystems        []Filesystem
@@ -57,6 +58,11 @@ type Machine struct {
 	HAPrimary *bool
 }
 
+// Application holds information about an application in a juju model.
+type Application struct {
+	Name string
+}
+
 // ModelInfo holds information about a model.
 type ModelInfo struct {
 	Name            string

api/client/application/client.go

@@ -8,7 +8,7 @@ import (
 	"strings"
 	"time"
 
-	"github.com/juju/charm/v9"
+	"github.com/juju/charm/v10"
 	"github.com/juju/collections/set"
 	"github.com/juju/errors"
 	"github.com/juju/loggo"

api/client/application/client_test.go

@@ -7,7 +7,7 @@ import (
 	stderrors "errors"
 	"time"
 
-	"github.com/juju/charm/v9"
+	"github.com/juju/charm/v10"
 	"github.com/juju/errors"
 	"github.com/juju/names/v4"
 	"github.com/juju/testing"
@@ -88,8 +88,8 @@ func (s *applicationSuite) TestDeploy(c *gc.C) {
 			c.Assert(ok, jc.IsTrue)
 			c.Assert(args.Applications, gc.HasLen, 1)
 			app := args.Applications[0]
-			c.Assert(app.CharmURL, gc.Equals, "cs:trusty/a-charm-1")
-			c.Assert(app.CharmOrigin, gc.DeepEquals, &params.CharmOrigin{Source: "charm-store"})
+			c.Assert(app.CharmURL, gc.Equals, "ch:a-charm-1")
+			c.Assert(app.CharmOrigin, gc.DeepEquals, &params.CharmOrigin{Source: "charm-hub"})
 			c.Assert(app.ApplicationName, gc.Equals, "applicationA")
 			c.Assert(app.NumUnits, gc.Equals, 1)
 			c.Assert(app.ConfigYAML, gc.Equals, "configYAML")
@@ -109,10 +109,10 @@ func (s *applicationSuite) TestDeploy(c *gc.C) {
 
 	args := application.DeployArgs{
 		CharmID: application.CharmID{
-			URL: charm.MustParseURL("cs:trusty/a-charm-1"),
+			URL: charm.MustParseURL("ch:a-charm-1"),
 		},
 		CharmOrigin: apicharm.Origin{
-			Source: apicharm.OriginCharmStore,
+			Source: apicharm.OriginCharmHub,
 		},
 		ApplicationName:  "applicationA",
 		NumUnits:         1,
@@ -153,10 +153,10 @@ func (s *applicationSuite) TestDeployAlreadyExists(c *gc.C) {
 
 	args := application.DeployArgs{
 		CharmID: application.CharmID{
-			URL: charm.MustParseURL("cs:trusty/a-charm-1"),
+			URL: charm.MustParseURL("ch:a-charm-1"),
 		},
 		CharmOrigin: apicharm.Origin{
-			Source: apicharm.OriginCharmStore,
+			Source: apicharm.OriginCharmHub,
 		},
 		ApplicationName:  "applicationA",
 		NumUnits:         1,
@@ -240,15 +240,15 @@ func (s *applicationSuite) TestApplicationGetCharmURLOrigin(c *gc.C) {
 		c.Assert(args.BranchName, gc.Equals, newBranchName)
 
 		result := response.(*params.CharmURLOriginResult)
-		result.URL = "cs:curl"
+		result.URL = "ch:curl"
 		result.Origin = params.CharmOrigin{
 			Risk: "edge",
 		}
 		return nil
 	})
 	curl, origin, err := client.GetCharmURLOrigin(newBranchName, "application")
 	c.Assert(err, jc.ErrorIsNil)
-	c.Assert(curl, gc.DeepEquals, charm.MustParseURL("cs:curl"))
+	c.Assert(curl, gc.DeepEquals, charm.MustParseURL("ch:curl"))
 	c.Assert(origin, gc.DeepEquals, apicharm.Origin{
 		Risk: "edge",
 	})
@@ -266,7 +266,7 @@ func (s *applicationSuite) TestSetCharm(c *gc.C) {
 		args, ok := a.(params.ApplicationSetCharm)
 		c.Assert(ok, jc.IsTrue)
 		c.Assert(args.ApplicationName, gc.Equals, "application")
-		c.Assert(args.CharmURL, gc.Equals, "cs:trusty/application-1")
+		c.Assert(args.CharmURL, gc.Equals, "ch:application-1")
 		c.Assert(args.CharmOrigin, gc.DeepEquals, &params.CharmOrigin{
 			Source: "charm-hub",
 			Risk:   "edge",
@@ -291,7 +291,7 @@ func (s *applicationSuite) TestSetCharm(c *gc.C) {
 	cfg := application.SetCharmConfig{
 		ApplicationName: "application",
 		CharmID: application.CharmID{
-			URL: charm.MustParseURL("cs:trusty/application-1"),
+			URL: charm.MustParseURL("ch:application-1"),
 			Origin: apicharm.Origin{
 				Source: "charm-hub",
 				Risk:   "edge",

api/client/applicationoffers/client.go

@@ -5,7 +5,7 @@ package applicationoffers
 
 import (
 	"github.com/go-macaroon-bakery/macaroon-bakery/v3/bakery"
-	"github.com/juju/charm/v9"
+	"github.com/juju/charm/v10"
 	"github.com/juju/errors"
 	"github.com/juju/loggo"
 	"github.com/juju/names/v4"

api/client/applicationoffers/client_test.go

@@ -7,7 +7,7 @@ import (
 	"fmt"
 	"time"
 
-	"github.com/juju/charm/v9"
+	"github.com/juju/charm/v10"
 	"github.com/juju/errors"
 	jc "github.com/juju/testing/checkers"
 	gc "gopkg.in/check.v1"
@@ -157,7 +157,7 @@ func (s *crossmodelMockSuite) TestList(c *gc.C) {
 				results.Results = []params.ApplicationOfferAdminDetails{{
 					ApplicationOfferDetails: offer,
 					ApplicationName:         "db2-app",
-					CharmURL:                "cs:db2-5",
+					CharmURL:                "ch:db2-5",
 					Connections: []params.OfferConnection{
 						{SourceModelTag: testing.ModelTag.String(), Username: "fred", RelationId: 3,
 							Endpoint: "db", Status: params.EntityStatus{Status: "joined", Info: "message", Since: &since},
@@ -178,7 +178,7 @@ func (s *crossmodelMockSuite) TestList(c *gc.C) {
 		OfferName:       offerName,
 		Endpoints:       []charm.Relation{{Name: "endPointA"}},
 		ApplicationName: "db2-app",
-		CharmURL:        "cs:db2-5",
+		CharmURL:        "ch:db2-5",
 		Connections: []jujucrossmodel.OfferConnection{
 			{SourceModelUUID: testing.ModelTag.Id(), Username: "fred", RelationId: 3,
 				Endpoint: "db", Status: "joined", Message: "message", Since: &since,
@@ -282,7 +282,7 @@ func (s *crossmodelMockSuite) TestShow(c *gc.C) {
 							},
 						},
 						ApplicationName: "db2-app",
-						CharmURL:        "cs:db2-5",
+						CharmURL:        "ch:db2-5",
 						Connections: []params.OfferConnection{
 							{SourceModelTag: testing.ModelTag.String(), Username: "fred", RelationId: 3,
 								Endpoint: "db", Status: params.EntityStatus{Status: "joined", Info: "message", Since: &since},
@@ -307,7 +307,7 @@ func (s *crossmodelMockSuite) TestShow(c *gc.C) {
 			{Name: "log", Role: "requirer", Interface: "http", Optional: false, Limit: 0, Scope: ""}},
 		ApplicationName:        "db2-app",
 		ApplicationDescription: "IBM DB2 Express Server Edition is an entry level database system",
-		CharmURL:               "cs:db2-5",
+		CharmURL:               "ch:db2-5",
 		Users: []jujucrossmodel.OfferUserDetails{
 			{UserName: "fred", DisplayName: "Fred", Access: "consume"},
 		},