v0.0.19: add version command, misc bug fixes

Author: geemus

api/api.go

@@ -15,6 +15,7 @@ import (
 
 	"github.com/anchordotdev/cli"
 	"github.com/anchordotdev/cli/keyring"
+	"github.com/anchordotdev/cli/version"
 	"golang.org/x/exp/slices"
 )
 
@@ -40,7 +41,9 @@ func NewClient(cfg *cli.Config) (*Session, error) {
 		Client: &http.Client{
 			Transport: urlRewriter{
 				RoundTripper: responseChecker{
-					RoundTripper: new(http.Transport),
+					RoundTripper: userAgentSetter{
+						RoundTripper: new(http.Transport),
+					},
 				},
 				URL: cfg.API.URL,
 			},
@@ -345,6 +348,16 @@ func (r urlRewriter) RoundTrip(req *http.Request) (*http.Response, error) {
 	return r.RoundTripper.RoundTrip(req)
 }
 
+type userAgentSetter struct {
+	http.RoundTripper
+}
+
+func (s userAgentSetter) RoundTrip(req *http.Request) (*http.Response, error) {
+	req.Header.Set("User-Agent", version.UserAgent())
+
+	return s.RoundTripper.RoundTrip(req)
+}
+
 type mediaTypes []string
 
 func (s mediaTypes) Matches(val string) bool {

cli.go

@@ -82,6 +82,8 @@ type Config struct {
 	Keyring struct {
 		MockMode bool `env:"ANCHOR_CLI_KEYRING_MOCK_MODE"`
 	}
+
+	Version struct{} `cmd:"version"`
 }
 
 type UI struct {

cmd/anchor/main.go

@@ -15,6 +15,7 @@ import (
 	"github.com/anchordotdev/cli/lcl"
 	"github.com/anchordotdev/cli/trust"
 	"github.com/anchordotdev/cli/ui"
+	versionpkg "github.com/anchordotdev/cli/version"
 )
 
 var (
@@ -166,6 +167,13 @@ var (
 					},
 				},
 			},
+			{
+				UI: versionpkg.Command{}.UI(),
+
+				Name:  "version",
+				Use:   "version",
+				Short: "Show version info",
+			},
 		},
 
 		Preflight: versionCheck,
@@ -175,11 +183,15 @@ var (
 
 	// Version info set by GoReleaser via ldflags
 
-	version = "dev"
-	commit  = "none"    //lint:ignore U1000 set by GoReleaser
-	date    = "unknown" //lint:ignore U1000 set by GoReleaser
+	version, commit, date string
 )
 
+func init() {
+	if version != "" {
+		versionpkg.Set(version, commit, date)
+	}
+}
+
 func main() {
 	ctx, cancel := context.WithCancel(context.Background())
 	defer cancel()
@@ -190,7 +202,7 @@ func main() {
 }
 
 func versionCheck(ctx context.Context) error {
-	if version == "dev" {
+	if version == "" {
 		return nil
 	}
 

lcl/lcl.go

@@ -14,6 +14,7 @@ import (
 	"github.com/anchordotdev/cli/auth"
 	"github.com/anchordotdev/cli/lcl/models"
 	"github.com/anchordotdev/cli/ui"
+	"github.com/anchordotdev/cli/version"
 )
 
 type Command struct {
@@ -118,6 +119,7 @@ func provisionCert(eab *api.Eab, domains []string, acmeURL string) (*tls.Certifi
 		HostPolicy: autocert.HostWhitelist(domains...),
 		Client: &acme.Client{
 			DirectoryURL: acmeURL,
+			UserAgent:    version.UserAgent(),
 		},
 		ExternalAccountBinding: &acme.ExternalAccountBinding{
 			KID: eab.Kid,

version/command.go

@@ -0,0 +1,23 @@
+package version
+
+import (
+	"context"
+	"fmt"
+
+	"github.com/muesli/termenv"
+
+	"github.com/anchordotdev/cli"
+)
+
+type Command struct{}
+
+func (c Command) UI() cli.UI {
+	return cli.UI{
+		RunTTY: c.run,
+	}
+}
+
+func (c Command) run(ctx context.Context, tty termenv.File) error {
+	_, err := fmt.Fprintln(tty, String())
+	return err
+}

version/command_test.go

@@ -0,0 +1,23 @@
+package version
+
+import (
+	"context"
+	"testing"
+
+	"github.com/anchordotdev/cli/api/apitest"
+)
+
+func TestCommand(t *testing.T) {
+	ctx, cancel := context.WithCancel(context.Background())
+	defer cancel()
+
+	cmd := new(Command)
+	buf, err := apitest.RunTTY(ctx, cmd.UI())
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	if want, got := String()+"\n", buf.String(); want != got {
+		t.Errorf("want output %q, got %q", want, got)
+	}
+}

version/version.go

@@ -0,0 +1,32 @@
+package version
+
+import (
+	"fmt"
+	"runtime"
+)
+
+var info = struct {
+	version, commit, date string
+
+	os, arch string
+}{
+	version: "dev",
+	commit:  "none",
+	date:    "unknown",
+	os:      runtime.GOOS,
+	arch:    runtime.GOARCH,
+}
+
+func Set(version, commit, date string) {
+	info.version = version
+	info.commit = commit
+	info.date = date
+}
+
+func String() string {
+	return fmt.Sprintf("%s (%s/%s) Commit: %s BuildDate: %s", info.version, info.os, info.arch, info.commit, info.date)
+}
+
+func UserAgent() string {
+	return "Anchor CLI " + String()
+}