Simplify logic

Author: bishtawi

gitlab/config.go

@@ -12,17 +12,16 @@ 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
-	TerraformUserAgent string
+	Token      string
+	BaseURL    string
+	Insecure   bool
+	CACertFile string
+	ClientCert string
+	ClientKey  string
 }
 
 // Client returns a *gitlab.Client to interact with the configured gitlab instance
-func (c *Config) Client() (interface{}, error) {
+func (c *Config) Client() (*gitlab.Client, error) {
 	// Configure TLS/SSL
 	tlsConfig := &tls.Config{}
 
@@ -62,10 +61,6 @@ func (c *Config) Client() (interface{}, error) {
 				Transport: logging.NewTransport("GitLab", t),
 			},
 		),
-		func(client *gitlab.Client) error {
-			client.UserAgent = c.TerraformUserAgent
-			return nil
-		},
 	}
 
 	if c.BaseURL != "" {

gitlab/provider.go

@@ -129,13 +129,18 @@ func providerConfigure(p *schema.Provider, d *schema.ResourceData) (interface{},
 		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),
+	client, err := config.Client()
+	if err != nil {
+		return nil, err
 	}
 
-	return config.Client()
+	// NOTE: httpclient.TerraformUserAgent is deprecated and removed in Terraform SDK v2
+	// After upgrading the SDK to v2 replace with p.UserAgent("terraform-provider-gitlab")
+	client.UserAgent = httpclient.TerraformUserAgent(p.TerraformVersion) + " terraform-provider-gitlab"
+
+	return client, err
 }
 
 func validateApiURLVersion(value interface{}, key string) (ws []string, es []error) {