Merge lp:~dimitern/juju-core/lp-1308146-1.18-backport into lp:~go-bot/juju-core/trunk

[Dimiter Naydenov]

Fixed lp:1308146 - backported from github/trunk

See http://pad.lv/1308146 - this fixes the issue by backporting
the already landed fix from github.com/juju/juju/ trunk - for
more info, see https://github.com/juju/juju/pull/786.

https://codereview.appspot.com/138640043/

[Dimiter Naydenov (dimitern)]

Reviewers: mp+235115_code.launchpad.net,

Message:
Please take a look.

Description:
Fixed lp:1308146 - backported from github/trunk

See http://pad.lv/1308146 - this fixes the issue by backporting
the already landed fix from github.com/juju/juju/ trunk - for
more info, see https://github.com/juju/juju/pull/786.

https://code.launchpad.net/~dimitern/juju-core/lp-1308146-1.18-backport/+merge/235115

(do not edit description out of merge proposal)

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

Affected files (+85, -12 lines):
   A [revision details]
   M agent/mongo/mongo.go
   M environs/cloudinit/cloudinit_test.go
   M environs/instances/instancetype.go
   M environs/instances/instancetype_test.go
   M environs/testing/tools.go
   M provider/ec2/image_test.go
   M scripts/win-installer/setup.iss
   M state/charm.go
   M state/state.go
   M state/state_test.go
   M version/version.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-20140513040856-lm051mdy3n916km6
+New revision:
<email address hidden>

Index: state/state_test.go
=== modified file 'state/state_test.go'
--- state/state_test.go 2014-03-27 12:53:54 +0000
+++ state/state_test.go 2014-09-18 12:52:26 +0000
@@ -6,6 +6,7 @@
  import (
   "fmt"
   "net/url"
+ "path/filepath"
   "sort"
   "strconv"
   "time"
@@ -340,6 +341,50 @@
   c.Assert(sch.BundleSha256(), gc.Equals, "missing")
  }

