Skip to content

feat(#1726): add literal colon support for gin and echo #1815

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
cosban wants to merge 3 commits into from
Closed

feat(#1726): add literal colon support for gin and echo #1815

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
22c8c07
add literal colon support for gin and echo
cosban Oct 28, 2024
b045ccb
backslashes should themselves be escaped too
cosban Oct 28, 2024
a58b695
and of course, the tests need to be updated to account for the backsl…
cosban Oct 28, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion internal/test/issues/issue-312/issue.gen.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 2 additions & 0 deletions pkg/codegen/utils.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -543,6 +543,7 @@ func SwaggerUriToIrisUri(uri string) string {
// {?param}
// {?param*}
func SwaggerUriToEchoUri(uri string) string {
uri = strings.ReplaceAll(uri, ":", "\\\\:")
return pathParamRE.ReplaceAllString(uri, ":$1")
}

Expand Down Expand Up @@ -591,6 +592,7 @@ func SwaggerUriToChiUri(uri string) string {
// {?param}
// {?param*}
func SwaggerUriToGinUri(uri string) string {
uri = strings.ReplaceAll(uri, ":", "\\\\:")
return pathParamRE.ReplaceAllString(uri, ":$1")
}

Expand Down
6 changes: 6 additions & 0 deletions pkg/codegen/utils_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -368,6 +368,9 @@ func TestSwaggerUriToEchoUri(t *testing.T) {
assert.Equal(t, "/path/:arg/foo", SwaggerUriToEchoUri("/path/{;arg*}/foo"))
assert.Equal(t, "/path/:arg/foo", SwaggerUriToEchoUri("/path/{?arg}/foo"))
assert.Equal(t, "/path/:arg/foo", SwaggerUriToEchoUri("/path/{?arg*}/foo"))

// Make sure literal colons are escaped
assert.Equal(t, "/path/:arg\\\\:foo", SwaggerUriToGinUri("/path/{arg}:foo"))
}

func TestSwaggerUriToGinUri(t *testing.T) {
Expand All @@ -385,6 +388,9 @@ func TestSwaggerUriToGinUri(t *testing.T) {
assert.Equal(t, "/path/:arg/foo", SwaggerUriToGinUri("/path/{;arg*}/foo"))
assert.Equal(t, "/path/:arg/foo", SwaggerUriToGinUri("/path/{?arg}/foo"))
assert.Equal(t, "/path/:arg/foo", SwaggerUriToGinUri("/path/{?arg*}/foo"))

// Make sure literal colons are escaped
assert.Equal(t, "/path/:arg\\\\:foo", SwaggerUriToGinUri("/path/{arg}:foo"))
}

func TestSwaggerUriToGorillaUri(t *testing.T) { // TODO
Expand Down