Merge lp:~mattyw/juju-core/add-environment into lp:~go-bot/juju-core/trunk

[Matthew Williams]

add-environment command for importing jenv files

Added an add-environment command that can be used for importing jenv files.

https://codereview.appspot.com/82910046/

Unmerged revisions

2536. By Matthew Williams on 2014-04-03

started work on addenvironment command, supports name args and reading yaml from stdin

=== added file 'cmd/juju/addenvironment.go'
--- cmd/juju/addenvironment.go	1970-01-01 00:00:00 +0000
+++ cmd/juju/addenvironment.go	2014-04-03 13:57:05 +0000
@@ -0,0 +1,72 @@
+// Copyright 2014 Canonical Ltd.
+// Licensed under the AGPLv3, see LICENCE file for details.
+
+package main
+
+import (
+	"fmt"
+	"io/ioutil"
+
+	"launchpad.net/goyaml"
+	"launchpad.net/juju-core/cmd"
+	"launchpad.net/juju-core/cmd/envcmd"
+	"launchpad.net/juju-core/environs/configstore"
+)
+
+const addEnvDoc = `
+`
+
+type AddEnvironmentCommand struct {
+	envcmd.EnvCommandBase
+	InputEnvName string
+}
+
+func (c *AddEnvironmentCommand) Info() *cmd.Info {
+	return &cmd.Info{
+		Name:    "add-environment",
+		Args:    "",
+		Purpose: "",
+		Doc:     addEnvDoc,
+	}
+}
+
+func (c *AddEnvironmentCommand) Init(args []string) error {
+	err := c.EnvCommandBase.Init()
+	if err != nil {
+		return err
+	}
+	switch len(args) {
+	case 0:
+		return fmt.Errorf("no environment name supplied")
+	case 1:
+		c.InputEnvName = args[0]
+	default:
+		return cmd.CheckEmpty(args[1:])
+	}
+	return cmd.CheckEmpty(args[1:])
+}
+
+func (c *AddEnvironmentCommand) Run(ctx *cmd.Context) error {
+	stdinData, err := ioutil.ReadAll(ctx.GetStdin())
+	if err != nil {
+		return fmt.Errorf("couldn't read data from stdin %v", err)
+	}
+
+	envData := configstore.EnvironInfoData{}
+	err = goyaml.Unmarshal(stdinData, &envData)
+	if err != nil {
+		return fmt.Errorf("failed to parse input data %v", err)
+	}
+
+	store, err := configstore.Default()
+
+	envInfo, err := store.CreateInfo(c.InputEnvName)
+	if err != nil {
+		return fmt.Errorf("Failed to create info %v", err)
+	}
+
+	envInfo.SetAPICredentials(configstore.APICredentials{envData.User, envData.Password})
+	envInfo.SetAPIEndpoint(configstore.APIEndpoint{envData.StateServers, envData.CACert})
+
+	return envInfo.Write()
+}

=== added file 'cmd/juju/addenvironment_test.go'
--- cmd/juju/addenvironment_test.go	1970-01-01 00:00:00 +0000
+++ cmd/juju/addenvironment_test.go	2014-04-03 13:57:05 +0000
@@ -0,0 +1,61 @@
+// Copyright 2014 Canonical Ltd.
+// Licensed under the AGPLv3, see LICENCE file for details.
+
+package main
+
+import (
+	"bytes"
+
+	gc "launchpad.net/gocheck"
+
+	"launchpad.net/goyaml"
+
+	"launchpad.net/juju-core/cmd"
+	"launchpad.net/juju-core/environs/configstore"
+	jujutesting "launchpad.net/juju-core/juju/testing"
+	"launchpad.net/juju-core/testing"
+)
+
+type AddEnvironmentSuite struct {
+	jujutesting.RepoSuite
+}
+
+var _ = gc.Suite(&AddEnvironmentSuite{})
+
+func (s *AddEnvironmentSuite) TestTooManyArgs(c *gc.C) {
+	_, err := testing.RunCommand(c, &AddEnvironmentCommand{}, []string{"name", "whoops"})
+	c.Assert(err, gc.ErrorMatches, `unrecognized args: \["whoops"\]`)
+}
+
+func (s *AddEnvironmentSuite) TestNotEnoughArgs(c *gc.C) {
+	_, err := testing.RunCommand(c, &AddEnvironmentCommand{}, []string{})
+	c.Assert(err, gc.ErrorMatches, `no environment name supplied`)
+}
+
+func (s *AddEnvironmentSuite) TestAddEnvironment(c *gc.C) {
+	var stdin bytes.Buffer
+	ctx, err := cmd.DefaultContext()
+	c.Assert(err, gc.IsNil)
+	ctx.Stdin = &stdin
+
+	jenvData := configstore.EnvironInfoData{
+		"username",
+		"password",
+		[]string{"state-server"},
+		"cacert", map[string]interface{}{},
+	}
+	input, err := goyaml.Marshal(jenvData)
+	c.Assert(err, gc.IsNil)
+	stdin.WriteString(string(input))
+	_, errc := runCommand(ctx, new(AddEnvironmentCommand), "name")
+	c.Assert(<-errc, gc.IsNil)
+	store, err := configstore.Default()
+	c.Assert(err, gc.IsNil)
+
+	envInfo, err := store.ReadInfo("name")
+	c.Assert(err, gc.IsNil)
+	c.Assert(envInfo.APICredentials().User, gc.Equals, jenvData.User)
+	c.Assert(envInfo.APICredentials().Password, gc.Equals, jenvData.Password)
+	c.Assert(envInfo.APIEndpoint().Addresses, gc.DeepEquals, jenvData.StateServers)
+	c.Assert(envInfo.APIEndpoint().CACert, gc.Equals, jenvData.CACert)
+}