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

Jump to bottom

feat(googleapi): inject gax apierror.APIError into googleapi.Error #1730

Merged
merged 12 commits into from
Nov 7, 2022
Merged

feat(googleapi): inject gax apierror.APIError into googleapi.Error #1730

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
c6e407b
feat(googleapi): inject gax apierror.APIError into googleapi.Error
quartzmo Oct 27, 2022
9cdb6ef
update google-api-go-generator/gen.go to call WrapError
quartzmo Oct 28, 2022
a01476c
update WrapError to accept and return error
quartzmo Nov 2, 2022
dbc3330
fix function docs and copyright year
quartzmo Nov 3, 2022
9c8a5b0
update function docs 2
quartzmo Nov 3, 2022
c981a19
refactor WrapError
quartzmo Nov 3, 2022
2f87501
replace Error.Err with Error.Wrap()
quartzmo Nov 4, 2022
b184cf5
update doc.go
quartzmo Nov 4, 2022
8276d89
refactor WrapError 2
quartzmo Nov 7, 2022
4e112bf
run generation
quartzmo Nov 7, 2022
49633d6
Merge branch 'main' into error-wrapping
quartzmo Nov 7, 2022
fc5a262
Merge branch 'main' into error-wrapping
quartzmo Nov 7, 2022
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
Prev Previous commit
Next Next commit
update google-api-go-generator/gen.go to call WrapError
  • Loading branch information
