Merge pull request #182 from terraform-providers/f-user-agent

provider: Use real Terraform version in UA header

fastly/config.go

@@ -14,6 +14,8 @@ const TerraformProviderProductUserAgent = "terraform-provider-fastly"
 type Config struct {
 	ApiKey  string
 	BaseURL string
+
+	terraformVersion string
 }
 
 type FastlyClient struct {
@@ -27,9 +29,10 @@ func (c *Config) Client() (interface{}, error) {
 		return nil, fmt.Errorf("[Err] No API key for Fastly")
 	}
 
-	composedUserAgent := fmt.Sprintf("%s %s/%s", httpclient.UserAgentString(), TerraformProviderProductUserAgent, version.ProviderVersion)
-
-	gofastly.UserAgent = composedUserAgent
+	tfUserAgent := httpclient.TerraformUserAgent(c.terraformVersion)
+	providerUserAgent := fmt.Sprintf("%s/%s", TerraformProviderProductUserAgent, version.ProviderVersion)
+	ua := fmt.Sprintf("%s %s", tfUserAgent, providerUserAgent)
+	gofastly.UserAgent = ua
 
 	fastlyClient, err := gofastly.NewClientForEndpoint(c.ApiKey, c.BaseURL)
 	if err != nil {

fastly/provider.go

@@ -8,7 +8,7 @@ import (
 
 // Provider returns a terraform.ResourceProvider.
 func Provider() terraform.ResourceProvider {
-	return &schema.Provider{
+	provider := &schema.Provider{
 		Schema: map[string]*schema.Schema{
 			"api_key": {
 				Type:        schema.TypeString,
@@ -32,15 +32,26 @@ func Provider() terraform.ResourceProvider {
 			"fastly_service_dictionary_items_v1":        resourceServiceDictionaryItemsV1(),
 			"fastly_service_dynamic_snippet_content_v1": resourceServiceDynamicSnippetContentV1(),
 		},
+	}
 
-		ConfigureFunc: providerConfigure,
+	provider.ConfigureFunc = func(d *schema.ResourceData) (interface{}, error) {
+		terraformVersion := provider.TerraformVersion
+		if terraformVersion == "" {
+			// Terraform 0.12 introduced this field to the protocol
+			// We can therefore assume that if it's missing it's 0.10 or 0.11
+			terraformVersion = "0.11+compatible"
+		}
+		return providerConfigure(d, terraformVersion)
 	}
+
+	return provider
 }
 
-func providerConfigure(d *schema.ResourceData) (interface{}, error) {
+func providerConfigure(d *schema.ResourceData, terraformVersion string) (interface{}, error) {
 	config := Config{
-		ApiKey:  d.Get("api_key").(string),
-		BaseURL: d.Get("base_url").(string),
+		ApiKey:           d.Get("api_key").(string),
+		BaseURL:          d.Get("base_url").(string),
+		terraformVersion: terraformVersion,
 	}
 	return config.Client()
 }

go.mod

@@ -6,5 +6,5 @@ require (
 	github.com/fastly/go-fastly v1.2.1
 	github.com/google/jsonapi v0.0.0-20180313013858-2dcc18f43696 // indirect
 	github.com/hashicorp/go-cleanhttp v0.5.0
-	github.com/hashicorp/terraform v0.12.3
+	github.com/hashicorp/terraform v0.12.7
 )