add SDK version to useragent header

hashicorp · Sep 10, 2019 · 9f40692 · 9f40692
1 parent 2ae14ce
commit 9f40692
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git 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
@@ -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