Get build info from goreleaser

- Remove old version package
- Add build info to cmd var
- Pass build info to printer, which is used in the header
- Use build info in version cmd

Author: aaronvb

cmd/protocol.go

@@ -20,7 +20,7 @@ func init() {
 }
 
 func http(cmd *cobra.Command, args []string) {
-	renderer := &renderer.Printer{Port: Port, Addr: Address}
+	renderer := &renderer.Printer{Port: Port, Addr: Address, BuildInfo: BuildInfo}
 	httpServer := server.Http{Addr: Address, Port: Port, ResponseCode: ResponseCode, Output: renderer}
 	httpServer.Start()
 }

cmd/root.go

@@ -7,6 +7,7 @@ var (
 	Address      string
 	Port         int
 	ResponseCode int
+	BuildInfo    map[string]string
 )
 
 var rootCmd = &cobra.Command{
@@ -16,7 +17,8 @@ var rootCmd = &cobra.Command{
 This CLI tool will let you create a temporary API endpoint for testing purposes.`,
 }
 
-func Execute() error {
+func Execute(buildInfo map[string]string) error {
+	BuildInfo = buildInfo
 	return rootCmd.Execute()
 }
 

cmd/version.go

@@ -2,8 +2,8 @@ package cmd
 
 import (
 	"fmt"
+	"time"
 
-	"github.com/aaronvb/request_hole/pkg/version"
 	"github.com/spf13/cobra"
 )
 
@@ -15,6 +15,15 @@ var versionCmd = &cobra.Command{
 	Use:   "version",
 	Short: "Print version number of Request Hole",
 	Run: func(cmd *cobra.Command, args []string) {
-		fmt.Printf("Request Hole %s\n%s\n", version.BuildVersion, version.BuildRepo)
+		var date string
+
+		buildDate, err := time.Parse(time.RFC3339, BuildInfo["date"])
+		if err != nil {
+			date = BuildInfo["date"]
+		} else {
+			date = buildDate.Format("2006-01-02 15:04:05")
+		}
+
+		fmt.Printf("Request Hole %s\n%s\n\nBuild date: %s\nCommit: %s\nBuild by: %s", BuildInfo["version"], BuildInfo["repo"], date, BuildInfo["commit"], BuildInfo["builtBy"])
 	},
 }

main.go

@@ -2,6 +2,21 @@ package main
 
 import "github.com/aaronvb/request_hole/cmd"
 
+var (
+	version = "dev"
+	commit  = "none"
+	date    = "unknown"
+	repo    = "github.com/aaronvb/request_hole"
+	builtBy = "dev"
+)
+
 func main() {
-	cmd.Execute()
+	buildInfo := map[string]string{
+		"version": version,
+		"commit":  commit,
+		"date":    date,
+		"repo":    repo,
+		"builtBy": builtBy,
+	}
+	cmd.Execute(buildInfo)
 }

pkg/renderer/printer.go

@@ -6,7 +6,6 @@ import (
 	"os"
 
 	"github.com/aaronvb/logrequest"
-	"github.com/aaronvb/request_hole/pkg/version"
 	"github.com/pterm/pterm"
 )
 
@@ -19,6 +18,9 @@ type Printer struct {
 	// Fields for startText
 	Port int
 	Addr string
+
+	// Contains build info
+	BuildInfo map[string]string
 }
 
 // Start renders the initial header and the spinner. The Spinner should be consistent during
@@ -41,7 +43,7 @@ func (p *Printer) startText() string {
 		Sprintf("Request Hole")
 	version := pterm.DefaultBasicText.
 		WithStyle(pterm.NewStyle(pterm.Fuzzy)).
-		Sprintf(version.BuildVersion)
+		Sprintf(p.BuildInfo["version"])
 
 	text := fmt.Sprintf("%s %s\nListening on http://%s:%d", primary, version, p.Addr, p.Port)
 	return text

pkg/renderer/printer_test.go

@@ -5,15 +5,14 @@ import (
 	"testing"
 
 	"github.com/aaronvb/logrequest"
-	"github.com/aaronvb/request_hole/pkg/version"
 	"github.com/pterm/pterm"
 )
 
 func TestStartText(t *testing.T) {
 	pterm.DisableColor()
-	printer := Printer{Addr: "localhost", Port: 8080}
+	printer := Printer{Addr: "localhost", Port: 8080, BuildInfo: map[string]string{"version": "dev"}}
 	result := printer.startText()
-	expected := fmt.Sprintf("Request Hole %s\nListening on http://%s:%d", version.BuildVersion, printer.Addr, printer.Port)
+	expected := fmt.Sprintf("Request Hole %s\nListening on http://%s:%d", "dev", printer.Addr, printer.Port)
 
 	if result != expected {
 		t.Errorf("Expected %s, got %s", expected, result)