Skip to content

Commit

Permalink
Merge pull request #5 from jcchavezs/fix_feedback_for_invalid_respons…
Browse files Browse the repository at this point in the history
…e_file

fix: fixes feedback when the response file is invalid.
  • Loading branch information
jcchavezs committed Feb 21, 2020
2 parents ec13d0a + acb5ea8 commit 9a1e510
Show file tree
Hide file tree
Showing 2 changed files with 21 additions and 5 deletions.
17 changes: 12 additions & 5 deletions pkg/responses/file/responder.go
Original file line number Diff line number Diff line change
Expand Up @@ -54,8 +54,11 @@ func NewResponder(filepath string) responses.Responder {

func (fr *responder) Respond(_ *http.Request) (*http.Response, error) {
if fr.mustSyncResponse {
if err := fr.loadResponse(); err != nil {
isFileRead, err := fr.loadResponse()
if !isFileRead {
log.Fatalf("failed to load response: %v", err)
} else if err != nil {
return nil, err
}
}
res := &http.Response{
Expand Down Expand Up @@ -89,17 +92,21 @@ func (fr *responder) checkNewResponse() {

// loadResponse reads the resFilepath and overrides the values in the provided
// response. If the json parsing fails, the response won't be overwriten.
func (fr *responder) loadResponse() error {
func (fr *responder) loadResponse() (bool, error) {
data, err := ioutil.ReadFile(fr.filepath)
if err != nil {
return err
return false, err
}
readingRes := response{}
err = json.Unmarshal(data, &readingRes)
if err != nil {
return err
return true, err
}

if err = readingRes.validate(); err != nil {
return true, err
}

fr.response.copyFrom(readingRes)
return nil
return true, nil
}
9 changes: 9 additions & 0 deletions pkg/responses/file/response.go
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ package file

import (
"encoding/json"
"errors"
"net/http"
)

Expand Down Expand Up @@ -33,6 +34,14 @@ func (r *response) UnmarshalJSON(data []byte) error {
return nil
}

func (r *response) validate() error {
if r.statusCode < 100 || r.statusCode >= 599 {
return errors.New("invalid status code")
}

return nil
}

func toMultiValueHeaders(singleValueHeaders map[string]string) http.Header {
multiValueHeaders := http.Header{}
for key, value := range singleValueHeaders {
Expand Down

0 comments on commit 9a1e510

Please sign in to comment.