Bumping k8s dependencies to 1.13

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

@@ -2,7 +2,7 @@
 // Use of this source code is governed by the Apache 2.0
 // license that can be found in the LICENSE file.
 
-// +build appengine
+// +build golangorg
 
 // Package short implements a simple URL shortener, serving an administrative
 // interface at /s and shortened urls from /s/key.
@@ -12,19 +12,18 @@ package short
 // TODO(adg): collect statistics on URL visits
 
 import (
+	"context"
 	"errors"
 	"fmt"
 	"html/template"
+	"io"
+	"log"
 	"net/http"
 	"net/url"
 	"regexp"
 
-	"golang.org/x/net/context"
-
-	"google.golang.org/appengine"
-	"google.golang.org/appengine/datastore"
-	"google.golang.org/appengine/log"
-	"google.golang.org/appengine/memcache"
+	"cloud.google.com/go/datastore"
+	"golang.org/x/tools/internal/memcache"
 	"google.golang.org/appengine/user"
 )
 
@@ -41,17 +40,32 @@ type Link struct {
 
 var validKey = regexp.MustCompile(`^[a-zA-Z0-9-_.]+$`)
 
-func RegisterHandlers(mux *http.ServeMux) {
-	mux.HandleFunc(prefix, adminHandler)
-	mux.HandleFunc(prefix+"/", linkHandler)
+type server struct {
+	datastore *datastore.Client
+	memcache  *memcache.CodecClient
+}
+
+func RegisterHandlers(mux *http.ServeMux, dc *datastore.Client, mc *memcache.Client) {
+	s := server{dc, mc.WithCodec(memcache.JSON)}
+	mux.HandleFunc(prefix+"/", s.linkHandler)
+
+	// TODO(cbro): move storage of the links to a text file in Gerrit.
+	// Disable the admin handler until that happens, since GAE Flex doesn't support
+	// the "google.golang.org/appengine/user" package.
+	// See golang.org/issue/27205#issuecomment-418673218
+	// mux.HandleFunc(prefix, adminHandler)
+	mux.HandleFunc(prefix, func(w http.ResponseWriter, r *http.Request) {
+		w.WriteHeader(http.StatusForbidden)
+		io.WriteString(w, "Link creation temporarily unavailable. See golang.org/issue/27205.")
+	})
 }
 
 // linkHandler services requests to short URLs.
 //   http://golang.org/s/key
 // It consults memcache and datastore for the Link for key.
 // It then sends a redirects or an error message.
-func linkHandler(w http.ResponseWriter, r *http.Request) {
-	c := appengine.NewContext(r)
+func (h server) linkHandler(w http.ResponseWriter, r *http.Request) {
+	ctx := r.Context()
 
 	key := r.URL.Path[len(prefix)+1:]
 	if !validKey.MatchString(key) {
@@ -60,16 +74,15 @@ func linkHandler(w http.ResponseWriter, r *http.Request) {
 	}
 
 	var link Link
-	_, err := memcache.JSON.Get(c, cacheKey(key), &link)
-	if err != nil {
-		k := datastore.NewKey(c, kind, key, 0, nil)
-		err = datastore.Get(c, k, &link)
+	if err := h.memcache.Get(ctx, cacheKey(key), &link); err != nil {
+		k := datastore.NameKey(kind, key, nil)
+		err = h.datastore.Get(ctx, k, &link)
 		switch err {
 		case datastore.ErrNoSuchEntity:
 			http.Error(w, "not found", http.StatusNotFound)
 			return
 		default: // != nil
-			log.Errorf(c, "%q: %v", key, err)
+			log.Printf("ERROR %q: %v", key, err)
 			http.Error(w, "internal server error", http.StatusInternalServerError)
 			return
 		case nil:
@@ -77,8 +90,8 @@ func linkHandler(w http.ResponseWriter, r *http.Request) {
 				Key:    cacheKey(key),
 				Object: &link,
 			}
-			if err := memcache.JSON.Set(c, item); err != nil {
-				log.Warningf(c, "%q: %v", key, err)
+			if err := h.memcache.Set(ctx, item); err != nil {
+				log.Printf("WARNING %q: %v", key, err)
 			}
 		}
 	}
@@ -89,10 +102,10 @@ func linkHandler(w http.ResponseWriter, r *http.Request) {
 var adminTemplate = template.Must(template.New("admin").Parse(templateHTML))
 
 // adminHandler serves an administrative interface.
-func adminHandler(w http.ResponseWriter, r *http.Request) {
-	c := appengine.NewContext(r)
+func (h server) adminHandler(w http.ResponseWriter, r *http.Request) {
+	ctx := r.Context()
 
-	if !user.IsAdmin(c) {
+	if !user.IsAdmin(ctx) {
 		http.Error(w, "forbidden", http.StatusForbidden)
 		return
 	}
@@ -104,24 +117,24 @@ func adminHandler(w http.ResponseWriter, r *http.Request) {
 		switch r.FormValue("do") {
 		case "Add":
 			newLink = &Link{key, r.FormValue("target")}
-			doErr = putLink(c, newLink)
+			doErr = h.putLink(ctx, newLink)
 		case "Delete":
-			k := datastore.NewKey(c, kind, key, 0, nil)
-			doErr = datastore.Delete(c, k)
+			k := datastore.NameKey(kind, key, nil)
+			doErr = h.datastore.Delete(ctx, k)
 		default:
 			http.Error(w, "unknown action", http.StatusBadRequest)
 		}
-		err := memcache.Delete(c, cacheKey(key))
+		err := h.memcache.Delete(ctx, cacheKey(key))
 		if err != nil && err != memcache.ErrCacheMiss {
-			log.Warningf(c, "%q: %v", key, err)
+			log.Printf("WARNING %q: %v", key, err)
 		}
 	}
 
 	var links []*Link
-	_, err := datastore.NewQuery(kind).Order("Key").GetAll(c, &links)
-	if err != nil {
+	q := datastore.NewQuery(kind).Order("Key")
+	if _, err := h.datastore.GetAll(ctx, q, &links); err != nil {
 		http.Error(w, err.Error(), http.StatusInternalServerError)
-		log.Errorf(c, "%v", err)
+		log.Printf("ERROR %v", err)
 		return
 	}
 
@@ -150,20 +163,20 @@ func adminHandler(w http.ResponseWriter, r *http.Request) {
 		Error   error
 	}{baseURL, prefix, links, newLink, doErr}
 	if err := adminTemplate.Execute(w, &data); err != nil {
-		log.Criticalf(c, "adminTemplate: %v", err)
+		log.Printf("ERROR adminTemplate: %v", err)
 	}
 }
 
 // putLink validates the provided link and puts it into the datastore.
-func putLink(c context.Context, link *Link) error {
+func (h server) putLink(ctx context.Context, link *Link) error {
 	if !validKey.MatchString(link.Key) {
 		return errors.New("invalid key; must match " + validKey.String())
 	}
 	if _, err := url.Parse(link.Target); err != nil {
 		return fmt.Errorf("bad target: %v", err)
 	}
-	k := datastore.NewKey(c, kind, link.Key, 0, nil)
-	_, err := datastore.Put(c, k, link)
+	k := datastore.NameKey(kind, link.Key, nil)
+	_, err := h.datastore.Put(ctx, k, link)
 	return err
 }
 

vendor/golang.org/x/tools/godoc/short/tmpl.go

@@ -2,8 +2,6 @@
 // Use of this source code is governed by the Apache 2.0
 // license that can be found in the LICENSE file.
 
-// +build appengine
-
 package short
 
 const templateHTML = `