Rework Makefile to pass in build info

Makefile

@@ -1,113 +1,27 @@
-MODULE   = $(shell env GO111MODULE=on $(GO) list -m)
-DATE    ?= $(shell date +%FT%T%z)
-VERSION ?= $(shell git describe --tags --always --dirty --match=v* 2> /dev/null || \
-			cat $(CURDIR)/.version 2> /dev/null || echo v0)
-PKGS     = $(or $(PKG),$(shell env GO111MODULE=on $(GO) list ./...))
-TESTPKGS = $(shell env GO111MODULE=on $(GO) list -f \
-			'{{ if or .TestGoFiles .XTestGoFiles }}{{ .ImportPath }}{{ end }}' \
-			$(PKGS))
-BIN      = $(CURDIR)/bin
+BUILD_DATE   = $(shell date +%Y%m%d-%H:%M:%S)
+BUILD_USER   = $(shell whoami)
+GIT_BRANCH   = $(shell git rev-parse --abbrev-ref HEAD)
+GIT_REVISION = $(shell git rev-parse HEAD)
+LDFLAGS      = -X github.com/xbglowx/vault-kv-search/cmd.BuildDate=$(BUILD_DATE) \
+	-X github.com/xbglowx/vault-kv-search/cmd.BuildUser=$(BUILD_USER) \
+	-X github.com/xbglowx/vault-kv-search/cmd.Branch=$(GIT_BRANCH) \
+	-X github.com/xbglowx/vault-kv-search/cmd.Revision=$(GIT_REVISION) \
+	-X github.com/xbglowx/vault-kv-search/cmd.Version=$(VERSION)
+OUTPUTOPTION = $(shell test "$(GOOS)" && test "$(GOARCH)" && echo "-o vault-kv-search-$(GOOS)-$(GOARCH)" || echo "")
+VERSION      = $(shell git describe --tags $(git rev-list --tags --max-count=1))
 
-GO      = go
-TIMEOUT = 15
-V = 0
-Q = $(if $(filter 1,$V),,@)
-M = $(shell printf "\033[34;1m▶\033[0m")
-
-export GO111MODULE=on
 
 .PHONY: all
-all: fmt lint | $(BIN) ; $(info $(M) building executable…) @ ## Build program binary
-	$Q $(GO) build \
-		-tags release \
-		-ldflags '-X $(MODULE)/cmd.Version=$(VERSION) -X $(MODULE)/cmd.BuildDate=$(DATE)' \
-		-o $(BIN)/$(basename $(MODULE)) main.go
-
-# Tools
-
-$(BIN):
-	@mkdir -p $@
-$(BIN)/%: | $(BIN) ; $(info $(M) building $(PACKAGE)…)
-	$Q tmp=$$(mktemp -d); \
-	   env GO111MODULE=off GOPATH=$$tmp GOBIN=$(BIN) $(GO) get $(PACKAGE) \
-		|| ret=$$?; \
-	   rm -rf $$tmp ; exit $$ret
-
-GOLINT = $(BIN)/golint
-$(BIN)/golint: PACKAGE=golang.org/x/lint/golint
-
-GOCOV = $(BIN)/gocov
-$(BIN)/gocov: PACKAGE=github.com/axw/gocov/...
-
-GOCOVXML = $(BIN)/gocov-xml
-$(BIN)/gocov-xml: PACKAGE=github.com/AlekSi/gocov-xml
-
-GO2XUNIT = $(BIN)/go2xunit
-$(BIN)/go2xunit: PACKAGE=github.com/tebeka/go2xunit
-
-# Tests
-
-TEST_TARGETS := test-default test-bench test-short test-verbose test-race
-.PHONY: $(TEST_TARGETS) test-xml check test tests
-test-bench:   ARGS=-run=__absolutelynothing__ -bench=. ## Run benchmarks
-test-short:   ARGS=-short        ## Run only short tests
-test-verbose: ARGS=-v            ## Run tests in verbose mode with coverage reporting
-test-race:    ARGS=-race         ## Run tests with race detector
-$(TEST_TARGETS): NAME=$(MAKECMDGOALS:test-%=%)
-$(TEST_TARGETS): test
-check test tests: fmt lint ; $(info $(M) running $(NAME:%=% )tests…) @ ## Run tests
-	$Q $(GO) test -timeout $(TIMEOUT)s $(ARGS) $(TESTPKGS)
+all: vault-kv-search
 
