summaryrefslogtreecommitdiff
path: root/client/httpclient_test.go
diff options
context:
space:
mode:
authorZeger-Jan van de Weg <git@zjvandeweg.nl>2020-10-14 16:56:49 +0200
committerZeger-Jan van de Weg <git@zjvandeweg.nl>2020-10-14 17:12:43 +0200
commit3f03127314bd768efd0bef57915320545afcdd78 (patch)
tree6bf635e8343edfed9d847726db27259dcb5f0a96 /client/httpclient_test.go
parentd5fdca30a0e5e7bec6f229aaff966a92ba369331 (diff)
downloadgitlab-shell-zj-override-user-agent.tar.gz
client: Allow User-Agent header to be overriddenzj-override-user-agent
The user agent for requests to the internal API endpoints used the default Go provided user agent. This change updates that to always set something else, by default `GitLab-Shell`. Than for others importing the package, there's a new API to set it to something else. This has been done with new method, a setter, to maintain backwards compatibility in the API.
Diffstat (limited to 'client/httpclient_test.go')
-rw-r--r--client/httpclient_test.go29
1 files changed, 29 insertions, 0 deletions
diff --git a/client/httpclient_test.go b/client/httpclient_test.go
index 97e1384..59dabc4 100644
--- a/client/httpclient_test.go
+++ b/client/httpclient_test.go
@@ -94,6 +94,35 @@ func TestEmptyBasicAuthSettings(t *testing.T) {
require.NoError(t, err)
}
+func TestRequestWithUserAgent(t *testing.T) {
+ const gitalyUserAgent = "gitaly/13.5.0"
+ requests := []testserver.TestRequestHandler{
+ {
+ Path: "/api/v4/internal/default_user_agent",
+ Handler: func(w http.ResponseWriter, r *http.Request) {
+ assert.Equal(t, defaultUserAgent, r.UserAgent())
+ },
+ },
+ {
+ Path: "/api/v4/internal/override_user_agent",
+ Handler: func(w http.ResponseWriter, r *http.Request) {
+ assert.Equal(t, gitalyUserAgent, r.UserAgent())
+ },
+ },
+ }
+
+ client, cleanup := setup(t, "", "", requests)
+ defer cleanup()
+
+ _, err := client.Get(context.Background(), "/default_user_agent")
+ require.NoError(t, err)
+
+ client.SetUserAgent(gitalyUserAgent)
+ _, err = client.Get(context.Background(), "/override_user_agent")
+ require.NoError(t, err)
+
+}
+
func setup(t *testing.T, username, password string, requests []testserver.TestRequestHandler) (*GitlabNetClient, func()) {
url, cleanup := testserver.StartHttpServer(t, requests)