add VersionString() to user agent

atomicptr · Apr 4, 2020 · fae309d · fae309d
1 parent edef46d
commit fae309d
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 3 deletions.
diff --git a/pkg/cli/crawl/request_modifiers.go b/pkg/cli/crawl/request_modifiers.go
@@ -10,7 +10,7 @@ import (
 
 func addUserAgentToRequest() crawler.RequestModifierFunc {
 	return func(req *http.Request) {
-		req.Header.Set("User-Agent", meta.UserAgent)
+		req.Header.Set("User-Agent", meta.UserAgent())
 	}
 }
 

diff --git a/pkg/cli/crawl/request_modifiers_test.go b/pkg/cli/crawl/request_modifiers_test.go
@@ -17,7 +17,7 @@ func TestAddUserAgentToRequest(t *testing.T) {
 	modifier.Do(req)
 
 	assert.NotEmpty(t, req.Header.Get("User-Agent"))
-	assert.Equal(t, meta.UserAgent, req.Header.Get("User-Agent"))
+	assert.Equal(t, meta.UserAgent(), req.Header.Get("User-Agent"))
 }
 
 func TestAddPrefixUrlToRequest(t *testing.T) {

diff --git a/pkg/meta/version.go b/pkg/meta/version.go
@@ -4,8 +4,14 @@ import "fmt"
 
 var Version = ""
 var GitCommit = ""
-var UserAgent = "github.com/atomicptr/crab"
+var UserAgentBase = "github.com/atomicptr/crab"
 
+// UserAgent returns the user agent
+func UserAgent() string {
+	return fmt.Sprintf("%s (%s)", UserAgentBase, VersionString())
+}
+
+// VersionString returns the build version and commit.
 func VersionString() string {
 	commitString := ""
 	// ignore warning, this value will be later added as a build flag