Bumping k8s dependencies to 1.13

vendor/golang.org/x/tools/godoc/proxy/proxy.go

@@ -2,30 +2,35 @@
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
-// +build appengine
-
 // Package proxy proxies requests to the playground's compile and share handlers.
 // It is designed to run only on the instance of godoc that serves golang.org.
 package proxy
 
 import (
 	"bytes"
+	"context"
 	"encoding/json"
 	"fmt"
 	"io/ioutil"
+	"log"
 	"net/http"
 	"net/http/httputil"
 	"net/url"
 	"strings"
 	"time"
 
-	"golang.org/x/net/context"
-
-	"google.golang.org/appengine"
-	"google.golang.org/appengine/log"
-	"google.golang.org/appengine/urlfetch"
+	"golang.org/x/tools/godoc/env"
 )
 
+const playgroundURL = "https://play.golang.org"
+
+var proxy *httputil.ReverseProxy
+
+func init() {
+	target, _ := url.Parse(playgroundURL)
+	proxy = httputil.NewSingleHostReverseProxy(target)
+}
+
 type Request struct {
 	Body string
 }
@@ -41,8 +46,6 @@ type Event struct {
 	Delay   time.Duration // time to wait before printing Message
 }
 
-const playgroundURL = "https://play.golang.org"
-
 const expires = 7 * 24 * time.Hour // 1 week
 var cacheControlHeader = fmt.Sprintf("public, max-age=%d", int(expires.Seconds()))
 
@@ -57,21 +60,17 @@ func compile(w http.ResponseWriter, r *http.Request) {
 		return
 	}
 
-	ctx := appengine.NewContext(r)
+	ctx := r.Context()
 
 	body := r.FormValue("body")
 	res := &Response{}
 	req := &Request{Body: body}
 	if err := makeCompileRequest(ctx, req, res); err != nil {
-		log.Errorf(ctx, "compile error: %v", err)
+		log.Printf("ERROR compile error: %v", err)
 		http.Error(w, "Internal Server Error", http.StatusInternalServerError)
 		return
 	}
 
-	expiresTime := time.Now().Add(expires).UTC()
-	w.Header().Set("Expires", expiresTime.Format(time.RFC1123))
-	w.Header().Set("Cache-Control", cacheControlHeader)
-
 	var out interface{}
 	switch r.FormValue("version") {
 	case "2":
@@ -82,9 +81,17 @@ func compile(w http.ResponseWriter, r *http.Request) {
 			Output        string `json:"output"`
 		}{res.Errors, flatten(res.Events)}
 	}
-	if err := json.NewEncoder(w).Encode(out); err != nil {
-		log.Errorf(ctx, "encoding response: %v", err)
+	b, err := json.Marshal(out)
+	if err != nil {
+		log.Printf("ERROR encoding response: %v", err)
+		http.Error(w, "Internal Server Error", http.StatusInternalServerError)
+		return
 	}
+
+	expiresTime := time.Now().Add(expires).UTC()
+	w.Header().Set("Expires", expiresTime.Format(time.RFC1123))
+	w.Header().Set("Cache-Control", cacheControlHeader)
+	w.Write(b)
 }
 
 // makePlaygroundRequest sends the given Request to the playground compile
@@ -94,17 +101,22 @@ func makeCompileRequest(ctx context.Context, req *Request, res *Response) error
 	if err != nil {
 		return fmt.Errorf("marshalling request: %v", err)
 	}
-	r, err := urlfetch.Client(ctx).Post(playgroundURL+"/compile", "application/json", bytes.NewReader(reqJ))
+	hReq, _ := http.NewRequest("POST", playgroundURL+"/compile", bytes.NewReader(reqJ))
+	hReq.Header.Set("Content-Type", "application/json")
+	hReq = hReq.WithContext(ctx)
+
+	r, err := http.DefaultClient.Do(hReq)
 	if err != nil {
 		return fmt.Errorf("making request: %v", err)
 	}
 	defer r.Body.Close()
+
 	if r.StatusCode != http.StatusOK {
 		b, _ := ioutil.ReadAll(r.Body)
 		return fmt.Errorf("bad status: %v body:\n%s", r.Status, b)
 	}
-	err = json.NewDecoder(r.Body).Decode(res)
-	if err != nil {
+
+	if err := json.NewDecoder(r.Body).Decode(res); err != nil {
 		return fmt.Errorf("unmarshalling response: %v", err)
 	}
 	return nil
@@ -124,17 +136,14 @@ func share(w http.ResponseWriter, r *http.Request) {
 		http.Error(w, http.StatusText(http.StatusForbidden), http.StatusForbidden)
 		return
 	}
-	target, _ := url.Parse(playgroundURL)
-	p := httputil.NewSingleHostReverseProxy(target)
-	p.Transport = &urlfetch.Transport{Context: appengine.NewContext(r)}
-	p.ServeHTTP(w, r)
+	proxy.ServeHTTP(w, r)
 }
 
 func googleCN(r *http.Request) bool {
 	if r.FormValue("googlecn") != "" {
 		return true
 	}
-	if appengine.IsDevAppServer() {
+	if !env.IsProd() {
 		return false
 	}
 	if strings.HasSuffix(r.Host, ".cn") {