Merge lp:~axwalk/juju-core/remove-1.16-client-support into lp:~go-bot/juju-core/trunk

[Andrew Wilkins]

Remove 1.16 support code

This drops most of the 1.16 support code from
the client-side. There's more to remove, this
is just a start.

https://codereview.appspot.com/84520046/

Remove 1.16 support code

This drops most of the 1.16 support code from
the client-side. There's more to remove, this
is just a start.

https://codereview.appspot.com/84520046/

[Andrew Wilkins (axwalk)]

Reviewers: mp+214504_code.launchpad.net,

Message:
Please take a look.

Description:
Remove 1.16 support code

This drops most of the 1.16 support code from
the client-side. There's more to remove, this
is just a start.

https://code.launchpad.net/~axwalk/juju-core/remove-1.16-client-support/+merge/214504

(do not edit description out of merge proposal)

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

Affected files (+23, -669 lines):
   A [revision details]
   M cmd/juju/addmachine.go
   M cmd/juju/common.go
   M cmd/juju/constraints.go
   M cmd/juju/deploy.go
   M cmd/juju/destroymachine.go
   M cmd/juju/environment.go
   M cmd/juju/set.go
   M cmd/juju/status.go
   M cmd/juju/unset.go
   cmd/juju/upgradecharm.go
   M cmd/juju/upgradejuju.go
   M environs/manual/provisioner.go
   D state/statecmd/destroymachines.go

[Ian Booth (wallyworld)]

LGTM. Woohoo!

https://codereview.appspot.com/84520046/

=== modified file 'cmd/juju/addmachine.go'
--- cmd/juju/addmachine.go	2014-04-03 04:46:51 +0000
+++ cmd/juju/addmachine.go	2014-04-07 10:13:32 +0000
@@ -12,12 +12,10 @@
 	"launchpad.net/juju-core/cmd"
 	"launchpad.net/juju-core/cmd/envcmd"
 	"launchpad.net/juju-core/constraints"
-	"launchpad.net/juju-core/environs/config"
 	"launchpad.net/juju-core/environs/manual"
 	"launchpad.net/juju-core/instance"
 	"launchpad.net/juju-core/juju"
 	"launchpad.net/juju-core/names"
-	"launchpad.net/juju-core/state"
 	"launchpad.net/juju-core/state/api/params"
 )
 
@@ -114,46 +112,6 @@
 	return err
 }
 
