From 998bf45ffa0e5ec747b7d53082028f6ae7d6a400 Mon Sep 17 00:00:00 2001 From: r-patali Date: Tue, 28 Apr 2020 17:02:33 -0700 Subject: [PATCH 1/3] support for system wide whitelisting of default headers we have a concept of default middleware, this is a same concept where we don't need a whitelist of headers per endpoint but rather a system-wide whitelist that will be always forwarded when available. These should be used for more of control plane kind of headers rather than application logic. --- codegen/gateway.go | 3 +++ codegen/module_system.go | 2 ++ codegen/package.go | 5 +++++ codegen/runner/runner.go | 4 ++++ codegen/template_bundle/template_files.go | 16 +++++++++++++++- codegen/templates/workflow.tmpl | 14 ++++++++++++++ examples/example-gateway/build.yaml | 3 +++ .../bar/workflow/bar_bar_method_argnotstruct.go | 10 ++++++++++ .../workflow/bar_bar_method_argwithheaders.go | 10 ++++++++++ .../bar_bar_method_argwithmanyqueryparams.go | 10 ++++++++++ .../bar_bar_method_argwithneardupqueryparams.go | 10 ++++++++++ .../bar_bar_method_argwithnestedqueryparams.go | 10 ++++++++++ .../bar/workflow/bar_bar_method_argwithparams.go | 10 ++++++++++ ...bar_method_argwithparamsandduplicatefields.go | 10 ++++++++++ .../bar_bar_method_argwithqueryheader.go | 10 ++++++++++ .../bar_bar_method_argwithqueryparams.go | 10 ++++++++++ .../bar/workflow/bar_bar_method_helloworld.go | 10 ++++++++++ .../bar/workflow/bar_bar_method_listandenum.go | 10 ++++++++++ .../bar/workflow/bar_bar_method_missingarg.go | 10 ++++++++++ .../bar/workflow/bar_bar_method_norequest.go | 10 ++++++++++ .../bar/workflow/bar_bar_method_normal.go | 10 ++++++++++ .../bar/workflow/bar_bar_method_toomanyargs.go | 10 ++++++++++ .../workflow/baz_simpleservice_method_call.go | 10 ++++++++++ .../workflow/baz_simpleservice_method_compare.go | 10 ++++++++++ .../baz_simpleservice_method_getprofile.go | 10 ++++++++++ .../baz_simpleservice_method_headerschema.go | 10 ++++++++++ .../workflow/baz_simpleservice_method_ping.go | 10 ++++++++++ .../baz_simpleservice_method_sillynoop.go | 10 ++++++++++ .../workflow/baz_simpleservice_method_trans.go | 10 ++++++++++ .../baz_simpleservice_method_transheaders.go | 10 ++++++++++ ...baz_simpleservice_method_transheadersnoreq.go | 10 ++++++++++ .../baz_simpleservice_method_transheaderstype.go | 10 ++++++++++ .../googlenow_googlenow_method_addcredentials.go | 10 ++++++++++ ...ooglenow_googlenow_method_checkcredentials.go | 10 ++++++++++ .../workflow/multi_serviceafront_method_hello.go | 10 ++++++++++ .../workflow/multi_servicebfront_method_hello.go | 10 ++++++++++ ...withexceptions_withexceptions_method_func1.go | 10 ++++++++++ 37 files changed, 346 insertions(+), 1 deletion(-) diff --git a/codegen/gateway.go b/codegen/gateway.go index 223c3f6ba..8b6280856 100644 --- a/codegen/gateway.go +++ b/codegen/gateway.go @@ -251,6 +251,8 @@ type EndpointSpec struct { ReqHeaders map[string]*TypedHeader `yaml:"reqHeaderMap,omitempty"` // ResHeaders maps headers from client to server ResHeaders map[string]*TypedHeader `yaml:"resHeaderMap,omitempty"` + // DefaultHeaders a slice of headers that are forwarded to downstream when available + DefaultHeaders []string `yaml:"-"` // WorkflowType, either "httpClient" or "custom". // A httpClient workflow generates a http client Caller // A custom workflow just imports the custom code @@ -417,6 +419,7 @@ func NewEndpointSpec( IsClientlessEndpoint: isClientlessEndpoint, ClientID: clientID, ClientMethod: clientMethod, + DefaultHeaders: h.defaultHeaders, } defaultMidSpecs, err := getOrderedDefaultMiddlewareSpecs( diff --git a/codegen/module_system.go b/codegen/module_system.go index b312f89d6..58ba62774 100644 --- a/codegen/module_system.go +++ b/codegen/module_system.go @@ -57,6 +57,7 @@ type EndpointMeta struct { ResRequiredHeadersKeys []string TraceKey string DeputyReqHeader string + DefaultHeaders []string } // EndpointCollectionMeta saves information used to generate an initializer @@ -1274,6 +1275,7 @@ func (g *EndpointGenerator) generateEndpointFile(e *EndpointSpec, instance *Modu WorkflowPkg: workflowPkg, TraceKey: g.packageHelper.traceKey, DeputyReqHeader: g.packageHelper.DeputyReqHeader(), + DefaultHeaders: e.DefaultHeaders, } targetPath := e.TargetEndpointPath(thriftServiceName, method.Name) diff --git a/codegen/package.go b/codegen/package.go index 775941a9e..bb5e7327b 100644 --- a/codegen/package.go +++ b/codegen/package.go @@ -58,6 +58,8 @@ type PackageHelper struct { middlewareSpecs map[string]*MiddlewareSpec // The default middlewares for all endpoints defaultMiddlewareSpecs map[string]*MiddlewareSpec + // The default headers to forward with all requests when present + defaultHeaders []string // Use deputy client when this header is set deputyReqHeader string // traceKey is the key for unique trace id that identifies request / response pair @@ -95,6 +97,8 @@ type PackageHelperOptions struct { CopyrightHeader string // header key to redirect client requests to staging environment, defaults to "X-Zanzibar-Use-Staging" StagingReqHeader string + // The default headers to forward with all requests when present + DefaultHeaders []string // header key to redirect client requests to local environment, defaults to "x-deputy-forwarded" DeputyReqHeader string // header key to uniquely identifies request/response pair, defaults to "x-trace-id" @@ -210,6 +214,7 @@ func NewPackageHelper( traceKey: options.traceKey(), moduleSearchPaths: options.ModuleSearchPaths, defaultDependencies: options.DefaultDependencies, + defaultHeaders: options.DefaultHeaders, } return p, nil } diff --git a/codegen/runner/runner.go b/codegen/runner/runner.go index cdc588690..ffec5785c 100644 --- a/codegen/runner/runner.go +++ b/codegen/runner/runner.go @@ -114,6 +114,9 @@ func main() { defaultDependencies := make(map[string][]string, 0) config.MustGetStruct("defaultDependencies", &defaultDependencies) + defaultHeaders := make([]string, 0) + config.MustGetStruct("defaultHeaders", &defaultHeaders) + options := &codegen.PackageHelperOptions{ RelThriftRootDir: config.MustGetString("thriftRootDir"), RelTargetGenDir: config.MustGetString("targetGenDir"), @@ -127,6 +130,7 @@ func main() { TraceKey: config.MustGetString("traceKey"), ModuleSearchPaths: searchPaths, DefaultDependencies: defaultDependencies, + DefaultHeaders: defaultHeaders, } packageHelper, err := codegen.NewPackageHelper( diff --git a/codegen/template_bundle/template_files.go b/codegen/template_bundle/template_files.go index 705c1b97c..ae3740f9f 100644 --- a/codegen/template_bundle/template_files.go +++ b/codegen/template_bundle/template_files.go @@ -3440,6 +3440,7 @@ package workflow {{- $endpointType := .Spec.EndpointType }} {{- $reqHeaderMap := .ReqHeaders }} {{- $reqHeaderMapKeys := .ReqHeadersKeys }} +{{- $defaultHeaders := .DefaultHeaders }} {{- $reqHeaderRequiredKeys := .ReqRequiredHeadersKeys }} {{- $resHeaderMap := .ResHeaders }} {{- $resHeaderMapKeys := .ResHeadersKeys }} @@ -3568,10 +3569,23 @@ func (w {{$workflowStruct}}) Handle( {{end}} clientHeaders := map[string]string{} + {{if (ne (len $defaultHeaders) 0) }} + var ok bool + var h string + {{range $i, $k := $defaultHeaders}} + h, ok = reqHeaders.Get("{{$k}}") + if ok { + clientHeaders["{{$k}}"] = h + } + {{- end -}} + {{- end -}} + {{if (ne (len $reqHeaderMapKeys) 0) }} + {{if (eq (len $defaultHeaders) 0) }} var ok bool var h string {{- end -}} + {{- end -}} {{range $i, $k := $reqHeaderMapKeys}} h, ok = reqHeaders.Get("{{$k}}") if ok { @@ -3723,7 +3737,7 @@ func workflowTmpl() (*asset, error) { return nil, err } - info := bindataFileInfo{name: "workflow.tmpl", size: 8344, mode: os.FileMode(420), modTime: time.Unix(1, 0)} + info := bindataFileInfo{name: "workflow.tmpl", size: 8642, mode: os.FileMode(420), modTime: time.Unix(1, 0)} a := &asset{bytes: bytes, info: info} return a, nil } diff --git a/codegen/templates/workflow.tmpl b/codegen/templates/workflow.tmpl index b1b4af657..6cfeda80e 100644 --- a/codegen/templates/workflow.tmpl +++ b/codegen/templates/workflow.tmpl @@ -5,6 +5,7 @@ package workflow {{- $endpointType := .Spec.EndpointType }} {{- $reqHeaderMap := .ReqHeaders }} {{- $reqHeaderMapKeys := .ReqHeadersKeys }} +{{- $defaultHeaders := .DefaultHeaders }} {{- $reqHeaderRequiredKeys := .ReqRequiredHeadersKeys }} {{- $resHeaderMap := .ResHeaders }} {{- $resHeaderMapKeys := .ResHeadersKeys }} @@ -133,10 +134,23 @@ func (w {{$workflowStruct}}) Handle( {{end}} clientHeaders := map[string]string{} + {{if (ne (len $defaultHeaders) 0) }} + var ok bool + var h string + {{range $i, $k := $defaultHeaders}} + h, ok = reqHeaders.Get("{{$k}}") + if ok { + clientHeaders["{{$k}}"] = h + } + {{- end -}} + {{- end -}} + {{if (ne (len $reqHeaderMapKeys) 0) }} + {{if (eq (len $defaultHeaders) 0) }} var ok bool var h string {{- end -}} + {{- end -}} {{range $i, $k := $reqHeaderMapKeys}} h, ok = reqHeaders.Get("{{$k}}") if ok { diff --git a/examples/example-gateway/build.yaml b/examples/example-gateway/build.yaml index fe8c9da4b..72b98e899 100644 --- a/examples/example-gateway/build.yaml +++ b/examples/example-gateway/build.yaml @@ -6,6 +6,9 @@ genCodePackage: github.com/uber/zanzibar/examples/example-gateway/build/gen-code genMock: true middlewareConfig: ./middlewares defaultMiddlewareConfig: ./middlewares/default +defaultHeaders: + - x-uber-foo + - x-uber-bar packageRoot: github.com/uber/zanzibar/examples/example-gateway targetGenDir: ./build thriftRootDir: ./idl diff --git a/examples/example-gateway/build/endpoints/bar/workflow/bar_bar_method_argnotstruct.go b/examples/example-gateway/build/endpoints/bar/workflow/bar_bar_method_argnotstruct.go index be32c008c..30827146b 100644 --- a/examples/example-gateway/build/endpoints/bar/workflow/bar_bar_method_argnotstruct.go +++ b/examples/example-gateway/build/endpoints/bar/workflow/bar_bar_method_argnotstruct.go @@ -84,6 +84,16 @@ func (w barArgNotStructWorkflow) Handle( var ok bool var h string + + h, ok = reqHeaders.Get("x-uber-foo") + if ok { + clientHeaders["x-uber-foo"] = h + } + h, ok = reqHeaders.Get("x-uber-bar") + if ok { + clientHeaders["x-uber-bar"] = h + } + h, ok = reqHeaders.Get("X-Deputy-Forwarded") if ok { clientHeaders["X-Deputy-Forwarded"] = h diff --git a/examples/example-gateway/build/endpoints/bar/workflow/bar_bar_method_argwithheaders.go b/examples/example-gateway/build/endpoints/bar/workflow/bar_bar_method_argwithheaders.go index 464a153e5..a3fa0a205 100644 --- a/examples/example-gateway/build/endpoints/bar/workflow/bar_bar_method_argwithheaders.go +++ b/examples/example-gateway/build/endpoints/bar/workflow/bar_bar_method_argwithheaders.go @@ -84,6 +84,16 @@ func (w barArgWithHeadersWorkflow) Handle( var ok bool var h string + + h, ok = reqHeaders.Get("x-uber-foo") + if ok { + clientHeaders["x-uber-foo"] = h + } + h, ok = reqHeaders.Get("x-uber-bar") + if ok { + clientHeaders["x-uber-bar"] = h + } + h, ok = reqHeaders.Get("X-Deputy-Forwarded") if ok { clientHeaders["X-Deputy-Forwarded"] = h diff --git a/examples/example-gateway/build/endpoints/bar/workflow/bar_bar_method_argwithmanyqueryparams.go b/examples/example-gateway/build/endpoints/bar/workflow/bar_bar_method_argwithmanyqueryparams.go index 26df6b6ba..f3ea29e5b 100644 --- a/examples/example-gateway/build/endpoints/bar/workflow/bar_bar_method_argwithmanyqueryparams.go +++ b/examples/example-gateway/build/endpoints/bar/workflow/bar_bar_method_argwithmanyqueryparams.go @@ -84,6 +84,16 @@ func (w barArgWithManyQueryParamsWorkflow) Handle( var ok bool var h string + + h, ok = reqHeaders.Get("x-uber-foo") + if ok { + clientHeaders["x-uber-foo"] = h + } + h, ok = reqHeaders.Get("x-uber-bar") + if ok { + clientHeaders["x-uber-bar"] = h + } + h, ok = reqHeaders.Get("X-Deputy-Forwarded") if ok { clientHeaders["X-Deputy-Forwarded"] = h diff --git a/examples/example-gateway/build/endpoints/bar/workflow/bar_bar_method_argwithneardupqueryparams.go b/examples/example-gateway/build/endpoints/bar/workflow/bar_bar_method_argwithneardupqueryparams.go index 79ef8e7d2..3ee7438e0 100644 --- a/examples/example-gateway/build/endpoints/bar/workflow/bar_bar_method_argwithneardupqueryparams.go +++ b/examples/example-gateway/build/endpoints/bar/workflow/bar_bar_method_argwithneardupqueryparams.go @@ -84,6 +84,16 @@ func (w barArgWithNearDupQueryParamsWorkflow) Handle( var ok bool var h string + + h, ok = reqHeaders.Get("x-uber-foo") + if ok { + clientHeaders["x-uber-foo"] = h + } + h, ok = reqHeaders.Get("x-uber-bar") + if ok { + clientHeaders["x-uber-bar"] = h + } + h, ok = reqHeaders.Get("X-Deputy-Forwarded") if ok { clientHeaders["X-Deputy-Forwarded"] = h diff --git a/examples/example-gateway/build/endpoints/bar/workflow/bar_bar_method_argwithnestedqueryparams.go b/examples/example-gateway/build/endpoints/bar/workflow/bar_bar_method_argwithnestedqueryparams.go index ee0893b48..7ee80f189 100644 --- a/examples/example-gateway/build/endpoints/bar/workflow/bar_bar_method_argwithnestedqueryparams.go +++ b/examples/example-gateway/build/endpoints/bar/workflow/bar_bar_method_argwithnestedqueryparams.go @@ -84,6 +84,16 @@ func (w barArgWithNestedQueryParamsWorkflow) Handle( var ok bool var h string + + h, ok = reqHeaders.Get("x-uber-foo") + if ok { + clientHeaders["x-uber-foo"] = h + } + h, ok = reqHeaders.Get("x-uber-bar") + if ok { + clientHeaders["x-uber-bar"] = h + } + h, ok = reqHeaders.Get("X-Deputy-Forwarded") if ok { clientHeaders["X-Deputy-Forwarded"] = h diff --git a/examples/example-gateway/build/endpoints/bar/workflow/bar_bar_method_argwithparams.go b/examples/example-gateway/build/endpoints/bar/workflow/bar_bar_method_argwithparams.go index 47bf7cc58..cf96c260a 100644 --- a/examples/example-gateway/build/endpoints/bar/workflow/bar_bar_method_argwithparams.go +++ b/examples/example-gateway/build/endpoints/bar/workflow/bar_bar_method_argwithparams.go @@ -84,6 +84,16 @@ func (w barArgWithParamsWorkflow) Handle( var ok bool var h string + + h, ok = reqHeaders.Get("x-uber-foo") + if ok { + clientHeaders["x-uber-foo"] = h + } + h, ok = reqHeaders.Get("x-uber-bar") + if ok { + clientHeaders["x-uber-bar"] = h + } + h, ok = reqHeaders.Get("X-Deputy-Forwarded") if ok { clientHeaders["X-Deputy-Forwarded"] = h diff --git a/examples/example-gateway/build/endpoints/bar/workflow/bar_bar_method_argwithparamsandduplicatefields.go b/examples/example-gateway/build/endpoints/bar/workflow/bar_bar_method_argwithparamsandduplicatefields.go index d60aedfcc..c6b6279e3 100644 --- a/examples/example-gateway/build/endpoints/bar/workflow/bar_bar_method_argwithparamsandduplicatefields.go +++ b/examples/example-gateway/build/endpoints/bar/workflow/bar_bar_method_argwithparamsandduplicatefields.go @@ -84,6 +84,16 @@ func (w barArgWithParamsAndDuplicateFieldsWorkflow) Handle( var ok bool var h string + + h, ok = reqHeaders.Get("x-uber-foo") + if ok { + clientHeaders["x-uber-foo"] = h + } + h, ok = reqHeaders.Get("x-uber-bar") + if ok { + clientHeaders["x-uber-bar"] = h + } + h, ok = reqHeaders.Get("X-Deputy-Forwarded") if ok { clientHeaders["X-Deputy-Forwarded"] = h diff --git a/examples/example-gateway/build/endpoints/bar/workflow/bar_bar_method_argwithqueryheader.go b/examples/example-gateway/build/endpoints/bar/workflow/bar_bar_method_argwithqueryheader.go index 18e13761c..519b82d04 100644 --- a/examples/example-gateway/build/endpoints/bar/workflow/bar_bar_method_argwithqueryheader.go +++ b/examples/example-gateway/build/endpoints/bar/workflow/bar_bar_method_argwithqueryheader.go @@ -84,6 +84,16 @@ func (w barArgWithQueryHeaderWorkflow) Handle( var ok bool var h string + + h, ok = reqHeaders.Get("x-uber-foo") + if ok { + clientHeaders["x-uber-foo"] = h + } + h, ok = reqHeaders.Get("x-uber-bar") + if ok { + clientHeaders["x-uber-bar"] = h + } + h, ok = reqHeaders.Get("X-Deputy-Forwarded") if ok { clientHeaders["X-Deputy-Forwarded"] = h diff --git a/examples/example-gateway/build/endpoints/bar/workflow/bar_bar_method_argwithqueryparams.go b/examples/example-gateway/build/endpoints/bar/workflow/bar_bar_method_argwithqueryparams.go index df6e8bb32..db552ccd3 100644 --- a/examples/example-gateway/build/endpoints/bar/workflow/bar_bar_method_argwithqueryparams.go +++ b/examples/example-gateway/build/endpoints/bar/workflow/bar_bar_method_argwithqueryparams.go @@ -84,6 +84,16 @@ func (w barArgWithQueryParamsWorkflow) Handle( var ok bool var h string + + h, ok = reqHeaders.Get("x-uber-foo") + if ok { + clientHeaders["x-uber-foo"] = h + } + h, ok = reqHeaders.Get("x-uber-bar") + if ok { + clientHeaders["x-uber-bar"] = h + } + h, ok = reqHeaders.Get("X-Deputy-Forwarded") if ok { clientHeaders["X-Deputy-Forwarded"] = h diff --git a/examples/example-gateway/build/endpoints/bar/workflow/bar_bar_method_helloworld.go b/examples/example-gateway/build/endpoints/bar/workflow/bar_bar_method_helloworld.go index 0a2f14003..3c8d4e052 100644 --- a/examples/example-gateway/build/endpoints/bar/workflow/bar_bar_method_helloworld.go +++ b/examples/example-gateway/build/endpoints/bar/workflow/bar_bar_method_helloworld.go @@ -81,6 +81,16 @@ func (w barHelloWorldWorkflow) Handle( var ok bool var h string + + h, ok = reqHeaders.Get("x-uber-foo") + if ok { + clientHeaders["x-uber-foo"] = h + } + h, ok = reqHeaders.Get("x-uber-bar") + if ok { + clientHeaders["x-uber-bar"] = h + } + h, ok = reqHeaders.Get("X-Deputy-Forwarded") if ok { clientHeaders["X-Deputy-Forwarded"] = h diff --git a/examples/example-gateway/build/endpoints/bar/workflow/bar_bar_method_listandenum.go b/examples/example-gateway/build/endpoints/bar/workflow/bar_bar_method_listandenum.go index dd655a791..ad8bd4a6b 100644 --- a/examples/example-gateway/build/endpoints/bar/workflow/bar_bar_method_listandenum.go +++ b/examples/example-gateway/build/endpoints/bar/workflow/bar_bar_method_listandenum.go @@ -84,6 +84,16 @@ func (w barListAndEnumWorkflow) Handle( var ok bool var h string + + h, ok = reqHeaders.Get("x-uber-foo") + if ok { + clientHeaders["x-uber-foo"] = h + } + h, ok = reqHeaders.Get("x-uber-bar") + if ok { + clientHeaders["x-uber-bar"] = h + } + h, ok = reqHeaders.Get("X-Deputy-Forwarded") if ok { clientHeaders["X-Deputy-Forwarded"] = h diff --git a/examples/example-gateway/build/endpoints/bar/workflow/bar_bar_method_missingarg.go b/examples/example-gateway/build/endpoints/bar/workflow/bar_bar_method_missingarg.go index b95cfd9e9..df2e8faf0 100644 --- a/examples/example-gateway/build/endpoints/bar/workflow/bar_bar_method_missingarg.go +++ b/examples/example-gateway/build/endpoints/bar/workflow/bar_bar_method_missingarg.go @@ -81,6 +81,16 @@ func (w barMissingArgWorkflow) Handle( var ok bool var h string + + h, ok = reqHeaders.Get("x-uber-foo") + if ok { + clientHeaders["x-uber-foo"] = h + } + h, ok = reqHeaders.Get("x-uber-bar") + if ok { + clientHeaders["x-uber-bar"] = h + } + h, ok = reqHeaders.Get("X-Deputy-Forwarded") if ok { clientHeaders["X-Deputy-Forwarded"] = h diff --git a/examples/example-gateway/build/endpoints/bar/workflow/bar_bar_method_norequest.go b/examples/example-gateway/build/endpoints/bar/workflow/bar_bar_method_norequest.go index d9f73f838..a6d50eeaf 100644 --- a/examples/example-gateway/build/endpoints/bar/workflow/bar_bar_method_norequest.go +++ b/examples/example-gateway/build/endpoints/bar/workflow/bar_bar_method_norequest.go @@ -81,6 +81,16 @@ func (w barNoRequestWorkflow) Handle( var ok bool var h string + + h, ok = reqHeaders.Get("x-uber-foo") + if ok { + clientHeaders["x-uber-foo"] = h + } + h, ok = reqHeaders.Get("x-uber-bar") + if ok { + clientHeaders["x-uber-bar"] = h + } + h, ok = reqHeaders.Get("X-Deputy-Forwarded") if ok { clientHeaders["X-Deputy-Forwarded"] = h diff --git a/examples/example-gateway/build/endpoints/bar/workflow/bar_bar_method_normal.go b/examples/example-gateway/build/endpoints/bar/workflow/bar_bar_method_normal.go index f774d7bf6..1e27688d7 100644 --- a/examples/example-gateway/build/endpoints/bar/workflow/bar_bar_method_normal.go +++ b/examples/example-gateway/build/endpoints/bar/workflow/bar_bar_method_normal.go @@ -84,6 +84,16 @@ func (w barNormalWorkflow) Handle( var ok bool var h string + + h, ok = reqHeaders.Get("x-uber-foo") + if ok { + clientHeaders["x-uber-foo"] = h + } + h, ok = reqHeaders.Get("x-uber-bar") + if ok { + clientHeaders["x-uber-bar"] = h + } + h, ok = reqHeaders.Get("X-Deputy-Forwarded") if ok { clientHeaders["X-Deputy-Forwarded"] = h diff --git a/examples/example-gateway/build/endpoints/bar/workflow/bar_bar_method_toomanyargs.go b/examples/example-gateway/build/endpoints/bar/workflow/bar_bar_method_toomanyargs.go index 61ba04a91..80d0ad8bf 100644 --- a/examples/example-gateway/build/endpoints/bar/workflow/bar_bar_method_toomanyargs.go +++ b/examples/example-gateway/build/endpoints/bar/workflow/bar_bar_method_toomanyargs.go @@ -87,6 +87,16 @@ func (w barTooManyArgsWorkflow) Handle( var ok bool var h string + + h, ok = reqHeaders.Get("x-uber-foo") + if ok { + clientHeaders["x-uber-foo"] = h + } + h, ok = reqHeaders.Get("x-uber-bar") + if ok { + clientHeaders["x-uber-bar"] = h + } + h, ok = reqHeaders.Get("X-Deputy-Forwarded") if ok { clientHeaders["X-Deputy-Forwarded"] = h diff --git a/examples/example-gateway/build/endpoints/baz/workflow/baz_simpleservice_method_call.go b/examples/example-gateway/build/endpoints/baz/workflow/baz_simpleservice_method_call.go index e6aeefb41..c008e59e2 100644 --- a/examples/example-gateway/build/endpoints/baz/workflow/baz_simpleservice_method_call.go +++ b/examples/example-gateway/build/endpoints/baz/workflow/baz_simpleservice_method_call.go @@ -84,6 +84,16 @@ func (w simpleServiceCallWorkflow) Handle( var ok bool var h string + + h, ok = reqHeaders.Get("x-uber-foo") + if ok { + clientHeaders["x-uber-foo"] = h + } + h, ok = reqHeaders.Get("x-uber-bar") + if ok { + clientHeaders["x-uber-bar"] = h + } + h, ok = reqHeaders.Get("X-Deputy-Forwarded") if ok { clientHeaders["X-Deputy-Forwarded"] = h diff --git a/examples/example-gateway/build/endpoints/baz/workflow/baz_simpleservice_method_compare.go b/examples/example-gateway/build/endpoints/baz/workflow/baz_simpleservice_method_compare.go index 32c4bc370..49b3622c5 100644 --- a/examples/example-gateway/build/endpoints/baz/workflow/baz_simpleservice_method_compare.go +++ b/examples/example-gateway/build/endpoints/baz/workflow/baz_simpleservice_method_compare.go @@ -85,6 +85,16 @@ func (w simpleServiceCompareWorkflow) Handle( var ok bool var h string + + h, ok = reqHeaders.Get("x-uber-foo") + if ok { + clientHeaders["x-uber-foo"] = h + } + h, ok = reqHeaders.Get("x-uber-bar") + if ok { + clientHeaders["x-uber-bar"] = h + } + h, ok = reqHeaders.Get("X-Deputy-Forwarded") if ok { clientHeaders["X-Deputy-Forwarded"] = h diff --git a/examples/example-gateway/build/endpoints/baz/workflow/baz_simpleservice_method_getprofile.go b/examples/example-gateway/build/endpoints/baz/workflow/baz_simpleservice_method_getprofile.go index 0960f8705..1a319c477 100644 --- a/examples/example-gateway/build/endpoints/baz/workflow/baz_simpleservice_method_getprofile.go +++ b/examples/example-gateway/build/endpoints/baz/workflow/baz_simpleservice_method_getprofile.go @@ -84,6 +84,16 @@ func (w simpleServiceGetProfileWorkflow) Handle( var ok bool var h string + + h, ok = reqHeaders.Get("x-uber-foo") + if ok { + clientHeaders["x-uber-foo"] = h + } + h, ok = reqHeaders.Get("x-uber-bar") + if ok { + clientHeaders["x-uber-bar"] = h + } + h, ok = reqHeaders.Get("X-Deputy-Forwarded") if ok { clientHeaders["X-Deputy-Forwarded"] = h diff --git a/examples/example-gateway/build/endpoints/baz/workflow/baz_simpleservice_method_headerschema.go b/examples/example-gateway/build/endpoints/baz/workflow/baz_simpleservice_method_headerschema.go index 30f676958..afeca2914 100644 --- a/examples/example-gateway/build/endpoints/baz/workflow/baz_simpleservice_method_headerschema.go +++ b/examples/example-gateway/build/endpoints/baz/workflow/baz_simpleservice_method_headerschema.go @@ -84,6 +84,16 @@ func (w simpleServiceHeaderSchemaWorkflow) Handle( var ok bool var h string + + h, ok = reqHeaders.Get("x-uber-foo") + if ok { + clientHeaders["x-uber-foo"] = h + } + h, ok = reqHeaders.Get("x-uber-bar") + if ok { + clientHeaders["x-uber-bar"] = h + } + h, ok = reqHeaders.Get("Auth") if ok { clientHeaders["Auth"] = h diff --git a/examples/example-gateway/build/endpoints/baz/workflow/baz_simpleservice_method_ping.go b/examples/example-gateway/build/endpoints/baz/workflow/baz_simpleservice_method_ping.go index c2bd7df72..b21764cd5 100644 --- a/examples/example-gateway/build/endpoints/baz/workflow/baz_simpleservice_method_ping.go +++ b/examples/example-gateway/build/endpoints/baz/workflow/baz_simpleservice_method_ping.go @@ -81,6 +81,16 @@ func (w simpleServicePingWorkflow) Handle( var ok bool var h string + + h, ok = reqHeaders.Get("x-uber-foo") + if ok { + clientHeaders["x-uber-foo"] = h + } + h, ok = reqHeaders.Get("x-uber-bar") + if ok { + clientHeaders["x-uber-bar"] = h + } + h, ok = reqHeaders.Get("X-Deputy-Forwarded") if ok { clientHeaders["X-Deputy-Forwarded"] = h diff --git a/examples/example-gateway/build/endpoints/baz/workflow/baz_simpleservice_method_sillynoop.go b/examples/example-gateway/build/endpoints/baz/workflow/baz_simpleservice_method_sillynoop.go index d2112c9d5..fee6565a6 100644 --- a/examples/example-gateway/build/endpoints/baz/workflow/baz_simpleservice_method_sillynoop.go +++ b/examples/example-gateway/build/endpoints/baz/workflow/baz_simpleservice_method_sillynoop.go @@ -82,6 +82,16 @@ func (w simpleServiceSillyNoopWorkflow) Handle( var ok bool var h string + + h, ok = reqHeaders.Get("x-uber-foo") + if ok { + clientHeaders["x-uber-foo"] = h + } + h, ok = reqHeaders.Get("x-uber-bar") + if ok { + clientHeaders["x-uber-bar"] = h + } + h, ok = reqHeaders.Get("X-Deputy-Forwarded") if ok { clientHeaders["X-Deputy-Forwarded"] = h diff --git a/examples/example-gateway/build/endpoints/baz/workflow/baz_simpleservice_method_trans.go b/examples/example-gateway/build/endpoints/baz/workflow/baz_simpleservice_method_trans.go index 8b66d5980..4dba816cf 100644 --- a/examples/example-gateway/build/endpoints/baz/workflow/baz_simpleservice_method_trans.go +++ b/examples/example-gateway/build/endpoints/baz/workflow/baz_simpleservice_method_trans.go @@ -85,6 +85,16 @@ func (w simpleServiceTransWorkflow) Handle( var ok bool var h string + + h, ok = reqHeaders.Get("x-uber-foo") + if ok { + clientHeaders["x-uber-foo"] = h + } + h, ok = reqHeaders.Get("x-uber-bar") + if ok { + clientHeaders["x-uber-bar"] = h + } + h, ok = reqHeaders.Get("X-Deputy-Forwarded") if ok { clientHeaders["X-Deputy-Forwarded"] = h diff --git a/examples/example-gateway/build/endpoints/baz/workflow/baz_simpleservice_method_transheaders.go b/examples/example-gateway/build/endpoints/baz/workflow/baz_simpleservice_method_transheaders.go index 7619ff1c6..359e01bd7 100644 --- a/examples/example-gateway/build/endpoints/baz/workflow/baz_simpleservice_method_transheaders.go +++ b/examples/example-gateway/build/endpoints/baz/workflow/baz_simpleservice_method_transheaders.go @@ -86,6 +86,16 @@ func (w simpleServiceTransHeadersWorkflow) Handle( var ok bool var h string + + h, ok = reqHeaders.Get("x-uber-foo") + if ok { + clientHeaders["x-uber-foo"] = h + } + h, ok = reqHeaders.Get("x-uber-bar") + if ok { + clientHeaders["x-uber-bar"] = h + } + h, ok = reqHeaders.Get("Token") if ok { clientHeaders["Token"] = h diff --git a/examples/example-gateway/build/endpoints/baz/workflow/baz_simpleservice_method_transheadersnoreq.go b/examples/example-gateway/build/endpoints/baz/workflow/baz_simpleservice_method_transheadersnoreq.go index 80b791fd6..9eade355c 100644 --- a/examples/example-gateway/build/endpoints/baz/workflow/baz_simpleservice_method_transheadersnoreq.go +++ b/examples/example-gateway/build/endpoints/baz/workflow/baz_simpleservice_method_transheadersnoreq.go @@ -84,6 +84,16 @@ func (w simpleServiceTransHeadersNoReqWorkflow) Handle( var ok bool var h string + + h, ok = reqHeaders.Get("x-uber-foo") + if ok { + clientHeaders["x-uber-foo"] = h + } + h, ok = reqHeaders.Get("x-uber-bar") + if ok { + clientHeaders["x-uber-bar"] = h + } + h, ok = reqHeaders.Get("B3") if ok { clientHeaders["B3"] = h diff --git a/examples/example-gateway/build/endpoints/baz/workflow/baz_simpleservice_method_transheaderstype.go b/examples/example-gateway/build/endpoints/baz/workflow/baz_simpleservice_method_transheaderstype.go index 0b7c8e745..f33250695 100644 --- a/examples/example-gateway/build/endpoints/baz/workflow/baz_simpleservice_method_transheaderstype.go +++ b/examples/example-gateway/build/endpoints/baz/workflow/baz_simpleservice_method_transheaderstype.go @@ -86,6 +86,16 @@ func (w simpleServiceTransHeadersTypeWorkflow) Handle( var ok bool var h string + + h, ok = reqHeaders.Get("x-uber-foo") + if ok { + clientHeaders["x-uber-foo"] = h + } + h, ok = reqHeaders.Get("x-uber-bar") + if ok { + clientHeaders["x-uber-bar"] = h + } + h, ok = reqHeaders.Get("X-Deputy-Forwarded") if ok { clientHeaders["X-Deputy-Forwarded"] = h diff --git a/examples/example-gateway/build/endpoints/googlenow/workflow/googlenow_googlenow_method_addcredentials.go b/examples/example-gateway/build/endpoints/googlenow/workflow/googlenow_googlenow_method_addcredentials.go index 3bfe16260..64382dadd 100644 --- a/examples/example-gateway/build/endpoints/googlenow/workflow/googlenow_googlenow_method_addcredentials.go +++ b/examples/example-gateway/build/endpoints/googlenow/workflow/googlenow_googlenow_method_addcredentials.go @@ -84,6 +84,16 @@ func (w googleNowAddCredentialsWorkflow) Handle( var ok bool var h string + + h, ok = reqHeaders.Get("x-uber-foo") + if ok { + clientHeaders["x-uber-foo"] = h + } + h, ok = reqHeaders.Get("x-uber-bar") + if ok { + clientHeaders["x-uber-bar"] = h + } + h, ok = reqHeaders.Get("X-Deputy-Forwarded") if ok { clientHeaders["X-Deputy-Forwarded"] = h diff --git a/examples/example-gateway/build/endpoints/googlenow/workflow/googlenow_googlenow_method_checkcredentials.go b/examples/example-gateway/build/endpoints/googlenow/workflow/googlenow_googlenow_method_checkcredentials.go index afec3042a..18045b1b7 100644 --- a/examples/example-gateway/build/endpoints/googlenow/workflow/googlenow_googlenow_method_checkcredentials.go +++ b/examples/example-gateway/build/endpoints/googlenow/workflow/googlenow_googlenow_method_checkcredentials.go @@ -78,6 +78,16 @@ func (w googleNowCheckCredentialsWorkflow) Handle( var ok bool var h string + + h, ok = reqHeaders.Get("x-uber-foo") + if ok { + clientHeaders["x-uber-foo"] = h + } + h, ok = reqHeaders.Get("x-uber-bar") + if ok { + clientHeaders["x-uber-bar"] = h + } + h, ok = reqHeaders.Get("X-Deputy-Forwarded") if ok { clientHeaders["X-Deputy-Forwarded"] = h diff --git a/examples/example-gateway/build/endpoints/multi/workflow/multi_serviceafront_method_hello.go b/examples/example-gateway/build/endpoints/multi/workflow/multi_serviceafront_method_hello.go index 8bb573390..547671d65 100644 --- a/examples/example-gateway/build/endpoints/multi/workflow/multi_serviceafront_method_hello.go +++ b/examples/example-gateway/build/endpoints/multi/workflow/multi_serviceafront_method_hello.go @@ -78,6 +78,16 @@ func (w serviceAFrontHelloWorkflow) Handle( var ok bool var h string + + h, ok = reqHeaders.Get("x-uber-foo") + if ok { + clientHeaders["x-uber-foo"] = h + } + h, ok = reqHeaders.Get("x-uber-bar") + if ok { + clientHeaders["x-uber-bar"] = h + } + h, ok = reqHeaders.Get("X-Deputy-Forwarded") if ok { clientHeaders["X-Deputy-Forwarded"] = h diff --git a/examples/example-gateway/build/endpoints/multi/workflow/multi_servicebfront_method_hello.go b/examples/example-gateway/build/endpoints/multi/workflow/multi_servicebfront_method_hello.go index 33e1b3732..6102c6846 100644 --- a/examples/example-gateway/build/endpoints/multi/workflow/multi_servicebfront_method_hello.go +++ b/examples/example-gateway/build/endpoints/multi/workflow/multi_servicebfront_method_hello.go @@ -78,6 +78,16 @@ func (w serviceBFrontHelloWorkflow) Handle( var ok bool var h string + + h, ok = reqHeaders.Get("x-uber-foo") + if ok { + clientHeaders["x-uber-foo"] = h + } + h, ok = reqHeaders.Get("x-uber-bar") + if ok { + clientHeaders["x-uber-bar"] = h + } + h, ok = reqHeaders.Get("X-Deputy-Forwarded") if ok { clientHeaders["X-Deputy-Forwarded"] = h diff --git a/examples/example-gateway/build/endpoints/withexceptions/workflow/withexceptions_withexceptions_method_func1.go b/examples/example-gateway/build/endpoints/withexceptions/workflow/withexceptions_withexceptions_method_func1.go index 8b1b0f627..6a18507f3 100644 --- a/examples/example-gateway/build/endpoints/withexceptions/workflow/withexceptions_withexceptions_method_func1.go +++ b/examples/example-gateway/build/endpoints/withexceptions/workflow/withexceptions_withexceptions_method_func1.go @@ -81,6 +81,16 @@ func (w withExceptionsFunc1Workflow) Handle( var ok bool var h string + + h, ok = reqHeaders.Get("x-uber-foo") + if ok { + clientHeaders["x-uber-foo"] = h + } + h, ok = reqHeaders.Get("x-uber-bar") + if ok { + clientHeaders["x-uber-bar"] = h + } + h, ok = reqHeaders.Get("X-Deputy-Forwarded") if ok { clientHeaders["X-Deputy-Forwarded"] = h From 3aa83dea0608867fc72b4376a03644646cf85c6d Mon Sep 17 00:00:00 2001 From: r-patali Date: Tue, 28 Apr 2020 17:44:52 -0700 Subject: [PATCH 2/3] canonicalize header casing --- codegen/template_bundle/template_files.go | 7 ++++--- codegen/templates/workflow.tmpl | 5 +++-- .../bar/workflow/bar_bar_method_argnotstruct.go | 10 ++++++---- .../bar/workflow/bar_bar_method_argwithheaders.go | 10 ++++++---- .../workflow/bar_bar_method_argwithmanyqueryparams.go | 10 ++++++---- .../bar_bar_method_argwithneardupqueryparams.go | 10 ++++++---- .../bar_bar_method_argwithnestedqueryparams.go | 10 ++++++---- .../bar/workflow/bar_bar_method_argwithparams.go | 10 ++++++---- .../bar_bar_method_argwithparamsandduplicatefields.go | 10 ++++++---- .../bar/workflow/bar_bar_method_argwithqueryheader.go | 10 ++++++---- .../bar/workflow/bar_bar_method_argwithqueryparams.go | 10 ++++++---- .../bar/workflow/bar_bar_method_helloworld.go | 10 ++++++---- .../bar/workflow/bar_bar_method_listandenum.go | 10 ++++++---- .../bar/workflow/bar_bar_method_missingarg.go | 10 ++++++---- .../endpoints/bar/workflow/bar_bar_method_norequest.go | 10 ++++++---- .../endpoints/bar/workflow/bar_bar_method_normal.go | 10 ++++++---- .../bar/workflow/bar_bar_method_toomanyargs.go | 10 ++++++---- .../baz/workflow/baz_simpleservice_method_call.go | 10 ++++++---- .../baz/workflow/baz_simpleservice_method_compare.go | 10 ++++++---- .../workflow/baz_simpleservice_method_getprofile.go | 10 ++++++---- .../workflow/baz_simpleservice_method_headerschema.go | 10 ++++++---- .../baz/workflow/baz_simpleservice_method_ping.go | 10 ++++++---- .../baz/workflow/baz_simpleservice_method_sillynoop.go | 10 ++++++---- .../baz/workflow/baz_simpleservice_method_trans.go | 10 ++++++---- .../workflow/baz_simpleservice_method_transheaders.go | 10 ++++++---- .../baz_simpleservice_method_transheadersnoreq.go | 10 ++++++---- .../baz_simpleservice_method_transheaderstype.go | 10 ++++++---- .../googlenow_googlenow_method_addcredentials.go | 10 ++++++---- .../googlenow_googlenow_method_checkcredentials.go | 10 ++++++---- .../multi/workflow/multi_serviceafront_method_hello.go | 10 ++++++---- .../multi/workflow/multi_servicebfront_method_hello.go | 10 ++++++---- .../withexceptions_withexceptions_method_func1.go | 10 ++++++---- 32 files changed, 187 insertions(+), 125 deletions(-) diff --git a/codegen/template_bundle/template_files.go b/codegen/template_bundle/template_files.go index ae3740f9f..4f5e540ce 100644 --- a/codegen/template_bundle/template_files.go +++ b/codegen/template_bundle/template_files.go @@ -3573,9 +3573,10 @@ func (w {{$workflowStruct}}) Handle( var ok bool var h string {{range $i, $k := $defaultHeaders}} - h, ok = reqHeaders.Get("{{$k}}") + k := textproto.CanonicalMIMEHeaderKey("{{$k}}") + h, ok = reqHeaders.Get(k) if ok { - clientHeaders["{{$k}}"] = h + clientHeaders[k] = h } {{- end -}} {{- end -}} @@ -3737,7 +3738,7 @@ func workflowTmpl() (*asset, error) { return nil, err } - info := bindataFileInfo{name: "workflow.tmpl", size: 8642, mode: os.FileMode(420), modTime: time.Unix(1, 0)} + info := bindataFileInfo{name: "workflow.tmpl", size: 8677, mode: os.FileMode(420), modTime: time.Unix(1, 0)} a := &asset{bytes: bytes, info: info} return a, nil } diff --git a/codegen/templates/workflow.tmpl b/codegen/templates/workflow.tmpl index 6cfeda80e..bb1ef29e3 100644 --- a/codegen/templates/workflow.tmpl +++ b/codegen/templates/workflow.tmpl @@ -138,9 +138,10 @@ func (w {{$workflowStruct}}) Handle( var ok bool var h string {{range $i, $k := $defaultHeaders}} - h, ok = reqHeaders.Get("{{$k}}") + k := textproto.CanonicalMIMEHeaderKey("{{$k}}") + h, ok = reqHeaders.Get(k) if ok { - clientHeaders["{{$k}}"] = h + clientHeaders[k] = h } {{- end -}} {{- end -}} diff --git a/examples/example-gateway/build/endpoints/bar/workflow/bar_bar_method_argnotstruct.go b/examples/example-gateway/build/endpoints/bar/workflow/bar_bar_method_argnotstruct.go index 30827146b..87d38bb48 100644 --- a/examples/example-gateway/build/endpoints/bar/workflow/bar_bar_method_argnotstruct.go +++ b/examples/example-gateway/build/endpoints/bar/workflow/bar_bar_method_argnotstruct.go @@ -85,13 +85,15 @@ func (w barArgNotStructWorkflow) Handle( var ok bool var h string - h, ok = reqHeaders.Get("x-uber-foo") + k := textproto.CanonicalMIMEHeaderKey("x-uber-foo") + h, ok = reqHeaders.Get(k) if ok { - clientHeaders["x-uber-foo"] = h + clientHeaders[k] = h } - h, ok = reqHeaders.Get("x-uber-bar") + k := textproto.CanonicalMIMEHeaderKey("x-uber-bar") + h, ok = reqHeaders.Get(k) if ok { - clientHeaders["x-uber-bar"] = h + clientHeaders[k] = h } h, ok = reqHeaders.Get("X-Deputy-Forwarded") diff --git a/examples/example-gateway/build/endpoints/bar/workflow/bar_bar_method_argwithheaders.go b/examples/example-gateway/build/endpoints/bar/workflow/bar_bar_method_argwithheaders.go index a3fa0a205..c4b5bb3c7 100644 --- a/examples/example-gateway/build/endpoints/bar/workflow/bar_bar_method_argwithheaders.go +++ b/examples/example-gateway/build/endpoints/bar/workflow/bar_bar_method_argwithheaders.go @@ -85,13 +85,15 @@ func (w barArgWithHeadersWorkflow) Handle( var ok bool var h string - h, ok = reqHeaders.Get("x-uber-foo") + k := textproto.CanonicalMIMEHeaderKey("x-uber-foo") + h, ok = reqHeaders.Get(k) if ok { - clientHeaders["x-uber-foo"] = h + clientHeaders[k] = h } - h, ok = reqHeaders.Get("x-uber-bar") + k := textproto.CanonicalMIMEHeaderKey("x-uber-bar") + h, ok = reqHeaders.Get(k) if ok { - clientHeaders["x-uber-bar"] = h + clientHeaders[k] = h } h, ok = reqHeaders.Get("X-Deputy-Forwarded") diff --git a/examples/example-gateway/build/endpoints/bar/workflow/bar_bar_method_argwithmanyqueryparams.go b/examples/example-gateway/build/endpoints/bar/workflow/bar_bar_method_argwithmanyqueryparams.go index f3ea29e5b..105431e66 100644 --- a/examples/example-gateway/build/endpoints/bar/workflow/bar_bar_method_argwithmanyqueryparams.go +++ b/examples/example-gateway/build/endpoints/bar/workflow/bar_bar_method_argwithmanyqueryparams.go @@ -85,13 +85,15 @@ func (w barArgWithManyQueryParamsWorkflow) Handle( var ok bool var h string - h, ok = reqHeaders.Get("x-uber-foo") + k := textproto.CanonicalMIMEHeaderKey("x-uber-foo") + h, ok = reqHeaders.Get(k) if ok { - clientHeaders["x-uber-foo"] = h + clientHeaders[k] = h } - h, ok = reqHeaders.Get("x-uber-bar") + k := textproto.CanonicalMIMEHeaderKey("x-uber-bar") + h, ok = reqHeaders.Get(k) if ok { - clientHeaders["x-uber-bar"] = h + clientHeaders[k] = h } h, ok = reqHeaders.Get("X-Deputy-Forwarded") diff --git a/examples/example-gateway/build/endpoints/bar/workflow/bar_bar_method_argwithneardupqueryparams.go b/examples/example-gateway/build/endpoints/bar/workflow/bar_bar_method_argwithneardupqueryparams.go index 3ee7438e0..4259021cc 100644 --- a/examples/example-gateway/build/endpoints/bar/workflow/bar_bar_method_argwithneardupqueryparams.go +++ b/examples/example-gateway/build/endpoints/bar/workflow/bar_bar_method_argwithneardupqueryparams.go @@ -85,13 +85,15 @@ func (w barArgWithNearDupQueryParamsWorkflow) Handle( var ok bool var h string - h, ok = reqHeaders.Get("x-uber-foo") + k := textproto.CanonicalMIMEHeaderKey("x-uber-foo") + h, ok = reqHeaders.Get(k) if ok { - clientHeaders["x-uber-foo"] = h + clientHeaders[k] = h } - h, ok = reqHeaders.Get("x-uber-bar") + k := textproto.CanonicalMIMEHeaderKey("x-uber-bar") + h, ok = reqHeaders.Get(k) if ok { - clientHeaders["x-uber-bar"] = h + clientHeaders[k] = h } h, ok = reqHeaders.Get("X-Deputy-Forwarded") diff --git a/examples/example-gateway/build/endpoints/bar/workflow/bar_bar_method_argwithnestedqueryparams.go b/examples/example-gateway/build/endpoints/bar/workflow/bar_bar_method_argwithnestedqueryparams.go index 7ee80f189..e8540824c 100644 --- a/examples/example-gateway/build/endpoints/bar/workflow/bar_bar_method_argwithnestedqueryparams.go +++ b/examples/example-gateway/build/endpoints/bar/workflow/bar_bar_method_argwithnestedqueryparams.go @@ -85,13 +85,15 @@ func (w barArgWithNestedQueryParamsWorkflow) Handle( var ok bool var h string - h, ok = reqHeaders.Get("x-uber-foo") + k := textproto.CanonicalMIMEHeaderKey("x-uber-foo") + h, ok = reqHeaders.Get(k) if ok { - clientHeaders["x-uber-foo"] = h + clientHeaders[k] = h } - h, ok = reqHeaders.Get("x-uber-bar") + k := textproto.CanonicalMIMEHeaderKey("x-uber-bar") + h, ok = reqHeaders.Get(k) if ok { - clientHeaders["x-uber-bar"] = h + clientHeaders[k] = h } h, ok = reqHeaders.Get("X-Deputy-Forwarded") diff --git a/examples/example-gateway/build/endpoints/bar/workflow/bar_bar_method_argwithparams.go b/examples/example-gateway/build/endpoints/bar/workflow/bar_bar_method_argwithparams.go index cf96c260a..256f85a00 100644 --- a/examples/example-gateway/build/endpoints/bar/workflow/bar_bar_method_argwithparams.go +++ b/examples/example-gateway/build/endpoints/bar/workflow/bar_bar_method_argwithparams.go @@ -85,13 +85,15 @@ func (w barArgWithParamsWorkflow) Handle( var ok bool var h string - h, ok = reqHeaders.Get("x-uber-foo") + k := textproto.CanonicalMIMEHeaderKey("x-uber-foo") + h, ok = reqHeaders.Get(k) if ok { - clientHeaders["x-uber-foo"] = h + clientHeaders[k] = h } - h, ok = reqHeaders.Get("x-uber-bar") + k := textproto.CanonicalMIMEHeaderKey("x-uber-bar") + h, ok = reqHeaders.Get(k) if ok { - clientHeaders["x-uber-bar"] = h + clientHeaders[k] = h } h, ok = reqHeaders.Get("X-Deputy-Forwarded") diff --git a/examples/example-gateway/build/endpoints/bar/workflow/bar_bar_method_argwithparamsandduplicatefields.go b/examples/example-gateway/build/endpoints/bar/workflow/bar_bar_method_argwithparamsandduplicatefields.go index c6b6279e3..284e4c70e 100644 --- a/examples/example-gateway/build/endpoints/bar/workflow/bar_bar_method_argwithparamsandduplicatefields.go +++ b/examples/example-gateway/build/endpoints/bar/workflow/bar_bar_method_argwithparamsandduplicatefields.go @@ -85,13 +85,15 @@ func (w barArgWithParamsAndDuplicateFieldsWorkflow) Handle( var ok bool var h string - h, ok = reqHeaders.Get("x-uber-foo") + k := textproto.CanonicalMIMEHeaderKey("x-uber-foo") + h, ok = reqHeaders.Get(k) if ok { - clientHeaders["x-uber-foo"] = h + clientHeaders[k] = h } - h, ok = reqHeaders.Get("x-uber-bar") + k := textproto.CanonicalMIMEHeaderKey("x-uber-bar") + h, ok = reqHeaders.Get(k) if ok { - clientHeaders["x-uber-bar"] = h + clientHeaders[k] = h } h, ok = reqHeaders.Get("X-Deputy-Forwarded") diff --git a/examples/example-gateway/build/endpoints/bar/workflow/bar_bar_method_argwithqueryheader.go b/examples/example-gateway/build/endpoints/bar/workflow/bar_bar_method_argwithqueryheader.go index 519b82d04..4f1da8a56 100644 --- a/examples/example-gateway/build/endpoints/bar/workflow/bar_bar_method_argwithqueryheader.go +++ b/examples/example-gateway/build/endpoints/bar/workflow/bar_bar_method_argwithqueryheader.go @@ -85,13 +85,15 @@ func (w barArgWithQueryHeaderWorkflow) Handle( var ok bool var h string - h, ok = reqHeaders.Get("x-uber-foo") + k := textproto.CanonicalMIMEHeaderKey("x-uber-foo") + h, ok = reqHeaders.Get(k) if ok { - clientHeaders["x-uber-foo"] = h + clientHeaders[k] = h } - h, ok = reqHeaders.Get("x-uber-bar") + k := textproto.CanonicalMIMEHeaderKey("x-uber-bar") + h, ok = reqHeaders.Get(k) if ok { - clientHeaders["x-uber-bar"] = h + clientHeaders[k] = h } h, ok = reqHeaders.Get("X-Deputy-Forwarded") diff --git a/examples/example-gateway/build/endpoints/bar/workflow/bar_bar_method_argwithqueryparams.go b/examples/example-gateway/build/endpoints/bar/workflow/bar_bar_method_argwithqueryparams.go index db552ccd3..8b0351eab 100644 --- a/examples/example-gateway/build/endpoints/bar/workflow/bar_bar_method_argwithqueryparams.go +++ b/examples/example-gateway/build/endpoints/bar/workflow/bar_bar_method_argwithqueryparams.go @@ -85,13 +85,15 @@ func (w barArgWithQueryParamsWorkflow) Handle( var ok bool var h string - h, ok = reqHeaders.Get("x-uber-foo") + k := textproto.CanonicalMIMEHeaderKey("x-uber-foo") + h, ok = reqHeaders.Get(k) if ok { - clientHeaders["x-uber-foo"] = h + clientHeaders[k] = h } - h, ok = reqHeaders.Get("x-uber-bar") + k := textproto.CanonicalMIMEHeaderKey("x-uber-bar") + h, ok = reqHeaders.Get(k) if ok { - clientHeaders["x-uber-bar"] = h + clientHeaders[k] = h } h, ok = reqHeaders.Get("X-Deputy-Forwarded") diff --git a/examples/example-gateway/build/endpoints/bar/workflow/bar_bar_method_helloworld.go b/examples/example-gateway/build/endpoints/bar/workflow/bar_bar_method_helloworld.go index 3c8d4e052..b318518f8 100644 --- a/examples/example-gateway/build/endpoints/bar/workflow/bar_bar_method_helloworld.go +++ b/examples/example-gateway/build/endpoints/bar/workflow/bar_bar_method_helloworld.go @@ -82,13 +82,15 @@ func (w barHelloWorldWorkflow) Handle( var ok bool var h string - h, ok = reqHeaders.Get("x-uber-foo") + k := textproto.CanonicalMIMEHeaderKey("x-uber-foo") + h, ok = reqHeaders.Get(k) if ok { - clientHeaders["x-uber-foo"] = h + clientHeaders[k] = h } - h, ok = reqHeaders.Get("x-uber-bar") + k := textproto.CanonicalMIMEHeaderKey("x-uber-bar") + h, ok = reqHeaders.Get(k) if ok { - clientHeaders["x-uber-bar"] = h + clientHeaders[k] = h } h, ok = reqHeaders.Get("X-Deputy-Forwarded") diff --git a/examples/example-gateway/build/endpoints/bar/workflow/bar_bar_method_listandenum.go b/examples/example-gateway/build/endpoints/bar/workflow/bar_bar_method_listandenum.go index ad8bd4a6b..c6939f00e 100644 --- a/examples/example-gateway/build/endpoints/bar/workflow/bar_bar_method_listandenum.go +++ b/examples/example-gateway/build/endpoints/bar/workflow/bar_bar_method_listandenum.go @@ -85,13 +85,15 @@ func (w barListAndEnumWorkflow) Handle( var ok bool var h string - h, ok = reqHeaders.Get("x-uber-foo") + k := textproto.CanonicalMIMEHeaderKey("x-uber-foo") + h, ok = reqHeaders.Get(k) if ok { - clientHeaders["x-uber-foo"] = h + clientHeaders[k] = h } - h, ok = reqHeaders.Get("x-uber-bar") + k := textproto.CanonicalMIMEHeaderKey("x-uber-bar") + h, ok = reqHeaders.Get(k) if ok { - clientHeaders["x-uber-bar"] = h + clientHeaders[k] = h } h, ok = reqHeaders.Get("X-Deputy-Forwarded") diff --git a/examples/example-gateway/build/endpoints/bar/workflow/bar_bar_method_missingarg.go b/examples/example-gateway/build/endpoints/bar/workflow/bar_bar_method_missingarg.go index df2e8faf0..d9b72e5d4 100644 --- a/examples/example-gateway/build/endpoints/bar/workflow/bar_bar_method_missingarg.go +++ b/examples/example-gateway/build/endpoints/bar/workflow/bar_bar_method_missingarg.go @@ -82,13 +82,15 @@ func (w barMissingArgWorkflow) Handle( var ok bool var h string - h, ok = reqHeaders.Get("x-uber-foo") + k := textproto.CanonicalMIMEHeaderKey("x-uber-foo") + h, ok = reqHeaders.Get(k) if ok { - clientHeaders["x-uber-foo"] = h + clientHeaders[k] = h } - h, ok = reqHeaders.Get("x-uber-bar") + k := textproto.CanonicalMIMEHeaderKey("x-uber-bar") + h, ok = reqHeaders.Get(k) if ok { - clientHeaders["x-uber-bar"] = h + clientHeaders[k] = h } h, ok = reqHeaders.Get("X-Deputy-Forwarded") diff --git a/examples/example-gateway/build/endpoints/bar/workflow/bar_bar_method_norequest.go b/examples/example-gateway/build/endpoints/bar/workflow/bar_bar_method_norequest.go index a6d50eeaf..680cb24c2 100644 --- a/examples/example-gateway/build/endpoints/bar/workflow/bar_bar_method_norequest.go +++ b/examples/example-gateway/build/endpoints/bar/workflow/bar_bar_method_norequest.go @@ -82,13 +82,15 @@ func (w barNoRequestWorkflow) Handle( var ok bool var h string - h, ok = reqHeaders.Get("x-uber-foo") + k := textproto.CanonicalMIMEHeaderKey("x-uber-foo") + h, ok = reqHeaders.Get(k) if ok { - clientHeaders["x-uber-foo"] = h + clientHeaders[k] = h } - h, ok = reqHeaders.Get("x-uber-bar") + k := textproto.CanonicalMIMEHeaderKey("x-uber-bar") + h, ok = reqHeaders.Get(k) if ok { - clientHeaders["x-uber-bar"] = h + clientHeaders[k] = h } h, ok = reqHeaders.Get("X-Deputy-Forwarded") diff --git a/examples/example-gateway/build/endpoints/bar/workflow/bar_bar_method_normal.go b/examples/example-gateway/build/endpoints/bar/workflow/bar_bar_method_normal.go index 1e27688d7..b3a071259 100644 --- a/examples/example-gateway/build/endpoints/bar/workflow/bar_bar_method_normal.go +++ b/examples/example-gateway/build/endpoints/bar/workflow/bar_bar_method_normal.go @@ -85,13 +85,15 @@ func (w barNormalWorkflow) Handle( var ok bool var h string - h, ok = reqHeaders.Get("x-uber-foo") + k := textproto.CanonicalMIMEHeaderKey("x-uber-foo") + h, ok = reqHeaders.Get(k) if ok { - clientHeaders["x-uber-foo"] = h + clientHeaders[k] = h } - h, ok = reqHeaders.Get("x-uber-bar") + k := textproto.CanonicalMIMEHeaderKey("x-uber-bar") + h, ok = reqHeaders.Get(k) if ok { - clientHeaders["x-uber-bar"] = h + clientHeaders[k] = h } h, ok = reqHeaders.Get("X-Deputy-Forwarded") diff --git a/examples/example-gateway/build/endpoints/bar/workflow/bar_bar_method_toomanyargs.go b/examples/example-gateway/build/endpoints/bar/workflow/bar_bar_method_toomanyargs.go index 80d0ad8bf..62dd951bc 100644 --- a/examples/example-gateway/build/endpoints/bar/workflow/bar_bar_method_toomanyargs.go +++ b/examples/example-gateway/build/endpoints/bar/workflow/bar_bar_method_toomanyargs.go @@ -88,13 +88,15 @@ func (w barTooManyArgsWorkflow) Handle( var ok bool var h string - h, ok = reqHeaders.Get("x-uber-foo") + k := textproto.CanonicalMIMEHeaderKey("x-uber-foo") + h, ok = reqHeaders.Get(k) if ok { - clientHeaders["x-uber-foo"] = h + clientHeaders[k] = h } - h, ok = reqHeaders.Get("x-uber-bar") + k := textproto.CanonicalMIMEHeaderKey("x-uber-bar") + h, ok = reqHeaders.Get(k) if ok { - clientHeaders["x-uber-bar"] = h + clientHeaders[k] = h } h, ok = reqHeaders.Get("X-Deputy-Forwarded") diff --git a/examples/example-gateway/build/endpoints/baz/workflow/baz_simpleservice_method_call.go b/examples/example-gateway/build/endpoints/baz/workflow/baz_simpleservice_method_call.go index c008e59e2..ff1141573 100644 --- a/examples/example-gateway/build/endpoints/baz/workflow/baz_simpleservice_method_call.go +++ b/examples/example-gateway/build/endpoints/baz/workflow/baz_simpleservice_method_call.go @@ -85,13 +85,15 @@ func (w simpleServiceCallWorkflow) Handle( var ok bool var h string - h, ok = reqHeaders.Get("x-uber-foo") + k := textproto.CanonicalMIMEHeaderKey("x-uber-foo") + h, ok = reqHeaders.Get(k) if ok { - clientHeaders["x-uber-foo"] = h + clientHeaders[k] = h } - h, ok = reqHeaders.Get("x-uber-bar") + k := textproto.CanonicalMIMEHeaderKey("x-uber-bar") + h, ok = reqHeaders.Get(k) if ok { - clientHeaders["x-uber-bar"] = h + clientHeaders[k] = h } h, ok = reqHeaders.Get("X-Deputy-Forwarded") diff --git a/examples/example-gateway/build/endpoints/baz/workflow/baz_simpleservice_method_compare.go b/examples/example-gateway/build/endpoints/baz/workflow/baz_simpleservice_method_compare.go index 49b3622c5..c004e3114 100644 --- a/examples/example-gateway/build/endpoints/baz/workflow/baz_simpleservice_method_compare.go +++ b/examples/example-gateway/build/endpoints/baz/workflow/baz_simpleservice_method_compare.go @@ -86,13 +86,15 @@ func (w simpleServiceCompareWorkflow) Handle( var ok bool var h string - h, ok = reqHeaders.Get("x-uber-foo") + k := textproto.CanonicalMIMEHeaderKey("x-uber-foo") + h, ok = reqHeaders.Get(k) if ok { - clientHeaders["x-uber-foo"] = h + clientHeaders[k] = h } - h, ok = reqHeaders.Get("x-uber-bar") + k := textproto.CanonicalMIMEHeaderKey("x-uber-bar") + h, ok = reqHeaders.Get(k) if ok { - clientHeaders["x-uber-bar"] = h + clientHeaders[k] = h } h, ok = reqHeaders.Get("X-Deputy-Forwarded") diff --git a/examples/example-gateway/build/endpoints/baz/workflow/baz_simpleservice_method_getprofile.go b/examples/example-gateway/build/endpoints/baz/workflow/baz_simpleservice_method_getprofile.go index 1a319c477..ed0191500 100644 --- a/examples/example-gateway/build/endpoints/baz/workflow/baz_simpleservice_method_getprofile.go +++ b/examples/example-gateway/build/endpoints/baz/workflow/baz_simpleservice_method_getprofile.go @@ -85,13 +85,15 @@ func (w simpleServiceGetProfileWorkflow) Handle( var ok bool var h string - h, ok = reqHeaders.Get("x-uber-foo") + k := textproto.CanonicalMIMEHeaderKey("x-uber-foo") + h, ok = reqHeaders.Get(k) if ok { - clientHeaders["x-uber-foo"] = h + clientHeaders[k] = h } - h, ok = reqHeaders.Get("x-uber-bar") + k := textproto.CanonicalMIMEHeaderKey("x-uber-bar") + h, ok = reqHeaders.Get(k) if ok { - clientHeaders["x-uber-bar"] = h + clientHeaders[k] = h } h, ok = reqHeaders.Get("X-Deputy-Forwarded") diff --git a/examples/example-gateway/build/endpoints/baz/workflow/baz_simpleservice_method_headerschema.go b/examples/example-gateway/build/endpoints/baz/workflow/baz_simpleservice_method_headerschema.go index afeca2914..e1addf1f3 100644 --- a/examples/example-gateway/build/endpoints/baz/workflow/baz_simpleservice_method_headerschema.go +++ b/examples/example-gateway/build/endpoints/baz/workflow/baz_simpleservice_method_headerschema.go @@ -85,13 +85,15 @@ func (w simpleServiceHeaderSchemaWorkflow) Handle( var ok bool var h string - h, ok = reqHeaders.Get("x-uber-foo") + k := textproto.CanonicalMIMEHeaderKey("x-uber-foo") + h, ok = reqHeaders.Get(k) if ok { - clientHeaders["x-uber-foo"] = h + clientHeaders[k] = h } - h, ok = reqHeaders.Get("x-uber-bar") + k := textproto.CanonicalMIMEHeaderKey("x-uber-bar") + h, ok = reqHeaders.Get(k) if ok { - clientHeaders["x-uber-bar"] = h + clientHeaders[k] = h } h, ok = reqHeaders.Get("Auth") diff --git a/examples/example-gateway/build/endpoints/baz/workflow/baz_simpleservice_method_ping.go b/examples/example-gateway/build/endpoints/baz/workflow/baz_simpleservice_method_ping.go index b21764cd5..909abc17b 100644 --- a/examples/example-gateway/build/endpoints/baz/workflow/baz_simpleservice_method_ping.go +++ b/examples/example-gateway/build/endpoints/baz/workflow/baz_simpleservice_method_ping.go @@ -82,13 +82,15 @@ func (w simpleServicePingWorkflow) Handle( var ok bool var h string - h, ok = reqHeaders.Get("x-uber-foo") + k := textproto.CanonicalMIMEHeaderKey("x-uber-foo") + h, ok = reqHeaders.Get(k) if ok { - clientHeaders["x-uber-foo"] = h + clientHeaders[k] = h } - h, ok = reqHeaders.Get("x-uber-bar") + k := textproto.CanonicalMIMEHeaderKey("x-uber-bar") + h, ok = reqHeaders.Get(k) if ok { - clientHeaders["x-uber-bar"] = h + clientHeaders[k] = h } h, ok = reqHeaders.Get("X-Deputy-Forwarded") diff --git a/examples/example-gateway/build/endpoints/baz/workflow/baz_simpleservice_method_sillynoop.go b/examples/example-gateway/build/endpoints/baz/workflow/baz_simpleservice_method_sillynoop.go index fee6565a6..3fed4b207 100644 --- a/examples/example-gateway/build/endpoints/baz/workflow/baz_simpleservice_method_sillynoop.go +++ b/examples/example-gateway/build/endpoints/baz/workflow/baz_simpleservice_method_sillynoop.go @@ -83,13 +83,15 @@ func (w simpleServiceSillyNoopWorkflow) Handle( var ok bool var h string - h, ok = reqHeaders.Get("x-uber-foo") + k := textproto.CanonicalMIMEHeaderKey("x-uber-foo") + h, ok = reqHeaders.Get(k) if ok { - clientHeaders["x-uber-foo"] = h + clientHeaders[k] = h } - h, ok = reqHeaders.Get("x-uber-bar") + k := textproto.CanonicalMIMEHeaderKey("x-uber-bar") + h, ok = reqHeaders.Get(k) if ok { - clientHeaders["x-uber-bar"] = h + clientHeaders[k] = h } h, ok = reqHeaders.Get("X-Deputy-Forwarded") diff --git a/examples/example-gateway/build/endpoints/baz/workflow/baz_simpleservice_method_trans.go b/examples/example-gateway/build/endpoints/baz/workflow/baz_simpleservice_method_trans.go index 4dba816cf..e76202397 100644 --- a/examples/example-gateway/build/endpoints/baz/workflow/baz_simpleservice_method_trans.go +++ b/examples/example-gateway/build/endpoints/baz/workflow/baz_simpleservice_method_trans.go @@ -86,13 +86,15 @@ func (w simpleServiceTransWorkflow) Handle( var ok bool var h string - h, ok = reqHeaders.Get("x-uber-foo") + k := textproto.CanonicalMIMEHeaderKey("x-uber-foo") + h, ok = reqHeaders.Get(k) if ok { - clientHeaders["x-uber-foo"] = h + clientHeaders[k] = h } - h, ok = reqHeaders.Get("x-uber-bar") + k := textproto.CanonicalMIMEHeaderKey("x-uber-bar") + h, ok = reqHeaders.Get(k) if ok { - clientHeaders["x-uber-bar"] = h + clientHeaders[k] = h } h, ok = reqHeaders.Get("X-Deputy-Forwarded") diff --git a/examples/example-gateway/build/endpoints/baz/workflow/baz_simpleservice_method_transheaders.go b/examples/example-gateway/build/endpoints/baz/workflow/baz_simpleservice_method_transheaders.go index 359e01bd7..e23cd02f0 100644 --- a/examples/example-gateway/build/endpoints/baz/workflow/baz_simpleservice_method_transheaders.go +++ b/examples/example-gateway/build/endpoints/baz/workflow/baz_simpleservice_method_transheaders.go @@ -87,13 +87,15 @@ func (w simpleServiceTransHeadersWorkflow) Handle( var ok bool var h string - h, ok = reqHeaders.Get("x-uber-foo") + k := textproto.CanonicalMIMEHeaderKey("x-uber-foo") + h, ok = reqHeaders.Get(k) if ok { - clientHeaders["x-uber-foo"] = h + clientHeaders[k] = h } - h, ok = reqHeaders.Get("x-uber-bar") + k := textproto.CanonicalMIMEHeaderKey("x-uber-bar") + h, ok = reqHeaders.Get(k) if ok { - clientHeaders["x-uber-bar"] = h + clientHeaders[k] = h } h, ok = reqHeaders.Get("Token") diff --git a/examples/example-gateway/build/endpoints/baz/workflow/baz_simpleservice_method_transheadersnoreq.go b/examples/example-gateway/build/endpoints/baz/workflow/baz_simpleservice_method_transheadersnoreq.go index 9eade355c..8114b59ec 100644 --- a/examples/example-gateway/build/endpoints/baz/workflow/baz_simpleservice_method_transheadersnoreq.go +++ b/examples/example-gateway/build/endpoints/baz/workflow/baz_simpleservice_method_transheadersnoreq.go @@ -85,13 +85,15 @@ func (w simpleServiceTransHeadersNoReqWorkflow) Handle( var ok bool var h string - h, ok = reqHeaders.Get("x-uber-foo") + k := textproto.CanonicalMIMEHeaderKey("x-uber-foo") + h, ok = reqHeaders.Get(k) if ok { - clientHeaders["x-uber-foo"] = h + clientHeaders[k] = h } - h, ok = reqHeaders.Get("x-uber-bar") + k := textproto.CanonicalMIMEHeaderKey("x-uber-bar") + h, ok = reqHeaders.Get(k) if ok { - clientHeaders["x-uber-bar"] = h + clientHeaders[k] = h } h, ok = reqHeaders.Get("B3") diff --git a/examples/example-gateway/build/endpoints/baz/workflow/baz_simpleservice_method_transheaderstype.go b/examples/example-gateway/build/endpoints/baz/workflow/baz_simpleservice_method_transheaderstype.go index f33250695..f62147776 100644 --- a/examples/example-gateway/build/endpoints/baz/workflow/baz_simpleservice_method_transheaderstype.go +++ b/examples/example-gateway/build/endpoints/baz/workflow/baz_simpleservice_method_transheaderstype.go @@ -87,13 +87,15 @@ func (w simpleServiceTransHeadersTypeWorkflow) Handle( var ok bool var h string - h, ok = reqHeaders.Get("x-uber-foo") + k := textproto.CanonicalMIMEHeaderKey("x-uber-foo") + h, ok = reqHeaders.Get(k) if ok { - clientHeaders["x-uber-foo"] = h + clientHeaders[k] = h } - h, ok = reqHeaders.Get("x-uber-bar") + k := textproto.CanonicalMIMEHeaderKey("x-uber-bar") + h, ok = reqHeaders.Get(k) if ok { - clientHeaders["x-uber-bar"] = h + clientHeaders[k] = h } h, ok = reqHeaders.Get("X-Deputy-Forwarded") diff --git a/examples/example-gateway/build/endpoints/googlenow/workflow/googlenow_googlenow_method_addcredentials.go b/examples/example-gateway/build/endpoints/googlenow/workflow/googlenow_googlenow_method_addcredentials.go index 64382dadd..e18a38b71 100644 --- a/examples/example-gateway/build/endpoints/googlenow/workflow/googlenow_googlenow_method_addcredentials.go +++ b/examples/example-gateway/build/endpoints/googlenow/workflow/googlenow_googlenow_method_addcredentials.go @@ -85,13 +85,15 @@ func (w googleNowAddCredentialsWorkflow) Handle( var ok bool var h string - h, ok = reqHeaders.Get("x-uber-foo") + k := textproto.CanonicalMIMEHeaderKey("x-uber-foo") + h, ok = reqHeaders.Get(k) if ok { - clientHeaders["x-uber-foo"] = h + clientHeaders[k] = h } - h, ok = reqHeaders.Get("x-uber-bar") + k := textproto.CanonicalMIMEHeaderKey("x-uber-bar") + h, ok = reqHeaders.Get(k) if ok { - clientHeaders["x-uber-bar"] = h + clientHeaders[k] = h } h, ok = reqHeaders.Get("X-Deputy-Forwarded") diff --git a/examples/example-gateway/build/endpoints/googlenow/workflow/googlenow_googlenow_method_checkcredentials.go b/examples/example-gateway/build/endpoints/googlenow/workflow/googlenow_googlenow_method_checkcredentials.go index 18045b1b7..87f77c5e8 100644 --- a/examples/example-gateway/build/endpoints/googlenow/workflow/googlenow_googlenow_method_checkcredentials.go +++ b/examples/example-gateway/build/endpoints/googlenow/workflow/googlenow_googlenow_method_checkcredentials.go @@ -79,13 +79,15 @@ func (w googleNowCheckCredentialsWorkflow) Handle( var ok bool var h string - h, ok = reqHeaders.Get("x-uber-foo") + k := textproto.CanonicalMIMEHeaderKey("x-uber-foo") + h, ok = reqHeaders.Get(k) if ok { - clientHeaders["x-uber-foo"] = h + clientHeaders[k] = h } - h, ok = reqHeaders.Get("x-uber-bar") + k := textproto.CanonicalMIMEHeaderKey("x-uber-bar") + h, ok = reqHeaders.Get(k) if ok { - clientHeaders["x-uber-bar"] = h + clientHeaders[k] = h } h, ok = reqHeaders.Get("X-Deputy-Forwarded") diff --git a/examples/example-gateway/build/endpoints/multi/workflow/multi_serviceafront_method_hello.go b/examples/example-gateway/build/endpoints/multi/workflow/multi_serviceafront_method_hello.go index 547671d65..30037e084 100644 --- a/examples/example-gateway/build/endpoints/multi/workflow/multi_serviceafront_method_hello.go +++ b/examples/example-gateway/build/endpoints/multi/workflow/multi_serviceafront_method_hello.go @@ -79,13 +79,15 @@ func (w serviceAFrontHelloWorkflow) Handle( var ok bool var h string - h, ok = reqHeaders.Get("x-uber-foo") + k := textproto.CanonicalMIMEHeaderKey("x-uber-foo") + h, ok = reqHeaders.Get(k) if ok { - clientHeaders["x-uber-foo"] = h + clientHeaders[k] = h } - h, ok = reqHeaders.Get("x-uber-bar") + k := textproto.CanonicalMIMEHeaderKey("x-uber-bar") + h, ok = reqHeaders.Get(k) if ok { - clientHeaders["x-uber-bar"] = h + clientHeaders[k] = h } h, ok = reqHeaders.Get("X-Deputy-Forwarded") diff --git a/examples/example-gateway/build/endpoints/multi/workflow/multi_servicebfront_method_hello.go b/examples/example-gateway/build/endpoints/multi/workflow/multi_servicebfront_method_hello.go index 6102c6846..3b8eb0ae5 100644 --- a/examples/example-gateway/build/endpoints/multi/workflow/multi_servicebfront_method_hello.go +++ b/examples/example-gateway/build/endpoints/multi/workflow/multi_servicebfront_method_hello.go @@ -79,13 +79,15 @@ func (w serviceBFrontHelloWorkflow) Handle( var ok bool var h string - h, ok = reqHeaders.Get("x-uber-foo") + k := textproto.CanonicalMIMEHeaderKey("x-uber-foo") + h, ok = reqHeaders.Get(k) if ok { - clientHeaders["x-uber-foo"] = h + clientHeaders[k] = h } - h, ok = reqHeaders.Get("x-uber-bar") + k := textproto.CanonicalMIMEHeaderKey("x-uber-bar") + h, ok = reqHeaders.Get(k) if ok { - clientHeaders["x-uber-bar"] = h + clientHeaders[k] = h } h, ok = reqHeaders.Get("X-Deputy-Forwarded") diff --git a/examples/example-gateway/build/endpoints/withexceptions/workflow/withexceptions_withexceptions_method_func1.go b/examples/example-gateway/build/endpoints/withexceptions/workflow/withexceptions_withexceptions_method_func1.go index 6a18507f3..a239d663b 100644 --- a/examples/example-gateway/build/endpoints/withexceptions/workflow/withexceptions_withexceptions_method_func1.go +++ b/examples/example-gateway/build/endpoints/withexceptions/workflow/withexceptions_withexceptions_method_func1.go @@ -82,13 +82,15 @@ func (w withExceptionsFunc1Workflow) Handle( var ok bool var h string - h, ok = reqHeaders.Get("x-uber-foo") + k := textproto.CanonicalMIMEHeaderKey("x-uber-foo") + h, ok = reqHeaders.Get(k) if ok { - clientHeaders["x-uber-foo"] = h + clientHeaders[k] = h } - h, ok = reqHeaders.Get("x-uber-bar") + k := textproto.CanonicalMIMEHeaderKey("x-uber-bar") + h, ok = reqHeaders.Get(k) if ok { - clientHeaders["x-uber-bar"] = h + clientHeaders[k] = h } h, ok = reqHeaders.Get("X-Deputy-Forwarded") From 269c9e148c7e126c7deb82d4448b524c9f545717 Mon Sep 17 00:00:00 2001 From: r-patali Date: Tue, 28 Apr 2020 17:55:35 -0700 Subject: [PATCH 3/3] reuse var --- codegen/template_bundle/template_files.go | 5 +++-- codegen/templates/workflow.tmpl | 3 ++- .../endpoints/bar/workflow/bar_bar_method_argnotstruct.go | 5 +++-- .../endpoints/bar/workflow/bar_bar_method_argwithheaders.go | 5 +++-- .../bar/workflow/bar_bar_method_argwithmanyqueryparams.go | 5 +++-- .../bar/workflow/bar_bar_method_argwithneardupqueryparams.go | 5 +++-- .../bar/workflow/bar_bar_method_argwithnestedqueryparams.go | 5 +++-- .../endpoints/bar/workflow/bar_bar_method_argwithparams.go | 5 +++-- .../bar_bar_method_argwithparamsandduplicatefields.go | 5 +++-- .../bar/workflow/bar_bar_method_argwithqueryheader.go | 5 +++-- .../bar/workflow/bar_bar_method_argwithqueryparams.go | 5 +++-- .../endpoints/bar/workflow/bar_bar_method_helloworld.go | 5 +++-- .../endpoints/bar/workflow/bar_bar_method_listandenum.go | 5 +++-- .../endpoints/bar/workflow/bar_bar_method_missingarg.go | 5 +++-- .../build/endpoints/bar/workflow/bar_bar_method_norequest.go | 5 +++-- .../build/endpoints/bar/workflow/bar_bar_method_normal.go | 5 +++-- .../endpoints/bar/workflow/bar_bar_method_toomanyargs.go | 5 +++-- .../endpoints/baz/workflow/baz_simpleservice_method_call.go | 5 +++-- .../baz/workflow/baz_simpleservice_method_compare.go | 5 +++-- .../baz/workflow/baz_simpleservice_method_getprofile.go | 5 +++-- .../baz/workflow/baz_simpleservice_method_headerschema.go | 5 +++-- .../endpoints/baz/workflow/baz_simpleservice_method_ping.go | 5 +++-- .../baz/workflow/baz_simpleservice_method_sillynoop.go | 5 +++-- .../endpoints/baz/workflow/baz_simpleservice_method_trans.go | 5 +++-- .../baz/workflow/baz_simpleservice_method_transheaders.go | 5 +++-- .../workflow/baz_simpleservice_method_transheadersnoreq.go | 5 +++-- .../workflow/baz_simpleservice_method_transheaderstype.go | 5 +++-- .../workflow/googlenow_googlenow_method_addcredentials.go | 5 +++-- .../workflow/googlenow_googlenow_method_checkcredentials.go | 5 +++-- .../multi/workflow/multi_serviceafront_method_hello.go | 5 +++-- .../multi/workflow/multi_servicebfront_method_hello.go | 5 +++-- .../workflow/withexceptions_withexceptions_method_func1.go | 5 +++-- 32 files changed, 95 insertions(+), 63 deletions(-) diff --git a/codegen/template_bundle/template_files.go b/codegen/template_bundle/template_files.go index 4f5e540ce..3c25f62bb 100644 --- a/codegen/template_bundle/template_files.go +++ b/codegen/template_bundle/template_files.go @@ -3572,8 +3572,9 @@ func (w {{$workflowStruct}}) Handle( {{if (ne (len $defaultHeaders) 0) }} var ok bool var h string + var k string {{range $i, $k := $defaultHeaders}} - k := textproto.CanonicalMIMEHeaderKey("{{$k}}") + k = textproto.CanonicalMIMEHeaderKey("{{$k}}") h, ok = reqHeaders.Get(k) if ok { clientHeaders[k] = h @@ -3738,7 +3739,7 @@ func workflowTmpl() (*asset, error) { return nil, err } - info := bindataFileInfo{name: "workflow.tmpl", size: 8677, mode: os.FileMode(420), modTime: time.Unix(1, 0)} + info := bindataFileInfo{name: "workflow.tmpl", size: 8690, mode: os.FileMode(420), modTime: time.Unix(1, 0)} a := &asset{bytes: bytes, info: info} return a, nil } diff --git a/codegen/templates/workflow.tmpl b/codegen/templates/workflow.tmpl index bb1ef29e3..cdca89fbd 100644 --- a/codegen/templates/workflow.tmpl +++ b/codegen/templates/workflow.tmpl @@ -137,8 +137,9 @@ func (w {{$workflowStruct}}) Handle( {{if (ne (len $defaultHeaders) 0) }} var ok bool var h string + var k string {{range $i, $k := $defaultHeaders}} - k := textproto.CanonicalMIMEHeaderKey("{{$k}}") + k = textproto.CanonicalMIMEHeaderKey("{{$k}}") h, ok = reqHeaders.Get(k) if ok { clientHeaders[k] = h diff --git a/examples/example-gateway/build/endpoints/bar/workflow/bar_bar_method_argnotstruct.go b/examples/example-gateway/build/endpoints/bar/workflow/bar_bar_method_argnotstruct.go index 87d38bb48..e6fb25d88 100644 --- a/examples/example-gateway/build/endpoints/bar/workflow/bar_bar_method_argnotstruct.go +++ b/examples/example-gateway/build/endpoints/bar/workflow/bar_bar_method_argnotstruct.go @@ -84,13 +84,14 @@ func (w barArgNotStructWorkflow) Handle( var ok bool var h string + var k string - k := textproto.CanonicalMIMEHeaderKey("x-uber-foo") + k = textproto.CanonicalMIMEHeaderKey("x-uber-foo") h, ok = reqHeaders.Get(k) if ok { clientHeaders[k] = h } - k := textproto.CanonicalMIMEHeaderKey("x-uber-bar") + k = textproto.CanonicalMIMEHeaderKey("x-uber-bar") h, ok = reqHeaders.Get(k) if ok { clientHeaders[k] = h diff --git a/examples/example-gateway/build/endpoints/bar/workflow/bar_bar_method_argwithheaders.go b/examples/example-gateway/build/endpoints/bar/workflow/bar_bar_method_argwithheaders.go index c4b5bb3c7..7c464cc1f 100644 --- a/examples/example-gateway/build/endpoints/bar/workflow/bar_bar_method_argwithheaders.go +++ b/examples/example-gateway/build/endpoints/bar/workflow/bar_bar_method_argwithheaders.go @@ -84,13 +84,14 @@ func (w barArgWithHeadersWorkflow) Handle( var ok bool var h string + var k string - k := textproto.CanonicalMIMEHeaderKey("x-uber-foo") + k = textproto.CanonicalMIMEHeaderKey("x-uber-foo") h, ok = reqHeaders.Get(k) if ok { clientHeaders[k] = h } - k := textproto.CanonicalMIMEHeaderKey("x-uber-bar") + k = textproto.CanonicalMIMEHeaderKey("x-uber-bar") h, ok = reqHeaders.Get(k) if ok { clientHeaders[k] = h diff --git a/examples/example-gateway/build/endpoints/bar/workflow/bar_bar_method_argwithmanyqueryparams.go b/examples/example-gateway/build/endpoints/bar/workflow/bar_bar_method_argwithmanyqueryparams.go index 105431e66..52c7b849c 100644 --- a/examples/example-gateway/build/endpoints/bar/workflow/bar_bar_method_argwithmanyqueryparams.go +++ b/examples/example-gateway/build/endpoints/bar/workflow/bar_bar_method_argwithmanyqueryparams.go @@ -84,13 +84,14 @@ func (w barArgWithManyQueryParamsWorkflow) Handle( var ok bool var h string + var k string - k := textproto.CanonicalMIMEHeaderKey("x-uber-foo") + k = textproto.CanonicalMIMEHeaderKey("x-uber-foo") h, ok = reqHeaders.Get(k) if ok { clientHeaders[k] = h } - k := textproto.CanonicalMIMEHeaderKey("x-uber-bar") + k = textproto.CanonicalMIMEHeaderKey("x-uber-bar") h, ok = reqHeaders.Get(k) if ok { clientHeaders[k] = h diff --git a/examples/example-gateway/build/endpoints/bar/workflow/bar_bar_method_argwithneardupqueryparams.go b/examples/example-gateway/build/endpoints/bar/workflow/bar_bar_method_argwithneardupqueryparams.go index 4259021cc..7032e8f74 100644 --- a/examples/example-gateway/build/endpoints/bar/workflow/bar_bar_method_argwithneardupqueryparams.go +++ b/examples/example-gateway/build/endpoints/bar/workflow/bar_bar_method_argwithneardupqueryparams.go @@ -84,13 +84,14 @@ func (w barArgWithNearDupQueryParamsWorkflow) Handle( var ok bool var h string + var k string - k := textproto.CanonicalMIMEHeaderKey("x-uber-foo") + k = textproto.CanonicalMIMEHeaderKey("x-uber-foo") h, ok = reqHeaders.Get(k) if ok { clientHeaders[k] = h } - k := textproto.CanonicalMIMEHeaderKey("x-uber-bar") + k = textproto.CanonicalMIMEHeaderKey("x-uber-bar") h, ok = reqHeaders.Get(k) if ok { clientHeaders[k] = h diff --git a/examples/example-gateway/build/endpoints/bar/workflow/bar_bar_method_argwithnestedqueryparams.go b/examples/example-gateway/build/endpoints/bar/workflow/bar_bar_method_argwithnestedqueryparams.go index e8540824c..9defa8915 100644 --- a/examples/example-gateway/build/endpoints/bar/workflow/bar_bar_method_argwithnestedqueryparams.go +++ b/examples/example-gateway/build/endpoints/bar/workflow/bar_bar_method_argwithnestedqueryparams.go @@ -84,13 +84,14 @@ func (w barArgWithNestedQueryParamsWorkflow) Handle( var ok bool var h string + var k string - k := textproto.CanonicalMIMEHeaderKey("x-uber-foo") + k = textproto.CanonicalMIMEHeaderKey("x-uber-foo") h, ok = reqHeaders.Get(k) if ok { clientHeaders[k] = h } - k := textproto.CanonicalMIMEHeaderKey("x-uber-bar") + k = textproto.CanonicalMIMEHeaderKey("x-uber-bar") h, ok = reqHeaders.Get(k) if ok { clientHeaders[k] = h diff --git a/examples/example-gateway/build/endpoints/bar/workflow/bar_bar_method_argwithparams.go b/examples/example-gateway/build/endpoints/bar/workflow/bar_bar_method_argwithparams.go index 256f85a00..c652c1ad3 100644 --- a/examples/example-gateway/build/endpoints/bar/workflow/bar_bar_method_argwithparams.go +++ b/examples/example-gateway/build/endpoints/bar/workflow/bar_bar_method_argwithparams.go @@ -84,13 +84,14 @@ func (w barArgWithParamsWorkflow) Handle( var ok bool var h string + var k string - k := textproto.CanonicalMIMEHeaderKey("x-uber-foo") + k = textproto.CanonicalMIMEHeaderKey("x-uber-foo") h, ok = reqHeaders.Get(k) if ok { clientHeaders[k] = h } - k := textproto.CanonicalMIMEHeaderKey("x-uber-bar") + k = textproto.CanonicalMIMEHeaderKey("x-uber-bar") h, ok = reqHeaders.Get(k) if ok { clientHeaders[k] = h diff --git a/examples/example-gateway/build/endpoints/bar/workflow/bar_bar_method_argwithparamsandduplicatefields.go b/examples/example-gateway/build/endpoints/bar/workflow/bar_bar_method_argwithparamsandduplicatefields.go index 284e4c70e..0a316482c 100644 --- a/examples/example-gateway/build/endpoints/bar/workflow/bar_bar_method_argwithparamsandduplicatefields.go +++ b/examples/example-gateway/build/endpoints/bar/workflow/bar_bar_method_argwithparamsandduplicatefields.go @@ -84,13 +84,14 @@ func (w barArgWithParamsAndDuplicateFieldsWorkflow) Handle( var ok bool var h string + var k string - k := textproto.CanonicalMIMEHeaderKey("x-uber-foo") + k = textproto.CanonicalMIMEHeaderKey("x-uber-foo") h, ok = reqHeaders.Get(k) if ok { clientHeaders[k] = h } - k := textproto.CanonicalMIMEHeaderKey("x-uber-bar") + k = textproto.CanonicalMIMEHeaderKey("x-uber-bar") h, ok = reqHeaders.Get(k) if ok { clientHeaders[k] = h diff --git a/examples/example-gateway/build/endpoints/bar/workflow/bar_bar_method_argwithqueryheader.go b/examples/example-gateway/build/endpoints/bar/workflow/bar_bar_method_argwithqueryheader.go index 4f1da8a56..8a83fb76c 100644 --- a/examples/example-gateway/build/endpoints/bar/workflow/bar_bar_method_argwithqueryheader.go +++ b/examples/example-gateway/build/endpoints/bar/workflow/bar_bar_method_argwithqueryheader.go @@ -84,13 +84,14 @@ func (w barArgWithQueryHeaderWorkflow) Handle( var ok bool var h string + var k string - k := textproto.CanonicalMIMEHeaderKey("x-uber-foo") + k = textproto.CanonicalMIMEHeaderKey("x-uber-foo") h, ok = reqHeaders.Get(k) if ok { clientHeaders[k] = h } - k := textproto.CanonicalMIMEHeaderKey("x-uber-bar") + k = textproto.CanonicalMIMEHeaderKey("x-uber-bar") h, ok = reqHeaders.Get(k) if ok { clientHeaders[k] = h diff --git a/examples/example-gateway/build/endpoints/bar/workflow/bar_bar_method_argwithqueryparams.go b/examples/example-gateway/build/endpoints/bar/workflow/bar_bar_method_argwithqueryparams.go index 8b0351eab..663b41e6a 100644 --- a/examples/example-gateway/build/endpoints/bar/workflow/bar_bar_method_argwithqueryparams.go +++ b/examples/example-gateway/build/endpoints/bar/workflow/bar_bar_method_argwithqueryparams.go @@ -84,13 +84,14 @@ func (w barArgWithQueryParamsWorkflow) Handle( var ok bool var h string + var k string - k := textproto.CanonicalMIMEHeaderKey("x-uber-foo") + k = textproto.CanonicalMIMEHeaderKey("x-uber-foo") h, ok = reqHeaders.Get(k) if ok { clientHeaders[k] = h } - k := textproto.CanonicalMIMEHeaderKey("x-uber-bar") + k = textproto.CanonicalMIMEHeaderKey("x-uber-bar") h, ok = reqHeaders.Get(k) if ok { clientHeaders[k] = h diff --git a/examples/example-gateway/build/endpoints/bar/workflow/bar_bar_method_helloworld.go b/examples/example-gateway/build/endpoints/bar/workflow/bar_bar_method_helloworld.go index b318518f8..00f619454 100644 --- a/examples/example-gateway/build/endpoints/bar/workflow/bar_bar_method_helloworld.go +++ b/examples/example-gateway/build/endpoints/bar/workflow/bar_bar_method_helloworld.go @@ -81,13 +81,14 @@ func (w barHelloWorldWorkflow) Handle( var ok bool var h string + var k string - k := textproto.CanonicalMIMEHeaderKey("x-uber-foo") + k = textproto.CanonicalMIMEHeaderKey("x-uber-foo") h, ok = reqHeaders.Get(k) if ok { clientHeaders[k] = h } - k := textproto.CanonicalMIMEHeaderKey("x-uber-bar") + k = textproto.CanonicalMIMEHeaderKey("x-uber-bar") h, ok = reqHeaders.Get(k) if ok { clientHeaders[k] = h diff --git a/examples/example-gateway/build/endpoints/bar/workflow/bar_bar_method_listandenum.go b/examples/example-gateway/build/endpoints/bar/workflow/bar_bar_method_listandenum.go index c6939f00e..fcc9161df 100644 --- a/examples/example-gateway/build/endpoints/bar/workflow/bar_bar_method_listandenum.go +++ b/examples/example-gateway/build/endpoints/bar/workflow/bar_bar_method_listandenum.go @@ -84,13 +84,14 @@ func (w barListAndEnumWorkflow) Handle( var ok bool var h string + var k string - k := textproto.CanonicalMIMEHeaderKey("x-uber-foo") + k = textproto.CanonicalMIMEHeaderKey("x-uber-foo") h, ok = reqHeaders.Get(k) if ok { clientHeaders[k] = h } - k := textproto.CanonicalMIMEHeaderKey("x-uber-bar") + k = textproto.CanonicalMIMEHeaderKey("x-uber-bar") h, ok = reqHeaders.Get(k) if ok { clientHeaders[k] = h diff --git a/examples/example-gateway/build/endpoints/bar/workflow/bar_bar_method_missingarg.go b/examples/example-gateway/build/endpoints/bar/workflow/bar_bar_method_missingarg.go index d9b72e5d4..a13989e5e 100644 --- a/examples/example-gateway/build/endpoints/bar/workflow/bar_bar_method_missingarg.go +++ b/examples/example-gateway/build/endpoints/bar/workflow/bar_bar_method_missingarg.go @@ -81,13 +81,14 @@ func (w barMissingArgWorkflow) Handle( var ok bool var h string + var k string - k := textproto.CanonicalMIMEHeaderKey("x-uber-foo") + k = textproto.CanonicalMIMEHeaderKey("x-uber-foo") h, ok = reqHeaders.Get(k) if ok { clientHeaders[k] = h } - k := textproto.CanonicalMIMEHeaderKey("x-uber-bar") + k = textproto.CanonicalMIMEHeaderKey("x-uber-bar") h, ok = reqHeaders.Get(k) if ok { clientHeaders[k] = h diff --git a/examples/example-gateway/build/endpoints/bar/workflow/bar_bar_method_norequest.go b/examples/example-gateway/build/endpoints/bar/workflow/bar_bar_method_norequest.go index 680cb24c2..ebbd06d65 100644 --- a/examples/example-gateway/build/endpoints/bar/workflow/bar_bar_method_norequest.go +++ b/examples/example-gateway/build/endpoints/bar/workflow/bar_bar_method_norequest.go @@ -81,13 +81,14 @@ func (w barNoRequestWorkflow) Handle( var ok bool var h string + var k string - k := textproto.CanonicalMIMEHeaderKey("x-uber-foo") + k = textproto.CanonicalMIMEHeaderKey("x-uber-foo") h, ok = reqHeaders.Get(k) if ok { clientHeaders[k] = h } - k := textproto.CanonicalMIMEHeaderKey("x-uber-bar") + k = textproto.CanonicalMIMEHeaderKey("x-uber-bar") h, ok = reqHeaders.Get(k) if ok { clientHeaders[k] = h diff --git a/examples/example-gateway/build/endpoints/bar/workflow/bar_bar_method_normal.go b/examples/example-gateway/build/endpoints/bar/workflow/bar_bar_method_normal.go index b3a071259..f6a046f0d 100644 --- a/examples/example-gateway/build/endpoints/bar/workflow/bar_bar_method_normal.go +++ b/examples/example-gateway/build/endpoints/bar/workflow/bar_bar_method_normal.go @@ -84,13 +84,14 @@ func (w barNormalWorkflow) Handle( var ok bool var h string + var k string - k := textproto.CanonicalMIMEHeaderKey("x-uber-foo") + k = textproto.CanonicalMIMEHeaderKey("x-uber-foo") h, ok = reqHeaders.Get(k) if ok { clientHeaders[k] = h } - k := textproto.CanonicalMIMEHeaderKey("x-uber-bar") + k = textproto.CanonicalMIMEHeaderKey("x-uber-bar") h, ok = reqHeaders.Get(k) if ok { clientHeaders[k] = h diff --git a/examples/example-gateway/build/endpoints/bar/workflow/bar_bar_method_toomanyargs.go b/examples/example-gateway/build/endpoints/bar/workflow/bar_bar_method_toomanyargs.go index 62dd951bc..7f5e1e366 100644 --- a/examples/example-gateway/build/endpoints/bar/workflow/bar_bar_method_toomanyargs.go +++ b/examples/example-gateway/build/endpoints/bar/workflow/bar_bar_method_toomanyargs.go @@ -87,13 +87,14 @@ func (w barTooManyArgsWorkflow) Handle( var ok bool var h string + var k string - k := textproto.CanonicalMIMEHeaderKey("x-uber-foo") + k = textproto.CanonicalMIMEHeaderKey("x-uber-foo") h, ok = reqHeaders.Get(k) if ok { clientHeaders[k] = h } - k := textproto.CanonicalMIMEHeaderKey("x-uber-bar") + k = textproto.CanonicalMIMEHeaderKey("x-uber-bar") h, ok = reqHeaders.Get(k) if ok { clientHeaders[k] = h diff --git a/examples/example-gateway/build/endpoints/baz/workflow/baz_simpleservice_method_call.go b/examples/example-gateway/build/endpoints/baz/workflow/baz_simpleservice_method_call.go index ff1141573..2d508e7c2 100644 --- a/examples/example-gateway/build/endpoints/baz/workflow/baz_simpleservice_method_call.go +++ b/examples/example-gateway/build/endpoints/baz/workflow/baz_simpleservice_method_call.go @@ -84,13 +84,14 @@ func (w simpleServiceCallWorkflow) Handle( var ok bool var h string + var k string - k := textproto.CanonicalMIMEHeaderKey("x-uber-foo") + k = textproto.CanonicalMIMEHeaderKey("x-uber-foo") h, ok = reqHeaders.Get(k) if ok { clientHeaders[k] = h } - k := textproto.CanonicalMIMEHeaderKey("x-uber-bar") + k = textproto.CanonicalMIMEHeaderKey("x-uber-bar") h, ok = reqHeaders.Get(k) if ok { clientHeaders[k] = h diff --git a/examples/example-gateway/build/endpoints/baz/workflow/baz_simpleservice_method_compare.go b/examples/example-gateway/build/endpoints/baz/workflow/baz_simpleservice_method_compare.go index c004e3114..0bff6b331 100644 --- a/examples/example-gateway/build/endpoints/baz/workflow/baz_simpleservice_method_compare.go +++ b/examples/example-gateway/build/endpoints/baz/workflow/baz_simpleservice_method_compare.go @@ -85,13 +85,14 @@ func (w simpleServiceCompareWorkflow) Handle( var ok bool var h string + var k string - k := textproto.CanonicalMIMEHeaderKey("x-uber-foo") + k = textproto.CanonicalMIMEHeaderKey("x-uber-foo") h, ok = reqHeaders.Get(k) if ok { clientHeaders[k] = h } - k := textproto.CanonicalMIMEHeaderKey("x-uber-bar") + k = textproto.CanonicalMIMEHeaderKey("x-uber-bar") h, ok = reqHeaders.Get(k) if ok { clientHeaders[k] = h diff --git a/examples/example-gateway/build/endpoints/baz/workflow/baz_simpleservice_method_getprofile.go b/examples/example-gateway/build/endpoints/baz/workflow/baz_simpleservice_method_getprofile.go index ed0191500..5215cc6cc 100644 --- a/examples/example-gateway/build/endpoints/baz/workflow/baz_simpleservice_method_getprofile.go +++ b/examples/example-gateway/build/endpoints/baz/workflow/baz_simpleservice_method_getprofile.go @@ -84,13 +84,14 @@ func (w simpleServiceGetProfileWorkflow) Handle( var ok bool var h string + var k string - k := textproto.CanonicalMIMEHeaderKey("x-uber-foo") + k = textproto.CanonicalMIMEHeaderKey("x-uber-foo") h, ok = reqHeaders.Get(k) if ok { clientHeaders[k] = h } - k := textproto.CanonicalMIMEHeaderKey("x-uber-bar") + k = textproto.CanonicalMIMEHeaderKey("x-uber-bar") h, ok = reqHeaders.Get(k) if ok { clientHeaders[k] = h diff --git a/examples/example-gateway/build/endpoints/baz/workflow/baz_simpleservice_method_headerschema.go b/examples/example-gateway/build/endpoints/baz/workflow/baz_simpleservice_method_headerschema.go index e1addf1f3..216e31d1d 100644 --- a/examples/example-gateway/build/endpoints/baz/workflow/baz_simpleservice_method_headerschema.go +++ b/examples/example-gateway/build/endpoints/baz/workflow/baz_simpleservice_method_headerschema.go @@ -84,13 +84,14 @@ func (w simpleServiceHeaderSchemaWorkflow) Handle( var ok bool var h string + var k string - k := textproto.CanonicalMIMEHeaderKey("x-uber-foo") + k = textproto.CanonicalMIMEHeaderKey("x-uber-foo") h, ok = reqHeaders.Get(k) if ok { clientHeaders[k] = h } - k := textproto.CanonicalMIMEHeaderKey("x-uber-bar") + k = textproto.CanonicalMIMEHeaderKey("x-uber-bar") h, ok = reqHeaders.Get(k) if ok { clientHeaders[k] = h diff --git a/examples/example-gateway/build/endpoints/baz/workflow/baz_simpleservice_method_ping.go b/examples/example-gateway/build/endpoints/baz/workflow/baz_simpleservice_method_ping.go index 909abc17b..099cddec2 100644 --- a/examples/example-gateway/build/endpoints/baz/workflow/baz_simpleservice_method_ping.go +++ b/examples/example-gateway/build/endpoints/baz/workflow/baz_simpleservice_method_ping.go @@ -81,13 +81,14 @@ func (w simpleServicePingWorkflow) Handle( var ok bool var h string + var k string - k := textproto.CanonicalMIMEHeaderKey("x-uber-foo") + k = textproto.CanonicalMIMEHeaderKey("x-uber-foo") h, ok = reqHeaders.Get(k) if ok { clientHeaders[k] = h } - k := textproto.CanonicalMIMEHeaderKey("x-uber-bar") + k = textproto.CanonicalMIMEHeaderKey("x-uber-bar") h, ok = reqHeaders.Get(k) if ok { clientHeaders[k] = h diff --git a/examples/example-gateway/build/endpoints/baz/workflow/baz_simpleservice_method_sillynoop.go b/examples/example-gateway/build/endpoints/baz/workflow/baz_simpleservice_method_sillynoop.go index 3fed4b207..c7485e0ed 100644 --- a/examples/example-gateway/build/endpoints/baz/workflow/baz_simpleservice_method_sillynoop.go +++ b/examples/example-gateway/build/endpoints/baz/workflow/baz_simpleservice_method_sillynoop.go @@ -82,13 +82,14 @@ func (w simpleServiceSillyNoopWorkflow) Handle( var ok bool var h string + var k string - k := textproto.CanonicalMIMEHeaderKey("x-uber-foo") + k = textproto.CanonicalMIMEHeaderKey("x-uber-foo") h, ok = reqHeaders.Get(k) if ok { clientHeaders[k] = h } - k := textproto.CanonicalMIMEHeaderKey("x-uber-bar") + k = textproto.CanonicalMIMEHeaderKey("x-uber-bar") h, ok = reqHeaders.Get(k) if ok { clientHeaders[k] = h diff --git a/examples/example-gateway/build/endpoints/baz/workflow/baz_simpleservice_method_trans.go b/examples/example-gateway/build/endpoints/baz/workflow/baz_simpleservice_method_trans.go index e76202397..603b65406 100644 --- a/examples/example-gateway/build/endpoints/baz/workflow/baz_simpleservice_method_trans.go +++ b/examples/example-gateway/build/endpoints/baz/workflow/baz_simpleservice_method_trans.go @@ -85,13 +85,14 @@ func (w simpleServiceTransWorkflow) Handle( var ok bool var h string + var k string - k := textproto.CanonicalMIMEHeaderKey("x-uber-foo") + k = textproto.CanonicalMIMEHeaderKey("x-uber-foo") h, ok = reqHeaders.Get(k) if ok { clientHeaders[k] = h } - k := textproto.CanonicalMIMEHeaderKey("x-uber-bar") + k = textproto.CanonicalMIMEHeaderKey("x-uber-bar") h, ok = reqHeaders.Get(k) if ok { clientHeaders[k] = h diff --git a/examples/example-gateway/build/endpoints/baz/workflow/baz_simpleservice_method_transheaders.go b/examples/example-gateway/build/endpoints/baz/workflow/baz_simpleservice_method_transheaders.go index e23cd02f0..0a019ef6f 100644 --- a/examples/example-gateway/build/endpoints/baz/workflow/baz_simpleservice_method_transheaders.go +++ b/examples/example-gateway/build/endpoints/baz/workflow/baz_simpleservice_method_transheaders.go @@ -86,13 +86,14 @@ func (w simpleServiceTransHeadersWorkflow) Handle( var ok bool var h string + var k string - k := textproto.CanonicalMIMEHeaderKey("x-uber-foo") + k = textproto.CanonicalMIMEHeaderKey("x-uber-foo") h, ok = reqHeaders.Get(k) if ok { clientHeaders[k] = h } - k := textproto.CanonicalMIMEHeaderKey("x-uber-bar") + k = textproto.CanonicalMIMEHeaderKey("x-uber-bar") h, ok = reqHeaders.Get(k) if ok { clientHeaders[k] = h diff --git a/examples/example-gateway/build/endpoints/baz/workflow/baz_simpleservice_method_transheadersnoreq.go b/examples/example-gateway/build/endpoints/baz/workflow/baz_simpleservice_method_transheadersnoreq.go index 8114b59ec..c781c29c6 100644 --- a/examples/example-gateway/build/endpoints/baz/workflow/baz_simpleservice_method_transheadersnoreq.go +++ b/examples/example-gateway/build/endpoints/baz/workflow/baz_simpleservice_method_transheadersnoreq.go @@ -84,13 +84,14 @@ func (w simpleServiceTransHeadersNoReqWorkflow) Handle( var ok bool var h string + var k string - k := textproto.CanonicalMIMEHeaderKey("x-uber-foo") + k = textproto.CanonicalMIMEHeaderKey("x-uber-foo") h, ok = reqHeaders.Get(k) if ok { clientHeaders[k] = h } - k := textproto.CanonicalMIMEHeaderKey("x-uber-bar") + k = textproto.CanonicalMIMEHeaderKey("x-uber-bar") h, ok = reqHeaders.Get(k) if ok { clientHeaders[k] = h diff --git a/examples/example-gateway/build/endpoints/baz/workflow/baz_simpleservice_method_transheaderstype.go b/examples/example-gateway/build/endpoints/baz/workflow/baz_simpleservice_method_transheaderstype.go index f62147776..efa4331e5 100644 --- a/examples/example-gateway/build/endpoints/baz/workflow/baz_simpleservice_method_transheaderstype.go +++ b/examples/example-gateway/build/endpoints/baz/workflow/baz_simpleservice_method_transheaderstype.go @@ -86,13 +86,14 @@ func (w simpleServiceTransHeadersTypeWorkflow) Handle( var ok bool var h string + var k string - k := textproto.CanonicalMIMEHeaderKey("x-uber-foo") + k = textproto.CanonicalMIMEHeaderKey("x-uber-foo") h, ok = reqHeaders.Get(k) if ok { clientHeaders[k] = h } - k := textproto.CanonicalMIMEHeaderKey("x-uber-bar") + k = textproto.CanonicalMIMEHeaderKey("x-uber-bar") h, ok = reqHeaders.Get(k) if ok { clientHeaders[k] = h diff --git a/examples/example-gateway/build/endpoints/googlenow/workflow/googlenow_googlenow_method_addcredentials.go b/examples/example-gateway/build/endpoints/googlenow/workflow/googlenow_googlenow_method_addcredentials.go index e18a38b71..205e096f5 100644 --- a/examples/example-gateway/build/endpoints/googlenow/workflow/googlenow_googlenow_method_addcredentials.go +++ b/examples/example-gateway/build/endpoints/googlenow/workflow/googlenow_googlenow_method_addcredentials.go @@ -84,13 +84,14 @@ func (w googleNowAddCredentialsWorkflow) Handle( var ok bool var h string + var k string - k := textproto.CanonicalMIMEHeaderKey("x-uber-foo") + k = textproto.CanonicalMIMEHeaderKey("x-uber-foo") h, ok = reqHeaders.Get(k) if ok { clientHeaders[k] = h } - k := textproto.CanonicalMIMEHeaderKey("x-uber-bar") + k = textproto.CanonicalMIMEHeaderKey("x-uber-bar") h, ok = reqHeaders.Get(k) if ok { clientHeaders[k] = h diff --git a/examples/example-gateway/build/endpoints/googlenow/workflow/googlenow_googlenow_method_checkcredentials.go b/examples/example-gateway/build/endpoints/googlenow/workflow/googlenow_googlenow_method_checkcredentials.go index 87f77c5e8..3ff75ca26 100644 --- a/examples/example-gateway/build/endpoints/googlenow/workflow/googlenow_googlenow_method_checkcredentials.go +++ b/examples/example-gateway/build/endpoints/googlenow/workflow/googlenow_googlenow_method_checkcredentials.go @@ -78,13 +78,14 @@ func (w googleNowCheckCredentialsWorkflow) Handle( var ok bool var h string + var k string - k := textproto.CanonicalMIMEHeaderKey("x-uber-foo") + k = textproto.CanonicalMIMEHeaderKey("x-uber-foo") h, ok = reqHeaders.Get(k) if ok { clientHeaders[k] = h } - k := textproto.CanonicalMIMEHeaderKey("x-uber-bar") + k = textproto.CanonicalMIMEHeaderKey("x-uber-bar") h, ok = reqHeaders.Get(k) if ok { clientHeaders[k] = h diff --git a/examples/example-gateway/build/endpoints/multi/workflow/multi_serviceafront_method_hello.go b/examples/example-gateway/build/endpoints/multi/workflow/multi_serviceafront_method_hello.go index 30037e084..e3ede2be0 100644 --- a/examples/example-gateway/build/endpoints/multi/workflow/multi_serviceafront_method_hello.go +++ b/examples/example-gateway/build/endpoints/multi/workflow/multi_serviceafront_method_hello.go @@ -78,13 +78,14 @@ func (w serviceAFrontHelloWorkflow) Handle( var ok bool var h string + var k string - k := textproto.CanonicalMIMEHeaderKey("x-uber-foo") + k = textproto.CanonicalMIMEHeaderKey("x-uber-foo") h, ok = reqHeaders.Get(k) if ok { clientHeaders[k] = h } - k := textproto.CanonicalMIMEHeaderKey("x-uber-bar") + k = textproto.CanonicalMIMEHeaderKey("x-uber-bar") h, ok = reqHeaders.Get(k) if ok { clientHeaders[k] = h diff --git a/examples/example-gateway/build/endpoints/multi/workflow/multi_servicebfront_method_hello.go b/examples/example-gateway/build/endpoints/multi/workflow/multi_servicebfront_method_hello.go index 3b8eb0ae5..aaccc68d5 100644 --- a/examples/example-gateway/build/endpoints/multi/workflow/multi_servicebfront_method_hello.go +++ b/examples/example-gateway/build/endpoints/multi/workflow/multi_servicebfront_method_hello.go @@ -78,13 +78,14 @@ func (w serviceBFrontHelloWorkflow) Handle( var ok bool var h string + var k string - k := textproto.CanonicalMIMEHeaderKey("x-uber-foo") + k = textproto.CanonicalMIMEHeaderKey("x-uber-foo") h, ok = reqHeaders.Get(k) if ok { clientHeaders[k] = h } - k := textproto.CanonicalMIMEHeaderKey("x-uber-bar") + k = textproto.CanonicalMIMEHeaderKey("x-uber-bar") h, ok = reqHeaders.Get(k) if ok { clientHeaders[k] = h diff --git a/examples/example-gateway/build/endpoints/withexceptions/workflow/withexceptions_withexceptions_method_func1.go b/examples/example-gateway/build/endpoints/withexceptions/workflow/withexceptions_withexceptions_method_func1.go index a239d663b..a181a8bff 100644 --- a/examples/example-gateway/build/endpoints/withexceptions/workflow/withexceptions_withexceptions_method_func1.go +++ b/examples/example-gateway/build/endpoints/withexceptions/workflow/withexceptions_withexceptions_method_func1.go @@ -81,13 +81,14 @@ func (w withExceptionsFunc1Workflow) Handle( var ok bool var h string + var k string - k := textproto.CanonicalMIMEHeaderKey("x-uber-foo") + k = textproto.CanonicalMIMEHeaderKey("x-uber-foo") h, ok = reqHeaders.Get(k) if ok { clientHeaders[k] = h } - k := textproto.CanonicalMIMEHeaderKey("x-uber-bar") + k = textproto.CanonicalMIMEHeaderKey("x-uber-bar") h, ok = reqHeaders.Get(k) if ok { clientHeaders[k] = h