A Makefile and some golint fixes

The Makefile makes it easier to build and actually substitute the
version of code into the built binary in the canonical golang way.
Finally.

And some basic golint suggestions were adopted.

Author: bobveznat

Makefile

@@ -0,0 +1,13 @@
+TAG?=1.6.1
+VERSION := $(shell echo `git describe --tags --long --match=*.*.* --dirty` | sed s/version-//g)
+
+PKG=github.com/cloudtools/ssh-cert-authority
+
+test:
+	go test ./...
+
+vet:
+	go vet ./...
+
+all: test
+	go build -ldflags "-X ${PKG}/version.Tag=${TAG} -X ${PKG}/version.BuildVersion=${VERSION}" .

client/client.go

@@ -60,9 +60,8 @@ func (req *SigningRequest) PostToWeb(requestParameters url.Values) error {
 	if resp.StatusCode != 200 {
 		respBuf, _ := ioutil.ReadAll(resp.Body)
 		return fmt.Errorf("HTTP %s: %s", resp.Status, string(respBuf))
-	} else {
-		return nil
 	}
+	return nil
 }
 
 func (req *SigningRequest) DeleteToWeb(requestParameters url.Values) error {
@@ -81,9 +80,8 @@ func (req *SigningRequest) DeleteToWeb(requestParameters url.Values) error {
 	if resp.StatusCode != 200 {
 		respBuf, _ := ioutil.ReadAll(resp.Body)
 		return fmt.Errorf("HTTP %s: %s", resp.Status, string(respBuf))
-	} else {
-		return nil
 	}
+	return nil
 }
 
 func (req *CertRequest) SetConfig(config ssh_ca_util.RequesterConfig) error {
@@ -195,9 +193,8 @@ func (req *CertRequest) PostToWeb(requestParameters url.Values) (string, bool, e
 	if resp.StatusCode == 201 || resp.StatusCode == 202 {
 		signed := resp.StatusCode == 202
 		return string(respBuf), signed, nil
-	} else {
-		return "", false, fmt.Errorf("Cert request rejected: %s", string(respBuf))
 	}
+	return "", false, fmt.Errorf("Cert request rejected: %s", string(respBuf))
 }
 
 type SlackWebhookInput struct {
@@ -233,7 +230,6 @@ func PostToSlack(slackUrl, slackChannel, msg string) error {
 	}
 	if resp.StatusCode == 200 {
 		return nil
-	} else {
-		return fmt.Errorf("Slack post rejected: %s", string(respBuf))
 	}
+	return fmt.Errorf("Slack post rejected: %s", string(respBuf))
 }

generate_config.go

@@ -54,7 +54,7 @@ func cmdGenerateConfig(c *cli.Context) error {
 		return cli.NewExitError(fmt.Sprintf("Error getting listing of environments: %s", string(getRespBuf)), 1)
 	}
 
-	environments := make([]string, 0)
+	var environments []string
 	json.Unmarshal(getRespBuf, &environments)
 
 	wholeConfig := make(map[string]ssh_ca_util.RequesterConfig, len(environments))

main.go

@@ -1,7 +1,7 @@
 package main
 
 import (
-	"github.com/cloudtools/ssh-cert-authority/util"
+	"github.com/cloudtools/ssh-cert-authority/version"
 	"github.com/codegangsta/cli"
 	"os"
 )
@@ -10,7 +10,7 @@ func main() {
 	app := cli.NewApp()
 	app.Name = "ssh-cert-authority"
 	app.EnableBashCompletion = true
-	app.Version = ssh_ca_util.BuildVersion
+	app.Version = version.BuildVersion
 
 	app.Commands = []cli.Command{
 		{

sign_cert.go

@@ -144,9 +144,8 @@ func signCert(c *cli.Context) error {
 	}
 	if err != nil {
 		return cli.NewExitError(fmt.Sprintf("Error sending in +1: %s", err), 1)
-	} else {
-		fmt.Println("Signature accepted by server.")
 	}
+	fmt.Println("Signature accepted by server.")
 	return nil
 
 }

sign_certd.go

@@ -14,6 +14,7 @@ import (
 	"github.com/aws/aws-sdk-go/service/kms"
 	"github.com/cloudtools/ssh-cert-authority/client"
 	"github.com/cloudtools/ssh-cert-authority/util"
+	"github.com/cloudtools/ssh-cert-authority/version"
 	"github.com/codegangsta/cli"
 	"github.com/gorilla/mux"
 	"golang.org/x/crypto/ssh"
@@ -46,7 +47,7 @@ func isSupportedOption(x string) bool {
 }
 
 func areCriticalOptionsValid(criticalOptions map[string]string) error {
-	for optionName, _ := range criticalOptions {
+	for optionName := range criticalOptions {
 		if !isSupportedOption(optionName) {
 			return fmt.Errorf("Invalid critical option name: '%s'", optionName)
 		}
@@ -398,8 +399,8 @@ func newResponseElement(certBlob string, signed bool, numSignatures, signaturesR
 }
 
 func (h *certRequestHandler) listEnvironments(rw http.ResponseWriter, req *http.Request) {
-	environments := make([]string, 0)
-	for k, _ := range h.Config {
+	var environments []string
+	for k := range h.Config {
 		environments = append(environments, k)
 	}
 	result, err := json.Marshal(environments)
@@ -667,7 +668,7 @@ func makeCertRequestHandler(config map[string]ssh_ca_util.SignerdConfig) certReq
 }
 
 func runSignCertd(config map[string]ssh_ca_util.SignerdConfig, addr string) error {
-	log.Println("Server running version", ssh_ca_util.BuildVersion)
+	log.Println("Server running version", version.BuildVersion)
 	log.Println("Using SSH agent at", os.Getenv("SSH_AUTH_SOCK"))
 
 	sshAgentConn, err := net.Dial("unix", os.Getenv("SSH_AUTH_SOCK"))