Merge lp:~wallyworld/juju-core/gwacl-231 into lp:~go-bot/juju-core/trunk

[Ian Booth]

Update gwacl dependency to rev 231

We need this for a 1.16.6 release.

https://codereview.appspot.com/61800043/

[Ian Booth (wallyworld)]

Reviewers: mp+205697_code.launchpad.net,

Message:
Please take a look.

Description:
Update gwacl dependency to rev 231

We need this for a 1.16.6 release.

https://code.launchpad.net/~wallyworld/juju-core/gwacl-231/+merge/205697

(do not edit description out of merge proposal)

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

Affected files (+106, -39 lines):
   A [revision details]
   M cmd/juju/destroymachine.go
   M cmd/juju/destroymachine_test.go
   M cmd/juju/destroyservice.go
   M cmd/juju/main_test.go
   M cmd/jujud/bootstrap.go
   M dependencies.tsv
   M environs/httpstorage/storage.go
   M provider/common/bootstrap_test.go
   M provider/common/state.go
   M provider/common/state_test.go
   M scripts/win-installer/setup.iss
   M state/apiserver/client/client_test.go
   M state/cleanup.go
   M state/cleanup_test.go
   M version/version.go

=== modified file 'cmd/juju/destroymachine.go'
--- cmd/juju/destroymachine.go	2014-01-07 12:36:45 +0000
+++ cmd/juju/destroymachine.go	2014-02-11 06:08:00 +0000
@@ -35,7 +35,7 @@
 		Args:    "<machine> ...",
 		Purpose: "destroy machines",
 		Doc:     destroyMachineDoc,
-		Aliases: []string{"terminate-machine"},
+		Aliases: []string{"remove-machine", "terminate-machine"},
 	}
 }
 

=== modified file 'cmd/juju/destroymachine_test.go'
--- cmd/juju/destroymachine_test.go	2014-01-24 14:26:05 +0000
+++ cmd/juju/destroymachine_test.go	2014-02-11 06:08:00 +0000
@@ -105,6 +105,10 @@
 	c.Assert(err, gc.IsNil)
 	err = u.Refresh()
 	c.Assert(err, jc.Satisfies, errors.IsNotFoundError)
+	err = m0.Refresh()
+	c.Assert(err, gc.IsNil)
+	c.Assert(m0.Life(), gc.Equals, state.Dead)
+
 	err = m1.Refresh()
 	c.Assert(err, gc.IsNil)
 	c.Assert(m1.Life(), gc.Equals, state.Dead)

=== modified file 'cmd/juju/destroyservice.go'
--- cmd/juju/destroyservice.go	2013-11-01 07:49:22 +0000
+++ cmd/juju/destroyservice.go	2014-02-11 06:08:00 +0000
@@ -23,6 +23,7 @@
 		Args:    "<service>",
 		Purpose: "destroy a service",
 		Doc:     "Destroying a service will destroy all its units and relations.",
+		Aliases: []string{"remove-service"},
 	}
 }
 

=== modified file 'cmd/juju/main_test.go'
--- cmd/juju/main_test.go	2014-01-22 23:36:28 +0000
+++ cmd/juju/main_test.go	2014-02-11 06:08:00 +0000
@@ -234,7 +234,9 @@
 	"help-tool",
 	"init",
 	"publish",
+	"remove-machine",  // alias for destroy-machine
 	"remove-relation", // alias for destroy-relation
+	"remove-service",  // alias for destroy-service
 	"remove-unit",     // alias for destroy-unit
 	"resolved",
 	"run",

=== modified file 'cmd/jujud/bootstrap.go'
--- cmd/jujud/bootstrap.go	2014-02-05 08:01:22 +0000
+++ cmd/jujud/bootstrap.go	2014-02-11 06:08:00 +0000
@@ -62,7 +62,11 @@
 		return fmt.Errorf("cannot read provider-state-url file: %v", err)
 	}
 	stateInfoURL := strings.Split(string(data), "\n")[0]
+<<<<<<< TREE
 	bsState, err := bootstrap.LoadStateFromURL(stateInfoURL)
