From 39cbab06d28f1d017bfc016c6735f6f45c51c90e Mon Sep 17 00:00:00 2001 From: Cody Oss <6331106+codyoss@users.noreply.github.com> Date: Fri, 11 Dec 2020 09:54:02 -0700 Subject: [PATCH] fix(all): use CheckResponse for media downloads (#773) If a method supports media downloads use CheckResponse. This method provided extra context to errors if the api follow https://google.aip.dev/193. The storage api will continue to use CheckMediaResponse as it does not conform to the aip due to legacy reasons. Fixes: #752 --- adsense/v1.4/adsense-gen.go | 4 ++-- androidpublisher/v3/androidpublisher-gen.go | 2 +- chat/v1/chat-gen.go | 2 +- dfareporting/v3.3/dfareporting-gen.go | 4 ++-- dfareporting/v3.4/dfareporting-gen.go | 4 ++-- displayvideo/v1/displayvideo-gen.go | 2 +- doubleclicksearch/v2/doubleclicksearch-gen.go | 2 +- drive/v2/drive-gen.go | 6 +++--- drive/v3/drive-gen.go | 8 ++++---- google-api-go-generator/gen.go | 6 +++++- remotebuildexecution/v1/remotebuildexecution-gen.go | 2 +- youtube/v3/youtube-gen.go | 2 +- youtubereporting/v1/youtubereporting-gen.go | 2 +- 13 files changed, 25 insertions(+), 21 deletions(-) diff --git a/adsense/v1.4/adsense-gen.go b/adsense/v1.4/adsense-gen.go index 3b1f399f741..b953605339a 100644 --- a/adsense/v1.4/adsense-gen.go +++ b/adsense/v1.4/adsense-gen.go @@ -4379,7 +4379,7 @@ func (c *AccountsReportsGenerateCall) Download(opts ...googleapi.CallOption) (*h if err != nil { return nil, err } - if err := googleapi.CheckMediaResponse(res); err != nil { + if err := googleapi.CheckResponse(res); err != nil { res.Body.Close() return nil, err } @@ -7719,7 +7719,7 @@ func (c *ReportsGenerateCall) Download(opts ...googleapi.CallOption) (*http.Resp if err != nil { return nil, err } - if err := googleapi.CheckMediaResponse(res); err != nil { + if err := googleapi.CheckResponse(res); err != nil { res.Body.Close() return nil, err } diff --git a/androidpublisher/v3/androidpublisher-gen.go b/androidpublisher/v3/androidpublisher-gen.go index 0da35e3cb6b..4d96c5896fb 100644 --- a/androidpublisher/v3/androidpublisher-gen.go +++ b/androidpublisher/v3/androidpublisher-gen.go @@ -12451,7 +12451,7 @@ func (c *SystemapksVariantsDownloadCall) Download(opts ...googleapi.CallOption) if err != nil { return nil, err } - if err := googleapi.CheckMediaResponse(res); err != nil { + if err := googleapi.CheckResponse(res); err != nil { res.Body.Close() return nil, err } diff --git a/chat/v1/chat-gen.go b/chat/v1/chat-gen.go index 490c600987e..d3087e44217 100644 --- a/chat/v1/chat-gen.go +++ b/chat/v1/chat-gen.go @@ -2031,7 +2031,7 @@ func (c *MediaDownloadCall) Download(opts ...googleapi.CallOption) (*http.Respon if err != nil { return nil, err } - if err := googleapi.CheckMediaResponse(res); err != nil { + if err := googleapi.CheckResponse(res); err != nil { res.Body.Close() return nil, err } diff --git a/dfareporting/v3.3/dfareporting-gen.go b/dfareporting/v3.3/dfareporting-gen.go index b7128a8f809..8bfde170323 100644 --- a/dfareporting/v3.3/dfareporting-gen.go +++ b/dfareporting/v3.3/dfareporting-gen.go @@ -31408,7 +31408,7 @@ func (c *FilesGetCall) Download(opts ...googleapi.CallOption) (*http.Response, e if err != nil { return nil, err } - if err := googleapi.CheckMediaResponse(res); err != nil { + if err := googleapi.CheckResponse(res); err != nil { res.Body.Close() return nil, err } @@ -45011,7 +45011,7 @@ func (c *ReportsFilesGetCall) Download(opts ...googleapi.CallOption) (*http.Resp if err != nil { return nil, err } - if err := googleapi.CheckMediaResponse(res); err != nil { + if err := googleapi.CheckResponse(res); err != nil { res.Body.Close() return nil, err } diff --git a/dfareporting/v3.4/dfareporting-gen.go b/dfareporting/v3.4/dfareporting-gen.go index 88fb116ae1f..8a6a5a270df 100644 --- a/dfareporting/v3.4/dfareporting-gen.go +++ b/dfareporting/v3.4/dfareporting-gen.go @@ -32544,7 +32544,7 @@ func (c *FilesGetCall) Download(opts ...googleapi.CallOption) (*http.Response, e if err != nil { return nil, err } - if err := googleapi.CheckMediaResponse(res); err != nil { + if err := googleapi.CheckResponse(res); err != nil { res.Body.Close() return nil, err } @@ -46147,7 +46147,7 @@ func (c *ReportsFilesGetCall) Download(opts ...googleapi.CallOption) (*http.Resp if err != nil { return nil, err } - if err := googleapi.CheckMediaResponse(res); err != nil { + if err := googleapi.CheckResponse(res); err != nil { res.Body.Close() return nil, err } diff --git a/displayvideo/v1/displayvideo-gen.go b/displayvideo/v1/displayvideo-gen.go index 65774ab5cbb..88e5cda1484 100644 --- a/displayvideo/v1/displayvideo-gen.go +++ b/displayvideo/v1/displayvideo-gen.go @@ -30380,7 +30380,7 @@ func (c *MediaDownloadCall) Download(opts ...googleapi.CallOption) (*http.Respon if err != nil { return nil, err } - if err := googleapi.CheckMediaResponse(res); err != nil { + if err := googleapi.CheckResponse(res); err != nil { res.Body.Close() return nil, err } diff --git a/doubleclicksearch/v2/doubleclicksearch-gen.go b/doubleclicksearch/v2/doubleclicksearch-gen.go index 53c85faadac..efcbe0dd978 100644 --- a/doubleclicksearch/v2/doubleclicksearch-gen.go +++ b/doubleclicksearch/v2/doubleclicksearch-gen.go @@ -2059,7 +2059,7 @@ func (c *ReportsGetFileCall) Download(opts ...googleapi.CallOption) (*http.Respo if err != nil { return nil, err } - if err := googleapi.CheckMediaResponse(res); err != nil { + if err := googleapi.CheckResponse(res); err != nil { res.Body.Close() return nil, err } diff --git a/drive/v2/drive-gen.go b/drive/v2/drive-gen.go index 5a201111636..880b5d8501a 100644 --- a/drive/v2/drive-gen.go +++ b/drive/v2/drive-gen.go @@ -8907,7 +8907,7 @@ func (c *FilesExportCall) Download(opts ...googleapi.CallOption) (*http.Response if err != nil { return nil, err } - if err := googleapi.CheckMediaResponse(res); err != nil { + if err := googleapi.CheckResponse(res); err != nil { res.Body.Close() return nil, err } @@ -9267,7 +9267,7 @@ func (c *FilesGetCall) Download(opts ...googleapi.CallOption) (*http.Response, e if err != nil { return nil, err } - if err := googleapi.CheckMediaResponse(res); err != nil { + if err := googleapi.CheckResponse(res); err != nil { res.Body.Close() return nil, err } @@ -11721,7 +11721,7 @@ func (c *FilesWatchCall) Download(opts ...googleapi.CallOption) (*http.Response, if err != nil { return nil, err } - if err := googleapi.CheckMediaResponse(res); err != nil { + if err := googleapi.CheckResponse(res); err != nil { res.Body.Close() return nil, err } diff --git a/drive/v3/drive-gen.go b/drive/v3/drive-gen.go index 96286202938..33aa615f74e 100644 --- a/drive/v3/drive-gen.go +++ b/drive/v3/drive-gen.go @@ -6715,7 +6715,7 @@ func (c *FilesExportCall) Download(opts ...googleapi.CallOption) (*http.Response if err != nil { return nil, err } - if err := googleapi.CheckMediaResponse(res); err != nil { + if err := googleapi.CheckResponse(res); err != nil { res.Body.Close() return nil, err } @@ -7049,7 +7049,7 @@ func (c *FilesGetCall) Download(opts ...googleapi.CallOption) (*http.Response, e if err != nil { return nil, err } - if err := googleapi.CheckMediaResponse(res); err != nil { + if err := googleapi.CheckResponse(res); err != nil { res.Body.Close() return nil, err } @@ -7981,7 +7981,7 @@ func (c *FilesWatchCall) Download(opts ...googleapi.CallOption) (*http.Response, if err != nil { return nil, err } - if err := googleapi.CheckMediaResponse(res); err != nil { + if err := googleapi.CheckResponse(res); err != nil { res.Body.Close() return nil, err } @@ -10211,7 +10211,7 @@ func (c *RevisionsGetCall) Download(opts ...googleapi.CallOption) (*http.Respons if err != nil { return nil, err } - if err := googleapi.CheckMediaResponse(res); err != nil { + if err := googleapi.CheckResponse(res); err != nil { res.Body.Close() return nil, err } diff --git a/google-api-go-generator/gen.go b/google-api-go-generator/gen.go index e19e2730863..657243197e8 100644 --- a/google-api-go-generator/gen.go +++ b/google-api-go-generator/gen.go @@ -2099,7 +2099,11 @@ func (meth *Method) generateCode() { pn(`gensupport.SetOptions(c.urlParams_, opts...)`) pn(`res, err := c.doRequest("media")`) pn("if err != nil { return nil, err }") - pn("if err := googleapi.CheckMediaResponse(res); err != nil {") + if meth.api.Name == "storage" { + pn("if err := googleapi.CheckMediaResponse(res); err != nil {") + } else { + pn("if err := googleapi.CheckResponse(res); err != nil {") + } pn("res.Body.Close()") pn("return nil, err") pn("}") diff --git a/remotebuildexecution/v1/remotebuildexecution-gen.go b/remotebuildexecution/v1/remotebuildexecution-gen.go index 17ae83bbdf4..7986567e79c 100644 --- a/remotebuildexecution/v1/remotebuildexecution-gen.go +++ b/remotebuildexecution/v1/remotebuildexecution-gen.go @@ -3379,7 +3379,7 @@ func (c *MediaDownloadCall) Download(opts ...googleapi.CallOption) (*http.Respon if err != nil { return nil, err } - if err := googleapi.CheckMediaResponse(res); err != nil { + if err := googleapi.CheckResponse(res); err != nil { res.Body.Close() return nil, err } diff --git a/youtube/v3/youtube-gen.go b/youtube/v3/youtube-gen.go index 469ce80ff8f..3d1fafda295 100644 --- a/youtube/v3/youtube-gen.go +++ b/youtube/v3/youtube-gen.go @@ -10883,7 +10883,7 @@ func (c *CaptionsDownloadCall) Download(opts ...googleapi.CallOption) (*http.Res if err != nil { return nil, err } - if err := googleapi.CheckMediaResponse(res); err != nil { + if err := googleapi.CheckResponse(res); err != nil { res.Body.Close() return nil, err } diff --git a/youtubereporting/v1/youtubereporting-gen.go b/youtubereporting/v1/youtubereporting-gen.go index 3cceebc2698..a1a2dcec9f8 100644 --- a/youtubereporting/v1/youtubereporting-gen.go +++ b/youtubereporting/v1/youtubereporting-gen.go @@ -2131,7 +2131,7 @@ func (c *MediaDownloadCall) Download(opts ...googleapi.CallOption) (*http.Respon if err != nil { return nil, err } - if err := googleapi.CheckMediaResponse(res); err != nil { + if err := googleapi.CheckResponse(res); err != nil { res.Body.Close() return nil, err }