Updated code for provider version in User-Agent

GNUmakefile

@@ -7,7 +7,7 @@ VERSION=$(shell git describe --tags --always)
 default: build
 
 build: fmtcheck
-	go install -ldflags="-X github.com/terraform-providers/terraform-provider-cloudflare/cloudflare.pluginVersion=$(VERSION)"
+	go install -ldflags="-X github.com/terraform-providers/terraform-provider-cloudflare/version.ProviderVersion=$(VERSION)"
 
 test: fmtcheck
 	go test -i $(TEST) || exit 1
@@ -61,4 +61,3 @@ endif
 	@$(MAKE) -C $(GOPATH)/src/$(WEBSITE_REPO) website-provider-test PROVIDER_PATH=$(shell pwd) PROVIDER_NAME=$(PKG_NAME)
 
 .PHONY: build test testacc vet fmt fmtcheck errcheck vendor-status test-compile website website-test
-

cloudflare/provider.go

@@ -3,16 +3,17 @@ package cloudflare
 import (
 	"log"
 	"os"
+	"strings"
 
 	"fmt"
 
 	"github.com/cloudflare/cloudflare-go"
 	"github.com/hashicorp/terraform/helper/schema"
+	"github.com/hashicorp/terraform/httpclient"
 	"github.com/hashicorp/terraform/terraform"
+	"github.com/terraform-providers/terraform-provider-cloudflare/version"
 )
 
-var pluginVersion string
-
 // Provider returns a terraform.ResourceProvider.
 func Provider() terraform.ResourceProvider {
 	return &schema.Provider{
@@ -163,9 +164,12 @@ func providerConfigure(d *schema.ResourceData) (interface{}, error) {
 		return client, err
 	}
 
-	if pluginVersion != "" {
-		options = append(options, cloudflare.UserAgent("terraform-provider-cloudflare/"+pluginVersion))
-	}
+	// TODO: This is the SDK version not the CLI version, once we are on 0.12, should revisit
+	tfUserAgent := httpclient.UserAgentString()
+
+	pv := version.ProviderVersion
+	providerUserAgent := fmt.Sprintf("%s terraform-provider-cloudflare/%s", tfUserAgent, pv)
+	options = append(options, cloudflare.UserAgent(strings.TrimSpace(fmt.Sprintf("%s %s", client.UserAgent, providerUserAgent))))
 
 	config = Config{
 		Email:   d.Get("email").(string),

version/version.go

@@ -0,0 +1,6 @@
+package version
+
+var (
+	// ProviderVersion is set during the release process to the release version of the binary
+	ProviderVersion = "dev"
+)