Merge pull request #18 from Mattias-/ref-user-agent

Move user agent to provider

buildkite/client/client.go

@@ -13,14 +13,11 @@ import (
 
 	"github.com/machinebox/graphql"
 	"github.com/pkg/errors"
-
-	"github.com/tink-ab/terraform-provider-buildkite/buildkite/version"
 )
 
 const (
 	defaultBaseURL             = "https://api.buildkite.com/"
 	defaultGraphQLUrl          = "https://graphql.buildkite.com/v1"
-	userAgent                  = "terraform-provider-buildkite/"
 	applicationJsonContentType = "application/json"
 )
 
@@ -32,8 +29,8 @@ type Client struct {
 	apiToken string
 }
 
-func NewClient(orgSlug string, apiToken string) *Client {
-	var authTransport http.RoundTripper = NewAuthTransport(apiToken, userAgent+version.Version, nil)
+func NewClient(orgSlug string, apiToken string, userAgent string) *Client {
+	var authTransport http.RoundTripper = NewAuthTransport(apiToken, userAgent, nil)
 	baseURL, _ := url.Parse(defaultBaseURL)
 
 	return &Client{

buildkite/provider/provider.go

@@ -9,6 +9,10 @@ import (
 	"github.com/tink-ab/terraform-provider-buildkite/buildkite/version"
 )
 
+const (
+	userAgent = "terraform-provider-buildkite/"
+)
+
 func Provider() *schema.Provider {
 	log.Printf("[DEBUG] Buildkite provider version %s", version.Version)
 	return &schema.Provider{
@@ -45,5 +49,5 @@ func providerConfigure(d *schema.ResourceData) (interface{}, error) {
 	orgName := d.Get("organization").(string)
 	apiToken := d.Get("api_token").(string)
 
-	return client.NewClient(orgName, apiToken), nil
+	return client.NewClient(orgName, apiToken, userAgent+version.Version), nil
 }