+func (s *StateSuite) TestUpdateUploadedCharmEscapesSpecialCharsInConfig(c
*gc.C) {
+ // Make sure when we have mongodb special characters like "$" and
+ // "." in the name of any charm config option, we do proper
+ // escaping before storing them and unescaping after loading. See
+ // also http://pad.lv/1308146.
+
+ // Clone the dummy charm and change the config.
+ configWithProblematicKeys := []byte(`
+options:
+ $bad.key: {default: bad, description: bad, type: string}
+ not.ok.key: {description: not ok, type: int}
+ valid-key: {description: all good, type: boolean}
+ still$bad.: {description: not good, type: float}
+ $.$: {description: awful, type: string}
+ ...: {description: oh boy, type: int}
+ just$: {description: no no, type: float}
+`[1:])
+ chDir := testing.Charms.ClonedDirPath(c.MkDir(), "dummy")
+ err := utils.AtomicWriteFile(
+ filepath.Join(chDir, "config.yaml"),
+ configWithProblematicKeys,
+ 0666,
+ )
+ c.Assert(err, gc.IsNil)
+ ch, err := charm.ReadDir(chDir)
+ c.Assert(err, gc.IsNil)
+ missingCurl := charm.MustParseURL("local:quantal/missing-1")
+ bundleURL, err := url.Parse("http://bundles.testing.invalid/dummy-1")
+ c.Assert(err, gc.IsNil)
+
+ _, err = s.State.PrepareLocalCharmUpload(missingCurl)
+ c.Assert(err, gc.IsNil)
+ sch, err := s.State.UpdateUploadedCharm(ch, missingCurl,
bundleURL, "missing")
+ c.Assert(err, gc.IsNil)
+ c.Assert(sch.URL(), gc.DeepEquals, missingCurl)
+ c.Assert(sch.Revision(), gc.Equals, missingCurl.Revision)
+ c.Assert(sch.IsUploaded(), jc.IsTrue)
+ c.Assert(sch.IsPlaceholder(), jc.IsFalse)
+ c.Assert(sch.Meta(), gc.DeepEquals, ch.Meta()...

=== modified file 'agent/mongo/mongo.go'
--- agent/mongo/mongo.go	2014-05-28 10:24:07 +0000
+++ agent/mongo/mongo.go	2014-09-18 12:56:08 +0000
@@ -54,6 +54,7 @@
 	upstartServiceStart         = (*upstart.Service).Start
 )
 
+<<<<<<< TREE
 // WithAddresses represents an entity that has a set of
 // addresses. e.g. a state Machine object
 type WithAddresses interface {
@@ -113,6 +114,30 @@
 }
 
 // Path returns the executable path to be used to run mongod on this
+=======
+// MongoPackageForSeries returns the name of the mongo package for the series
+// of the machine that it is going to be running on.
+func MongoPackageForSeries(series string) string {
+	switch series {
+	case "precise", "quantal", "raring", "saucy":
+		return "mongodb-server"
+	default:
+		// trusty and onwards
+		return "juju-mongodb"
+	}
+}
+
+// MongodPathForSeries returns the path to the mongod executable for the
+// series of the machine that it is going to be running on.
+func MongodPathForSeries(series string) string {
+	if MongoPackageForSeries(series) == "juju-mongodb" {
+		return JujuMongodPath
+	}
+	return MongodbServerPath
+}
+
+// MongoPath returns the executable path to be used to run mongod on this
+>>>>>>> MERGE-SOURCE
 // machine. If the juju-bundled version of mongo exists, it will return that
 // path, otherwise it will return the command to run mongod from the path.
 func Path() (string, error) {

=== modified file 'environs/cloudinit/cloudinit_test.go'
--- environs/cloudinit/cloudinit_test.go	2014-05-20 04:27:02 +0000
+++ environs/cloudinit/cloudinit_test.go	2014-09-18 12:56:08 +0000
@@ -182,6 +182,47 @@
 ln -s 1\.2\.3-raring-amd64 '/var/lib/juju/tools/machine-0'
 `,
 	}, {
+<<<<<<< TREE
+=======
+		// utopic state server - use the new mongo from juju-mongodb
+		cfg: cloudinit.MachineConfig{
+			MachineId:        "0",
+			AuthorizedKeys:   "sshkey1",
+			AgentEnvironment: map[string]string{agent.ProviderType: "dummy"},
+			// raring provides mongo in the archive
+			Tools:           newSimpleTools("1.2.3-utopic-amd64"),
+			StateServer:     true,
+			StateServerCert: serverCert,
+			StateServerKey:  serverKey,
+			StatePort:       37017,
+			APIPort:         17070,
+			MachineNonce:    "FAKE_NONCE",
+			StateInfo: &state.Info{
+				Password: "arble",
+				CACert:   []byte("CA CERT\n" + testing.CACert),
+			},
+			APIInfo: &api.Info{
+				Password: "bletch",
+				CACert:   []byte("CA CERT\n" + testing.CACert),
+			},
+			Constraints:             envConstraints,
+			DataDir:                 environs.DataDir,
+			LogDir:                  agent.DefaultLogDir,
+			Jobs:                    allMachineJobs,
+			CloudInitOutputLog:      environs.CloudInitOutputLog,
+			InstanceId:              "i-bootstrap",
+			SystemPrivateSSHKey:     "private rsa key",
+			MachineAgentServiceName: "jujud-machine-0",
+			MongoServiceName:        "juju-db",
+		},
+		setEnvConfig: true,
+		inexactMatch: true,
+		expectScripts: `
+echo 'Starting MongoDB server \(juju-db\)'.*
+cat >> /etc/init/juju-db\.conf << 'EOF'\\ndescription "juju state database"\\nauthor "Juju Team <juju@lists\.ubuntu\.com>"\\nstart on runlevel \[2345\]\\nstop on runlevel \[!2345\]\\nrespawn\\nnormal exit 0\\n\\nlimit nofile 65000 65000\\nlimit nproc 20000 20000\\n\\nexec /usr/lib/juju/bin/mongod --auth --dbpath=/var/lib/juju/db --sslOnNormalPorts --sslPEMKeyFile '/var/lib/juju/server\.pem' --sslPEMKeyPassword ignored --bind_ip 0\.0\.0\.0 --port 37017 --noprealloc --syslog --smallfiles\\nEOF\\n
+`,
+	}, {
+>>>>>>> MERGE-SOURCE
 		// non state server.
 		cfg: cloudinit.MachineConfig{
 			MachineId:          "99",
@@ -392,6 +433,16 @@
 // TestCloudInit checks that the output from the various tests
 // in cloudinitTests is well formed.
 func (*cloudinitSuite) TestCloudInit(c *gc.C) {
+<<<<<<< TREE
+=======
+	expectedMongoPackage := map[string]string{
+		"precise": "mongodb-server",
+		"raring":  "mongodb-server",
+		"trusty":  "juju-mongodb",
+		"utopic":  "juju-mongodb",
+	}
+
+>>>>>>> MERGE-SOURCE
 	for i, test := range cloudinitTests {
 		c.Logf("test %d", i)
 		if test.setEnvConfig {

=== modified file 'environs/instances/instancetype_test.go'
=== modified file 'environs/testing/tools.go'
=== modified file 'provider/ec2/image_test.go'
--- provider/ec2/image_test.go	2014-06-02 05:50:33 +0000
+++ provider/ec2/image_test.go	2014-09-18 12:56:08 +0000
@@ -103,6 +103,7 @@
 		series: "quantal",
 		arches: both,
 		cons:   "arch=amd64",
+<<<<<<< TREE
 		itype:  "cc2.8xlarge",
 		image:  "ami-01000035",
 	}, {
@@ -123,6 +124,16 @@
 		cons:   "mem=4G root-disk=16384M",
 		itype:  "m1.large",
 		image:  "ami-00000033",
+=======
+		itype:  "cc1.4xlarge",
+		image:  "ami-01000035",
+	}, {
+		series: "precise",
+		arches: both,
+		cons:   "mem=4G root-disk=16384M",
+		itype:  "m1.large",
+		image:  "ami-00000033",
+>>>>>>> MERGE-SOURCE
 	},
 }
 

=== modified file 'scripts/win-installer/setup.iss'
--- scripts/win-installer/setup.iss	2014-05-30 17:17:02 +0000
+++ scripts/win-installer/setup.iss	2014-09-18 12:56:08 +0000
@@ -2,7 +2,11 @@
 ; SEE THE DOCUMENTATION FOR DETAILS ON CREATING INNO SETUP SCRIPT FILES!
 
 #define MyAppName "Juju"
+<<<<<<< TREE
 #define MyAppVersion "1.19.4"
+=======
+#define MyAppVersion "1.18.5"
+>>>>>>> MERGE-SOURCE
 #define MyAppPublisher "Canonical, Ltd"
 #define MyAppURL "http://juju.ubuntu.com/"
 #define MyAppExeName "juju.exe"

=== modified file 'state/charm.go'
--- state/charm.go	2014-01-29 20:57:31 +0000
+++ state/charm.go	2014-09-18 12:56:08 +0000
@@ -27,6 +27,17 @@
 }
 
 func newCharm(st *State, cdoc *charmDoc) (*Charm, error) {
+	// Because we probably just read the doc from state, make sure we
+	// unescape any config option names for "$" and ".". See
+	// http://pad.lv/1308146
+	if cdoc != nil && cdoc.Config != nil {
+		unescapedConfig := charm.NewConfig()
+		for optionName, option := range cdoc.Config.Options {
+			unescapedName := unescapeReplacer.Replace(optionName)
+			unescapedConfig.Options[unescapedName] = option
+		}
+		cdoc.Config = unescapedConfig
+	}
 	return &Charm{st: st, doc: *cdoc}, nil
 }
 

=== modified file 'state/state.go'
--- state/state.go	2014-05-27 14:02:22 +0000
+++ state/state.go	2014-09-18 12:56:08 +0000
@@ -870,9 +870,18 @@
 func (st *State) updateCharmDoc(
 	ch charm.Charm, curl *charm.URL, bundleURL *url.URL, bundleSha256 string, preReq interface{}) (*Charm, error) {
 
+	// Make sure we escape any "$" and "." in config option names
+	// first. See http://pad.lv/1308146.
+	cfg := ch.Config()
+	escapedConfig := charm.NewConfig()
+	for optionName, option := range cfg.Options {
+		escapedName := escapeReplacer.Replace(optionName)
+		escapedConfig.Options[escapedName] = option
+	}
+
 	updateFields := bson.D{{"$set", bson.D{
 		{"meta", ch.Meta()},
-		{"config", ch.Config()},
+		{"config", escapedConfig},
 		{"bundleurl", bundleURL},
 		{"bundlesha256", bundleSha256},
 		{"pendingupload", false},

=== modified file 'state/state_test.go'
--- state/state_test.go	2014-05-27 06:12:16 +0000
+++ state/state_test.go	2014-09-18 12:56:08 +0000
@@ -6,6 +6,11 @@
 import (
 	"fmt"
 	"net/url"
+<<<<<<< TREE
+=======
+	"path/filepath"
+	"sort"
+>>>>>>> MERGE-SOURCE
 	"strconv"
 	"strings"
 	"time"
@@ -351,6 +356,50 @@
 	c.Assert(sch.BundleSha256(), gc.Equals, "missing")
 }
 
+func (s *StateSuite) TestUpdateUploadedCharmEscapesSpecialCharsInConfig(c *gc.C) {
+	// Make sure when we have mongodb special characters like "$" and
+	// "." in the name of any charm config option, we do proper
+	// escaping before storing them and unescaping after loading. See
+	// also http://pad.lv/1308146.
+
+	// Clone the dummy charm and change the config.
+	configWithProblematicKeys := []byte(`
+options:
+  $bad.key: {default: bad, description: bad, type: string}
+  not.ok.key: {description: not ok, type: int}
+  valid-key: {description: all good, type: boolean}
+  still$bad.: {description: not good, type: float}
+  $.$: {description: awful, type: string}
+  ...: {description: oh boy, type: int}
+  just$: {description: no no, type: float}
+`[1:])
+	chDir := testing.Charms.ClonedDirPath(c.MkDir(), "dummy")
+	err := utils.AtomicWriteFile(
+		filepath.Join(chDir, "config.yaml"),
+		configWithProblematicKeys,
+		0666,
+	)
+	c.Assert(err, gc.IsNil)
+	ch, err := charm.ReadDir(chDir)
+	c.Assert(err, gc.IsNil)
+	missingCurl := charm.MustParseURL("local:quantal/missing-1")
+	bundleURL, err := url.Parse("http://bundles.testing.invalid/dummy-1")
+	c.Assert(err, gc.IsNil)
+
+	_, err = s.State.PrepareLocalCharmUpload(missingCurl)
+	c.Assert(err, gc.IsNil)
+	sch, err := s.State.UpdateUploadedCharm(ch, missingCurl, bundleURL, "missing")
+	c.Assert(err, gc.IsNil)
+	c.Assert(sch.URL(), gc.DeepEquals, missingCurl)
+	c.Assert(sch.Revision(), gc.Equals, missingCurl.Revision)
+	c.Assert(sch.IsUploaded(), jc.IsTrue)
+	c.Assert(sch.IsPlaceholder(), jc.IsFalse)
+	c.Assert(sch.Meta(), gc.DeepEquals, ch.Meta())
+	c.Assert(sch.Config(), gc.DeepEquals, ch.Config())
+	c.Assert(sch.BundleURL(), gc.DeepEquals, bundleURL)
+	c.Assert(sch.BundleSha256(), gc.Equals, "missing")
+}
+
 func (s *StateSuite) assertPlaceholderCharmExists(c *gc.C, curl *charm.URL) {
 	// Find charm directly and verify only the charm URL and
 	// Placeholder are set.

=== modified file 'version/version.go'
--- version/version.go	2014-06-02 17:12:27 +0000
+++ version/version.go	2014-09-18 12:56:08 +0000
@@ -24,10 +24,14 @@
 // 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.19.4"
 
 // The version that we switched over from old style numbering to new style.
 var switchOverVersion = MustParse("1.19.9")
+=======
+const version = "1.18.5"
+>>>>>>> MERGE-SOURCE
 
 // lsbReleaseFile is the name of the file that is read in order to determine
 // the release version of ubuntu.