add response code to the Request()

Author: exelban

request.go

@@ -11,26 +11,26 @@ import (
 )
 
 // Request - for http requests. Expect method, url and body. Will inject bearer token and tracing id to request.
-func Request(ctx context.Context, method string, url string, b []byte, auth bool) ([]byte, error) {
+func Request(ctx context.Context, method string, url string, b []byte, auth bool) ([]byte, int, error) {
 	req, err := http.NewRequest(method, url, bytes.NewBuffer(b))
 	if err != nil {
-		return nil, err
+		return nil, 0, err
 	}
 
 	req.Header.Add("Content-Type", "application/json")
 	if auth {
 		if err := SetAuthorization(ctx, req); err != nil {
-			return nil, err
+			return nil, 0, err
 		}
 	}
 	if err := InjectToReq(ctx, req); err != nil {
-		return nil, err
+		return nil, 0, err
 	}
 
 	client := http.Client{}
 	resp, err := client.Do(req)
 	if err != nil {
-		return nil, err
+		return nil, 0, err
 	}
 
 	defer func() {
@@ -39,15 +39,15 @@ func Request(ctx context.Context, method string, url string, b []byte, auth bool
 
 	body, err := ioutil.ReadAll(resp.Body)
 	if err != nil {
-		return nil, err
+		return nil, 0, err
 	}
 
 	if resp.StatusCode >= 400 {
 		log.Printf("[DEBUG] %s %s: %d (%s) %s", method, url, resp.StatusCode, http.StatusText(resp.StatusCode), string(body))
-		return nil, errors.New(string(body))
+		return nil, resp.StatusCode, errors.New(string(body))
 	}
 
-	return body, nil
+	return body, resp.StatusCode, nil
 }
 
 // SetAuthorization - take token from context value and set as Bearer token in Authorization header.

request_test.go

@@ -23,52 +23,58 @@ func TestRequest(t *testing.T) {
 	defer ts.Close()
 
 	t.Run("invalid method", func(t *testing.T) {
-		resp, err := Request(context.Background(), " ", "", []byte{}, false)
+		resp, code, err := Request(context.Background(), " ", "", []byte{}, false)
 		require.Error(t, err)
 		require.Nil(t, resp)
+		require.Equal(t, 0, code)
 	})
 
 	t.Run("no token", func(t *testing.T) {
-		resp, err := Request(context.Background(), "", "", []byte{}, true)
+		resp, code, err := Request(context.Background(), "", "", []byte{}, true)
 		require.Error(t, err)
 		require.Nil(t, resp)
+		require.Equal(t, 0, code)
 	})
 
 	t.Run("no span", func(t *testing.T) {
 		ctx := context.WithValue(context.Background(), "token", "test")
-		resp, err := Request(ctx, "", "", []byte{}, true)
+		resp, code, err := Request(ctx, "", "", []byte{}, true)
 		require.Error(t, err)
 		require.Nil(t, resp)
+		require.Equal(t, 0, code)
 	})
 
 	t.Run("wrong url", func(t *testing.T) {
 		ctx := context.WithValue(context.Background(), "token", "test")
 		span, ctx := opentracing.StartSpanFromContext(ctx, "test")
 		require.NotNil(t, span)
 
-		resp, err := Request(ctx, "", "", []byte{}, true)
+		resp, code, err := Request(ctx, "", "", []byte{}, true)
 		require.Error(t, err)
 		require.Nil(t, resp)
+		require.Equal(t, 0, code)
 	})
 
 	t.Run("non 1xx, 2xx, 3xx response", func(t *testing.T) {
 		ctx := context.WithValue(context.Background(), "token", "test")
 		span, ctx := opentracing.StartSpanFromContext(ctx, "test")
 		require.NotNil(t, span)
 
-		resp, err := Request(ctx, "GET", ts.URL, []byte{}, true)
+		resp, code, err := Request(ctx, "GET", ts.URL, []byte{}, true)
 		require.Error(t, err)
 		require.Nil(t, resp)
+		require.Equal(t, http.StatusBadRequest, code)
 	})
 
 	t.Run("200", func(t *testing.T) {
 		ctx := context.WithValue(context.Background(), "token", "test")
 		span, ctx := opentracing.StartSpanFromContext(ctx, "test")
 		require.NotNil(t, span)
 
-		resp, err := Request(ctx, "POST", ts.URL, []byte{}, true)
+		resp, code, err := Request(ctx, "POST", ts.URL, []byte{}, true)
 		require.NoError(t, err)
 		require.Equal(t, []byte("OK"), resp)
+		require.Equal(t, http.StatusOK, code)
 	})
 }