-// addMachine1dot16 runs Client.AddMachines using a direct DB connection to maintain
-// compatibility with an API server running 1.16 or older (when AddMachines
-// was not available). This fallback can be removed when we no longer maintain
-// 1.16 compatibility.
-// This was copied directly from the code in AddMachineCommand.Run in 1.16
-func (c *AddMachineCommand) addMachine1dot16() (string, error) {
-	conn, err := juju.NewConnFromName(c.EnvName)
-	if err != nil {
-		return "", err
-	}
-	defer conn.Close()
-
-	series := c.Series
-	if series == "" {
-		conf, err := conn.State.EnvironConfig()
-		if err != nil {
-			return "", err
-		}
-		series = config.PreferredSeries(conf)
-	}
-	template := state.MachineTemplate{
-		Series:      series,
-		Constraints: c.Constraints,
-		Jobs:        []state.MachineJob{state.JobHostUnits},
-	}
-	var m *state.Machine
-	switch {
-	case c.ContainerType == "":
-		m, err = conn.State.AddOneMachine(template)
-	case c.MachineId != "":
-		m, err = conn.State.AddMachineInsideMachine(template, c.MachineId, c.ContainerType)
-	default:
-		m, err = conn.State.AddMachineInsideNewMachine(template, template, c.ContainerType)
-	}
-	if err != nil {
-		return "", err
-	}
-	return m.String(), err
-}
-
 func (c *AddMachineCommand) Run(ctx *cmd.Context) error {
 	if c.SSHHost != "" {
 		args := manual.ProvisionMachineArgs{
@@ -181,25 +139,15 @@
 		Jobs:          []params.MachineJob{params.JobHostUnits},
 	}
 	results, err := client.AddMachines([]params.AddMachineParams{machineParams})
-	var machineId string
-	if params.IsCodeNotImplemented(err) {
-		logger.Infof("AddMachines not supported by the API server, " +
-			"falling back to 1.16 compatibility mode (direct DB access)")
-		machineId, err = c.addMachine1dot16()
-	} else if err != nil {
-		return err
-	} else {
-		// Currently, only one machine is added, but in future there may be several added in one call.
-		machineInfo := results[0]
-		var machineErr *params.Error
-		machineId, machineErr = machineInfo.Machine, machineInfo.Error
-		if machineErr != nil {
-			err = machineErr
-		}
-	}
 	if err != nil {
 		return err
 	}
+	// Currently, only one machine is added, but in future there may be several added in one call.
+	machineInfo := results[0]
+	if machineInfo.Error != nil {
+		return machineInfo.Error
+	}
+	machineId := machineInfo.Machine
 	if c.ContainerType == "" {
 		logger.Infof("created machine %v", machineId)
 	} else {
 
=== modified file 'cmd/juju/common.go'
--- cmd/juju/common.go	2014-04-03 15:55:07 +0000
+++ cmd/juju/common.go	2014-04-07 10:13:32 +0000
@@ -69,18 +69,3 @@
 	}
 	return &charm.URL{Reference: ref, Series: series}, nil
 }
-
-// resolveCharmURL1dot16 returns a resolved charm URL for older state servers
-// that do not support ResolveCharm. The default series "precise" is
-// appropriate for these environments.
-func resolveCharmURL1dot16(url string, conf *config.Config) (*charm.URL, error) {
-	ref, series, err := charm.ParseReference(url)
-	if err != nil {
-		return nil, err
-	}
-
-	if series == "" {
-		series = config.PreferredSeries(conf)
-	}
-	return &charm.URL{Reference: ref, Series: series}, err
-}
 
=== modified file 'cmd/juju/constraints.go'
--- cmd/juju/constraints.go	2014-04-01 04:53:43 +0000
+++ cmd/juju/constraints.go	2014-04-07 10:13:32 +0000
@@ -13,7 +13,6 @@
 	"launchpad.net/juju-core/constraints"
 	"launchpad.net/juju-core/juju"
 	"launchpad.net/juju-core/names"
-	"launchpad.net/juju-core/state/api/params"
 )
 
 const getConstraintsDoc = `
@@ -93,21 +92,6 @@
 	return cmd.CheckEmpty(args)
 }
 
-// getEnvironConstraints1dot16 uses direct DB access to get the Environment
-// constraints against an API server running 1.16 or older (when GetEnvironmentConstraints
-// was not available). This fallback can be removed when we no longer maintain
-// 1.16 compatibility.
-// This only does the GetEnvironmentConstraints portion of Run, since
-// GetServiceConstraints was already implemented.
-func (c *GetConstraintsCommand) getEnvironConstraints1dot16() (constraints.Value, error) {
-	conn, err := juju.NewConnFromName(c.EnvName)
-	if err != nil {
-		return constraints.Value{}, err
-	}
-	defer conn.Close()
-	return conn.State.EnvironConstraints()
-}
-
 func (c *GetConstraintsCommand) Run(ctx *cmd.Context) error {
 	apiclient, err := juju.NewAPIClientFromName(c.EnvName)
 	if err != nil {
@@ -118,11 +102,6 @@
 	var cons constraints.Value
 	if c.ServiceName == "" {
 		cons, err = apiclient.GetEnvironmentConstraints()
-		if params.IsCodeNotImplemented(err) {
-			logger.Infof("GetEnvironmentConstraints not supported by the API server, " +
-				"falling back to 1.16 compatibility mode (direct DB access)")
-			cons, err = c.getEnvironConstraints1dot16()
-		}
 	} else {
 		cons, err = apiclient.GetServiceConstraints(c.ServiceName)
 	}
@@ -166,21 +145,6 @@
 	return err
 }
 
-// setEnvironConstraints1dot16 uses direct DB access to get the Environment
-// constraints against an API server running 1.16 or older (when SetEnvironmentConstraints
-// was not available). This fallback can be removed when we no longer maintain
-// 1.16 compatibility.
-// This only does the SetEnvironmentConstraints portion of Run, since
-// SetServiceConstraints was already implemented.
-func (c *SetConstraintsCommand) setEnvironConstraints1dot16() error {
-	conn, err := juju.NewConnFromName(c.EnvName)
-	if err != nil {
-		return err
-	}
-	defer conn.Close()
-	return conn.State.SetEnvironConstraints(c.Constraints)
-}
-
 func (c *SetConstraintsCommand) Run(_ *cmd.Context) (err error) {
 	apiclient, err := juju.NewAPIClientFromName(c.EnvName)
 	if err != nil {
@@ -188,13 +152,7 @@
 	}
 	defer apiclient.Close()
 	if c.ServiceName == "" {
-		err = apiclient.SetEnvironmentConstraints(c.Constraints)
-		if params.IsCodeNotImplemented(err) {
-			logger.Infof("SetEnvironmentConstraints not supported by the API server, " +
-				"falling back to 1.16 compatibility mode (direct DB access)")
-			err = c.setEnvironConstraints1dot16()
-		}
-		return err
+		return apiclient.SetEnvironmentConstraints(c.Constraints)
 	}
 	return apiclient.SetServiceConstraints(c.ServiceName, c.Constraints)
 }
 
=== modified file 'cmd/juju/deploy.go'
--- cmd/juju/deploy.go	2014-04-03 04:46:51 +0000
+++ cmd/juju/deploy.go	2014-04-07 10:13:32 +0000
@@ -142,11 +142,6 @@
 	defer client.Close()
 
 	attrs, err := client.EnvironmentGet()
-	if params.IsCodeNotImplemented(err) {
-		logger.Infof("EnvironmentGet not supported by the API server, " +
-			"falling back to 1.16 compatibility mode (direct DB access)")
-		return c.run1dot16(ctx)
-	}
 	if err != nil {
 		return err
 	}
@@ -249,79 +244,6 @@
 	return err
 }
 
-// run1dot16 implements the deploy command in 1.16 compatibility mode,
-// with direct state access. Remove this when support for 1.16 is
-// dropped.
-func (c *DeployCommand) run1dot16(ctx *cmd.Context) error {
-	conn, err := juju.NewConnFromName(c.EnvName)
-	if err != nil {
-		return err
-	}
-	defer conn.Close()
-	conf, err := conn.State.EnvironConfig()
-	if err != nil {
-		return err
-	}
-
-	curl, err := resolveCharmURL1dot16(c.CharmName, conf)
-	if err != nil {
-		return err
-	}
-
-	repo, err := charm.InferRepository(curl.Reference, c.RepoPath)
-	if err != nil {
-		return err
-	}
-	repo = config.SpecializeCharmRepo(repo, conf)
-
-	// TODO(fwereade) it's annoying to roundtrip the bytes through the client
-	// here, but it's the original behaviour and not convenient to change.
-	// PutCharm will always be required in some form for local charms; and we
-	// will need an EnsureStoreCharm method somewhere that gets the state.Charm
-	// for use in the following checks.
-	ch, err := conn.PutCharm(curl, repo, c.BumpRevision)
-	if err != nil {
-		return err
-	}
-	numUnits := c.NumUnits
-	if ch.Meta().Subordinate {
-		if !constraints.IsEmpty(&c.Constraints) {
-			return errors.New("cannot use --constraints with subordinate service")
-		}
-		if numUnits == 1 && c.ToMachineSpec == "" {
-			numUnits = 0
-		} else {
-			return errors.New("cannot use --num-units or --to with subordinate service")
-		}
-	}
-
-	serviceName := c.ServiceName
-	if serviceName == "" {
-		serviceName = ch.Meta().Name
-	}
-	var settings charm.Settings
-	if c.Config.Path != "" {
-		configYAML, err := c.Config.Read(ctx)
-		if err != nil {
-			return err
-		}
-		settings, err = ch.Config().ParseSettingsYAML(configYAML, serviceName)
-		if err != nil {
-			return err
-		}
-	}
-	_, err = juju.DeployService(conn.State,
-		juju.DeployServiceParams{
-			ServiceName:    serviceName,
-			Charm:          ch,
-			NumUnits:       numUnits,
-			ConfigSettings: settings,
-			Constraints:    c.Constraints,
-			ToMachineSpec:  c.ToMachineSpec,
-		})
-	return err
-}
-
 // addCharmViaAPI calls the appropriate client API calls to add the
 // given charm URL to state. Also displays the charm URL of the added
 // charm on stdout.
 
=== modified file 'cmd/juju/destroymachine.go'
--- cmd/juju/destroymachine.go	2014-04-01 04:53:43 +0000
+++ cmd/juju/destroymachine.go	2014-04-07 10:13:32 +0000
@@ -12,8 +12,6 @@
 	"launchpad.net/juju-core/cmd/envcmd"
 	"launchpad.net/juju-core/juju"
 	"launchpad.net/juju-core/names"
-	"launchpad.net/juju-core/state/api/params"
-	"launchpad.net/juju-core/state/statecmd"
 )
 
 // DestroyMachineCommand causes an existing machine to be destroyed.
@@ -62,21 +60,6 @@
 	return nil
 }
 
-func (c *DestroyMachineCommand) run1dot16() error {
-	if c.Force {
-		return fmt.Errorf("destroy-machine --force is not supported in Juju servers older than 1.16.4")
-	}
-	conn, err := juju.NewConnFromName(c.EnvName)
-	if err != nil {
-		return err
-	}
-	defer conn.Close()
-	// TODO: When this run1dot16 code is removed, we should remove the
-	// method in state as well (as long as add-machine also no longer
-	// needs it.)
-	return statecmd.DestroyMachines1dot16(conn.State, c.MachineIds...)
-}
-
 func (c *DestroyMachineCommand) Run(_ *cmd.Context) error {
 	apiclient, err := juju.NewAPIClientFromName(c.EnvName)
 	if err != nil {
@@ -84,15 +67,7 @@
 	}
 	defer apiclient.Close()
 	if c.Force {
-		err = apiclient.ForceDestroyMachines(c.MachineIds...)
-	} else {
-		err = apiclient.DestroyMachines(c.MachineIds...)
-	}
-	// Juju 1.16.3 and older did not have DestroyMachines as an API command.
-	if params.IsCodeNotImplemented(err) {
-		logger.Infof("DestroyMachines not supported by the API server, " +
-			"falling back to <=1.16.3 compatibility")
-		return c.run1dot16()
-	}
-	return err
+		return apiclient.ForceDestroyMachines(c.MachineIds...)
+	}
+	return apiclient.DestroyMachines(c.MachineIds...)
 }
 
=== modified file 'cmd/juju/environment.go'
--- cmd/juju/environment.go	2014-04-01 14:31:22 +0000
+++ cmd/juju/environment.go	2014-04-07 10:13:32 +0000
@@ -12,7 +12,6 @@
 	"launchpad.net/juju-core/cmd"
 	"launchpad.net/juju-core/cmd/envcmd"
 	"launchpad.net/juju-core/juju"
-	"launchpad.net/juju-core/state/api/params"
 )
 
 // GetEnvironmentCommand is able to output either the entire environment or
@@ -59,26 +58,6 @@
 	return
 }
 
-// environmentGet1dot16 runs matches client.EnvironmentGet using a direct DB
-// connection to maintain compatibility with an API server running 1.16 or
-// older (when EnvironmentGet was not available). This fallback can be removed
-// when we no longer maintain 1.16 compatibility.
-func (c *GetEnvironmentCommand) environmentGet1dot16() (map[string]interface{}, error) {
-	conn, err := juju.NewConnFromName(c.EnvName)
-	if err != nil {
-		return nil, err
-	}
-	defer conn.Close()
-
-	// Get the existing environment config from the state.
-	config, err := conn.State.EnvironConfig()
-	if err != nil {
-		return nil, err
-	}
-	attrs := config.AllAttrs()
-	return attrs, nil
-}
-
 func (c *GetEnvironmentCommand) Run(ctx *cmd.Context) error {
 	client, err := juju.NewAPIClientFromName(c.EnvName)
 	if err != nil {
@@ -87,11 +66,6 @@
 	defer client.Close()
 
 	attrs, err := client.EnvironmentGet()
-	if params.IsCodeNotImplemented(err) {
-		logger.Infof("EnvironmentGet not supported by the API server, " +
-			"falling back to 1.16 compatibility mode (direct DB access)")
-		attrs, err = c.environmentGet1dot16()
-	}
 	if err != nil {
 		return err
 	}
@@ -159,36 +133,13 @@
 	return nil
 }
 
-// run1dot16 runs matches client.EnvironmentSet using a direct DB
-// connection to maintain compatibility with an API server running 1.16 or
-// older (when EnvironmentSet was not available). This fallback can be removed
-// when we no longer maintain 1.16 compatibility.
-// This content was copied from SetEnvironmentCommand.Run in 1.16
-func (c *SetEnvironmentCommand) run1dot16() error {
-	conn, err := juju.NewConnFromName(c.EnvName)
-	if err != nil {
-		return err
-	}
-	defer conn.Close()
-
-	// Update state config with new values
-	return conn.State.UpdateEnvironConfig(c.values, nil, nil)
-}
-
 func (c *SetEnvironmentCommand) Run(ctx *cmd.Context) error {
 	client, err := juju.NewAPIClientFromName(c.EnvName)
 	if err != nil {
 		return err
 	}
 	defer client.Close()
-
-	err = client.EnvironmentSet(c.values)
-	if params.IsCodeNotImplemented(err) {
-		logger.Infof("EnvironmentSet not supported by the API server, " +
-			"falling back to 1.16 compatibility mode (direct DB access)")
-		err = c.run1dot16()
-	}
-	return err
+	return client.EnvironmentSet(c.values)
 }
 
 // UnsetEnvironment
@@ -228,31 +179,11 @@
 	return nil
 }
 
-// run1dot16 runs matches client.EnvironmentUnset using a direct DB
-// connection to maintain compatibility with an API server running 1.16 or
-// older (when EnvironmentUnset was not available). This fallback can be removed
-// when we no longer maintain 1.16 compatibility.
-func (c *UnsetEnvironmentCommand) run1dot16() error {
-	conn, err := juju.NewConnFromName(c.EnvName)
-	if err != nil {
-		return err
-	}
-	defer conn.Close()
-	return conn.State.UpdateEnvironConfig(nil, c.keys, nil)
-}
-
 func (c *UnsetEnvironmentCommand) Run(ctx *cmd.Context) error {
 	client, err := juju.NewAPIClientFromName(c.EnvName)
 	if err != nil {
 		return err
 	}
 	defer client.Close()
-
-	err = client.EnvironmentUnset(c.keys...)
-	if params.IsCodeNotImplemented(err) {
-		logger.Infof("EnvironmentUnset not supported by the API server, " +
-			"falling back to 1.16 compatibility mode (direct DB access)")
-		err = c.run1dot16()
-	}
-	return err
+	return client.EnvironmentUnset(c.keys...)
 }
 
=== modified file 'cmd/juju/set.go'
--- cmd/juju/set.go	2014-04-01 04:53:43 +0000
+++ cmd/juju/set.go	2014-04-07 10:13:32 +0000
@@ -13,7 +13,6 @@
 	"launchpad.net/juju-core/cmd"
 	"launchpad.net/juju-core/cmd/envcmd"
 	"launchpad.net/juju-core/juju"
-	"launchpad.net/juju-core/state/api/params"
 )
 
 // SetCommand updates the configuration of a service.
@@ -64,34 +63,6 @@
 	return nil
 }
 
-// serviceSet1dot16 does the final ServiceSet step using direct DB access
-// compatibility with an API server running 1.16 or older (when ServiceUnset
-// was not available). This fallback can be removed when we no longer maintain
-// 1.16 compatibility.
-// This was copied directly from the code in SetCommand.Run in 1.16
-func (c *SetCommand) serviceSet1dot16() error {
-	conn, err := juju.NewConnFromName(c.EnvName)
-	if err != nil {
-		return err
-	}
-	defer conn.Close()
-	service, err := conn.State.Service(c.ServiceName)
-	if err != nil {
-		return err
-	}
-	ch, _, err := service.Charm()
-	if err != nil {
-		return err
-	}
-	// We don't need the multiple logic here, because that should have
-	// already been taken care of by the API code (which *was* in 1.16).
-	settings, err := ch.Config().ParseSettingsStrings(c.SettingsStrings)
-	if err != nil {
-		return err
-	}
-	return service.UpdateConfigSettings(settings)
-}
-
 // Run updates the configuration of a service.
 func (c *SetCommand) Run(ctx *cmd.Context) error {
 	api, err := juju.NewAPIClientFromName(c.EnvName)
@@ -109,13 +80,7 @@
 	} else if len(c.SettingsStrings) == 0 {
 		return nil
 	}
-	err = api.ServiceSet(c.ServiceName, c.SettingsStrings)
-	if params.IsCodeNotImplemented(err) {
-		logger.Infof("NewServiceSetForClientAPI not supported by the API server, " +
-			"falling back to 1.16 compatibility mode (direct DB access)")
-		err = c.serviceSet1dot16()
-	}
-	return err
+	return api.ServiceSet(c.ServiceName, c.SettingsStrings)
 }
 
 // parse parses the option k=v strings into a map of options to be
 
=== modified file 'cmd/juju/status.go'
--- cmd/juju/status.go	2014-04-01 04:53:43 +0000
+++ cmd/juju/status.go	2014-04-07 10:13:32 +0000
@@ -68,16 +68,6 @@
 %v
 `
 
