feat: remove branches/generations

This removes branches/generations. This was never fully realised
and was always behind a feature flag. It was decided to remove this
and tackle it once the dqlite was done. The approach is to leave
the params/facades with the branch name and just set it to an
empty string. The underlying data/persistence model will change now
we're moving to dqlite.

Author: SimonRichardson

api/client/application/client.go

@@ -190,10 +190,9 @@ func (c *Client) Deploy(args DeployArgs) error {
 // given application is running at present.
 // The charm origin gives more information about the location of the charm and
 // what revision/channel it came from.
-func (c *Client) GetCharmURLOrigin(branchName, applicationName string) (*charm.URL, apicharm.Origin, error) {
+func (c *Client) GetCharmURLOrigin(applicationName string) (*charm.URL, apicharm.Origin, error) {
 	args := params.ApplicationGet{
 		ApplicationName: applicationName,
-		BranchName:      branchName,
 	}
 
 	var result params.CharmURLOriginResult
@@ -215,10 +214,10 @@ func (c *Client) GetCharmURLOrigin(branchName, applicationName string) (*charm.U
 // GetConfig returns the charm configuration settings for each of the
 // applications. If any of the applications are not found, an error is
 // returned.
-func (c *Client) GetConfig(branchName string, appNames ...string) ([]map[string]interface{}, error) {
+func (c *Client) GetConfig(appNames ...string) ([]map[string]interface{}, error) {
 	arg := params.ApplicationGetArgs{Args: make([]params.ApplicationGet, len(appNames))}
 	for i, appName := range appNames {
-		arg.Args[i] = params.ApplicationGet{ApplicationName: appName, BranchName: branchName}
+		arg.Args[i] = params.ApplicationGet{ApplicationName: appName}
 	}
 
 	var results params.ApplicationGetConfigResults
@@ -300,7 +299,7 @@ type SetCharmConfig struct {
 }
 
 // SetCharm sets the charm for a given application.
-func (c *Client) SetCharm(branchName string, cfg SetCharmConfig) error {
+func (c *Client) SetCharm(cfg SetCharmConfig) error {
 	var storageDirectives map[string]params.StorageDirectives
 	if len(cfg.StorageDirectives) > 0 {
 		storageDirectives = make(map[string]params.StorageDirectives)
@@ -337,7 +336,6 @@ func (c *Client) SetCharm(branchName string, cfg SetCharmConfig) error {
 		ResourceIDs:        cfg.ResourceIDs,
 		StorageDirectives:  storageDirectives,
 		EndpointBindings:   cfg.EndpointBindings,
-		Generation:         branchName,
 	}
 	return c.facade.FacadeCall(context.TODO(), "SetCharm", args, nil)
 }
@@ -684,11 +682,10 @@ func (c *Client) Unexpose(application string, endpoints []string) error {
 }
 
 // Get returns the configuration for the named application.
-func (c *Client) Get(branchName, application string) (*params.ApplicationGetResults, error) {
+func (c *Client) Get(application string) (*params.ApplicationGetResults, error) {
 	var results params.ApplicationGetResults
 	args := params.ApplicationGet{
 		ApplicationName: application,
-		BranchName:      branchName,
 	}
 	err := c.facade.FacadeCall(context.TODO(), "Get", args, &results)
 	return &results, err
@@ -799,11 +796,10 @@ func (c *Client) Consume(arg crossmodel.ConsumeApplicationArgs) (string, error)
 }
 
 // SetConfig sets configuration options on an application and the charm.
-func (c *Client) SetConfig(branchName, application, configYAML string, config map[string]string) error {
+func (c *Client) SetConfig(application, configYAML string, config map[string]string) error {
 	args := params.ConfigSetArgs{
 		Args: []params.ConfigSet{{
 			ApplicationName: application,
-			Generation:      branchName,
 			Config:          config,
 			ConfigYAML:      configYAML,
 		}},
@@ -817,11 +813,10 @@ func (c *Client) SetConfig(branchName, application, configYAML string, config ma
 }
 
 // UnsetApplicationConfig resets configuration options on an application.
-func (c *Client) UnsetApplicationConfig(branchName, application string, options []string) error {
+func (c *Client) UnsetApplicationConfig(application string, options []string) error {
 	args := params.ApplicationConfigUnsetArgs{
 		Args: []params.ApplicationUnset{{
 			ApplicationName: application,
-			BranchName:      branchName,
 			Options:         options,
 		}},
 	}

api/client/application/client_test.go

@@ -27,8 +27,6 @@ import (
 	"github.com/juju/juju/rpc/params"
 )
 
-const newBranchName = "new-branch"
-
 type applicationSuite struct{}
 
 var _ = gc.Suite(&applicationSuite{})
@@ -207,13 +205,12 @@ func (s *applicationSuite) TestApplicationGetCharmURLOrigin(c *gc.C) {
 	}
 	args := params.ApplicationGet{
 		ApplicationName: "application",
-		BranchName:      newBranchName,
 	}
 	mockFacadeCaller := mocks.NewMockFacadeCaller(ctrl)
 	mockFacadeCaller.EXPECT().FacadeCall(gomock.Any(), "GetCharmURLOrigin", args, result).SetArg(3, results).Return(nil)
 	client := application.NewClientFromCaller(mockFacadeCaller)
 
-	curl, origin, err := client.GetCharmURLOrigin(newBranchName, "application")
+	curl, origin, err := client.GetCharmURLOrigin("application")
 	c.Assert(err, jc.ErrorIsNil)
 	c.Assert(curl, gc.DeepEquals, charm.MustParseURL("ch:curl"))
 	c.Assert(origin, gc.DeepEquals, apicharm.Origin{
@@ -250,7 +247,6 @@ func (s *applicationSuite) TestSetCharm(c *gc.C) {
 			"b": {Count: toUint64Ptr(123)},
 			"c": {Size: toUint64Ptr(123)},
 		},
-		Generation: newBranchName,
 	}
 
 	c.Assert(args.ConfigSettingsYAML, gc.Equals, "yaml")
@@ -290,7 +286,7 @@ func (s *applicationSuite) TestSetCharm(c *gc.C) {
 	mockFacadeCaller.EXPECT().FacadeCall(gomock.Any(), "SetCharm", args, nil).Return(nil)
 
 	client := application.NewClientFromCaller(mockFacadeCaller)
-	err := client.SetCharm(newBranchName, cfg)
+	err := client.SetCharm(cfg)
 	c.Assert(err, jc.ErrorIsNil)
 }
 
@@ -309,7 +305,7 @@ func (s *applicationSuite) TestDestroyApplications(c *gc.C) {
 	}}
 	delay := 1 * time.Minute
 	result := new(params.DestroyApplicationResults)
-	results := params.DestroyApplicationResults{expectedResults}
+	results := params.DestroyApplicationResults{Results: expectedResults}
 	args := params.DestroyApplicationsParams{
 		Applications: []params.DestroyApplicationParams{
 			{ApplicationTag: "application-foo", Force: true, MaxWait: &delay},
@@ -713,8 +709,8 @@ func (s *applicationSuite) TestGetConfig(c *gc.C) {
 	defer ctrl.Finish()
 
 	args := params.ApplicationGetArgs{Args: []params.ApplicationGet{
-		{ApplicationName: "foo", BranchName: newBranchName},
-		{ApplicationName: "bar", BranchName: newBranchName},
+		{ApplicationName: "foo"},
+		{ApplicationName: "bar"},
 	}}
 	fooConfig := map[string]interface{}{
 		"outlook": map[string]interface{}{
@@ -754,7 +750,7 @@ func (s *applicationSuite) TestGetConfig(c *gc.C) {
 	mockFacadeCaller.EXPECT().FacadeCall(gomock.Any(), "CharmConfig", args, result).SetArg(3, results).Return(nil)
 
 	client := application.NewClientFromCaller(mockFacadeCaller)
-	res, err := client.GetConfig(newBranchName, "foo", "bar")
+	res, err := client.GetConfig("foo", "bar")
 	c.Assert(err, jc.ErrorIsNil)
 	c.Assert(res, jc.DeepEquals, []map[string]interface{}{
 		fooConfig, barConfig,
@@ -827,7 +823,6 @@ func (s *applicationSuite) TestSetConfig(c *gc.C) {
 			ApplicationName: "foo",
 			Config:          fooConfig,
 			ConfigYAML:      fooConfigYaml,
-			Generation:      newBranchName,
 		}}}
 	result := new(params.ErrorResults)
 	results := params.ErrorResults{
@@ -839,7 +834,7 @@ func (s *applicationSuite) TestSetConfig(c *gc.C) {
 	mockFacadeCaller.EXPECT().FacadeCall(gomock.Any(), "SetConfigs", args, result).SetArg(3, results).Return(nil)
 
 	client := application.NewClientFromCaller(mockFacadeCaller)
-	err := client.SetConfig(newBranchName, "foo", fooConfigYaml, fooConfig)
+	err := client.SetConfig("foo", fooConfigYaml, fooConfig)
 	c.Assert(err, gc.ErrorMatches, "FAIL")
 }
 
@@ -851,7 +846,6 @@ func (s *applicationSuite) TestUnsetApplicationConfig(c *gc.C) {
 		Args: []params.ApplicationUnset{{
 			ApplicationName: "foo",
 			Options:         []string{"option"},
-			BranchName:      newBranchName,
 		}},
 	}
 	result := new(params.ErrorResults)
@@ -864,7 +858,7 @@ func (s *applicationSuite) TestUnsetApplicationConfig(c *gc.C) {
 	mockFacadeCaller.EXPECT().FacadeCall(gomock.Any(), "UnsetApplicationsConfig", args, result).SetArg(3, results).Return(nil)
 
 	client := application.NewClientFromCaller(mockFacadeCaller)
-	err := client.UnsetApplicationConfig(newBranchName, "foo", []string{"option"})
+	err := client.UnsetApplicationConfig("foo", []string{"option"})
 	c.Assert(err, gc.ErrorMatches, "FAIL")
 }