Merge lp:~jameinel/juju-core/1.17-set-get-environment-compat-1253625 into lp:~go-bot/juju-core/trunk

[John A Meinel]

cmd/juju/environ.go: restore 1.16 compat

bug #1253625 is about "juju get-environment" and "juju
set-environment" not being compatible with a 1.16 API server because
Client.EnvironmentGet and Client.EnvironmentSet were not available.

So we fall back to direct DB access.

This replaces 'all' of SetEnvironment.Run because it has virtually no
other local logic. For GetEnvironment.Run we only replace the
EnvironmentGet step. (hence the different names for the functions.)

https://codereview.appspot.com/34750043/

cmd/juju/environ.go: restore 1.16 compat

bug #1253625 is about "juju get-environment" and "juju
set-environment" not being compatible with a 1.16 API server because
Client.EnvironmentGet and Client.EnvironmentSet were not available.

So we fall back to direct DB access.

This replaces 'all' of SetEnvironment.Run because it has virtually no
other local logic. For GetEnvironment.Run we only replace the
EnvironmentGet step. (hence the different names for the functions.)

https://codereview.appspot.com/34750043/

[John A Meinel (jameinel)]

Reviewers: mp+197059_code.launchpad.net,

Message:
Please take a look.

Description:
cmd/juju/environ.go: restore 1.16 compat

bug #1253625 is about "juju get-environment" and "juju
set-environment" not being compatible with a 1.16 API server because
Client.EnvironmentGet and Client.EnvironmentSet were not available.

So we fall back to direct DB access.

This replaces 'all' of SetEnvironment.Run because it has virtually no
other local logic. For GetEnvironment.Run we only replace the
EnvironmentGet step. (hence the different names for the functions.)

https://code.launchpad.net/~jameinel/juju-core/1.17-set-get-environment-compat-1253625/+merge/197059

(do not edit description out of merge proposal)

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

Affected files (+69, -1 lines):
   A [revision details]
   M cmd/juju/environment.go

Index: [revision details]
=== added file '[revision details]'
--- [revision details] 2012-01-01 00:00:00 +0000
+++ [revision details] 2012-01-01 00:00:00 +0000
@@ -0,0 +1,2 @@
+Old revision: tarmac-20131128093217-llqiq8yepsvtg5py
+New revision: <email address hidden>

Index: cmd/juju/environment.go
=== modified file 'cmd/juju/environment.go'
--- cmd/juju/environment.go 2013-11-06 10:51:34 +0000
+++ cmd/juju/environment.go 2013-11-28 12:52:51 +0000
@@ -11,6 +11,7 @@

   "launchpad.net/juju-core/cmd"
   "launchpad.net/juju-core/juju"
+ "launchpad.net/juju-core/rpc"
  )

  // GetEnvironmentCommand is able to output either the entire environment or
@@ -53,6 +54,26 @@
   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 {
@@ -61,6 +82,11 @@
   defer client.Close()

   attrs, err := client.EnvironmentGet()
+ if rpc.IsNoSuchRequest(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
   }
@@ -124,6 +150,40 @@
   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.N...

[Andrew Wilkins (axwalk)]

On 2013/11/28 12:53:09, jameinel wrote:
> Please take a look.

LGTM

https://codereview.appspot.com/34750043/

=== modified file 'cmd/juju/environment.go'
--- cmd/juju/environment.go	2013-11-06 10:51:34 +0000
+++ cmd/juju/environment.go	2013-11-28 12:53:06 +0000
@@ -11,6 +11,7 @@
 
 	"launchpad.net/juju-core/cmd"
 	"launchpad.net/juju-core/juju"
+	"launchpad.net/juju-core/rpc"
 )
 
 // GetEnvironmentCommand is able to output either the entire environment or
@@ -53,6 +54,26 @@
 	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 {
@@ -61,6 +82,11 @@
 	defer client.Close()
 
 	attrs, err := client.EnvironmentGet()
+	if rpc.IsNoSuchRequest(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
 	}
@@ -124,6 +150,40 @@
 	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()
+
+	// Here is the magic around setting the attributes:
+	// TODO(thumper): get this magic under test somewhere, and update other call-sites to use it.
+	// Get the existing environment config from the state.
+	oldConfig, err := conn.State.EnvironConfig()
+	if err != nil {
+		return err
+	}
+	// Apply the attributes specified for the command to the state config.
+	newConfig, err := oldConfig.Apply(c.values)
+	if err != nil {
+		return err
+	}
+	// Now validate this new config against the existing config via the provider.
+	provider := conn.Environ.Provider()
+	newProviderConfig, err := provider.Validate(newConfig, oldConfig)
+	if err != nil {
+		return err
+	}
+	// Now try to apply the new validated config.
+	return conn.State.SetEnvironConfig(newProviderConfig)
+}
+
 func (c *SetEnvironmentCommand) Run(ctx *cmd.Context) error {
 	client, err := juju.NewAPIClientFromName(c.EnvName)
 	if err != nil {
@@ -131,5 +191,11 @@
 	}
 	defer client.Close()
 
-	return client.EnvironmentSet(c.values)
+	err = client.EnvironmentSet(c.values)
+	if rpc.IsNoSuchRequest(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
 }