From bb7a4e744eb5de26820e0c6f5fe4b4b34f01e7e0 Mon Sep 17 00:00:00 2001 From: Aleksandr Razumov Date: Wed, 17 Apr 2024 19:23:19 +0300 Subject: [PATCH] fix(api): fix url param --- _oas/openapi.yaml | 2 +- internal/oas/oas_client_gen.go | 8 ++++---- internal/oas/oas_handlers_gen.go | 4 ++-- internal/oas/oas_router_gen.go | 10 +++++----- internal/oas/oas_server_gen.go | 2 +- internal/oas/oas_unimplemented_gen.go | 2 +- 6 files changed, 14 insertions(+), 14 deletions(-) diff --git a/_oas/openapi.yaml b/_oas/openapi.yaml index c95048c..4fd1bcb 100644 --- a/_oas/openapi.yaml +++ b/_oas/openapi.yaml @@ -25,7 +25,7 @@ paths: $ref: "#/components/schemas/Status" default: $ref: "#/components/responses/Error" - /badge/telegram/${group_name}: + /badge/telegram/{group_name}: parameters: - required: true in: path diff --git a/internal/oas/oas_client_gen.go b/internal/oas/oas_client_gen.go index d1292fb..e3c99f5 100644 --- a/internal/oas/oas_client_gen.go +++ b/internal/oas/oas_client_gen.go @@ -27,7 +27,7 @@ type Invoker interface { // // Get svg badge for telegram group. // - // GET /badge/telegram/${group_name} + // GET /badge/telegram/{group_name} GetTelegramBadge(ctx context.Context, params GetTelegramBadgeParams) (GetTelegramBadgeOK, error) // Status invokes status operation. // @@ -93,7 +93,7 @@ func (c *Client) requestURL(ctx context.Context) *url.URL { // // Get svg badge for telegram group. // -// GET /badge/telegram/${group_name} +// GET /badge/telegram/{group_name} func (c *Client) GetTelegramBadge(ctx context.Context, params GetTelegramBadgeParams) (GetTelegramBadgeOK, error) { res, err := c.sendGetTelegramBadge(ctx, params) return res, err @@ -103,7 +103,7 @@ func (c *Client) sendGetTelegramBadge(ctx context.Context, params GetTelegramBad otelAttrs := []attribute.KeyValue{ otelogen.OperationID("getTelegramBadge"), semconv.HTTPMethodKey.String("GET"), - semconv.HTTPRouteKey.String("/badge/telegram/${group_name}"), + semconv.HTTPRouteKey.String("/badge/telegram/{group_name}"), } // Run stopwatch. @@ -136,7 +136,7 @@ func (c *Client) sendGetTelegramBadge(ctx context.Context, params GetTelegramBad stage = "BuildURL" u := uri.Clone(c.requestURL(ctx)) var pathParts [2]string - pathParts[0] = "/badge/telegram/$" + pathParts[0] = "/badge/telegram/" { // Encode "group_name" parameter. e := uri.NewPathEncoder(uri.PathEncoderConfig{ diff --git a/internal/oas/oas_handlers_gen.go b/internal/oas/oas_handlers_gen.go index 5f88cfd..15ac27c 100644 --- a/internal/oas/oas_handlers_gen.go +++ b/internal/oas/oas_handlers_gen.go @@ -24,12 +24,12 @@ import ( // // Get svg badge for telegram group. // -// GET /badge/telegram/${group_name} +// GET /badge/telegram/{group_name} func (s *Server) handleGetTelegramBadgeRequest(args [1]string, argsEscaped bool, w http.ResponseWriter, r *http.Request) { otelAttrs := []attribute.KeyValue{ otelogen.OperationID("getTelegramBadge"), semconv.HTTPMethodKey.String("GET"), - semconv.HTTPRouteKey.String("/badge/telegram/${group_name}"), + semconv.HTTPRouteKey.String("/badge/telegram/{group_name}"), } // Start a span for this request. diff --git a/internal/oas/oas_router_gen.go b/internal/oas/oas_router_gen.go index c11d94d..0d7c75b 100644 --- a/internal/oas/oas_router_gen.go +++ b/internal/oas/oas_router_gen.go @@ -61,9 +61,9 @@ func (s *Server) ServeHTTP(w http.ResponseWriter, r *http.Request) { break } switch elem[0] { - case 'b': // Prefix: "badge/telegram/$" + case 'b': // Prefix: "badge/telegram/" origElem := elem - if l := len("badge/telegram/$"); len(elem) >= l && elem[0:l] == "badge/telegram/$" { + if l := len("badge/telegram/"); len(elem) >= l && elem[0:l] == "badge/telegram/" { elem = elem[l:] } else { break @@ -205,9 +205,9 @@ func (s *Server) FindPath(method string, u *url.URL) (r Route, _ bool) { break } switch elem[0] { - case 'b': // Prefix: "badge/telegram/$" + case 'b': // Prefix: "badge/telegram/" origElem := elem - if l := len("badge/telegram/$"); len(elem) >= l && elem[0:l] == "badge/telegram/$" { + if l := len("badge/telegram/"); len(elem) >= l && elem[0:l] == "badge/telegram/" { elem = elem[l:] } else { break @@ -225,7 +225,7 @@ func (s *Server) FindPath(method string, u *url.URL) (r Route, _ bool) { r.name = "GetTelegramBadge" r.summary = "" r.operationID = "getTelegramBadge" - r.pathPattern = "/badge/telegram/${group_name}" + r.pathPattern = "/badge/telegram/{group_name}" r.args = args r.count = 1 return r, true diff --git a/internal/oas/oas_server_gen.go b/internal/oas/oas_server_gen.go index a8e4bf2..9ce349a 100644 --- a/internal/oas/oas_server_gen.go +++ b/internal/oas/oas_server_gen.go @@ -12,7 +12,7 @@ type Handler interface { // // Get svg badge for telegram group. // - // GET /badge/telegram/${group_name} + // GET /badge/telegram/{group_name} GetTelegramBadge(ctx context.Context, params GetTelegramBadgeParams) (GetTelegramBadgeOK, error) // Status implements status operation. // diff --git a/internal/oas/oas_unimplemented_gen.go b/internal/oas/oas_unimplemented_gen.go index 9b1e04a..2370897 100644 --- a/internal/oas/oas_unimplemented_gen.go +++ b/internal/oas/oas_unimplemented_gen.go @@ -17,7 +17,7 @@ var _ Handler = UnimplementedHandler{} // // Get svg badge for telegram group. // -// GET /badge/telegram/${group_name} +// GET /badge/telegram/{group_name} func (UnimplementedHandler) GetTelegramBadge(ctx context.Context, params GetTelegramBadgeParams) (r GetTelegramBadgeOK, _ error) { return r, ht.ErrNotImplemented }