From 9f40692c23934e33749650510d782626898e76e1 Mon Sep 17 00:00:00 2001 From: Katy Moe Date: Mon, 9 Sep 2019 16:26:15 +0100 Subject: [PATCH] add SDK version to useragent header --- httpclient/useragent.go | 4 +++- httpclient/useragent_test.go | 4 +++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/httpclient/useragent.go b/httpclient/useragent.go index 5d444ae5119..36b494c0149 100644 --- a/httpclient/useragent.go +++ b/httpclient/useragent.go @@ -5,12 +5,14 @@ import ( "log" "os" "strings" + + "github.com/hashicorp/terraform-plugin-sdk/meta" ) const uaEnvVar = "TF_APPEND_USER_AGENT" func TerraformUserAgent(version string) string { - ua := fmt.Sprintf("HashiCorp Terraform/%s (+https://www.terraform.io)", version) + ua := fmt.Sprintf("HashiCorp Terraform/%s (+https://www.terraform.io) Terraform Plugin SDK/%s", version, meta.SDKVersionString()) if add := os.Getenv(uaEnvVar); add != "" { add = strings.TrimSpace(add) diff --git a/httpclient/useragent_test.go b/httpclient/useragent_test.go index afa9a545b8e..e5d88ed9a2e 100644 --- a/httpclient/useragent_test.go +++ b/httpclient/useragent_test.go @@ -4,6 +4,8 @@ import ( "fmt" "os" "testing" + + "github.com/hashicorp/terraform-plugin-sdk/meta" ) func TestUserAgentAppendViaEnvVar(t *testing.T) { @@ -13,7 +15,7 @@ func TestUserAgentAppendViaEnvVar(t *testing.T) { defer os.Unsetenv(uaEnvVar) } - expectedBase := "HashiCorp Terraform/0.0.0 (+https://www.terraform.io)" + expectedBase := "HashiCorp Terraform/0.0.0 (+https://www.terraform.io) Terraform Plugin SDK/" + meta.SDKVersionString() testCases := []struct { envVarValue string