-
Notifications
You must be signed in to change notification settings - Fork 51
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
fix(gengapic): regapic fix missing return statement (#1054)
- Loading branch information
Showing
6 changed files
with
125 additions
and
13 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,66 @@ | ||
| func (c *fooRESTClient) HttpBodyRPC(ctx context.Context, req *foopb.Foo, opts ...gax.CallOption) (*httpbodypb.HttpBody, error) { | ||
| m := protojson.MarshalOptions{AllowPartial: true, UseEnumNumbers: true} | ||
| jsonReq, err := m.Marshal(req) | ||
| if err != nil { | ||
| return nil, err | ||
| } | ||
|
|
||
| baseUrl, err := url.Parse(c.endpoint) | ||
| if err != nil { | ||
| return nil, err | ||
| } | ||
| baseUrl.Path += fmt.Sprintf("/v1/foo") | ||
|
|
||
| // Build HTTP headers from client and context metadata. | ||
| routingHeaders := "" | ||
| routingHeadersMap := make(map[string]string) | ||
| if reg := regexp.MustCompile("(.*)"); reg.MatchString(req.GetOther()) && len(url.QueryEscape(reg.FindStringSubmatch(req.GetOther())[1])) > 0 { | ||
| routingHeadersMap["other"] = url.QueryEscape(reg.FindStringSubmatch(req.GetOther())[1]) | ||
| } | ||
| for headerName, headerValue := range routingHeadersMap { | ||
| routingHeaders = fmt.Sprintf("%s%s=%s&", routingHeaders, headerName, headerValue) | ||
| } | ||
| routingHeaders = strings.TrimSuffix(routingHeaders, "&") | ||
| md := metadata.Pairs("x-goog-request-params", routingHeaders) | ||
|
|
||
| headers := buildHeaders(ctx, c.xGoogMetadata, md, metadata.Pairs("Content-Type", "application/json")) | ||
| opts = append((*c.CallOptions).HttpBodyRPC[0:len((*c.CallOptions).HttpBodyRPC):len((*c.CallOptions).HttpBodyRPC)], opts...) | ||
| resp := &httpbodypb.HttpBody{} | ||
| e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error { | ||
| if settings.Path != "" { | ||
| baseUrl.Path = settings.Path | ||
| } | ||
| httpReq, err := http.NewRequest("POST", baseUrl.String(), bytes.NewReader(jsonReq)) | ||
| if err != nil { | ||
| return err | ||
| } | ||
| httpReq = httpReq.WithContext(ctx) | ||
| httpReq.Header = headers | ||
|
|
||
| httpRsp, err := c.httpClient.Do(httpReq) | ||
| if err != nil{ | ||
| return err | ||
| } | ||
| defer httpRsp.Body.Close() | ||
|
|
||
| if err = googleapi.CheckResponse(httpRsp); err != nil { | ||
| return err | ||
| } | ||
|
|
||
| buf, err := ioutil.ReadAll(httpRsp.Body) | ||
| if err != nil { | ||
| return err | ||
| } | ||
|
|
||
| resp.Data = buf | ||
| if headers := httpRsp.Header; len(headers["Content-Type"]) > 0 { | ||
| resp.ContentType = headers["Content-Type"][0] | ||
| } | ||
|
|
||
| return nil | ||
| }, opts...) | ||
| if e != nil { | ||
| return nil, e | ||
| } | ||
| return resp, nil | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters