Merge pull request #665 from uber/add_application/json

Add application/json too all requests by default
uber · Oct 31, 2019 · e670e4d · e670e4d
2 parents 3270596 + a7407ab
commit e670e4d
Show file tree

Hide file tree

Showing 13 changed files with 35 additions and 5 deletions.
diff --git a/codegen/template_bundle/template_files.go b/codegen/template_bundle/template_files.go
diff --git a/codegen/templates/http_client.tmpl b/codegen/templates/http_client.tmpl
@@ -78,6 +78,9 @@ func {{$exportName}}(deps *module.Dependencies) Client {
 		timeoutVal,
 	)
 	defaultHeaders := make(map[string]string)
+	if deps.Default.Config.ContainsKey("http.defaultHeaders") {
+		deps.Default.Config.MustGetStruct("http.defaultHeaders", &defaultHeaders)
+	}
 	if deps.Default.Config.ContainsKey("clients.{{$clientID}}.defaultHeaders") {
 		deps.Default.Config.MustGetStruct("clients.{{$clientID}}.defaultHeaders", &defaultHeaders)
 	}

diff --git a/examples/example-gateway/build/clients/bar/bar.go b/examples/example-gateway/build/clients/bar/bar.go
diff --git a/examples/example-gateway/build/clients/contacts/contacts.go b/examples/example-gateway/build/clients/contacts/contacts.go
diff --git a/examples/example-gateway/build/clients/corge-http/corge-http.go b/examples/example-gateway/build/clients/corge-http/corge-http.go
diff --git a/examples/example-gateway/build/clients/google-now/google-now.go b/examples/example-gateway/build/clients/google-now/google-now.go
diff --git a/examples/example-gateway/build/clients/multi/multi.go b/examples/example-gateway/build/clients/multi/multi.go
diff --git a/examples/example-gateway/build/clients/withexceptions/withexceptions.go b/examples/example-gateway/build/clients/withexceptions/withexceptions.go
diff --git a/examples/example-gateway/config/production.yaml b/examples/example-gateway/config/production.yaml
@@ -46,6 +46,9 @@ clients.withexceptions.timeout: 10000
 clients.withexceptions.maxConcurrentRequests: 1000
 clients.withexceptions.errorPercentThreshold: 20
 envVarsToTagInRootScope: []
+http.defaultHeaders:
+  Accept: application/json
+  Content-Type: application/json
 http.port: 7783
 http.clients.requestUUIDHeaderKey: x-request-uuid
 logger.fileName: /var/log/example-gateway/example-gateway.log

diff --git a/examples/example-gateway/config/test.yaml b/examples/example-gateway/config/test.yaml
@@ -45,6 +45,9 @@ clients.withexceptions.maxConcurrentRequests: 1000
 clients.withexceptions.errorPercentThreshold: 20
 env: test
 envVarsToTagInRootScope: []
+http.defaultHeaders:
+  Accept: application/json
+  Content-Type: application/json
 http.port: 0
 http.clients.requestUUIDHeaderKey: x-request-uuid
 logger.fileName: /tmp/example-gateway.log

diff --git a/runtime/client_http_request.go b/runtime/client_http_request.go
@@ -164,10 +164,6 @@ func (req *ClientHTTPRequest) WriteJSON(
 		httpReq.Header.Set(k, headers[k])
 	}
 
-	if body != nil {
-		httpReq.Header.Set("Content-Type", "application/json")
-	}
-
 	req.httpReq = httpReq
 	req.ctx = WithLogFields(req.ctx,
 		zap.String(logFieldClientHTTPMethod, method),

diff --git a/runtime/client_http_request_test.go b/runtime/client_http_request_test.go
@@ -145,6 +145,7 @@ func TestMakingClientCallWithHeaders(t *testing.T) {
 			_, _ = w.Write([]byte(r.Header.Get("Example-Header")))
 			// Check that the default header got set and actually sent to the server.
 			assert.Equal(t, r.Header.Get("X-Client-ID"), "bar")
+			assert.Equal(t, r.Header.Get("Accept"), "application/test+json")
 		},
 	)
 
@@ -160,6 +161,7 @@ func TestMakingClientCallWithHeaders(t *testing.T) {
 		client.BaseURL+"/bar-path",
 		map[string]string{
 			"Example-Header": "Example-Value",
+			"Accept":         "application/test+json",
 		},
 		nil,
 	)
@@ -284,6 +286,7 @@ func TestMakingClientCallWithRespHeaders(t *testing.T) {
 		"clientHTTPMethod":                 "POST",
 		"Client-Req-Header-X-Client-Id":    "bar",
 		"Client-Req-Header-Content-Type":   "application/json",
+		"Client-Req-Header-Accept":         "application/json",
 		"Client-Res-Header-Example-Header": "Example-Value",
 		"Client-Res-Header-Content-Type":   "text/plain; charset=utf-8",
 	}

diff --git a/test/endpoints/bar/bar_metrics_test.go b/test/endpoints/bar/bar_metrics_test.go
@@ -220,6 +220,7 @@ func TestCallMetrics(t *testing.T) {
 		"clientHTTPMethod":               "POST",
 		"Client-Req-Header-X-Client-Id":  "bar",
 		"Client-Req-Header-Content-Type": "application/json",
+		"Client-Req-Header-Accept":       "application/json",
 		"Client-Res-Header-Content-Type": "text/plain; charset=utf-8",
 
 		"zone":            "unknown",