+=======
+	bsState, err := common.LoadStateFromURL(stateInfoURL, !cfg.SSLHostnameVerification())
+>>>>>>> MERGE-SOURCE
 	if err != nil {
 		return fmt.Errorf("cannot load state from URL %q (read from %q): %v", stateInfoURL, providerStateURLFile, err)
 	}

=== modified file 'dependencies.tsv'
--- dependencies.tsv	2014-02-05 05:01:01 +0000
+++ dependencies.tsv	2014-02-11 06:08:00 +0000
@@ -10,6 +10,11 @@
 launchpad.net/gomaasapi	bzr	[e-mail]-20131017011445-m1hmr0ap14osd7li	47
 launchpad.net/goose	bzr	tarmac-20140124165235-h9rloooc531udms5	116
 launchpad.net/goyaml	bzr	[e-mail]-20131114120802-abe042syx64z2m7s	50
-launchpad.net/gwacl	bzr	tarmac-20140205045433-81h182mhz24fzp5e	231
+<<<<<<< TREE
+launchpad.net/gwacl	bzr	tarmac-20140205045433-81h182mhz24fzp5e	231
+=======
+launchpad.net/gwacl	bzr	tarmac-20140205045433-81h182mhz24fzp5e	231
+launchpad.net/loggo	bzr	[e-mail]-20130729043644-ym0cscir1cist4sm	39
+>>>>>>> MERGE-SOURCE
 launchpad.net/lpad	bzr	[e-mail]-20120626194701-536yx0g9jdq2ik3h	64
 launchpad.net/tomb	bzr	[e-mail]-20130531003818-70ikdgklbxopn8x4	17

