Use Terraform SDK UserAgent function

Author: bishtawi

gitlab/config.go

@@ -3,7 +3,6 @@ package gitlab
 import (
 	"crypto/tls"
 	"crypto/x509"
-	"fmt"
 	"io/ioutil"
 	"net/http"
 
@@ -13,13 +12,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
-	TerraformVersion string
+	Token              string
+	BaseURL            string
+	Insecure           bool
+	CACertFile         string
+	ClientCert         string
+	ClientKey          string
+	TerraformUserAgent string
 }
 
 // Client returns a *gitlab.Client to interact with the configured gitlab instance
@@ -64,7 +63,7 @@ func (c *Config) Client() (interface{}, error) {
 			},
 		),
 		func(client *gitlab.Client) error {
-			client.UserAgent = fmt.Sprintf("terraform-provider-gitlab/%s", c.TerraformVersion)
+			client.UserAgent = c.TerraformUserAgent
 			return nil
 		},
 	}

gitlab/provider.go

@@ -5,6 +5,7 @@ import (
 	"strings"
 
 	"github.com/hashicorp/terraform-plugin-sdk/helper/schema"
+	"github.com/hashicorp/terraform-plugin-sdk/httpclient"
 	"github.com/hashicorp/terraform-plugin-sdk/terraform"
 )
 
@@ -122,13 +123,16 @@ func init() {
 
 func providerConfigure(p *schema.Provider, 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),
-		TerraformVersion: p.TerraformVersion,
+		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),
+
+		// NOTE: httpclient.TerraformUserAgent is deprecated and removed in Terraform SDK v2
+		// After upgrading the SDK to v2 replace with p.UserAgent()
+		TerraformUserAgent: httpclient.TerraformUserAgent(p.TerraformVersion),
 	}
 
 	return config.Client()