gofmt

cmd/control/os.go

@@ -65,9 +65,9 @@ func osRollback(c *cli.Context) {
 
 	fileReader := bufio.NewScanner(file)
 	line := " "
-	for ; line[len(line)-1:] != "*"; {
+	for line[len(line)-1:] != "*" {
 		if !fileReader.Scan() {
-			log.Error("Current version not indicated in "+ osVersionsFile)
+			log.Error("Current version not indicated in " + osVersionsFile)
 		}
 		line = fileReader.Text()
 	}
@@ -81,7 +81,8 @@ func osRollback(c *cli.Context) {
 }
 
 func osMetaDataGet(c *cli.Context) {
-	osChannel, ok := getChannelUrl("meta"); if !ok {
+	osChannel, ok := getChannelUrl("meta")
+	if !ok {
 		log.Fatal("unrecognized channel meta")
 	}
 	resp, err := http.Get(osChannel)
@@ -161,7 +162,8 @@ func getLatestImage(channel string) (string, error) {
 	} else {
 		pivot = channel
 	}
-	osChannel, ok := getChannelUrl(pivot); if !ok {
+	osChannel, ok := getChannelUrl(pivot)
+	if !ok {
 		return "", errors.New("unrecognized channel " + pivot)
 	}
 	resp, err := http.Get(osChannel)
@@ -184,14 +186,13 @@ func parseBody(body []byte, channel string) string {
 
 func getChannelUrl(channel string) (string, bool) {
 	if osChannels == nil {
-		osChannels = map[string]string {
-				"stable" : "",
-				"alpha" : "",
-				"beta" : "",
-				"meta" : "",
+		osChannels = map[string]string{
+			"stable": "",
+			"alpha":  "",
+			"beta":   "",
+			"meta":   "",
 		}
 	}
-	channel, ok := osChannels[channel]; 
+	channel, ok := osChannels[channel]
 	return channel, ok
 }
-

cmd/control/tlsconf.go

@@ -10,25 +10,25 @@ import (
 )
 
 func tlsConfCommands() []cli.Command {
-	return []cli.Command {
+	return []cli.Command{
 		{
 			Name:   "create",
 			Usage:  "use it to create a new set of tls configuration certs and keys or upload existing ones",
 			Action: tlsConfCreate,
-			Flags: []cli.Flag {
-				cli.StringFlag {
+			Flags: []cli.Flag{
+				cli.StringFlag{
 					Name:  "cakey",
 					Usage: "path to existing certificate authority key (only use with --generate)",
 				},
-				cli.StringFlag {
+				cli.StringFlag{
 					Name:  "ca",
 					Usage: "path to existing certificate authority (only use with --genreate)",
 				},
-				cli.BoolFlag {
+				cli.BoolFlag{
 					Name:  "generate, g",
 					Usage: "generate the client key and client cert from existing ca and cakey",
 				},
-				cli.StringFlag {
+				cli.StringFlag{
 					Name:  "outDir, o",
 					Usage: "the output directory to save the generated certs or keys",
 				},
@@ -100,7 +100,6 @@ func tlsConfCreate(c *cli.Context) {
 		serverKeyPath = "client-key.pem"
 	}
 
-
 	serverCertPath = filepath.Join(outDir, serverCertPath)
 	serverKeyPath = filepath.Join(outDir, serverKeyPath)
 

cmd/power/power.go

@@ -8,8 +8,8 @@ import (
 	"strings"
 	"syscall"
 
-	"github.com/fsouza/go-dockerclient"
 	log "github.com/Sirupsen/logrus"
+	"github.com/fsouza/go-dockerclient"
 )
 
 const (