=== modified file 'environs/httpstorage/storage.go'
--- environs/httpstorage/storage.go	2013-10-17 22:48:19 +0000
+++ environs/httpstorage/storage.go	2014-02-11 06:08:00 +0000
@@ -62,12 +62,15 @@
 }
 
 func (s *localStorage) getHTTPSBaseURL() (string, error) {
-	url, _ := s.URL("/") // never fails
+	url, _ := s.URL("") // never fails
 	resp, err := s.client.Head(url)
 	if err != nil {
 		return "", err
 	}
 	resp.Body.Close()
+	if resp.StatusCode != http.StatusOK {
+		return "", fmt.Errorf("Could not access file storage: %v %s", url, resp.Status)
+	}
 	httpsURL, err := resp.Location()
 	if err != nil {
 		return "", err

=== modified file 'provider/common/bootstrap_test.go'
--- provider/common/bootstrap_test.go	2014-01-30 17:27:26 +0000
+++ provider/common/bootstrap_test.go	2014-02-11 06:08:00 +0000
@@ -235,7 +235,11 @@
 	err := common.Bootstrap(ctx, env, constraints.Value{})
 	c.Assert(err, gc.IsNil)
 
+<<<<<<< TREE
 	savedState, err := bootstrap.LoadStateFromURL(checkURL)
+=======
+	savedState, err := common.LoadStateFromURL(checkURL, false)
+>>>>>>> MERGE-SOURCE
 	c.Assert(err, gc.IsNil)
 	c.Assert(savedState, gc.DeepEquals, &bootstrap.BootstrapState{
 		StateInstances:  []instance.Id{instance.Id(checkInstanceId)},

=== modified file 'provider/common/state.go'
--- provider/common/state.go	2013-11-18 04:53:44 +0000
+++ provider/common/state.go	2014-02-11 06:08:00 +0000
@@ -14,8 +14,98 @@
 	"launchpad.net/juju-core/log"
 	"launchpad.net/juju-core/state"
 	"launchpad.net/juju-core/state/api"
+	"launchpad.net/juju-core/utils"
 )
 
+<<<<<<< TREE
+=======
+// StateFile is the name of the file where the provider's state is stored.
+const StateFile = "provider-state"
+
+// BootstrapState is the state information that is stored in StateFile.
+//
+// Individual providers may define their own state structures instead of
+// this one, and use their own code for loading and saving those, but this is
+// the definition that most practically useful providers share unchanged.
+type BootstrapState struct {
+	// StateInstances are the state servers.
+	StateInstances []instance.Id `yaml:"state-instances"`
+	// Characteristics reflect the hardware each state server is running on.
+	// This is used at bootstrap time so the state server knows what hardware it has.
+	// The state *may* be updated later without this information, but by then it's
+	// served it's purpose.
+	Characteristics []instance.HardwareCharacteristics `yaml:"characteristics,omitempty"`
+}
+
+// putState writes the given data to the state file on the given storage.
+// The file's name is as defined in StateFile.
+func putState(storage storage.StorageWriter, data []byte) error {
+	return storage.Put(StateFile, bytes.NewBuffer(data), int64(len(data)))
+}
+
+// CreateStateFile creates an empty state file on the given storage, and
+// returns its URL.
+func CreateStateFile(storage storage.Storage) (string, error) {
+	err := putState(storage, []byte{})
+	if err != nil {
+		return "", fmt.Errorf("cannot create initial state file: %v", err)
+	}
+	return storage.URL(StateFile)
+}
+
+// SaveState writes the given state to the given storage.
+func SaveState(storage storage.StorageWriter, state *BootstrapState) error {
+	data, err := goyaml.Marshal(state)
+	if err != nil {
+		return err
+	}
+	return putState(storage, data)
+}
+
+// LoadStateFromURL reads state from the given URL.
+func LoadStateFromURL(url string, disableSSLHostnameVerification bool) (*BootstrapState, error) {
+	client := http.DefaultClient
+	if disableSSLHostnameVerification {
+		logger.Infof("hostname SSL verification disabled")
+		client = utils.GetNonValidatingHTTPClient()
+	}
+	resp, err := client.Get(url)
+	if err != nil {
+		return nil, err
+	}
+	if resp.StatusCode != http.StatusOK {
+		return nil, fmt.Errorf("could not load state from url: %v %s", url, resp.Status)
+	}
+	return loadState(resp.Body)
+}
+
+// LoadState reads state from the given storage.
+func LoadState(stor storage.StorageReader) (*BootstrapState, error) {
+	r, err := storage.Get(stor, StateFile)
+	if err != nil {
+		if coreerrors.IsNotFoundError(err) {
+			return nil, environs.ErrNotBootstrapped
+		}
+		return nil, err
+	}
+	return loadState(r)
+}
+
+func loadState(r io.ReadCloser) (*BootstrapState, error) {
+	defer r.Close()
+	data, err := ioutil.ReadAll(r)
+	if err != nil {
+		return nil, fmt.Errorf("error reading %q: %v", StateFile, err)
+	}
+	var state BootstrapState
+	err = goyaml.Unmarshal(data, &state)
+	if err != nil {
+		return nil, fmt.Errorf("error unmarshalling %q: %v", StateFile, err)
+	}
+	return &state, nil
+}
+
+>>>>>>> MERGE-SOURCE
 // getDNSNames queries and returns the DNS names for the given instances,
 // ignoring nil instances or ones without DNS names.
 func getDNSNames(instances []instance.Instance) []string {

=== modified file 'provider/common/state_test.go'
--- provider/common/state_test.go	2013-11-18 04:53:44 +0000
+++ provider/common/state_test.go	2014-02-11 06:08:00 +0000
@@ -4,6 +4,14 @@
 package common_test
 
 import (
+<<<<<<< TREE
+=======
+	"io/ioutil"
+	"net/http"
+	"net/http/httptest"
+	"path/filepath"
+
+>>>>>>> MERGE-SOURCE
 	gc "launchpad.net/gocheck"
 
 	"launchpad.net/juju-core/environs/config"
@@ -19,6 +27,139 @@
 
 var _ = gc.Suite(&StateSuite{})
 
+<<<<<<< TREE
+=======
+type cleaner interface {
+	AddCleanup(testbase.CleanupFunc)
+}
+
+func newStorageWithDataDir(suite cleaner, c *gc.C) (stor storage.Storage, dataDir string) {
+	closer, stor, dataDir := envtesting.CreateLocalTestStorage(c)
+	suite.AddCleanup(func(*gc.C) { closer.Close() })
+	return
+}
+
+func newStorage(suite cleaner, c *gc.C) (stor storage.Storage) {
+	stor, _ = newStorageWithDataDir(suite, c)
+	return
+}
+
+// testingHTTPServer creates a tempdir backed https server with internal
+// self-signed certs that will not be accepted as valid.
+func testingHTTPSServer(suite cleaner, c *gc.C) (baseURL string, dataDir string) {
+	dataDir = c.MkDir()
+	mux := http.NewServeMux()
+	mux.Handle("/", http.FileServer(http.Dir(dataDir)))
+	server := httptest.NewTLSServer(mux)
+	suite.AddCleanup(func(*gc.C) { server.Close() })
+	baseURL = server.URL
+	return
+}
+
+func (suite *StateSuite) TestCreateStateFileWritesEmptyStateFile(c *gc.C) {
+	stor := newStorage(suite, c)
+
+	url, err := common.CreateStateFile(stor)
+	c.Assert(err, gc.IsNil)
+
+	reader, err := storage.Get(stor, common.StateFile)
+	c.Assert(err, gc.IsNil)
+	data, err := ioutil.ReadAll(reader)
+	c.Assert(err, gc.IsNil)
+	c.Check(string(data), gc.Equals, "")
+	c.Assert(url, gc.NotNil)
+	expectedURL, err := stor.URL(common.StateFile)
+	c.Assert(err, gc.IsNil)
+	c.Check(url, gc.Equals, expectedURL)
+}
+
+func (suite *StateSuite) TestSaveStateWritesStateFile(c *gc.C) {
+	stor := newStorage(suite, c)
+	arch := "amd64"
+	state := common.BootstrapState{
+		StateInstances:  []instance.Id{instance.Id("an-instance-id")},
+		Characteristics: []instance.HardwareCharacteristics{{Arch: &arch}}}
+	marshaledState, err := goyaml.Marshal(state)
+	c.Assert(err, gc.IsNil)
+
+	err = common.SaveState(stor, &state)
+	c.Assert(err, gc.IsNil)
+
+	loadedState, err := storage.Get(stor, common.StateFile)
+	c.Assert(err, gc.IsNil)
+	content, err := ioutil.ReadAll(loadedState)
+	c.Assert(err, gc.IsNil)
+	c.Check(content, gc.DeepEquals, marshaledState)
+}
+
+func (suite *StateSuite) setUpSavedState(c *gc.C, dataDir string) common.BootstrapState {
+	arch := "amd64"
+	state := common.BootstrapState{
+		StateInstances:  []instance.Id{instance.Id("an-instance-id")},
+		Characteristics: []instance.HardwareCharacteristics{{Arch: &arch}}}
+	content, err := goyaml.Marshal(state)
+	c.Assert(err, gc.IsNil)
+	err = ioutil.WriteFile(filepath.Join(dataDir, common.StateFile), []byte(content), 0644)
+	c.Assert(err, gc.IsNil)
+	return state
+}
+
+func (suite *StateSuite) TestLoadStateReadsStateFile(c *gc.C) {
+	storage, dataDir := newStorageWithDataDir(suite, c)
+	state := suite.setUpSavedState(c, dataDir)
+	storedState, err := common.LoadState(storage)
+	c.Assert(err, gc.IsNil)
+	c.Check(*storedState, gc.DeepEquals, state)
+}
+
+func (suite *StateSuite) TestLoadStateFromURLReadsStateFile(c *gc.C) {
+	stor, dataDir := newStorageWithDataDir(suite, c)
+	state := suite.setUpSavedState(c, dataDir)
+	url, err := stor.URL(common.StateFile)
+	c.Assert(err, gc.IsNil)
+	storedState, err := common.LoadStateFromURL(url, false)
+	c.Assert(err, gc.IsNil)
+	c.Check(*storedState, gc.DeepEquals, state)
+}
+
+func (suite *StateSuite) TestLoadStateFromURLBadCert(c *gc.C) {
+	baseURL, _ := testingHTTPSServer(suite, c)
+	url := baseURL + "/" + common.StateFile
+	storedState, err := common.LoadStateFromURL(url, false)
+	c.Assert(err, gc.ErrorMatches, ".*/provider-state:.* certificate signed by unknown authority")
+	c.Assert(storedState, gc.IsNil)
+}
+
+func (suite *StateSuite) TestLoadStateFromURLBadCertPermitted(c *gc.C) {
+	baseURL, dataDir := testingHTTPSServer(suite, c)
+	state := suite.setUpSavedState(c, dataDir)
+	url := baseURL + "/" + common.StateFile
+	storedState, err := common.LoadStateFromURL(url, true)
+	c.Assert(err, gc.IsNil)
+	c.Check(*storedState, gc.DeepEquals, state)
+}
+
+func (suite *StateSuite) TestLoadStateMissingFile(c *gc.C) {
+	stor := newStorage(suite, c)
+	_, err := common.LoadState(stor)
+	c.Check(err, gc.Equals, environs.ErrNotBootstrapped)
+}
+
+func (suite *StateSuite) TestLoadStateIntegratesWithSaveState(c *gc.C) {
+	storage := newStorage(suite, c)
+	arch := "amd64"
+	state := common.BootstrapState{
+		StateInstances:  []instance.Id{instance.Id("an-instance-id")},
+		Characteristics: []instance.HardwareCharacteristics{{Arch: &arch}}}
+	err := common.SaveState(storage, &state)
+	c.Assert(err, gc.IsNil)
+	storedState, err := common.LoadState(storage)
+	c.Assert(err, gc.IsNil)
+
+	c.Check(*storedState, gc.DeepEquals, state)
+}
+
+>>>>>>> MERGE-SOURCE
 func (suite *StateSuite) TestGetDNSNamesAcceptsNil(c *gc.C) {
 	result := common.GetDNSNames(nil)
 	c.Check(result, gc.DeepEquals, []string{})

=== modified file 'scripts/win-installer/setup.iss'
--- scripts/win-installer/setup.iss	2014-01-31 15:41:48 +0000
+++ scripts/win-installer/setup.iss	2014-02-11 06:08:00 +0000
@@ -2,7 +2,11 @@
 ; SEE THE DOCUMENTATION FOR DETAILS ON CREATING INNO SETUP SCRIPT FILES!
 
 #define MyAppName "Juju"
+<<<<<<< TREE
 #define MyAppVersion "1.17.3"
+=======
+#define MyAppVersion "1.16.6"
+>>>>>>> MERGE-SOURCE
 #define MyAppPublisher "Canonical, Ltd"
 #define MyAppURL "http://juju.ubuntu.com/"
 #define MyAppExeName "juju.exe"

=== modified file 'state/apiserver/client/client_test.go'
--- state/apiserver/client/client_test.go	2014-01-30 14:11:27 +0000
+++ state/apiserver/client/client_test.go	2014-02-11 06:08:00 +0000
@@ -554,9 +554,15 @@
 
 	err = s.State.Cleanup()
 	c.Assert(err, gc.IsNil)
+<<<<<<< TREE
 	assertLife(c, m0, state.Alive)
 	assertLife(c, m1, state.Dead)
 	assertLife(c, m2, state.Dead)
+=======
+	assertLife(c, m0, state.Dead)
+	assertLife(c, m1, state.Alive)
+	assertLife(c, m2, state.Dead)
+>>>>>>> MERGE-SOURCE
 	assertRemoved(c, u)
 }
 

=== modified file 'state/cleanup.go'
=== modified file 'state/cleanup_test.go'
=== modified file 'version/version.go'
--- version/version.go	2014-01-31 15:41:48 +0000
+++ version/version.go	2014-02-11 06:08:00 +0000
@@ -22,7 +22,11 @@
 // The presence and format of this constant is very important.
 // The debian/rules build recipe uses this value for the version
 // number of the release package.
+<<<<<<< TREE
 const version = "1.17.3"
+=======
+const version = "1.16.6"
+>>>>>>> MERGE-SOURCE
 
 // Current gives the current version of the system.  If the file
 // "FORCE-VERSION" is present in the same directory as the running