rename to MethodAnnotationsFromCtx

webrpc · Sep 27, 2024 · 1af2de2 · 1af2de2
1 parent f8297fa
commit 1af2de2
Show file tree

Hide file tree

Showing 5 changed files with 38 additions and 35 deletions.
diff --git a/_examples/golang-basics/example.gen.go b/_examples/golang-basics/example.gen.go
diff --git a/_examples/golang-basics/example.ridl b/_examples/golang-basics/example.ridl
@@ -92,6 +92,7 @@ service ExampleService
   # Status endpoint
   #
   # gives you current status of running application
+  @internal
   - Status() => (status: bool)
   - Version() => (version: Version)
   - GetUser(header: map<string,string>, userID: uint64) => (user: User)

diff --git a/_examples/golang-imports/api.gen.go b/_examples/golang-imports/api.gen.go
diff --git a/helpers.go.tmpl b/helpers.go.tmpl
@@ -27,7 +27,7 @@ var (
 
 	MethodNameCtxKey = &contextKey{"MethodName"}
 
-	AnnotationsCtxKey = &contextKey{"Annotations"}
+	MethodAnnotationsCtxKey = &contextKey{"MethodAnnotations"}
 )
 
 func ServiceNameFromContext(ctx context.Context) string {
@@ -46,7 +46,7 @@ func RequestFromContext(ctx context.Context) *http.Request {
 }
 
 func MethodAnnotationsFromContext(ctx context.Context) map[string]string {
-	annotations, _ := ctx.Value(AnnotationsCtxKey).(map[string]string)
+	annotations, _ := ctx.Value(MethodAnnotationsCtxKey).(map[string]string)
 	return annotations
 }
 

diff --git a/server.go.tmpl b/server.go.tmpl
@@ -42,7 +42,7 @@ func (s *{{$serviceName}}) ServeHTTP(w http.ResponseWriter, r *http.Request) {
 	ctx = context.WithValue(ctx, HTTPResponseWriterCtxKey, w)
 	ctx = context.WithValue(ctx, HTTPRequestCtxKey, r)
 	ctx = context.WithValue(ctx, ServiceNameCtxKey, "{{.Name}}")
-	ctx = context.WithValue(ctx, AnnotationsCtxKey, annotations[r.URL.Path])
+	ctx = context.WithValue(ctx, MethodAnnotationsCtxKey, methodAnnotations[r.URL.Path])
 
     if s.OnRequest != nil {
         s.OnRequest(w, r)