-func (c *StatusCommand) getStatus1dot16() (*api.Status, error) {
-	conn, err := juju.NewConnFromName(c.EnvName)
-	if err != nil {
-		return nil, fmt.Errorf(connectionError, c.EnvName, err)
-	}
-	defer conn.Close()
-
-	return statecmd.Status(conn, c.patterns)
-}
-
 func (c *StatusCommand) Run(ctx *cmd.Context) error {
 	// Just verify the pattern validity client side, do not use the matcher
 	_, err := statecmd.NewUnitMatcher(c.patterns)
@@ -91,12 +81,6 @@
 	defer apiclient.Close()
 
 	status, err := apiclient.Status(c.patterns)
-	if params.IsCodeNotImplemented(err) {
-		logger.Infof("Status not supported by the API server, " +
-			"falling back to 1.16 compatibility mode " +
-			"(direct DB access)")
-		status, err = c.getStatus1dot16()
-	}
 	// Display any error, but continue to print status if some was returned
 	if err != nil {
 		fmt.Fprintf(ctx.Stderr, "%v\n", err)
 
=== modified file 'cmd/juju/unset.go'
--- cmd/juju/unset.go	2014-04-01 04:53:43 +0000
+++ cmd/juju/unset.go	2014-04-07 10:13:32 +0000
@@ -8,11 +8,9 @@
 
 	"launchpad.net/gnuflag"
 
-	"launchpad.net/juju-core/charm"
 	"launchpad.net/juju-core/cmd"
 	"launchpad.net/juju-core/cmd/envcmd"
 	"launchpad.net/juju-core/juju"
-	"launchpad.net/juju-core/state/api/params"
 )
 
 // UnsetCommand sets configuration values of a service back
@@ -58,32 +56,6 @@
 	return nil
 }
 
