Enable custom UserAgent

Author: bishtawi

gitlab/config.go

@@ -3,6 +3,7 @@ package gitlab
 import (
 	"crypto/tls"
 	"crypto/x509"
+	"fmt"
 	"io/ioutil"
 	"net/http"
 
@@ -12,12 +13,13 @@ import (
 
 // Config is per-provider, specifies where to connect to gitlab
 type Config struct {
-	Token      string
-	BaseURL    string
-	Insecure   bool
-	CACertFile string
-	ClientCert string
-	ClientKey  string
+	Token            string
+	BaseURL          string
+	Insecure         bool
+	CACertFile       string
+	ClientCert       string
+	ClientKey        string
+	TerraformVersion string
 }
 
 // Client returns a *gitlab.Client to interact with the configured gitlab instance
@@ -61,6 +63,10 @@ func (c *Config) Client() (interface{}, error) {
 				Transport: logging.NewTransport("GitLab", t),
 			},
 		),
+		func(client *gitlab.Client) error {
+			client.UserAgent = fmt.Sprintf("terraform-provider-gitlab/%s", c.TerraformVersion)
+			return nil
+		},
 	}
 
 	if c.BaseURL != "" {

gitlab/provider.go

@@ -118,12 +118,13 @@ func init() {
 
 func providerConfigure(d *schema.ResourceData) (interface{}, error) {
 	config := Config{
-		Token:      d.Get("token").(string),
-		BaseURL:    d.Get("base_url").(string),
-		CACertFile: d.Get("cacert_file").(string),
-		Insecure:   d.Get("insecure").(bool),
-		ClientCert: d.Get("client_cert").(string),
-		ClientKey:  d.Get("client_key").(string),
+		Token:            d.Get("token").(string),
+		BaseURL:          d.Get("base_url").(string),
+		CACertFile:       d.Get("cacert_file").(string),
+		Insecure:         d.Get("insecure").(bool),
+		ClientCert:       d.Get("client_cert").(string),
+		ClientKey:        d.Get("client_key").(string),
+		TerraformVersion: "TODO", // TODO: How to get Terraform version?
 	}
 
 	return config.Client()
@@ -132,7 +133,7 @@ func providerConfigure(d *schema.ResourceData) (interface{}, error) {
 func validateApiURLVersion(value interface{}, key string) (ws []string, es []error) {
 	v := value.(string)
 	if strings.HasSuffix(v, "/api/v3") || strings.HasSuffix(v, "/api/v3/") {
-		es = append(es, fmt.Errorf("terraform-gitlab-provider does not support v3 api; please upgrade to /api/v4 in %s", v))
+		es = append(es, fmt.Errorf("terraform-provider-gitlab does not support v3 api; please upgrade to /api/v4 in %s", v))
 	}
 	return
 }