maxmustermann/pulumi
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Allow Pulumi service HTTP client to unmarshal body as raw bytes

Browse source 
This commit will allow the Pulumi service HTTP client to deserialize
HTTP responses that have bodies encoded as `application/octet-stream` to
be deserialized as `[]byte`.

This fixes a small bug that causes the HTTP client to fail under these
circumstances, as it expects any body to be JSON-deserializable.
This commit is contained in:
Alex Clemmer 2019-06-27 16:30:38 -07:00
parent cb1a4ff1fd
commit c7e1f19733
1 changed files with 12 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
pkg/backend/httpstate/client/api.go
View file

@ -23,6 +23,7 @@ import (
"io"
"io/ioutil"
"net/http"
"reflect"
"runtime"
"strings"
@ -287,8 +288,17 @@ func pulumiRESTCall(ctx context.Context, diag diag.Sink, cloudAPI, method, path
}
if respObj != nil {
if err = json.Unmarshal(respBody, respObj); err != nil {
return errors.Wrapf(err, "unmarshalling response object")
bytes := reflect.TypeOf([]byte(nil))
if typ := reflect.TypeOf(respObj); typ == reflect.PtrTo(bytes) {
// Return the raw bytes of the response body.
*respObj.(*[]byte) = append([]byte(nil), respBody...)
} else if typ == bytes {
return fmt.Errorf("Can't unmarshal response body to []byte. Try *[]byte")
} else {
// Else, unmarshal as JSON.
if err = json.Unmarshal(respBody, respObj); err != nil {
return errors.Wrapf(err, "unmarshalling response object")
}
}
}