-// run1dot16 runs 'juju unset' using a direct DB connection to maintain
-// compatibility with an API server running 1.16 or older (when ServiceUnset
-// was not available). This fallback can be removed when we no longer maintain
-// 1.16 compatibility.
-// This was copied directly from the code in UnsetCommand.Run in 1.16
-func (c *UnsetCommand) run1dot16() error {
-	conn, err := juju.NewConnFromName(c.EnvName)
-	if err != nil {
-		return err
-	}
-	defer conn.Close()
-	service, err := conn.State.Service(c.ServiceName)
-	if err != nil {
-		return err
-	}
-	if len(c.Options) > 0 {
-		settings := make(charm.Settings)
-		for _, option := range c.Options {
-			settings[option] = nil
-		}
-		return service.UpdateConfigSettings(settings)
-	} else {
-		return nil
-	}
-}
-
 // Run resets the configuration of a service.
 func (c *UnsetCommand) Run(ctx *cmd.Context) error {
 	apiclient, err := juju.NewAPIClientFromName(c.EnvName)
@@ -91,11 +63,5 @@
 		return err
 	}
 	defer apiclient.Close()
-	err = apiclient.ServiceUnset(c.ServiceName, c.Options)
-	if params.IsCodeNotImplemented(err) {
-		logger.Infof("ServiceUnset not supported by the API server, " +
-			"falling back to 1.16 compatibility mode (direct DB access)")
-		err = c.run1dot16()
-	}
-	return err
+	return apiclient.ServiceUnset(c.ServiceName, c.Options)
 }
 
