Make default headers config driven

uber · Oct 31, 2019 · f0051d8 · f0051d8
1 parent fe0b53c
commit f0051d8
Show file tree

Hide file tree

Showing 11 changed files with 31 additions and 10 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
@@ -66,6 +66,9 @@ tchannel.port: 7784
 tchannel.processName: example-gateway
 tchannel.serviceName: example-gateway
 tchannel.clients.requestUUIDHeaderKey: x-request-uuid
+http.defaultHeaders:
+  Accept: application/json
+  Content-Type: application/json
 useDatacenter: false
 clients.baz.alternates:
   routingConfigs:

diff --git a/examples/example-gateway/config/test.yaml b/examples/example-gateway/config/test.yaml
@@ -67,6 +67,9 @@ tchannel.port: 0
 tchannel.processName: example-gateway
 tchannel.serviceName: example-gateway
 tchannel.clients.requestUUIDHeaderKey: x-request-uuid
+http.defaultHeaders:
+  Accept: application/json
+  Content-Type: application/json
 useDatacenter: false
 clients.baz.alternates:
   routingConfigs:

diff --git a/runtime/client_http_request.go b/runtime/client_http_request.go
@@ -171,15 +171,6 @@ func (req *ClientHTTPRequest) WriteJSON(
 		httpReq.Header.Set(k, headers[k])
 	}
 
-	if body != nil {
-		httpReq.Header.Set(http.CanonicalHeaderKey(contentTypeHeader), contentTypeHeaderValue)
-	}
-
-	/* Only unmarshal JSON is supported today so set this as default if none present */
-	if _, ok := headers[http.CanonicalHeaderKey(acceptHeader)]; !ok {
-		httpReq.Header.Set(acceptHeader, acceptHeaderValue)
-	}
-
 	req.httpReq = httpReq
 	req.ctx = WithLogFields(req.ctx,
 		zap.String(logFieldClientHTTPMethod, method),