c0c6a9b0b8
* Renamed fakeRepo to mockRepo * Changing around TODOs to capture current plans with the code. * Remove the repo interface and use a real DB for tests. * Fixed a few tests. * Adding checks for properly formatted identifiers. * Updating code to account for recent merges. Relaxing some restrictions on what an id can look like. * Added small comment explaining why RegisterGrpcGatewayer interface exists. * Move project service up a call level. Long term I think it would make sense to define these services even higher up the call stack, potentially at the initialization of the controller server, near where the DB is initialized. * Making these fields align with those in the resources under hosts/... * Hard code the service initialization in the handler registration code. * Regenerate project related code proto code. * Removing type field for project. * Adds basic project handling in CLI/SDK (#47) * Adds SDK for creating and reading projects * Reorganizes a bit * Adds CLI for creating and reading projects * Fixes some some generation bugs * Adds redirect support for default org ID * Fix protobuf import references being moved. * Update client test to look for "orgs" and "projects" instead of "org" and "project" * Update expected segments test * Fix setAddr handling when default organization is in use * Set client in target after create or read Co-authored-by: Jim Lambert <jimlambrt@Jims-MBP-3.home> Co-authored-by: Jim <jlambert@hashicorp.com> Co-authored-by: Michael Gaffney <mgaffney@users.noreply.github.com> Co-authored-by: Jeff Mitchell <jeffrey.mitchell@gmail.com>
58 lines
1.3 KiB
Go
58 lines
1.3 KiB
Go
package api
|
|
|
|
import (
|
|
"bytes"
|
|
"encoding/json"
|
|
"fmt"
|
|
"net/http"
|
|
)
|
|
|
|
// Response is a custom response that wraps an HTTP response. Body will be
|
|
// populated with a buffer containing the response body after Decode is called;
|
|
// it will be nil if the response was a 204.
|
|
type Response struct {
|
|
resp *http.Response
|
|
|
|
Body *bytes.Buffer
|
|
}
|
|
|
|
// HttpResponse returns the underlying HTTP response
|
|
func (r *Response) HttpResponse() *http.Response {
|
|
return r.resp
|
|
}
|
|
|
|
func (r *Response) Decode(inStruct interface{}) (*Error, error) {
|
|
if r == nil || r.resp == nil {
|
|
return nil, fmt.Errorf("nil response, cannot decode")
|
|
}
|
|
defer r.resp.Body.Close()
|
|
|
|
if r.resp.StatusCode == 204 {
|
|
// Do nothing.
|
|
return nil, nil
|
|
}
|
|
|
|
if inStruct == nil {
|
|
return nil, fmt.Errorf("nil value given to decode into and not a 204 response")
|
|
}
|
|
|
|
r.Body = new(bytes.Buffer)
|
|
if _, err := r.Body.ReadFrom(r.resp.Body); err != nil {
|
|
return nil, fmt.Errorf("error reading response body: %w", err)
|
|
}
|
|
|
|
dec := json.NewDecoder(bytes.NewReader(r.Body.Bytes()))
|
|
var apiErr Error
|
|
if r.resp.StatusCode >= 400 {
|
|
inStruct = &apiErr
|
|
}
|
|
if err := dec.Decode(inStruct); err != nil {
|
|
return nil, fmt.Errorf("error decoding response: %w; response was %s", err, r.Body.String())
|
|
}
|
|
if r.resp.StatusCode >= 400 {
|
|
return &apiErr, nil
|
|
}
|
|
|
|
return nil, nil
|
|
}
|