Merge pull request #1382 from paragon/main

feat: fix `trimTrailingSlashes` unresolved reference
ogen-go · Jan 25, 2025 · 660b2c5 · 660b2c5
2 parents c120ddb + cc9a542
commit 660b2c5
Show file tree

Hide file tree

Showing 37 changed files with 185 additions and 185 deletions.
diff --git a/examples/ex_2ch/oas_client_gen.go b/examples/ex_2ch/oas_client_gen.go
diff --git a/examples/ex_ent/oas_client_gen.go b/examples/ex_ent/oas_client_gen.go
diff --git a/examples/ex_firecracker/oas_client_gen.go b/examples/ex_firecracker/oas_client_gen.go
diff --git a/examples/ex_github/oas_client_gen.go b/examples/ex_github/oas_client_gen.go
diff --git a/examples/ex_gotd/oas_client_gen.go b/examples/ex_gotd/oas_client_gen.go
diff --git a/examples/ex_k8s/oas_client_gen.go b/examples/ex_k8s/oas_client_gen.go
diff --git a/examples/ex_manga/oas_client_gen.go b/examples/ex_manga/oas_client_gen.go
diff --git a/examples/ex_oauth2/oas_client_gen.go b/examples/ex_oauth2/oas_client_gen.go
diff --git a/examples/ex_openai/oas_client_gen.go b/examples/ex_openai/oas_client_gen.go
diff --git a/examples/ex_petstore/oas_client_gen.go b/examples/ex_petstore/oas_client_gen.go
diff --git a/examples/ex_petstore_expanded/oas_client_gen.go b/examples/ex_petstore_expanded/oas_client_gen.go
diff --git a/examples/ex_route_params/oas_client_gen.go b/examples/ex_route_params/oas_client_gen.go
diff --git a/examples/ex_telegram/oas_client_gen.go b/examples/ex_telegram/oas_client_gen.go
diff --git a/examples/ex_test_format/oas_client_gen.go b/examples/ex_test_format/oas_client_gen.go
diff --git a/examples/ex_tinkoff/oas_client_gen.go b/examples/ex_tinkoff/oas_client_gen.go
diff --git a/gen/_template/client.tmpl b/gen/_template/client.tmpl
@@ -55,6 +55,11 @@ func WithEditResponse(fn func(resp *http.Response) error) RequestOption {
 }
 {{- end }}
 
+func trimTrailingSlashes(u *url.URL) {
+    u.Path = strings.TrimRight(u.Path, "/")
+    u.RawPath = strings.TrimRight(u.RawPath, "/")
+}
+
 {{- if $.PathsClientEnabled }}
 
 // Invoker invokes operations described by OpenAPI v3 specification.
@@ -113,11 +118,6 @@ var _ Handler = struct{
 }{}
 {{- end }}
 
-func trimTrailingSlashes(u *url.URL) {
-	u.Path = strings.TrimRight(u.Path, "/")
-	u.RawPath = strings.TrimRight(u.RawPath, "/")
-}
-
 // NewClient initializes new Client defined by OAS.
 func NewClient(serverURL string, {{- if $.Securities }}sec SecuritySource,{{- end }} opts ...ClientOption) (*Client, error) {
 	u, err := url.Parse(serverURL)