Merge lp:~thumper/juju-core/fix-windows-build into lp:~go-bot/juju-core/trunk

[Tim Penhey]

Make bootstrap work from a windows client.

This change uses path rather than filepath for the Join
methods for the cloudinit and upstart job creation.

This is because the client OS may be windows, but the
code is running on linux server-side.

A util function has been added that should be used in
the agent and worker code to ease the transition to
supporting windows as a server OS.

The generated cloudinit content for new machines is
logged out at TRACE level to provide debugging info.

This is already on the lp:juju-core/1.14 branch.

https://codereview.appspot.com/13241053/

Make bootstrap work from a windows client.

This change uses path rather than filepath for the Join
methods for the cloudinit and upstart job creation.

This is because the client OS may be windows, but the
code is running on linux server-side.

A util function has been added that should be used in
the agent and worker code to ease the transition to
supporting windows as a server OS.

The generated cloudinit content for new machines is
logged out at TRACE level to provide debugging info.

This is already on the lp:juju-core/1.14 branch.

https://codereview.appspot.com/13241053/

[Tim Penhey (thumper)]

Reviewers: mp+186225_code.launchpad.net,

Message:
Please take a look.

Description:
Make bootstrap work from a windows client.

This change uses path rather than filepath for the Join
methods for the cloudinit and upstart job creation.

This is because the client OS may be windows, but the
code is running on linux server-side.

A util function has been added that should be used in
the agent and worker code to ease the transition to
supporting windows as a server OS.

The generated cloudinit content for new machines is
logged out at TRACE level to provide debugging info.

This is already on the lp:juju-core/1.14 branch.

https://code.launchpad.net/~thumper/juju-core/fix-windows-build/+merge/186225

(do not edit description out of merge proposal)

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

Affected files (+21, -10 lines):
   A [revision details]
   M environs/cloudinit.go
   M environs/cloudinit/cloudinit.go
   M scripts/win-installer/setup.iss
   M upstart/service.go
   M utils/file.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-20130917082542-j1hu82fubd89ombo
+New revision: <email address hidden>

Index: environs/cloudinit.go
=== modified file 'environs/cloudinit.go'
--- environs/cloudinit.go 2013-09-16 22:02:24 +0000
+++ environs/cloudinit.go 2013-09-18 01:25:45 +0000
@@ -126,6 +126,7 @@
    return nil, err
   }
   data, err := cloudcfg.Render()
+ logger.Tracef("Generated cloud init:\n%s", string(data))
   if err != nil {
    return nil, err
   }

Index: upstart/service.go
=== modified file 'upstart/service.go'
--- upstart/service.go 2013-09-16 22:02:24 +0000
+++ upstart/service.go 2013-09-18 01:25:45 +0000
@@ -5,7 +5,7 @@

  import (
   "fmt"
- "path/filepath"
+ "path"

   "launchpad.net/juju-core/utils"
  )
@@ -17,7 +17,7 @@

  // MongoUpstartService returns the upstart config for the mongo state