-test-xml: fmt lint | $(GO2XUNIT) ; $(info $(M) running xUnit tests…) @ ## Run tests with xUnit output
-	$Q mkdir -p test
-	$Q 2>&1 $(GO) test -timeout $(TIMEOUT)s -v $(TESTPKGS) | tee test/tests.output
-	$(GO2XUNIT) -fail -input test/tests.output -output test/tests.xml
+vault-kv-search: cmd/*.go
+	@go get -v .
+	@GOOS=$(GOOS) GOARCH=$(GOARCH) go build -ldflags "$(LDFLAGS)" $(OUTPUTOPTION)
 
-COVERAGE_MODE    = atomic
-COVERAGE_PROFILE = $(COVERAGE_DIR)/profile.out
-COVERAGE_XML     = $(COVERAGE_DIR)/coverage.xml
-COVERAGE_HTML    = $(COVERAGE_DIR)/index.html
-.PHONY: test-coverage test-coverage-tools
-test-coverage-tools: | $(GOCOV) $(GOCOVXML)
-test-coverage: COVERAGE_DIR := $(CURDIR)/test/coverage.$(shell date -u +"%Y-%m-%dT%H:%M:%SZ")
-test-coverage: fmt lint test-coverage-tools ; $(info $(M) running coverage tests…) @ ## Run coverage tests
-	$Q mkdir -p $(COVERAGE_DIR)
-	$Q $(GO) test \
-		-coverpkg=$$($(GO) list -f '{{ join .Deps "\n" }}' $(TESTPKGS) | \
-					grep '^$(MODULE)/' | \
-					tr '\n' ',' | sed 's/,$$//') \
-		-covermode=$(COVERAGE_MODE) \
-		-coverprofile="$(COVERAGE_PROFILE)" $(TESTPKGS)
-	$Q $(GO) tool cover -html=$(COVERAGE_PROFILE) -o $(COVERAGE_HTML)
-	$Q $(GOCOV) convert $(COVERAGE_PROFILE) | $(GOCOVXML) > $(COVERAGE_XML)
-
-.PHONY: lint
-lint: | $(GOLINT) ; $(info $(M) running golint…) @ ## Run golint
-	$Q $(GOLINT) -set_exit_status $(PKGS)
-
-.PHONY: fmt
-fmt: ; $(info $(M) running gofmt…) @ ## Run gofmt on all source files
-	$Q $(GO) fmt $(PKGS)
-
-# Misc
+.PHONY: test
+test:
+	@go test -v ./...
 
 .PHONY: clean
-clean: ; $(info $(M) cleaning…)	@ ## Cleanup everything
-	@rm -rf $(BIN)
-	@rm -rf test/tests.* test/coverage.*
-
-.PHONY: help
-help:
-	@grep -hE '^[ a-zA-Z_-]+:.*?## .*$$' $(MAKEFILE_LIST) | \
-		awk 'BEGIN {FS = ":.*?## "}; {printf "\033[36m%-17s\033[0m %s\n", $$1, $$2}'
-
-.PHONY: version
-version:
-	@echo $(VERSION)
-
-
-# Release
-
-.PHONY: release
-release:
-	@./scripts/release.sh $(shell git tag | tail -1 | sed 's/v//')
+clean:
+	@rm -f vault-kv-search*

cmd/version.go

@@ -1,19 +1,15 @@
 package cmd
 
 import (
+	"bytes"
 	"fmt"
+	"html/template"
 	"runtime"
+	"strings"
 
 	"github.com/spf13/cobra"
 )
 
-var (
-	// Version contains the current version.
-	Version = "dev"
-	// BuildDate contains a string with the build date.
-	BuildDate = "unknown"
-)
-
 func init() {
 	RootCmd.AddCommand(versionCmd)
 }
@@ -23,8 +19,47 @@ var versionCmd = &cobra.Command{
 	Short: "Print version",
 	Long:  `Display version and build information about vault-kv-search.`,
 	Run: func(cmd *cobra.Command, args []string) {
-		fmt.Printf("vault-kv-search %s\n", Version)
-		fmt.Printf("  Build date: %s\n", BuildDate)
-		fmt.Printf("  Built with: %s\n", runtime.Version())
+		fmt.Println(buildInfo())
 	},
 }
+
+var (
+	Version   = "unknown"
+	Revision  = "unknown"
+	Branch    = "unknown"
+	BuildUser = "unknown"
+	BuildDate = "unknown"
+	GoVersion = runtime.Version()
+	GoOS      = runtime.GOOS
+	GoArch    = runtime.GOARCH
+	Platform  = GoOS + "/" + GoArch
+)
+
+var versionInfoTmpl = `
+version:    {{.version}}
+  branch:   {{.branch}}
+  revision: {{.revision}})
+build user: {{.buildUser}}
+build date: {{.buildDate}}
+go version: {{.goVersion}}
+platform:   {{.platform}}
+`
+
+func buildInfo() string {
+	m := map[string]string{
+		"version":   Version,
+		"revision":  Revision,
+		"branch":    Branch,
+		"buildUser": BuildUser,
+		"buildDate": BuildDate,
+		"goVersion": GoVersion,
+		"platform":  GoOS + "/" + GoArch,
+	}
+	t := template.Must(template.New("version").Parse(versionInfoTmpl))
+
+	var buf bytes.Buffer
+	if err := t.ExecuteTemplate(&buf, "version", m); err != nil {
+		panic(err)
+	}
+	return strings.TrimSpace(buf.String())
+}