makefile

Author: BeryJu

.gitignore

@@ -0,0 +1 @@
+bin/**

Makefile

@@ -0,0 +1,17 @@
+.ONESHELL:
+.SHELLFLAGS += -x -e
+PWD = $(shell pwd)
+UID = $(shell id -u)
+GID = $(shell id -g)
+VERSION = "0.1.0"
+LD_FLAGS = -X goauthentik.io/cli/pkg/cfg.Version=${VERSION}
+GO_FLAGS = -ldflags "${LD_FLAGS}" -v
+
+bin/ak:
+	$(eval LD_FLAGS := -X goauthentik.io/cli/pkg/cfg.Version=${VERSION} -X goauthentik.io/cli/pkg/cfg.BuildHash=dev-$(shell git rev-parse HEAD))
+	go build \
+		-ldflags "${LD_FLAGS} -X goauthentik.io/cli/pkg/cfg.BuildHash=${GIT_BUILD_HASH}" \
+		-v -a -o bin/ak .
+
+clean:
+	rm -rf ${PWD}/bin/*

cmd/root.go

@@ -1,10 +1,12 @@
 package cmd
 
 import (
+	"fmt"
 	"os"
 
 	log "github.com/sirupsen/logrus"
 	"github.com/spf13/cobra"
+	"goauthentik.io/cli/pkg/cfg"
 )
 
 func mustFlag[T any](res T, err error) T {
@@ -17,7 +19,7 @@ func mustFlag[T any](res T, err error) T {
 // rootCmd represents the base command when called without any subcommands
 var rootCmd = &cobra.Command{
 	Use:   "ak",
-	Short: "authentik CLI",
+	Short: fmt.Sprintf("authentik CLI v%s", cfg.FullVersion()),
 	PersistentPreRun: func(cmd *cobra.Command, args []string) {
 		verbose := mustFlag(cmd.Flags().GetBool("verbose"))
 		if verbose {

pkg/agent/tray.go

@@ -5,6 +5,7 @@ import (
 
 	"github.com/kolide/systray"
 	"goauthentik.io/cli/pkg/agent/icon"
+	"goauthentik.io/cli/pkg/cfg"
 )
 
 func (a *Agent) startSystray() {
@@ -25,7 +26,7 @@ func (a *Agent) systrayReady() {
 }
 
 func (a *Agent) systrayEarlyItems() {
-	_ = systray.AddMenuItem("authentik CLI v0.1", "")
+	_ = systray.AddMenuItem(fmt.Sprintf("authentik CLI v%s", cfg.FullVersion()), "")
 }
 
 func (a *Agent) systrayLateItems() {

pkg/ak/refresher.go pkg/ak/token.go

@@ -0,0 +1,31 @@
+package cfg
+
+import (
+	"strings"
+)
+
+// Set via ldflags
+var (
+	Version   = ""
+	BuildHash = ""
+)
+
+func FullVersion() string {
+	version := strings.Builder{}
+	version.WriteString(Version)
+	if BuildHash != "" {
+		version.WriteRune('-')
+		if len(BuildHash) >= 8 {
+			version.WriteString(BuildHash[:8])
+		} else {
+			version.WriteString(BuildHash)
+		}
+	}
+	return version.String()
+}
+
+func init() {
+	if BuildHash == "" {
+		BuildHash = "dev"
+	}
+}