github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-25 12:43:23 +00:00
Code Issues Projects Releases Wiki Activity

probe: add test case for redirect terminating cases

Browse Source
This commit is contained in:
Paco Xu 2021-12-15 17:33:19 +08:00
parent 65529fe6e9
commit 3c06ef9c0c
2 changed files with 22 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pkg/probe/http/http.go
View File

@ -129,11 +129,7 @@ func DoHTTPProbe(url *url.URL, headers http.Header, client GetHTTPInterface) (pr
if res.StatusCode >= http.StatusOK && res.StatusCode < http.StatusBadRequest {
if res.StatusCode >= http.StatusMultipleChoices { // Redirect
klog.V(4).Infof("Probe terminated redirects for %s, Response: %v", url.String(), *res)
// add some message in case body is empty when redirect is terminated
if len(body) == 0 {
return probe.Warning, "Probe terminated redirects", nil
}
return probe.Warning, body, nil
return probe.Warning, fmt.Sprintf("Probe terminated redirects, Response body: %v", body), nil
}
klog.V(4).Infof("Probe succeeded for %s, Response: %v", url.String(), *res)
return probe.Success, body, nil

21
pkg/probe/http/http_test.go
View File

@ -139,6 +139,17 @@ func TestHTTPProbeChecker(t *testing.T) {
}
}
redirectHandlerWithBody := func(s int, body string) func(w http.ResponseWriter, r *http.Request) {
return func(w http.ResponseWriter, r *http.Request) {
if r.URL.Path == "/" {
http.Redirect(w, r, "/new", s)
} else if r.URL.Path == "/new" {
w.WriteHeader(s)
w.Write([]byte(body))
}
}
}
followNonLocalRedirects := true
prober := New(followNonLocalRedirects)
testCases := []struct {
@ -336,6 +347,16 @@ func TestHTTPProbeChecker(t *testing.T) {
handler: redirectHandler(http.StatusPermanentRedirect, true), // 308
health: probe.Failure,
},
{
handler: redirectHandlerWithBody(http.StatusPermanentRedirect, ""), // redirect with empty body
health: probe.Warning,
accBody: "Probe terminated redirects, Response body:",
},
{
handler: redirectHandlerWithBody(http.StatusPermanentRedirect, "ok body"), // redirect with body
health: probe.Warning,
accBody: "Probe terminated redirects, Response body: ok body",
},
}
for i, test := range testCases {
t.Run(fmt.Sprintf("case-%2d", i), func(t *testing.T) {