Dark-Alex-17/kapow
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Implemented getRequestHeaders

Browse Source 
Co-authored-by: Hector Hurtado <hector.hurtado@bbva.com>
This commit is contained in:
Roberto Abdelkader Martínez Pérez
2019-10-17 14:59:34 +02:00
parent 92e1658844
commit 635d2c31a7
2 changed files with 71 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
internal/server/data/resource.go
+13 -3
View File
@@ -3,6 +3,7 @@ package data
import (
"io"
"net/http"
"net/textproto"
"github.com/BBVA/kapow/internal/server/model"
"github.com/gorilla/mux"
@@ -52,13 +53,22 @@ func getRequestMatches(w http.ResponseWriter, r *http.Request, h *model.Handler)
func getRequestParams(w http.ResponseWriter, r *http.Request, h *model.Handler) {
w.Header().Add("Content-Type", "application/octet-stream")
name := mux.Vars(r)["name"]
if value, ok := h.Request.URL.Query()[name]; ok {
w.Write([]byte(value[0]))
if values, ok := h.Request.URL.Query()[name]; ok {
w.Write([]byte(values[0]))
} else {
w.WriteHeader(http.StatusNotFound)
}
}
func getRequestHeaders(w http.ResponseWriter, r *http.Request, h *model.Handler) {
// DELETE ON START
w.Header().Add("Content-Type", "application/octet-stream")
name := mux.Vars(r)["name"]
// fmt.Printf("%+v", h.Request.Header)
if values, ok := h.Request.Header[textproto.CanonicalMIMEHeaderKey(name)]; ok {
w.Write([]byte(values[0]))
} else {
w.WriteHeader(http.StatusNotFound)
}
}
internal/server/data/resource_test.go
+58 -11
View File
@@ -438,11 +438,11 @@ func TestGetRequestParamsReturnsTheFirstCorrectMatchValue(t *testing.T) {
}
func TestGetRequestHeaders200sOnHappyPath(t *testing.T) {
t.Skip("******** WIP ********")
h := model.Handler{
Request: httptest.NewRequest("GET", "/", nil),
Writer: httptest.NewRecorder(),
}
h.Request.Header.Set("bar", "BAZ")
r := createMuxRequest("/handlers/HANDLERID/request/headers/{name}", "/handlers/HANDLERID/request/headers/bar", "GET")
w := httptest.NewRecorder()
@@ -450,12 +450,11 @@ func TestGetRequestHeaders200sOnHappyPath(t *testing.T) {
res := w.Result()
if res.StatusCode != http.StatusOK {
t.Error("Status code mismatch")
t.Errorf("Status code mismatch. Expected: 200, Got: %d", res.StatusCode)
}
}
func TestGetRequestHeadersSetsOctectStreamContentType(t *testing.T) {
t.Skip("******** WIP ********")
h := model.Handler{
Request: httptest.NewRequest("GET", "/", nil),
Writer: httptest.NewRecorder(),
@@ -472,7 +471,57 @@ func TestGetRequestHeadersSetsOctectStreamContentType(t *testing.T) {
}
func TestGetRequestHeadersReturnsTheCorrectMatchValue(t *testing.T) {
t.Skip("******** WIP ********")
h := model.Handler{
Request: httptest.NewRequest("GET", "/", nil),
Writer: httptest.NewRecorder(),
}
h.Request.Header.Set("Bar", "BAZ")
r := createMuxRequest("/handlers/HANDLERID/request/headers/{name}", "/handlers/HANDLERID/request/headers/bar", "GET")
w := httptest.NewRecorder()
getRequestHeaders(w, r, &h)
res := w.Result()
if body, _ := ioutil.ReadAll(res.Body); string(body) != "BAZ" {
t.Errorf("Body mismatch. Expected: BAZ. Got: %v", string(body))
}
}
func TestGetRequestHeaders200sWhenHeaderIsEmptyString(t *testing.T) {
h := model.Handler{
Request: httptest.NewRequest("GET", "/", nil),
Writer: httptest.NewRecorder(),
}
h.Request.Header.Set("bar", "")
r := createMuxRequest("/handlers/HANDLERID/request/headers/{name}", "/handlers/HANDLERID/request/headers/bar", "GET")
w := httptest.NewRecorder()
getRequestHeaders(w, r, &h)
res := w.Result()
if res.StatusCode != http.StatusOK {
t.Errorf("Status code mismatch. Expected: 200, Got: %d", res.StatusCode)
}
}
func TestGetRequestHeadersReturnsEmptyBodyWhenHeaderIsEmptyString(t *testing.T) {
h := model.Handler{
Request: httptest.NewRequest("GET", "/", nil),
Writer: httptest.NewRecorder(),
}
h.Request.Header.Set("bar", "")
r := createMuxRequest("/handlers/HANDLERID/request/headers/{name}", "/handlers/HANDLERID/request/headers/bar", "GET")
w := httptest.NewRecorder()
getRequestHeaders(w, r, &h)
res := w.Result()
if body, _ := ioutil.ReadAll(res.Body); string(body) != "" {
t.Errorf(`Body mismatch. Expected "". Got: %q`, string(body))
}
}
func TestGetRequestHeadersReturnsTheCorrectInsensitiveMatchValue(t *testing.T) {
h := model.Handler{
Request: httptest.NewRequest("GET", "/", nil),
Writer: httptest.NewRecorder(),
@@ -484,13 +533,12 @@ func TestGetRequestHeadersReturnsTheCorrectMatchValue(t *testing.T) {
getRequestHeaders(w, r, &h)
res := w.Result()
if res.Header.Get("bar") != "BAZ" {
t.Errorf("Body mismatch: Expected: BAZ. Got: %s", res.Header.Get("bar"))
if body, _ := ioutil.ReadAll(res.Body); string(body) != "BAZ" {
t.Errorf("Body mismatch. Expected: BAZ. Got: %v", string(body))
}
}
func TestGetRequestHeaders404sWhenParamDoesntExist(t *testing.T) {
t.Skip("******** WIP ********")
func TestGetRequestHeaders404sWhenHeaderDoesntExist(t *testing.T) {
h := model.Handler{
Request: httptest.NewRequest("GET", "/", nil),
Writer: httptest.NewRecorder(),
@@ -507,7 +555,6 @@ func TestGetRequestHeaders404sWhenParamDoesntExist(t *testing.T) {
}
func TestGetRequestHeadersReturnsTheFirstCorrectMatchValue(t *testing.T) {
t.Skip("******** WIP ********")
h := model.Handler{
Request: httptest.NewRequest("GET", "/", nil),
Writer: httptest.NewRecorder(),
@@ -520,7 +567,7 @@ func TestGetRequestHeadersReturnsTheFirstCorrectMatchValue(t *testing.T) {
getRequestHeaders(w, r, &h)
res := w.Result()
if res.Header.Get("bar") != "BAZ" {
t.Errorf("Body mismatch: Expected: BAZ. Got: %s", res.Header.Get("bar"))
if body, _ := ioutil.ReadAll(res.Body); string(body) != "BAZ" {
t.Errorf("Body mismatch. Expected: BAZ. Got: %v", string(body))
}
}