Skip to content
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

Corrected MapParams Behavior to Avoid Unintended Filtering #3446

Merged
merged 11 commits into from
Jan 12, 2024
Merged

Corrected MapParams Behavior to Avoid Unintended Filtering #3446

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
9b1ee42
Map all query string parameters when using MapParams.
raphael Jan 12, 2024
1cb1d3f
Upgrade dependencies
raphael Jan 12, 2024
0c544cb
Improve Wizard callout
raphael Jan 12, 2024
997e8aa
Make it prettier
raphael Jan 12, 2024
120ddd5
try again
raphael Jan 12, 2024
0736c45
again
raphael Jan 12, 2024
60fd4e9
again
raphael Jan 12, 2024
d5d9bcd
again
raphael Jan 12, 2024
60806d2
again
raphael Jan 12, 2024
676400b
again
raphael Jan 12, 2024
ea2feb0
again
raphael Jan 12, 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
14 changes: 11 additions & 3 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,25 +16,33 @@
</p>
</p>

<table style="border-collapse: collapse; width: 100%;">
<div align="center">
<table style="border-collapse: collapse; width: 500px;">
<tr>
<td style="border: none; width: 200px;">
<a href="https://chat.openai.com/g/g-mLuQDGyro-goa-design-wizard">
<img src="docs/Wizard.png" alt="Wizard Logo" style="width: 100%; height: auto;"/>
</a>
</td>
<td style="border: none;">
<div style="text-align:center">
<h1>Goa Design Wizard</h1>
</div>
<p>
Use the <a href="https://chat.openai.com/g/g-mLuQDGyro-goa-design-wizard">Goa Design Wizard</a> to:
</p>
<ul>
<li>Create Goa designs for new services in seconds</li>
<li>Create Goa designs in seconds</li>
<li>Review existing designs</li>
<li>Explore the Goa DSL</li>
</ul>
<p>(requires a <a href="https://openai.com/blog/chatgpt-plus">ChatGPT Plus</a> subscription)</p>
<p>
(requires a <a href="https://openai.com/blog/chatgpt-plus">ChatGPT Plus</a> subscription)<br/><br/>
</p>
</td>
</tr>
</table>
</div>

# Overview

