generate only if includeHeaders option is set

webrpc · Oct 16, 2024 · 6dadae4 · 6dadae4
1 parent 603d10a
commit 6dadae4
Show file tree

Hide file tree

Showing 6 changed files with 16 additions and 14 deletions.
diff --git a/_examples/golang-basics/example.gen.go b/_examples/golang-basics/example.gen.go
diff --git a/_examples/golang-basics/main.go b/_examples/golang-basics/main.go
@@ -1,4 +1,4 @@
-//go:generate webrpc-gen -schema=example.ridl -target=../../../gen-golang -pkg=main -server -client -legacyErrors -fixEmptyArrays -out=./example.gen.go
+//go:generate webrpc-gen -schema=example.ridl -target=../../../gen-golang -pkg=main -server -client -legacyErrors -fixEmptyArrays -includeHeaders -out=./example.gen.go
 package main
 
 import (

diff --git a/_examples/golang-imports/api.gen.go b/_examples/golang-imports/api.gen.go
diff --git a/client.go.tmpl b/client.go.tmpl
@@ -208,7 +208,9 @@ func newRequest(ctx context.Context, url string, reqBody io.Reader, contentType
 	}
 	req.Header.Set("Accept", contentType)
 	req.Header.Set("Content-Type", contentType)
-	req.Header.Set(WebRpcHeaderName, WebRpcHeader)
+	{{- if $opts.includeHeaders }}
+		req.Header.Set(WebRpcHeader, WebRpcHeaderValue)
+	{{- end }}
 	if headers, ok := HTTPRequestHeaders(ctx); ok {
 		for k := range headers {
 			for _, v := range headers[k] {

diff --git a/main.go.tmpl b/main.go.tmpl
@@ -11,6 +11,7 @@
 {{- set $opts "fixEmptyArrays" (ternary (in .Opts.fixEmptyArrays "" "true") true false) -}}
 {{- set $opts "errorStackTrace" (ternary (in .Opts.errorStackTrace "" "true") true false) -}}
 {{- set $opts "legacyErrors" (ternary (in .Opts.legacyErrors "" "true") true false) -}}
+{{- set $opts "includeHeaders" (ternary (in .Opts.includeHeaders "" "false") true false) -}}
 
 {{- $typePrefix := (last (split "/" $opts.importTypesFrom)) -}}
 {{- if ne $typePrefix "" -}}

diff --git a/server.go.tmpl b/server.go.tmpl
@@ -38,7 +38,7 @@ func (s *{{$serviceName}}) ServeHTTP(w http.ResponseWriter, r *http.Request) {
 		}
 	}()
 
-	w.Header().Set(WebRpcHeaderName, WebRpcHeader)
+	w.Header().Set(WebRpcHeader, WebRpcHeaderValue)
 
 	ctx := r.Context()
 	ctx = context.WithValue(ctx, HTTPResponseWriterCtxKey, w)