Make luci-go compile again after deps.lock roll.

milo/appengine/common/middleware.go

 // Copyright 2015 The LUCI Authors. All rights reserved.
 // Use of this source code is governed under the Apache License, Version 2.0
 // that can be found in the LICENSE file.
 
 package common
 
 import (
         "net/http"
         "strings"
 
         "golang.org/x/net/context"
 
         "github.com/luci/gae/impl/cloud"
         "github.com/luci/gae/service/info"
         "github.com/luci/luci-go/appengine/gaeauth/server"
         "github.com/luci/luci-go/appengine/gaemiddleware"
         "github.com/luci/luci-go/common/clock"
-        "github.com/luci/luci-go/common/cloudlogging"
-        "github.com/luci/luci-go/common/logging/cloudlog"
         "github.com/luci/luci-go/server/analytics"
         "github.com/luci/luci-go/server/auth"
         "github.com/luci/luci-go/server/auth/identity"
         "github.com/luci/luci-go/server/router"
         "github.com/luci/luci-go/server/templates"
 )
 
 var authconfig *auth.Config
 
 // GetTemplateBundles is used to render HTML templates. It provides base args
@@ skipping 36 matching lines @@
         return gaemiddleware.BaseProd().Extend(
                 auth.Authenticate(server.CookieAuth),
                 withRequestMiddleware,
                 templates.WithTemplates(GetTemplateBundle(templatePath)),
         )
 }
 
 // FlexBase returns the basic middleware for use on appengine flex.  Flex does not
 // allow the use of appengine APIs.
 func FlexBase() router.MiddlewareChain {
-        // Use the cloud logger.
-        logger := func(c *router.Context, next router.Handler) {
-                project := info.AppID(c.Context)
-                logClient, err := cloudlogging.NewClient(
-                        cloudlogging.ClientOptions{
-                                ProjectID:    project,
-                                LogID:        "gae_app",
-                                ResourceType: "gae_app",
-                        },
-                        // TODO(hinoka): This may require authentication to actually work.
-                        http.DefaultClient)
-                if err != nil {
-                        panic(err)
-                }
-                c.Context = cloudlog.Use(c.Context, cloudlog.Config{}, logClient)
-                next(c)
-        }
         // Installs the Info and Datastore services.
-        base := func(c *router.Context, next router.Handler) {
+        return router.NewMiddlewareChain(func(c *router.Context, next router.Handler) {
                 c.Context = cloud.UseFlex(c.Context)
                 next(c)
-        }
-        // Now chain it all together!
-        return router.NewMiddlewareChain(base, logger)
+        })
 }
 
 // The context key, so that we can embed the http.Request object into
 // the context.
 var requestKey = "http.request"
 
 // WithRequest returns a context with the http.Request object
 // in it.
 func WithRequest(c context.Context, r *http.Request) context.Context {
         return context.WithValue(c, &requestKey, r)
 }
 
 // withRequestMiddleware is a middleware that installs a request into the context.
 // This is used for various things in the default template.
 func withRequestMiddleware(c *router.Context, next router.Handler) {
         c.Context = WithRequest(c.Context, c.Request)
         next(c)
 }
 
 func getRequest(c context.Context) *http.Request {
         if req, ok := c.Value(&requestKey).(*http.Request); ok {
                 return req
         }
         panic("No http.request found in context")
 }