Merge pull request #13749 from Microsoft/adduseragent

Add GOOS in User-Agent

integration-cli/docker_api_test.go

@@ -35,7 +35,7 @@ func (s *DockerSuite) TestVersionStatusCode(c *check.C) {
 
 	req, err := http.NewRequest("GET", "/v999.0/version", nil)
 	c.Assert(err, check.IsNil)
-	req.Header.Set("User-Agent", "Docker-Client/999.0")
+	req.Header.Set("User-Agent", "Docker-Client/999.0 (os)")
 
 	res, err := client.Do(req)
 	c.Assert(res.StatusCode, check.Equals, http.StatusBadRequest)

integration-cli/docker_cli_config_test.go

@@ -7,7 +7,9 @@ import (
 	"os"
 	"os/exec"
 	"path/filepath"
+	"runtime"
 
+	"github.com/docker/docker/autogen/dockerversion"
 	"github.com/docker/docker/pkg/homedir"
 	"github.com/go-check/check"
 )
@@ -50,6 +52,14 @@ func (s *DockerSuite) TestConfigHttpHeader(c *check.C) {
 	cmd := exec.Command(dockerBinary, "-H="+server.URL[7:], "ps")
 	out, _, _ := runCommandWithOutput(cmd)
 
+	if headers["User-Agent"] == nil {
+		c.Fatalf("Missing User-Agent: %q\nout:%v", headers, out)
+	}
+
+	if headers["User-Agent"][0] != "Docker-Client/"+dockerversion.VERSION+" ("+runtime.GOOS+")" {
+		c.Fatalf("Badly formatted User-Agent: %q\nout:%v", headers, out)
+	}
+
 	if headers["Myheader"] == nil || headers["Myheader"][0] != "MyValue" {
 		c.Fatalf("Missing/bad header: %q\nout:%v", headers, out)
 	}