=== modified file 'cmd/juju/upgradecharm.go'
--- cmd/juju/upgradecharm.go	2014-04-03 15:05:14 +0000
+++ cmd/juju/upgradecharm.go	2014-04-07 10:13:32 +0000
@@ -16,7 +16,6 @@
 	"launchpad.net/juju-core/environs/config"
 	"launchpad.net/juju-core/juju"
 	"launchpad.net/juju-core/names"
-	"launchpad.net/juju-core/state/api/params"
 )
 
 // UpgradeCharm is responsible for upgrading a service's charm.
@@ -115,10 +114,6 @@
 	}
 	defer client.Close()
 	oldURL, err := client.ServiceGetCharmURL(c.ServiceName)
-	if params.IsCodeNotImplemented(err) {
-		logger.Infof("ServiceGetCharmURL is not implemented by the API server, switching to 1.16 compatibility mode (direct DB connection).")
-		return c.run1dot16(ctx)
-	}
 	if err != nil {
 		return err
 	}
@@ -178,79 +173,3 @@
 
 	return client.ServiceSetCharm(c.ServiceName, addedURL.String(), c.Force)
 }
-
-// run1dot16 perfoms the charm upgrade using a 1.16 compatible code
-// path, with a direct state connection. Remove once the support for
-// 1.16 is dropped.
-func (c *UpgradeCharmCommand) run1dot16(ctx *cmd.Context) error {
-	conn, err := juju.NewConnFromName(c.EnvName)
-	if err != nil {
-		return err
-	}
-	defer conn.Close()
-	service, err := conn.State.Service(c.ServiceName)
-	if err != nil {
-		return err
-	}
-
-	conf, err := conn.State.EnvironConfig()
-	if err != nil {
-		return err
-	}
-
-	oldURL, _ := service.CharmURL()
-	var newURL *charm.URL
-	if c.SwitchURL != "" {
-		// A new charm URL was explicitly specified.
-		newURL, err = resolveCharmURL1dot16(c.SwitchURL, conf)
-		if err != nil {
-			return err
-		}
-	} else {
-		// No new URL specified, but revision might have been.
-		newURL = oldURL.WithRevision(c.Revision)
-	}
-
-	repo, err := charm.InferRepository(newURL.Reference, ctx.AbsPath(c.RepoPath))
-	if err != nil {
-		return err
-	}
-	repo = config.SpecializeCharmRepo(repo, conf)
-
-	// If no explicit revision was set with either SwitchURL
-	// or Revision flags, discover the latest.
-	explicitRevision := true
-	if newURL.Revision == -1 {
-		explicitRevision = false
-		latest, err := charm.Latest(repo, newURL)
-		if err != nil {
-			return err
-		}
-		newURL = newURL.WithRevision(latest)
-	}
-	bumpRevision := false
-	if *newURL == *oldURL {
-		if explicitRevision {
-			return fmt.Errorf("already running specified charm %q", newURL)
-		}
-		// Only try bumping the revision when necessary (local dir charm).
-		if _, isLocal := repo.(*charm.LocalRepository); !isLocal {
-			// TODO(dimitern): If the --force flag is set to something
-			// different to before, we might actually want to allow this
-			// case (and the other error below). LP bug #1174287
-			return fmt.Errorf("already running latest charm %q", newURL)
-		}
-		// This is a local repository.
-		if ch, err := repo.Get(newURL); err != nil {
-			return err
-		} else if _, bumpRevision = ch.(*charm.Dir); !bumpRevision {
-			// Only bump the revision when it's a directory.
-			return fmt.Errorf("cannot increment revision of charm %q: not a directory", newURL)
-		}
-	}
-	sch, err := conn.PutCharm(newURL, repo, bumpRevision)
-	if err != nil {
-		return err
-	}
-	return service.SetCharm(sch, c.Force)
-}
 