service.
  func MongoUpstartService(name, dataDir, dbDir string, port int) *Conf {
- keyFile := filepath.Join(dataDir, "server.pem")
+ keyFile := path.Join(dataDir, "server.pem")
   svc := NewService(name)
   return &Conf{
    Service: *svc,
@@ -44,7 +44,7 @@
  // based on the tag and machineId passed in.
  func MachineAgentUpstartService(name, toolsDir, dataDir, logDir, tag,
machineId string, env map[string]string) *Conf {
   svc := NewService(name)
- logFile := filepath.Join(logDir, tag+".log")
+ logFile := path.Join(logDir, tag+".log")
   // The machine agent always starts with debug turned on. The logger
worker
   // will update this to the system logging environment as soon as it
starts.
   return &Conf{
@@ -53,7 +53,7 @@
    Limit: map[string]string{
     "nofile": fmt.Sprintf("%d %d", maxAgentFiles, maxAgentFiles),
    },
- Cmd: filepath.Join(toolsDir, "jujud") +
+ Cmd: path.Join(toolsDir, "jujud") +
     " machine" +
     " --data-dir " + utils.ShQuote(dataDir) +
     " --machine-id " + machineId +

Index: utils/file.go
=== modified file 'utils/file.go'
--- utils/file.go 2013-08-28 20:37:53 +0000
+++ utils/file.go 201...

=== modified file 'environs/cloudinit.go'
--- environs/cloudinit.go	2013-09-16 22:02:24 +0000
+++ environs/cloudinit.go	2013-09-18 01:29:18 +0000
@@ -126,6 +126,7 @@
 		return nil, err
 	}
 	data, err := cloudcfg.Render()
+	logger.Tracef("Generated cloud init:\n%s", string(data))
 	if err != nil {
 		return nil, err
 	}

=== modified file 'environs/cloudinit/cloudinit.go'
--- environs/cloudinit/cloudinit.go	2013-09-16 22:04:09 +0000
+++ environs/cloudinit/cloudinit.go	2013-09-18 01:29:18 +0000
@@ -6,7 +6,7 @@
 import (
 	"encoding/base64"
 	"fmt"
-	"path/filepath"
+	"path"
 
 	"launchpad.net/goyaml"
 
@@ -222,7 +222,7 @@
 }
 
 func (cfg *MachineConfig) dataFile(name string) string {
-	return filepath.Join(cfg.DataDir, name)
+	return path.Join(cfg.DataDir, name)
 }
 
 func (cfg *MachineConfig) agentConfig(tag string) (agent.Config, error) {
@@ -292,7 +292,7 @@
 }
 
 func (cfg *MachineConfig) addMongoToBoot(c *cloudinit.Config) error {
-	dbDir := filepath.Join(cfg.DataDir, "db")
+	dbDir := path.Join(cfg.DataDir, "db")
 	c.AddScripts(
 		"mkdir -p "+dbDir+"/journal",
 		"chmod 0700 "+dbDir,
@@ -315,8 +315,8 @@
 // to use as a directory for storing the tools executables in
 // by using the last element stripped of its extension.
 func versionDir(toolsURL string) string {
-	name := filepath.Base(toolsURL)
-	ext := filepath.Ext(name)
+	name := path.Base(toolsURL)
+	ext := path.Ext(name)
 	return name[:len(name)-len(ext)]
 }
 

=== modified file 'scripts/win-installer/setup.iss'
--- scripts/win-installer/setup.iss	2013-08-30 19:36:39 +0000
+++ scripts/win-installer/setup.iss	2013-09-18 01:29:18 +0000
@@ -2,7 +2,7 @@
 ; SEE THE DOCUMENTATION FOR DETAILS ON CREATING INNO SETUP SCRIPT FILES!
 
 #define MyAppName "Juju"
-#define MyAppVersion "1.13.2"
+#define MyAppVersion "1.15.0"
 #define MyAppPublisher "Canonical, Ltd"
 #define MyAppURL "http://juju.ubuntu.com/"
 #define MyAppExeName "juju.exe"

=== modified file 'upstart/service.go'
--- upstart/service.go	2013-09-16 22:02:24 +0000
+++ upstart/service.go	2013-09-18 01:29:18 +0000
@@ -5,7 +5,7 @@
 
 import (
 	"fmt"
-	"path/filepath"
+	"path"
 
 	"launchpad.net/juju-core/utils"
 )
@@ -17,7 +17,7 @@
 
 // MongoUpstartService returns the upstart config for the mongo state service.
 func MongoUpstartService(name, dataDir, dbDir string, port int) *Conf {
-	keyFile := filepath.Join(dataDir, "server.pem")
+	keyFile := path.Join(dataDir, "server.pem")
 	svc := NewService(name)
 	return &Conf{
 		Service: *svc,
@@ -44,7 +44,7 @@
 // based on the tag and machineId passed in.
 func MachineAgentUpstartService(name, toolsDir, dataDir, logDir, tag, machineId string, env map[string]string) *Conf {
 	svc := NewService(name)
-	logFile := filepath.Join(logDir, tag+".log")
+	logFile := path.Join(logDir, tag+".log")
 	// The machine agent always starts with debug turned on.  The logger worker
 	// will update this to the system logging environment as soon as it starts.
 	return &Conf{
@@ -53,7 +53,7 @@
 		Limit: map[string]string{
 			"nofile": fmt.Sprintf("%d %d", maxAgentFiles, maxAgentFiles),
 		},
-		Cmd: filepath.Join(toolsDir, "jujud") +
+		Cmd: path.Join(toolsDir, "jujud") +
 			" machine" +
 			" --data-dir " + utils.ShQuote(dataDir) +
 			" --machine-id " + machineId +

=== modified file 'utils/file.go'
--- utils/file.go	2013-08-28 20:37:53 +0000
+++ utils/file.go	2013-09-18 01:29:18 +0000
@@ -4,6 +4,7 @@
 package utils
 
 import (
+	"path"
 	"path/filepath"
 	"strings"
 
@@ -18,3 +19,10 @@
 	}
 	return filepath.Clean(dir)
 }
+
+// JoinServerPath joins any number of path elements into a single path, adding
+// a path separator (based on the current juju server OS) if necessary. The
+// result is Cleaned; in particular, all empty strings are ignored.
+func JoinServerPath(elem ...string) string {
+	return path.Join(elem...)
+}