github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-09-15 06:01:50 +00:00
Code Issues Projects Releases Wiki Activity

set right Content-Type for configz

Browse Source
This commit is contained in:
Cao Shufeng
2018-03-29 16:07:47 +08:00
parent 3cb73605aa
commit d3bac22a1f
2 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
pkg/util/configz/configz.go
View File

@@ -19,7 +19,6 @@ package configz
import ( import (
"encoding/json" "encoding/json"
"fmt" "fmt"
"io"
"net/http" "net/http"
"sync" "sync"
) )
@@ -74,7 +73,7 @@ func handle(w http.ResponseWriter, r *http.Request) {
} }
} }
func write(w io.Writer) error { func write(w http.ResponseWriter) error {
var b []byte var b []byte
var err error var err error
func() { func() {
@@ -85,6 +84,7 @@ func write(w io.Writer) error {
if err != nil { if err != nil {
return fmt.Errorf("error marshaling json: %v", err) return fmt.Errorf("error marshaling json: %v", err)
} }
w.Header().Set("Content-Type", "application/json")
_, err = w.Write(b) _, err = w.Write(b)
return err return err
} }

9
pkg/util/configz/configz_test.go
View File

@@ -44,7 +44,7 @@ func TestConfigz(t *testing.T) {
t.Fatalf("err: %v", err) t.Fatalf("err: %v", err)
} }
if string(body) != `{"testing":"blah"}` { if string(body) != `{"testing":"blah"}` {
t.Fatalf("unexpected output: %v", err) t.Fatalf("unexpected output: %s", body)
} }
v.Set("bing") v.Set("bing")
@@ -58,7 +58,7 @@ func TestConfigz(t *testing.T) {
t.Fatalf("err: %v", err) t.Fatalf("err: %v", err)
} }
if string(body) != `{"testing":"bing"}` { if string(body) != `{"testing":"bing"}` {
t.Fatalf("unexpected output: %v", err) t.Fatalf("unexpected output: %s", body)
} }
Delete("testing") Delete("testing")
@@ -72,6 +72,9 @@ func TestConfigz(t *testing.T) {
t.Fatalf("err: %v", err) t.Fatalf("err: %v", err)
} }
if string(body) != `{}` { if string(body) != `{}` {
t.Fatalf("unexpected output: %v", err) t.Fatalf("unexpected output: %s", body)
}
if resp.Header.Get("Content-Type") != "application/json" {
t.Fatalf("unexpected Content-Type: %s", resp.Header.Get("Content-Type"))
} }
} }