=== modified file 'cmd/juju/upgradejuju.go'
--- cmd/juju/upgradejuju.go	2014-04-01 04:53:43 +0000
+++ cmd/juju/upgradejuju.go	2014-04-07 10:13:32 +0000
@@ -16,10 +16,8 @@
 	"launchpad.net/juju-core/environs"
 	"launchpad.net/juju-core/environs/bootstrap"
 	"launchpad.net/juju-core/environs/config"
-	"launchpad.net/juju-core/environs/storage"
 	"launchpad.net/juju-core/environs/sync"
 	envtools "launchpad.net/juju-core/environs/tools"
-	"launchpad.net/juju-core/errors"
 	"launchpad.net/juju-core/juju"
 	"launchpad.net/juju-core/state/api"
 	"launchpad.net/juju-core/state/api/params"
@@ -132,9 +130,6 @@
 
 	// Determine the version to upgrade to, uploading tools if necessary.
 	attrs, err := client.EnvironmentGet()
-	if params.IsCodeNotImplemented(err) {
-		return c.run1dot16()
-	}
 	if err != nil {
 		return err
 	}
@@ -372,94 +367,3 @@
 	}
 	return vers
 }
-
-// run1dot16 implements the command without access to the API. This is
-// needed for compatibility, so 1.16 can be upgraded to newer
-// releases. It should be removed in 1.18.
-func (c *UpgradeJujuCommand) run1dot16() error {
-	logger.Warningf("running in 1.16 compatibility mode")
-	conn, err := juju.NewConnFromName(c.EnvName)
-	if err != nil {
-		return err
-	}
-	defer conn.Close()
-	defer func() {
-		if err == errUpToDate {
-			logger.Infof(err.Error())
-			err = nil
-		}
-	}()
-
-	// Determine the version to upgrade to, uploading tools if necessary.
-	env := conn.Environ
-	cfg, err := conn.State.EnvironConfig()
-	if err != nil {
-		return err
-	}
-	context, err := c.initVersions1dot16(cfg, env)
-	if err != nil {
-		return err
-	}
-	if c.UploadTools {
-		series := bootstrap.SeriesToUpload(cfg, c.Series)
-		if err := context.uploadTools1dot16(env.Storage(), series); err != nil {
-			return err
-		}
-	}
-	if err := context.validate(); err != nil {
-		return err
-	}
-	logger.Infof("upgrade version chosen: %s", context.chosen)
-	logger.Infof("available tools: %s", context.tools)
-
-	if err := conn.State.SetEnvironAgentVersion(context.chosen); err != nil {
-		return err
-	}
-	logger.Infof("started upgrade to %s", context.chosen)
-	return nil
-}
-
-func (c *UpgradeJujuCommand) initVersions1dot16(cfg *config.Config, env environs.Environ) (*upgradeContext, error) {
-	agent, ok := cfg.AgentVersion()
-	if !ok {
-		// Can't happen. In theory.
-		return nil, fmt.Errorf("incomplete environment configuration")
-	}
-	if c.Version == agent {
-		return nil, errUpToDate
-	}
-	client := version.Current.Number
-	available, err := envtools.FindTools(env, client.Major, -1, coretools.Filter{}, envtools.DoNotAllowRetry)
-	if err != nil {
-		if !errors.IsNotFoundError(err) {
-			return nil, err
-		}
-		if !c.UploadTools {
-			// No tools found and we shouldn't upload any, so if we are not asking for a
-			// major upgrade, pretend there is no more recent version available.
-			if c.Version == version.Zero && agent.Major == client.Major {
-				return nil, errUpToDate
-			}
-			return nil, err
-		}
-	}
-	return &upgradeContext{
-		agent:  agent,
-		client: client,
-		chosen: c.Version,
-		tools:  available,
-	}, nil
-}
-
-func (context *upgradeContext) uploadTools1dot16(storage storage.Storage, series []string) error {
-	if context.chosen == version.Zero {
-		context.chosen = context.client
-	}
-	context.chosen = uploadVersion(context.chosen, context.tools)
-	uploaded, err := sync.Upload(storage, &context.chosen, series...)
-	if err != nil {
-		return err
-	}
-	context.tools = coretools.List{uploaded}
-	return nil
-}
 
