[Terraform]: Add provider version to useragent. (#891)

Merged PR #891.
GoogleCloudPlatform · Nov 14, 2018 · 5885b68 · 5885b68
1 parent da8934a
commit 5885b68
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 6 deletions.
diff --git a/build/terraform b/build/terraform
diff --git a/build/terraform-beta b/build/terraform-beta
diff --git a/third_party/terraform/utils/config.go.erb b/third_party/terraform/utils/config.go.erb
@@ -11,7 +11,6 @@ import (
 
 	"github.com/hashicorp/terraform/helper/logging"
 	"github.com/hashicorp/terraform/helper/pathorcontents"
-	"github.com/hashicorp/terraform/version"
 
 	"golang.org/x/oauth2"
 	"golang.org/x/oauth2/google"
@@ -167,9 +166,14 @@ func (c *Config) loadAndValidate() error {
 
 	client.Transport = logging.NewTransport("Google", client.Transport)
 
-	projectURL := "https://www.terraform.io"
-	userAgent := fmt.Sprintf("Terraform/%s (+%s)",
-		version.String(), projectURL)
+	terraformVersion := httpclient.UserAgentString()
+	<% if version.nil? || version == 'ga' -%>
+	providerVersion := fmt.Sprintf("terraform-provider-google/%s", version.ProviderVersion)
+	<% else -%>
+	providerVersion := fmt.Sprintf("terraform-provider-google-<%= version -%>/%s", version.ProviderVersion)
+	<% end -%>
+	terraformWebsite := "(+https://www.terraform.io)"
+	userAgent := fmt.Sprintf("%s %s %s", terraformVersion, terraformWebsite, providerVersion)
 
 	c.client = client
 	c.userAgent = userAgent