chore: use User-Agent header (#4662)

snyk · Jun 15, 2023 · 4e26e3c · 4e26e3c
1 parent c52782f
commit 4e26e3c
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 5 deletions.
diff --git a/cliv2/cmd/cliv2/main.go b/cliv2/cmd/cliv2/main.go
@@ -323,7 +323,10 @@ func displayError(err error) {
 	}
 }
 
-func logHeaderAuthorizationInfo(config configuration.Configuration, networkAccess networking.NetworkAccess) (string, string) {
+func logHeaderAuthorizationInfo(
+	config configuration.Configuration,
+	networkAccess networking.NetworkAccess,
+) (string, string) {
 	oauthEnabled := "Disabled"
 	authorization := ""
 	tokenShaSum := ""
@@ -439,7 +442,10 @@ func MainWithErrorCode() int {
 	// init NetworkAccess
 	networkAccess := engine.GetNetworkAccess()
 	networkAccess.AddHeaderField("x-snyk-cli-version", cliv2.GetFullVersion())
-	networkAccess.AddHeaderField("User-Agent", "snyk-cli/"+cliv2.GetFullVersion())
+	networkAccess.AddHeaderField(
+		"User-Agent",
+		networking.UserAgentFromConfig(config, "snyk-cli", cliv2.GetFullVersion()).String(),
+	)
 
 	if debugEnabled {
 		writeLogHeader(config, networkAccess)

diff --git a/cliv2/go.mod b/cliv2/go.mod
@@ -11,7 +11,7 @@ require (
 	github.com/rs/zerolog v1.29.1
 	github.com/snyk/cli-extension-iac-rules v0.0.0-20230601153200-c572cfce46ce
 	github.com/snyk/cli-extension-sbom v0.0.0-20230608154310-6573cedca977
-	github.com/snyk/go-application-framework v0.0.0-20230608152503-40b6d700aefa
+	github.com/snyk/go-application-framework v0.0.0-20230614130554-b66a702d7528
 	github.com/snyk/go-httpauth v0.0.0-20230512081507-800aedece3cb
 	github.com/snyk/snyk-iac-capture v0.6.0
 	github.com/spf13/cobra v1.7.0

diff --git a/cliv2/go.sum b/cliv2/go.sum
@@ -578,8 +578,8 @@ github.com/snyk/cli-extension-iac-rules v0.0.0-20230601153200-c572cfce46ce h1:Wc
 github.com/snyk/cli-extension-iac-rules v0.0.0-20230601153200-c572cfce46ce/go.mod h1:5/IYYTgf32pST7St4GhS3KNz32WE17Ys+Hdb5Pqxex0=
 github.com/snyk/cli-extension-sbom v0.0.0-20230608154310-6573cedca977 h1:kW8XGQ3hseTP6WbGrO4Q6ssqGejT02hleNzxfWga72E=
 github.com/snyk/cli-extension-sbom v0.0.0-20230608154310-6573cedca977/go.mod h1:O/cjwCbKhJQWyXHPmNbZ7ToQKnhyw0VUp1Qhim3WEcw=
-github.com/snyk/go-application-framework v0.0.0-20230608152503-40b6d700aefa h1:ayXWL+vemwdQqATgvUAoTZG8wq8bEZ52iCnEyISlQ70=
-github.com/snyk/go-application-framework v0.0.0-20230608152503-40b6d700aefa/go.mod h1:Aun65T/AmzxjZe9jZZBqia6RHwoS7oq8QB2UfQIcPjU=
+github.com/snyk/go-application-framework v0.0.0-20230614130554-b66a702d7528 h1:9D2zvqLKRRzou7evXRBgZn+uhE8qFRLXrihLMxzPMHY=
+github.com/snyk/go-application-framework v0.0.0-20230614130554-b66a702d7528/go.mod h1:Aun65T/AmzxjZe9jZZBqia6RHwoS7oq8QB2UfQIcPjU=
 github.com/snyk/go-httpauth v0.0.0-20230512081507-800aedece3cb h1:UwbUBfe1u5MYLhtCNOsFEM98tfEUWqgmaXam/UxU88Q=
 github.com/snyk/go-httpauth v0.0.0-20230512081507-800aedece3cb/go.mod h1:88KbbvGYlmLgee4OcQ19yr0bNpXpOr2kciOthaSzCAg=
 github.com/snyk/policy-engine v0.22.0 h1:od9pduGrXyfWO791X+8M1qmnvWUxaIXh0gBzGKqeseA=