Skip to content

Translate * as ... for std/http #1830

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

Draft
hiddenmarten wants to merge 1 commit into
base: main
Choose a base branch
from
Draft

Translate * as ... for std/http #1830

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
5 changes: 4 additions & 1 deletion pkg/codegen/utils.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -623,7 +623,10 @@ func SwaggerUriToGorillaUri(uri string) string {
// {?param}
// {?param*}
func SwaggerUriToStdHttpUri(uri string) string {
return pathParamRE.ReplaceAllString(uri, "{$1}")
// Create a regex to match path parameters with `*` and replace them with `...`
re := regexp.MustCompile(`{([^}]+)\*}`)
modifiedUri := re.ReplaceAllString(uri, `{$1...}`)
return pathParamRE.ReplaceAllString(modifiedUri, "{$1}")
}

// OrderedParamsFromUri returns the argument names, in order, in a given URI string, so for
Expand Down
10 changes: 5 additions & 5 deletions pkg/codegen/utils_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -440,19 +440,19 @@ func TestSwaggerUriToChiUri(t *testing.T) {

func TestSwaggerUriToStdHttpUriUri(t *testing.T) {
assert.Equal(t, "/path", SwaggerUriToStdHttpUri("/path"))
assert.Equal(t, "/path/{arg}", SwaggerUriToStdHttpUri("/path/{arg}"))
assert.Equal(t, "/path/{arg...}", SwaggerUriToStdHttpUri("/path/{arg*}"))
assert.Equal(t, "/path/{arg1}/{arg2}", SwaggerUriToStdHttpUri("/path/{arg1}/{arg2}"))
assert.Equal(t, "/path/{arg1}/{arg2}/foo", SwaggerUriToStdHttpUri("/path/{arg1}/{arg2}/foo"))

// Make sure all the exploded and alternate formats match too
assert.Equal(t, "/path/{arg}/foo", SwaggerUriToStdHttpUri("/path/{arg}/foo"))
assert.Equal(t, "/path/{arg}/foo", SwaggerUriToStdHttpUri("/path/{arg*}/foo"))
assert.Equal(t, "/path/{arg...}/foo", SwaggerUriToStdHttpUri("/path/{arg*}/foo"))
assert.Equal(t, "/path/{arg}/foo", SwaggerUriToStdHttpUri("/path/{.arg}/foo"))
assert.Equal(t, "/path/{arg}/foo", SwaggerUriToStdHttpUri("/path/{.arg*}/foo"))
assert.Equal(t, "/path/{arg...}/foo", SwaggerUriToStdHttpUri("/path/{.arg*}/foo"))
assert.Equal(t, "/path/{arg}/foo", SwaggerUriToStdHttpUri("/path/{;arg}/foo"))
assert.Equal(t, "/path/{arg}/foo", SwaggerUriToStdHttpUri("/path/{;arg*}/foo"))
assert.Equal(t, "/path/{arg...}/foo", SwaggerUriToStdHttpUri("/path/{;arg*}/foo"))
assert.Equal(t, "/path/{arg}/foo", SwaggerUriToStdHttpUri("/path/{?arg}/foo"))
assert.Equal(t, "/path/{arg}/foo", SwaggerUriToStdHttpUri("/path/{?arg*}/foo"))
assert.Equal(t, "/path/{arg...}/foo", SwaggerUriToStdHttpUri("/path/{?arg*}/foo"))
}

func TestOrderedParamsFromUri(t *testing.T) {
Expand Down