Replace the string with constants from the http package (istio#45077)

Signed-off-by: Zechun Chen <[email protected]>
zhaohuabing · May 24, 2023 · be636e5 · be636e5
1 parent 8841329
commit be636e5
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 8 deletions.
diff --git a/pilot/pkg/xds/debug.go b/pilot/pkg/xds/debug.go
@@ -1109,7 +1109,7 @@ func sortMCSServices(svcs []model.MCSServiceInfo) []model.MCSServiceInfo {
 
 func (s *DiscoveryServer) clusterz(w http.ResponseWriter, req *http.Request) {
  if s.ListRemoteClusters == nil {
- w.WriteHeader(400)
+ w.WriteHeader(http.StatusBadRequest)
  return
  }
  writeJSON(w, s.ListRemoteClusters(), req)

diff --git a/pkg/hbone/dialer.go b/pkg/hbone/dialer.go
@@ -129,7 +129,7 @@ func (d *dialer) proxyTo(conn io.ReadWriteCloser, req Config, address string) er
  remoteID = ids[0]
  }
  }
- if resp.StatusCode != 200 {
+ if resp.StatusCode != http.StatusOK {
  return fmt.Errorf("round trip failed: %v", resp.Status)
  }
  log.WithLabels("host", r.Host, "remote", remoteID).Info("CONNECT established")

diff --git a/pkg/istio-agent/health/health_check_test.go b/pkg/istio-agent/health/health_check_test.go
@@ -112,10 +112,10 @@ func TestWorkloadHealthChecker_PerformApplicationHealthCheck(t *testing.T) {
  httpServerEventCount := 0
  sss := httptest.NewServer(http.HandlerFunc(func(writer http.ResponseWriter, request *http.Request) {
  if httpServerEventCount < len(httpHealthStatuses) && httpHealthStatuses[httpServerEventCount] {
- writer.WriteHeader(200)
+ writer.WriteHeader(http.StatusOK)
  writer.Write([]byte("foobar"))
  } else {
- writer.WriteHeader(500)
+ writer.WriteHeader(http.StatusInternalServerError)
  }
  httpServerEventCount++
  }))

diff --git a/pkg/wasm/httpfetcher_test.go b/pkg/wasm/httpfetcher_test.go
@@ -52,7 +52,7 @@ func TestWasmHTTPFetch(t *testing.T) {
  name: "download retry",
  handler: func(w http.ResponseWriter, r *http.Request, num int) {
  if num <= 2 {
- w.WriteHeader(500)
+ w.WriteHeader(http.StatusInternalServerError)
  } else {
  fmt.Fprintln(w, "wasm")
  }
@@ -63,7 +63,7 @@ func TestWasmHTTPFetch(t *testing.T) {
  {
  name: "download max retry",
  handler: func(w http.ResponseWriter, r *http.Request, num int) {
- w.WriteHeader(500)
+ w.WriteHeader(http.StatusInternalServerError)
  },
  timeout: 5 * time.Second,
  wantNumRequest: 5,
@@ -72,7 +72,7 @@ func TestWasmHTTPFetch(t *testing.T) {
  {
  name: "download is never tried by immediate context timeout",
  handler: func(w http.ResponseWriter, r *http.Request, num int) {
- w.WriteHeader(500)
+ w.WriteHeader(http.StatusInternalServerError)
  },
  timeout: 0, // Immediately timeout in the context level.
  wantNumRequest: 0, // Should not retried because it is already timed out.

diff --git a/security/pkg/stsservice/server/server.go b/security/pkg/stsservice/server/server.go
@@ -144,7 +144,7 @@ func (s *Server) validateStsRequest(req *http.Request) (security.StsRequestParam
  reqDump, _ := httputil.DumpRequest(debugReq, true)
  stsServerLog.Debugf("Received STS request: %s", string(reqDump))
  }
- if req.Method != "POST" {
+ if req.Method != http.MethodPost {
  return reqParam, fmt.Errorf("request method is invalid, should be POST but get %s", req.Method)
  }
  if req.Header.Get("Content-Type") != URLEncodedForm {