Allowed Unmarshal to handle the error and removed debug output

nywilken · Aug 15, 2019 · 31c4c10 · 31c4c10
1 parent 08d56c1
commit 31c4c10
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 5 deletions.
diff --git a/cmd/download.go b/cmd/download.go
@@ -187,10 +187,14 @@ func newDownload(flags *pflag.FlagSet, usrCfg *viper.Viper) (*download, error) {
 	}
 	defer res.Body.Close()
 
-	body, err := ioutil.ReadAll(res.Body)
+	if res.StatusCode < 200 || res.StatusCode > 299 {
+		return nil, decodedAPIError(res)
+	}
+
+	body, _ := ioutil.ReadAll(res.Body)
 	res.Body = ioutil.NopCloser(bytes.NewReader(body))
 
-	if err := json.Unmarshal(body, &d.payload); err != nil || res.StatusCode < 200 || res.StatusCode > 299 {
+	if err := json.Unmarshal(body, &d.payload); err != nil {
 		return nil, decodedAPIError(res)
 	}
 

diff --git a/cmd/download_test.go b/cmd/download_test.go
@@ -302,9 +302,7 @@ func TestDownloadError(t *testing.T) {
 
 	err = runDownload(cfg, flags, []string{})
 
-	fmt.Println(err)
-
-	assert.Regexp(t, "test error", err.Error())
+	assert.Equal(t, "test error", err.Error())
 
 }