=== modified file 'environs/manual/provisioner.go'
--- environs/manual/provisioner.go	2014-04-01 04:15:17 +0000
+++ environs/manual/provisioner.go	2014-04-07 10:13:32 +0000
@@ -21,7 +21,6 @@
 	"launchpad.net/juju-core/state"
 	"launchpad.net/juju-core/state/api"
 	"launchpad.net/juju-core/state/api/params"
-	"launchpad.net/juju-core/state/statecmd"
 	"launchpad.net/juju-core/tools"
 	"launchpad.net/juju-core/utils"
 	"launchpad.net/juju-core/utils/shell"
@@ -72,34 +71,14 @@
 	if err != nil {
 		return "", err
 	}
-	// Used for fallback to 1.16 code
-	var stateConn *juju.Conn
 	defer func() {
 		if machineId != "" && err != nil {
 			logger.Errorf("provisioning failed, removing machine %v: %v", machineId, err)
-			// If we have stateConn, then we are in 1.16
-			// compatibility mode and we should issue
-			// DestroyMachines directly on the state, rather than
-			// via API (because DestroyMachine *also* didn't exist
-			// in 1.16, though it will be in 1.16.5).
-			// TODO: When this compatibility code is removed, we
-			// should remove the method in state as well (as long
-			// as destroy-machine also no longer needs it.)
-			var cleanupErr error
-			if stateConn != nil {
-				cleanupErr = statecmd.DestroyMachines1dot16(stateConn.State, machineId)
-			} else {
-				cleanupErr = client.DestroyMachines(machineId)
-			}
-			if cleanupErr != nil {
+			if cleanupErr := client.DestroyMachines(machineId); cleanupErr != nil {
 				logger.Warningf("error cleaning up machine: %s", cleanupErr)
 			}
 			machineId = ""
 		}
-		if stateConn != nil {
-			stateConn.Close()
-			stateConn = nil
-		}
 		client.Close()
 	}()
 
@@ -120,35 +99,16 @@
 
 	// Inform Juju that the machine exists.
 	machineId, err = recordMachineInState(client, *machineParams)
-	if params.IsCodeNotImplemented(err) {
-		logger.Infof("AddMachines not supported by the API server, " +
-			"falling back to 1.16 compatibility mode (direct DB access)")
-		stateConn, err = juju.NewConnFromName(args.EnvName)
-		if err == nil {
-			machineId, err = recordMachineInState1dot16(stateConn, *machineParams)
-		}
-	}
 	if err != nil {
 		return "", err
 	}
 
-	var provisioningScript string
-	if stateConn == nil {
-		provisioningScript, err = client.ProvisioningScript(params.ProvisioningScriptParams{
-			MachineId: machineId,
-			Nonce:     machineParams.Nonce,
-		})
-		if err != nil {
-			return "", err
-		}
-	} else {
-		mcfg, err := statecmd.MachineConfig(stateConn.State, machineId, machineParams.Nonce, args.DataDir)
-		if err == nil {
-			provisioningScript, err = ProvisioningScript(mcfg)
-		}
-		if err != nil {
-			return "", err
-		}
+	provisioningScript, err := client.ProvisioningScript(params.ProvisioningScriptParams{
+		MachineId: machineId,
+		Nonce:     machineParams.Nonce,
+	})
+	if err != nil {
+		return "", err
 	}
 
 	// Finally, provision the machine agent.
@@ -194,28 +154,6 @@
 	return outJobs, nil
 }
 
-func recordMachineInState1dot16(
-	stateConn *juju.Conn, machineParams params.AddMachineParams) (machineId string, err error) {
-	stateJobs, err := convertToStateJobs(machineParams.Jobs)
-	if err != nil {
-		return "", err
-	}
-	template := state.MachineTemplate{
-		Series:      machineParams.Series,
-		Constraints: machineParams.Constraints,
-		InstanceId:  machineParams.InstanceId,
-		Jobs:        stateJobs,
-		Nonce:       machineParams.Nonce,
-		HardwareCharacteristics: machineParams.HardwareCharacteristics,
-		Addresses:               machineParams.Addrs,
-	}
-	machine, err := stateConn.State.AddOneMachine(template)
-	if err != nil {
-		return "", err
-	}
-	return machine.Id(), nil
-}
-
 // gatherMachineParams collects all the information we know about the machine
 // we are about to provision. It will SSH into that machine as the ubuntu user.
 // The hostname supplied should not include a username.
 
=== removed file 'state/statecmd/destroymachines.go'
--- state/statecmd/destroymachines.go	2013-12-10 12:24:25 +0000
+++ state/statecmd/destroymachines.go	1970-01-01 00:00:00 +0000
@@ -1,43 +0,0 @@
-// Copyright 2012, 2013 Canonical Ltd.
-// Licensed under the AGPLv3, see LICENCE file for details.
-
-package statecmd
-
-import (
-	"fmt"
-	"strings"
-
-	"launchpad.net/juju-core/errors"
-	"launchpad.net/juju-core/state"
-)
-
-// DestroyMachines1dot16 destroys the machines with the specified ids.
-// This is copied from the 1.16.3 code to enable compatibility. It should be
-// removed when we release a version that goes via the API only (whatever is
-// after 1.18)
-func DestroyMachines1dot16(st *state.State, ids ...string) (err error) {
-	var errs []string
-	for _, id := range ids {
-		machine, err := st.Machine(id)
-		switch {
-		case errors.IsNotFoundError(err):
-			err = fmt.Errorf("machine %s does not exist", id)
-		case err != nil:
-		case machine.Life() != state.Alive:
-			continue
-		default:
-			err = machine.Destroy()
-		}
-		if err != nil {
-			errs = append(errs, err.Error())
-		}
-	}
-	if len(errs) == 0 {
-		return nil
-	}
-	msg := "some machines were not destroyed"
-	if len(errs) == len(ids) {
-		msg = "no machines were destroyed"
-	}
-	return fmt.Errorf("%s: %s", msg, strings.Join(errs, "; "))
-}