@quartzmo
quartzmo committed Nov 7, 2022
commit 9cdb6ef2bb68051d9054fe506772a30b3146bf97
4 changes: 2 additions & 2 deletions go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ require (
github.com/google/go-cmp v0.5.9
github.com/google/uuid v1.3.0
github.com/googleapis/enterprise-certificate-proxy v0.2.0
github.com/googleapis/gax-go/v2 v2.6.0
github.com/googleapis/gax-go/v2 v2.7.0
go.opencensus.io v0.23.0
golang.org/x/net v0.0.0-20221014081412-f15817d10f9b
golang.org/x/oauth2 v0.0.0-20221014153046-6fdb5e3db783
Expand All @@ -17,12 +17,12 @@ require (
google.golang.org/appengine v1.6.7
google.golang.org/genproto v0.0.0-20221024183307-1bc688fe9f3e
google.golang.org/grpc v1.50.1
google.golang.org/protobuf v1.28.1
)

require (
cloud.google.com/go/compute v1.12.1 // indirect
github.com/golang/groupcache v0.0.0-20200121045136-8c9f03a8e57e // indirect
github.com/golang/protobuf v1.5.2 // indirect
golang.org/x/text v0.4.0 // indirect
google.golang.org/protobuf v1.28.1 // indirect
)
4 changes: 2 additions & 2 deletions go.sum
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,8 +43,8 @@ github.com/google/uuid v1.3.0 h1:t6JiXgmwXMjEs8VusXIJk2BXHsn+wx8BZdTaoZ5fu7I=
github.com/google/uuid v1.3.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
github.com/googleapis/enterprise-certificate-proxy v0.2.0 h1:y8Yozv7SZtlU//QXbezB6QkpuE6jMD2/gfzk4AftXjs=
github.com/googleapis/enterprise-certificate-proxy v0.2.0/go.mod h1:8C0jb7/mgJe/9KK8Lm7X9ctZC2t60YyIpYEI16jx0Qg=
github.com/googleapis/gax-go/v2 v2.6.0 h1:SXk3ABtQYDT/OH8jAyvEOQ58mgawq5C4o/4/89qN2ZU=
github.com/googleapis/gax-go/v2 v2.6.0/go.mod h1:1mjbznJAPHFpesgE5ucqfYEscaz5kMdcIDwU/6+DDoY=
github.com/googleapis/gax-go/v2 v2.7.0 h1:IcsPKeInNvYi7eqSaDjiZqDDKu5rsmunY0Y1YupQSSQ=
github.com/googleapis/gax-go/v2 v2.7.0/go.mod h1:TEop28CZZQ2y+c0VxMUmu1lV+fQx57QpBWsYpwqHJx8=
github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA=
github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
Expand Down
10 changes: 5 additions & 5 deletions google-api-go-generator/gen.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2166,7 +2166,7 @@ func (meth *Method) generateCode() {
pn("if err := googleapi.CheckResponse(res); err != nil {")
}
pn("res.Body.Close()")
pn("return nil, err")
pn("return nil, gensupport.WrapError(err)")
pn("}")
pn("return res, nil")
pn("}")
Expand Down Expand Up @@ -2198,15 +2198,15 @@ func (meth *Method) generateCode() {
if retTypeComma != "" && !mapRetType {
pn("if res != nil && res.StatusCode == http.StatusNotModified {")
pn(" if res.Body != nil { res.Body.Close() }")
pn(" return nil, &googleapi.Error{")
pn(" return nil, gensupport.WrapError(&googleapi.Error{")
pn(" Code: res.StatusCode,")
pn(" Header: res.Header,")
pn(" }")
pn(" })")
pn("}")
}
pn("if err != nil { return %serr }", nilRet)
pn("defer googleapi.CloseBody(res)")
pn("if err := googleapi.CheckResponse(res); err != nil { return %serr }", nilRet)
pn("if err := googleapi.CheckResponse(res); err != nil { return %sgensupport.WrapError(err) }", nilRet)
if meth.supportsMediaUpload() {
pn(`rx := c.mediaInfo_.ResumableUpload(res.Header.Get("Location"))`)
pn("if rx != nil {")
Expand All @@ -2223,7 +2223,7 @@ func (meth *Method) generateCode() {
pn(" res, err = rx.Upload(ctx)")
pn(" if err != nil { return %serr }", nilRet)
pn(" defer res.Body.Close()")
pn(" if err := googleapi.CheckResponse(res); err != nil { return %serr }", nilRet)
pn(" if err := googleapi.CheckResponse(res); err != nil { return %sgensupport.WrapError(err) }", nilRet)
pn("}")
}
if retTypeComma == "" {
Expand Down
90 changes: 45 additions & 45 deletions google-api-go-generator/testdata/any.want
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -900,17 +900,17 @@ func (c *ProjectsLogServicesListCall) Do(opts ...googleapi.CallOption) (*ListLog
if res.Body != nil {
res.Body.Close()
}
return nil, &googleapi.Error{
return nil, gensupport.WrapError(&googleapi.Error{
Code: res.StatusCode,
Header: res.Header,
}
})
}
if err != nil {
return nil, err
}
defer googleapi.CloseBody(res)
if err := googleapi.CheckResponse(res); err != nil {
return nil, err
return nil, gensupport.WrapError(err)
}
ret := &ListLogServicesResponse{
ServerResponse: googleapi.ServerResponse{
Expand Down Expand Up @@ -1140,17 +1140,17 @@ func (c *ProjectsLogServicesIndexesListCall) Do(opts ...googleapi.CallOption) (*
if res.Body != nil {
res.Body.Close()
}
return nil, &googleapi.Error{
return nil, gensupport.WrapError(&googleapi.Error{
Code: res.StatusCode,
Header: res.Header,
}
})
}
if err != nil {
return nil, err
}
defer googleapi.CloseBody(res)
if err := googleapi.CheckResponse(res); err != nil {
return nil, err
return nil, gensupport.WrapError(err)
}
ret := &ListLogServiceIndexesResponse{
ServerResponse: googleapi.ServerResponse{
Expand Down Expand Up @@ -1338,17 +1338,17 @@ func (c *ProjectsLogServicesSinksCreateCall) Do(opts ...googleapi.CallOption) (*
if res.Body != nil {
res.Body.Close()
}
return nil, &googleapi.Error{
return nil, gensupport.WrapError(&googleapi.Error{
Code: res.StatusCode,
Header: res.Header,
}
})
}
if err != nil {
return nil, err
}
defer googleapi.CloseBody(res)
if err := googleapi.CheckResponse(res); err != nil {
return nil, err
return nil, gensupport.WrapError(err)
}
ret := &LogSink{
ServerResponse: googleapi.ServerResponse{
Expand Down Expand Up @@ -1487,17 +1487,17 @@ func (c *ProjectsLogServicesSinksDeleteCall) Do(opts ...googleapi.CallOption) (*
if res.Body != nil {
res.Body.Close()
}
return nil, &googleapi.Error{
return nil, gensupport.WrapError(&googleapi.Error{
Code: res.StatusCode,
Header: res.Header,
}
})
}
if err != nil {
return nil, err
}
defer googleapi.CloseBody(res)
if err := googleapi.CheckResponse(res); err != nil {
return nil, err
return nil, gensupport.WrapError(err)
}
ret := &Empty{
ServerResponse: googleapi.ServerResponse{
Expand Down Expand Up @@ -1654,17 +1654,17 @@ func (c *ProjectsLogServicesSinksGetCall) Do(opts ...googleapi.CallOption) (*Log
if res.Body != nil {
res.Body.Close()
}
return nil, &googleapi.Error{
return nil, gensupport.WrapError(&googleapi.Error{
Code: res.StatusCode,
Header: res.Header,
}
})
}
if err != nil {
return nil, err
}
defer googleapi.CloseBody(res)
if err := googleapi.CheckResponse(res); err != nil {
return nil, err
return nil, gensupport.WrapError(err)
}
ret := &LogSink{
ServerResponse: googleapi.ServerResponse{
Expand Down Expand Up @@ -1818,17 +1818,17 @@ func (c *ProjectsLogServicesSinksListCall) Do(opts ...googleapi.CallOption) (*Li
if res.Body != nil {
res.Body.Close()
}
return nil, &googleapi.Error{
return nil, gensupport.WrapError(&googleapi.Error{
Code: res.StatusCode,
Header: res.Header,
}
})
}
if err != nil {
return nil, err
}
defer googleapi.CloseBody(res)
if err := googleapi.CheckResponse(res); err != nil {
return nil, err
return nil, gensupport.WrapError(err)
}
ret := &ListLogServiceSinksResponse{
ServerResponse: googleapi.ServerResponse{
Expand Down Expand Up @@ -1971,17 +1971,17 @@ func (c *ProjectsLogServicesSinksUpdateCall) Do(opts ...googleapi.CallOption) (*
if res.Body != nil {
res.Body.Close()
}
return nil, &googleapi.Error{
return nil, gensupport.WrapError(&googleapi.Error{
Code: res.StatusCode,
Header: res.Header,
}
})
}
if err != nil {
return nil, err
}
defer googleapi.CloseBody(res)
if err := googleapi.CheckResponse(res); err != nil {
return nil, err
return nil, gensupport.WrapError(err)
}
ret := &LogSink{
ServerResponse: googleapi.ServerResponse{
Expand Down Expand Up @@ -2123,17 +2123,17 @@ func (c *ProjectsLogsDeleteCall) Do(opts ...googleapi.CallOption) (*Empty, error
if res.Body != nil {
res.Body.Close()
}
return nil, &googleapi.Error{
return nil, gensupport.WrapError(&googleapi.Error{
Code: res.StatusCode,
Header: res.Header,
}
})
}
if err != nil {
return nil, err
}
defer googleapi.CloseBody(res)
if err := googleapi.CheckResponse(res); err != nil {
return nil, err
return nil, gensupport.WrapError(err)
}
ret := &Empty{
ServerResponse: googleapi.ServerResponse{
Expand Down Expand Up @@ -2316,17 +2316,17 @@ func (c *ProjectsLogsListCall) Do(opts ...googleapi.CallOption) (*ListLogsRespon
if res.Body != nil {
res.Body.Close()
}
return nil, &googleapi.Error{
return nil, gensupport.WrapError(&googleapi.Error{
Code: res.StatusCode,
Header: res.Header,
}
})
}
if err != nil {
return nil, err
}
defer googleapi.CloseBody(res)
if err := googleapi.CheckResponse(res); err != nil {
return nil, err
return nil, gensupport.WrapError(err)
}
ret := &ListLogsResponse{
ServerResponse: googleapi.ServerResponse{
Expand Down Expand Up @@ -2507,17 +2507,17 @@ func (c *ProjectsLogsEntriesWriteCall) Do(opts ...googleapi.CallOption) (*WriteL
if res.Body != nil {
res.Body.Close()
}
return nil, &googleapi.Error{
return nil, gensupport.WrapError(&googleapi.Error{
Code: res.StatusCode,
Header: res.Header,
}
})
}
if err != nil {
return nil, err
}
defer googleapi.CloseBody(res)
if err := googleapi.CheckResponse(res); err != nil {
return nil, err
return nil, gensupport.WrapError(err)
}
ret := &WriteLogEntriesResponse{
ServerResponse: googleapi.ServerResponse{
Expand Down Expand Up @@ -2659,17 +2659,17 @@ func (c *ProjectsLogsSinksCreateCall) Do(opts ...googleapi.CallOption) (*LogSink
if res.Body != nil {
res.Body.Close()
}
return nil, &googleapi.Error{
return nil, gensupport.WrapError(&googleapi.Error{
Code: res.StatusCode,
Header: res.Header,
}
})
}
if err != nil {
return nil, err
}
defer googleapi.CloseBody(res)
if err := googleapi.CheckResponse(res); err != nil {
return nil, err
return nil, gensupport.WrapError(err)
}
ret := &LogSink{
ServerResponse: googleapi.ServerResponse{
Expand Down Expand Up @@ -2807,17 +2807,17 @@ func (c *ProjectsLogsSinksDeleteCall) Do(opts ...googleapi.CallOption) (*Empty,
if res.Body != nil {
res.Body.Close()
}
return nil, &googleapi.Error{
return nil, gensupport.WrapError(&googleapi.Error{
Code: res.StatusCode,
Header: res.Header,
}
})
}
if err != nil {
return nil, err
}
defer googleapi.CloseBody(res)
if err := googleapi.CheckResponse(res); err != nil {
return nil, err
return nil, gensupport.WrapError(err)
}
ret := &Empty{
ServerResponse: googleapi.ServerResponse{
Expand Down Expand Up @@ -2974,17 +2974,17 @@ func (c *ProjectsLogsSinksGetCall) Do(opts ...googleapi.CallOption) (*LogSink, e
if res.Body != nil {
res.Body.Close()
}
return nil, &googleapi.Error{
return nil, gensupport.WrapError(&googleapi.Error{
Code: res.StatusCode,
Header: res.Header,
}
})
}
if err != nil {
return nil, err
}
defer googleapi.CloseBody(res)
if err := googleapi.CheckResponse(res); err != nil {
return nil, err
return nil, gensupport.WrapError(err)
}
ret := &LogSink{
ServerResponse: googleapi.ServerResponse{
Expand Down Expand Up @@ -3136,17 +3136,17 @@ func (c *ProjectsLogsSinksListCall) Do(opts ...googleapi.CallOption) (*ListLogSi
if res.Body != nil {
res.Body.Close()
}
return nil, &googleapi.Error{
return nil, gensupport.WrapError(&googleapi.Error{
Code: res.StatusCode,
Header: res.Header,
}
})
}
if err != nil {
return nil, err
}
defer googleapi.CloseBody(res)
if err := googleapi.CheckResponse(res); err != nil {
return nil, err
return nil, gensupport.WrapError(err)
}
ret := &ListLogSinksResponse{
ServerResponse: googleapi.ServerResponse{
Expand Down Expand Up @@ -3288,17 +3288,17 @@ func (c *ProjectsLogsSinksUpdateCall) Do(opts ...googleapi.CallOption) (*LogSink
if res.Body != nil {
res.Body.Close()
}
return nil, &googleapi.Error{
return nil, gensupport.WrapError(&googleapi.Error{
Code: res.StatusCode,
Header: res.Header,
}
})
}
if err != nil {
return nil, err
}
defer googleapi.CloseBody(res)
if err := googleapi.CheckResponse(res); err != nil {
return nil, err
return nil, gensupport.WrapError(err)
}
ret := &LogSink{
ServerResponse: googleapi.ServerResponse{
Expand Down
Loading