Expand Down
6 changes: 3 additions & 3 deletions go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ require (
github.com/sergi/go-diff v1.3.1
github.com/stretchr/testify v1.8.4
golang.org/x/text v0.14.0
golang.org/x/tools v0.16.1
golang.org/x/tools v0.17.0
google.golang.org/grpc v1.60.1
google.golang.org/protobuf v1.32.0
gopkg.in/yaml.v3 v3.0.1
Expand All @@ -33,7 +33,7 @@ require (
github.com/perimeterx/marshmallow v1.1.5 // indirect
github.com/pmezard/go-difflib v1.0.0 // indirect
golang.org/x/mod v0.14.0 // indirect
golang.org/x/net v0.19.0 // indirect
golang.org/x/net v0.20.0 // indirect
golang.org/x/sys v0.16.0 // indirect
google.golang.org/genproto/googleapis/rpc v0.0.0-20240102182953-50ed04b92917 // indirect
google.golang.org/genproto/googleapis/rpc v0.0.0-20240108191215-35c7eff3a6b1 // indirect
)
14 changes: 7 additions & 7 deletions go.sum
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,18 +64,18 @@ github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXl
github.com/ugorji/go/codec v1.2.7 h1:YPXUKf7fYbp/y8xloBqZOw2qaVggbfwMlI8WM3wZUJ0=
golang.org/x/mod v0.14.0 h1:dGoOF9QVLYng8IHTm7BAyWqCqSheQ5pYWGhzW00YJr0=
golang.org/x/mod v0.14.0/go.mod h1:hTbmBsO62+eylJbnUtE2MGJUyE7QWk4xUqPFrRgJ+7c=
golang.org/x/net v0.19.0 h1:zTwKpTd2XuCqf8huc7Fo2iSy+4RHPd10s4KzeTnVr1c=
golang.org/x/net v0.19.0/go.mod h1:CfAk/cbD4CthTvqiEl8NpboMuiuOYsAr/7NOjZJtv1U=
golang.org/x/sync v0.5.0 h1:60k92dhOjHxJkrqnwsfl8KuaHbn/5dl0lUPUklKo3qE=
golang.org/x/net v0.20.0 h1:aCL9BSgETF1k+blQaYUBx9hJ9LOGP3gAVemcZlf1Kpo=
golang.org/x/net v0.20.0/go.mod h1:z8BVo6PvndSri0LbOE3hAn0apkU+1YvI6E70E9jsnvY=
golang.org/x/sync v0.6.0 h1:5BMeUDZ7vkXGfEr1x9B4bRcTH4lpkTkpdh0T/J+qjbQ=
golang.org/x/sys v0.16.0 h1:xWw16ngr6ZMtmxDyKyIgsE93KNKz5HKmMa3b8ALHidU=
golang.org/x/sys v0.16.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
golang.org/x/text v0.14.0 h1:ScX5w1eTa3QqT8oi6+ziP7dTV1S2+ALU0bI+0zXKWiQ=
golang.org/x/text v0.14.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU=
golang.org/x/tools v0.16.1 h1:TLyB3WofjdOEepBHAU20JdNC1Zbg87elYofWYAY5oZA=
golang.org/x/tools v0.16.1/go.mod h1:kYVVN6I1mBNoB1OX+noeBjbRk4IUEPa7JJ+TJMEooJ0=
golang.org/x/tools v0.17.0 h1:FvmRgNOcs3kOa+T20R1uhfP9F6HgG2mfxDv1vrx1Htc=
golang.org/x/tools v0.17.0/go.mod h1:xsh6VxdV005rRVaS6SSAf9oiAqljS7UZUacMZ8Bnsps=
golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
google.golang.org/genproto/googleapis/rpc v0.0.0-20240102182953-50ed04b92917 h1:6G8oQ016D88m1xAKljMlBOOGWDZkes4kMhgGFlf8WcQ=
google.golang.org/genproto/googleapis/rpc v0.0.0-20240102182953-50ed04b92917/go.mod h1:xtjpI3tXFPP051KaWnhvxkiubL/6dJ18vLVf7q2pTOU=
google.golang.org/genproto/googleapis/rpc v0.0.0-20240108191215-35c7eff3a6b1 h1:gphdwh0npgs8elJ4T6J+DQJHPVF7RsuJHCfwztUb4J4=
google.golang.org/genproto/googleapis/rpc v0.0.0-20240108191215-35c7eff3a6b1/go.mod h1:daQN87bsDqDoe316QbbvX60nMoJQa4r6Ds0ZuoAe5yA=
google.golang.org/grpc v1.60.1 h1:26+wFr+cNqSGFcOXcabYC0lUVJVRa2Sb2ortSK7VrEU=
google.golang.org/grpc v1.60.1/go.mod h1:OlCHIeLYqSSsLi6i49B5QGdzaMZK9+M7LXN2FKz4eGM=
google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw=
Expand Down
4 changes: 1 addition & 3 deletions http/codegen/server.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -779,9 +779,7 @@ const requestElementsT = `{{- define "request_elements" }}
if len({{ .VarName }}Raw) != 0 {
{{- end }}
for keyRaw, valRaw := range {{ .VarName }}Raw {
if strings.HasPrefix(keyRaw, "{{ .HTTPName }}[") {
{{- template "map_conversion" (mapQueryDecodeData .Type .VarName 0) }}
}
{{- template "map_conversion" (mapQueryDecodeData .Type .VarName 0) }}
}
{{- if or .DefaultValue (not .Required) }}
}
Expand Down
28 changes: 13 additions & 15 deletions http/codegen/testdata/payload_decode_functions.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4906,23 +4906,21 @@ func DecodeMethodMapQueryObjectRequest(mux goahttp.Muxer, decoder func(*http.Req
err = goa.MergeErrors(err, goa.MissingFieldError("c", "query string"))
}
for keyRaw, valRaw := range cRaw {
if strings.HasPrefix(keyRaw, "c[") {
if c == nil {
c = make(map[int][]string)
}
var keya int
{
openIdx := strings.IndexRune(keyRaw, '[')
closeIdx := strings.IndexRune(keyRaw, ']')
keyaRaw := keyRaw[openIdx+1 : closeIdx]
v, err2 := strconv.ParseInt(keyaRaw, 10, strconv.IntSize)
if err2 != nil {
err = goa.MergeErrors(err, goa.InvalidFieldTypeError("query", keyaRaw, "integer"))
}
keya = int(v)
if c == nil {
c = make(map[int][]string)
}
var keya int
{
openIdx := strings.IndexRune(keyRaw, '[')
closeIdx := strings.IndexRune(keyRaw, ']')
keyaRaw := keyRaw[openIdx+1 : closeIdx]
v, err2 := strconv.ParseInt(keyaRaw, 10, strconv.IntSize)
if err2 != nil {
err = goa.MergeErrors(err, goa.InvalidFieldTypeError("query", keyaRaw, "integer"))
}
c[keya] = valRaw
keya = int(v)
}
c[keya] = valRaw
}
}
if err != nil {
Expand Down
Loading