Merge pull request #61883 from CaoShuFeng/configz

Automatic merge from submit-queue (batch tested with PRs 63297, 61883). If you want to cherry-pick this change to another branch, please follow the instructions <a href="https://github.com/kubernetes/community/blob/master/contributors/devel/cherry-picks.md">here</a>. set right Content-Type for configz **What this PR does / why we need it**: **Which issue(s) this PR fixes** *(optional, in `fixes #<issue number>(, fixes #<issue_number>, ...)` format, will close the issue(s) when PR gets merged)*: Fixes # **Special notes for your reviewer**: **Release note**: ```release-note NONE ```

Merge pull request #61883 from CaoShuFeng/configz
b733342f · Kubernetes Submit Queue · GitHub · bc6e5255 · d3bac22a · b733342f
Unverified Commit b733342f authored May 08, 2018 by Kubernetes Submit Queue Committed by GitHub May 08, 2018
Hide whitespace changes
Inline Side-by-side

Showing with 8 additions and 5 deletions

configz.go pkg/util/configz/configz.go +2 -2

configz_test.go pkg/util/configz/configz_test.go +6 -3

No files found.
--- a/pkg/util/configz/configz.go
+++ b/pkg/util/configz/configz.go
@@ -19,7 +19,6 @@ package configz
 import (
 	"encoding/json"
 	"fmt"
-	"io"
 	"net/http"
 	"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 err error
 	func() {
@@ -85,6 +84,7 @@ func write(w io.Writer) error {
 	if err != nil {
 		return fmt.Errorf("error marshaling json: %v", err)
 	}
+	w.Header().Set("Content-Type", "application/json")
 	_, err = w.Write(b)
 	return err
 }
--- a/pkg/util/configz/configz_test.go
+++ b/pkg/util/configz/configz_test.go
@@ -44,7 +44,7 @@ func TestConfigz(t *testing.T) {
 		t.Fatalf("err: %v", err)
 	}
 	if string(body) != `{"testing":"blah"}` {
-		t.Fatalf("unexpected output: %v", err)
+		t.Fatalf("unexpected output: %s", body)
 	}

 	v.Set("bing")
@@ -58,7 +58,7 @@ func TestConfigz(t *testing.T) {
 		t.Fatalf("err: %v", err)
 	}
 	if string(body) != `{"testing":"bing"}` {
-		t.Fatalf("unexpected output: %v", err)
+		t.Fatalf("unexpected output: %s", body)
 	}

 	Delete("testing")
@@ -72,6 +72,9 @@ func TestConfigz(t *testing.T) {
 		t.Fatalf("err: %v", err)
 	}
 	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"))
 	}
 }