chore: [DI-1566] modify ua string (#159)

* [DI-1566] modify ua string

Author: claudiachua

client/client.go

@@ -29,8 +29,9 @@ func NewCredentials(username string, password string) *Credentials {
 // Client encapsulates a standard HTTP backend with authorization.
 type Client struct {
 	*Credentials
-	HTTPClient *http.Client
-	accountSid string
+	HTTPClient          *http.Client
+	accountSid          string
+	UserAgentExtensions []string
 }
 
 // default http Client should not follow redirects and return the most recent response.
@@ -118,8 +119,13 @@ func (c *Client) SendRequest(method string, rawURL string, data url.Values,
 
 	req.SetBasicAuth(c.basicAuth())
 
-	// E.g. "User-Agent": "twilio-go/1.0.0 (go1.16)"
-	userAgent := fmt.Sprint("twilio-go/", LibraryVersion, " (", goVersion, ")")
+	// E.g. "User-Agent": "twilio-go/1.0.0 (darwin amd64) go/go1.17.8"
+	userAgent := fmt.Sprintf("twilio-go/%s (%s %s) go/%s", LibraryVersion, runtime.GOOS, runtime.GOARCH, goVersion)
+
+	if len(c.UserAgentExtensions) > 0 {
+		userAgent += " " + strings.Join(c.UserAgentExtensions, " ")
+	}
+
 	req.Header.Add("User-Agent", userAgent)
 
 	if method == http.MethodPost {

client/client_test.go

@@ -7,6 +7,8 @@ import (
 	"net/http/httptest"
 	"net/url"
 	"os"
+	"regexp"
+	"strings"
 	"testing"
 	"time"
 
@@ -266,3 +268,25 @@ func TestClient_SetAccountSid(t *testing.T) {
 	client.SetAccountSid("account_sid")
 	assert.Equal(t, "account_sid", client.AccountSid())
 }
+
+func TestClient_DefaultUserAgentHeaders(t *testing.T) {
+	headerServer := httptest.NewServer(http.HandlerFunc(
+		func(writer http.ResponseWriter, request *http.Request) {
+			assert.Regexp(t, regexp.MustCompile(`^twilio-go/[0-9.]+\s\(\w+\s\w+\)\sgo/[^\s]+$`), request.Header.Get("User-Agent"))
+		}))
+
+	resp, _ := testClient.SendRequest("GET", headerServer.URL, nil, nil)
+	assert.Equal(t, 200, resp.StatusCode)
+}
+
+func TestClient_UserAgentExtensionsHeaders(t *testing.T) {
+	var expectedExtensions = []string{"twilio-run/2.0.0-test", "flex-plugin/3.4.0"}
+	testClient.UserAgentExtensions = expectedExtensions
+	headerServer := httptest.NewServer(http.HandlerFunc(
+		func(writer http.ResponseWriter, request *http.Request) {
+			var headersList = strings.Split(request.Header.Get("User-Agent"), " ")
+			assert.Equal(t, headersList[len(headersList)-len(expectedExtensions):], expectedExtensions)
+		}))
+	resp, _ := testClient.SendRequest("GET", headerServer.URL, nil, nil)
+	assert.Equal(t, 200, resp.StatusCode)
+}