From 42001785b9b928c201961dcde51e4e755435227a Mon Sep 17 00:00:00 2001
From: Paul Kuruvilla <rohitpaulk@gmail.com>
Date: Sun, 30 Oct 2022 15:08:32 +0000
Subject: [PATCH] fix version detection

---
 .goreleaser.yml                       |  1 +
 cmd/codecrafters/main.go              |  6 ++----
 internal/utils/codecrafters_client.go |  9 ++++-----
 internal/utils/version.go             | 10 ++++++++++
 4 files changed, 17 insertions(+), 9 deletions(-)
 create mode 100644 internal/utils/version.go

diff --git a/.goreleaser.yml b/.goreleaser.yml
index 679c76b..b7db28c 100644
--- a/.goreleaser.yml
+++ b/.goreleaser.yml
@@ -2,6 +2,7 @@ builds:
 - env:
     - CGO_ENABLED=0
   main: ./cmd/codecrafters
+  ldflags: "-s -w -X utils.version={{.Version}} -X utils.commit={{.Commit}}"
 archives:
   - name_template: "{{ .Tag }}_{{ .Os }}_{{ .Arch }}"
     format: binary
diff --git a/cmd/codecrafters/main.go b/cmd/codecrafters/main.go
index 5d2cf3d..3b253b5 100644
--- a/cmd/codecrafters/main.go
+++ b/cmd/codecrafters/main.go
@@ -4,12 +4,10 @@ import (
 	"flag"
 	"fmt"
 	"github.com/codecrafters-io/cli/internal/commands"
+	"github.com/codecrafters-io/cli/internal/utils"
 	"os"
 )
 
-var version string = "0"
-var commit string = "unknown"
-
 // Usage: codecrafters test
 func main() {
 	flag.Usage = func() {
@@ -23,7 +21,7 @@ USAGE
 
 COMMANDS
   test:  run tests on project in current directory
-`, fmt.Sprintf("v%s-%s", version, commit[:7]))
+`, utils.VersionString())
 
 	}
 
diff --git a/internal/utils/codecrafters_client.go b/internal/utils/codecrafters_client.go
index f71d662..4e59e2b 100644
--- a/internal/utils/codecrafters_client.go
+++ b/internal/utils/codecrafters_client.go
@@ -26,17 +26,16 @@ type FetchSubmissionResponse struct {
 }
 
 type CodecraftersClient struct {
-	ServerUrl  string
-	CLIVersion string
+	ServerUrl string
 }
 
-func NewCodecraftersClient(serverUrl string, cliVersion string) CodecraftersClient {
-	return CodecraftersClient{ServerUrl: serverUrl, CLIVersion: cliVersion}
+func NewCodecraftersClient(serverUrl string) CodecraftersClient {
+	return CodecraftersClient{ServerUrl: serverUrl}
 }
 
 func (c CodecraftersClient) headers() map[string]string {
 	return map[string]string{
-		"X-Codecrafters-CLI-Version": c.CLIVersion,
+		"X-Codecrafters-CLI-Version": VersionString(),
 	}
 }
 
diff --git a/internal/utils/version.go b/internal/utils/version.go
new file mode 100644
index 0000000..af9f2b1
--- /dev/null
+++ b/internal/utils/version.go
@@ -0,0 +1,10 @@
+package utils
+
+import "fmt"
+
+var version string = "0"
+var commit string = "unknown"
+
+func VersionString() string {
+	return fmt.Sprintf("v%s-%s", version, commit[:7])
+}