Update go-kit to 0.4.0 (#1411)

Notable refactoring:
- Use stdlib "context" in place of "golang.org/x/net/context"
- Go-kit no longer wraps errors, so we remove the unwrap in transport_error.go
- Use MakeHandler when setting up endpoint tests (fixes test bug caught during
  this refactoring)

Closes #1411.

cli/serve.go

@@ -45,7 +45,6 @@ binary (which you're executing right now). Use the options below to customize
 the way that the kolide server works.
 `,
 		Run: func(cmd *cobra.Command, args []string) {
-			ctx := context.Background()
 			config := configManager.LoadConfig()
 
 			var logger kitlog.Logger
@@ -56,7 +55,7 @@ the way that the kolide server works.
 				} else {
 					logger = kitlog.NewLogfmtLogger(output)
 				}
-				logger = kitlog.NewContext(logger).With("ts", kitlog.DefaultTimestampUTC)
+				logger = kitlog.With(logger, "ts", kitlog.DefaultTimestampUTC)
 			}
 
 			var ds kolide.Datastore
@@ -143,16 +142,16 @@ the way that the kolide server works.
 				Help:      "Total duration of requests in microseconds.",
 			}, fieldKeys)
 
-			svcLogger := kitlog.NewContext(logger).With("component", "service")
+			svcLogger := kitlog.With(logger, "component", "service")
 			svc = service.NewLoggingService(svc, svcLogger)
 			svc = service.NewMetricsService(svc, requestCount, requestLatency)
 
-			httpLogger := kitlog.NewContext(logger).With("component", "http")
+			httpLogger := kitlog.With(logger, "component", "http")
 
 			var apiHandler, frontendHandler http.Handler
 			{
 				frontendHandler = prometheus.InstrumentHandler("get_frontend", service.ServeFrontend(httpLogger))
-				apiHandler = service.MakeHandler(ctx, svc, config.Auth.JwtKey, httpLogger)
+				apiHandler = service.MakeHandler(svc, config.Auth.JwtKey, httpLogger)
 
 				setupRequired, err := service.RequireSetup(svc)
 				if err != nil {
@@ -229,7 +228,7 @@ the way that the kolide server works.
 				sig := make(chan os.Signal)
 				signal.Notify(sig, syscall.SIGINT, syscall.SIGTERM)
 				<-sig //block on signal
-				ctx, _ = context.WithTimeout(context.Background(), 30*time.Second)
+				ctx, _ := context.WithTimeout(context.Background(), 30*time.Second)
 				errs <- srv.Shutdown(ctx)
 			}()
 

glide.lock

@@ -1,5 +1,5 @@
-hash: c1bacfac1e43a7b6cb050afc246e21a426e9781fac4146df1d5571d5c28c4d90
-updated: 2017-03-08T09:05:13.458507954-08:00
+hash: f3cd6c2e30f6c19975df5373a3fd6132d5672273718275c6ecf4dfbe4993b149
+updated: 2017-03-14T10:36:42.833374871-07:00
 imports:
 - name: github.com/alecthomas/template
   version: a0175ee3bccc567396460bf5acd36800cb10c49c
@@ -27,7 +27,7 @@ imports:
   - internal
   - redis
 - name: github.com/go-kit/kit
-  version: f66b0e13579bfc5a48b9e2a94b1209c107ea1f41
+  version: fadad6fffe0466b19df9efd9acde5c9a52df5fa4
   subpackages:
   - endpoint
   - log

glide.yaml

@@ -64,7 +64,7 @@ import:
 - package: github.com/VividCortex/mysqlerr
   version: master
 - package: github.com/go-kit/kit
-  version: ~0.3.0
+  version: ~0.4.0
 - package: github.com/go-yaml/yaml
 - package: github.com/ryanuber/go-license
 - package: github.com/igm/sockjs-go

server/contexts/host/host.go

@@ -3,8 +3,9 @@
 package host
 
 import (
+	"context"
+
 	"github.com/kolide/kolide/server/kolide"
-	"golang.org/x/net/context"
 )
 
 type key int

server/contexts/token/token.go

@@ -3,10 +3,9 @@
 package token
 
 import (
+	"context"
 	"net/http"
 	"strings"
-
-	"golang.org/x/net/context"
 )
 
 type key int

server/contexts/viewer/viewer.go

@@ -3,8 +3,9 @@
 package viewer
 
 import (
+	"context"
+
 	"github.com/kolide/kolide/server/kolide"
-	"golang.org/x/net/context"
 )
 
 type key int

server/kolide/app.go

@@ -1,7 +1,7 @@
 package kolide
 
 import (
-	"golang.org/x/net/context"
+	"context"
 )
 
 // AppConfigStore contains method for saving and retrieving

server/kolide/campaigns.go

@@ -1,10 +1,10 @@
 package kolide
 
 import (
+	"context"
 	"time"
 
 	"github.com/kolide/kolide/server/websocket"
-	"golang.org/x/net/context"
 )
 
 // CampaignStore defines the distributed query campaign related datastore

server/kolide/hosts.go

@@ -1,11 +1,10 @@
 package kolide
 
 import (
+	"context"
 	"crypto/rand"
 	"encoding/base64"
 	"time"
-
-	"golang.org/x/net/context"
 )
 
 const (

server/kolide/import_config.go

@@ -1,11 +1,10 @@
 package kolide
 
 import (
+	"context"
 	"errors"
 	"fmt"
 	"strings"
-
-	"golang.org/x/net/context"
 )
 
 type ImportConfigService interface {

server/kolide/invites.go

@@ -2,9 +2,8 @@ package kolide
 
 import (
 	"bytes"
+	"context"
 	"html/template"
-
-	"golang.org/x/net/context"
 )
 
 // InviteStore contains the methods for

server/kolide/labels.go

@@ -1,9 +1,8 @@
 package kolide
 
 import (
+	"context"
 	"time"
-
-	"golang.org/x/net/context"
 )
 
 type LabelStore interface {

server/kolide/licenses.go

@@ -1,12 +1,12 @@
 package kolide
 
 import (
+	"context"
 	"fmt"
 	"time"
 
 	"github.com/dgrijalva/jwt-go"
 	"github.com/pkg/errors"
-	"golang.org/x/net/context"
 )
 
 const (

server/kolide/options.go

@@ -1,13 +1,12 @@
 package kolide
 
 import (
+	"context"
 	"database/sql/driver"
 	"encoding/json"
 	"fmt"
 	"strings"
 	"time"
-
-	"golang.org/x/net/context"
 )
 
 // OptionStore interface describes methods to access datastore

server/kolide/osquery.go

@@ -1,6 +1,8 @@
 package kolide
 
-import "golang.org/x/net/context"
+import (
+	"context"
+)
 
 type OsqueryService interface {
 	EnrollAgent(ctx context.Context, enrollSecret, hostIdentifier string) (nodeKey string, err error)

server/kolide/packs.go

@@ -1,7 +1,7 @@
 package kolide
 
 import (
-	"golang.org/x/net/context"
+	"context"
 )
 
 // PackStore is the datastore interface for managing query packs.

server/kolide/queries.go

@@ -1,6 +1,8 @@
 package kolide
 
-import "golang.org/x/net/context"
+import (
+	"context"
+)
 
 type QueryStore interface {
 	// NewQuery creates a new query object in thie datastore. The returned

server/kolide/query_results.go

@@ -1,6 +1,8 @@
 package kolide
 
-import "golang.org/x/net/context"
+import (
+	"context"
+)
 
 // QueryResultStore defines functions for sending and receiving distributed
 // query results over a pub/sub system. It is implemented by structs in package

server/kolide/scheduled_queries.go

@@ -1,7 +1,7 @@
 package kolide
 
 import (
-	"golang.org/x/net/context"
+	"context"
 )
 
 type ScheduledQueryStore interface {

server/kolide/sessions.go

@@ -1,9 +1,8 @@
 package kolide
 
 import (
+	"context"
 	"time"
-
-	"golang.org/x/net/context"
 )
 
 // SessionStore is the abstract interface that all session backends must

server/kolide/targets.go

@@ -1,7 +1,7 @@
 package kolide
 
 import (
-	"golang.org/x/net/context"
+	"context"
 )
 
 type TargetSearchResults struct {

server/kolide/users.go

@@ -2,13 +2,13 @@ package kolide
 
 import (
 	"bytes"
+	"context"
 	"crypto/rand"
 	"encoding/base64"
 	"fmt"
 	"html/template"
 
 	"golang.org/x/crypto/bcrypt"
-	"golang.org/x/net/context"
 )
 
 // UserStore contains methods for managing users in a datastore

server/license/checker.go

@@ -1,6 +1,7 @@
 package license
 
 import (
+	"context"
 	"encoding/json"
 	"fmt"
 	"net/http"
@@ -13,7 +14,6 @@ import (
 	"github.com/kolide/kolide/server/kolide"
 	"github.com/kolide/kolide/server/version"
 	"github.com/pkg/errors"
-	"golang.org/x/net/context"
 )
 
 const (
@@ -99,7 +99,7 @@ func NewChecker(ds kolide.Datastore, licenseEndpointURL string, opts ...Option)
 		o(response)
 	}
 
-	response.logger = log.NewContext(response.logger).With("component", "license-checker")
+	response.logger = log.With(response.logger, "component", "license-checker")
 	return response
 }
 

server/license/checker_test.go

@@ -1,6 +1,7 @@
 package license
 
 import (
+	"context"
 	"encoding/json"
 	"fmt"
 	"net/http"
@@ -16,7 +17,6 @@ import (
 	"github.com/kolide/kolide/server/mock"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
-	"golang.org/x/net/context"
 )
 
 var tokenString = "eyJ0eXAiOiJKV1QiLCJhbGciOiJSUzI1NiIsImtpZCI6IjRkOmM1OmRlOmE1Oj" +

server/pubsub/inmem_query_results.go

@@ -1,11 +1,10 @@
 package pubsub
 
 import (
+	"context"
 	"strconv"
 	"sync"
 
-	"golang.org/x/net/context"
-
 	"github.com/kolide/kolide/server/kolide"
 )
 

server/pubsub/query_results_test.go

@@ -1,6 +1,7 @@
 package pubsub
 
 import (
+	"context"
 	"fmt"
 	"os"
 	"reflect"
@@ -13,7 +14,6 @@ import (
 	"github.com/kolide/kolide/server/kolide"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
-	"golang.org/x/net/context"
 )
 
 // waitTimeout waits for the waitgroup for the specified max timeout.

server/pubsub/redis_query_results.go

@@ -1,12 +1,11 @@
 package pubsub
 
 import (
+	"context"
 	"encoding/json"
 	"fmt"
 	"time"
 
-	"golang.org/x/net/context"
-
 	"github.com/garyburd/redigo/redis"
 	"github.com/kolide/kolide/server/kolide"
 	"github.com/pkg/errors"

server/service/endpoint_appconfig.go

@@ -1,12 +1,12 @@
 package service
 
 import (
+	"context"
 	"fmt"
 
 	"github.com/go-kit/kit/endpoint"
 	"github.com/kolide/kolide/server/contexts/viewer"
 	"github.com/kolide/kolide/server/kolide"
-	"golang.org/x/net/context"
 )
 
 type appConfigRequest struct {

server/service/endpoint_campaigns.go

@@ -1,6 +1,7 @@
 package service
 
 import (
+	"context"
 	"encoding/json"
 	"net/http"
 
@@ -10,7 +11,6 @@ import (
 	"github.com/kolide/kolide/server/contexts/viewer"
 	"github.com/kolide/kolide/server/kolide"
 	"github.com/kolide/kolide/server/websocket"
-	"golang.org/x/net/context"
 )
 
 ////////////////////////////////////////////////////////////////////////////////

server/service/endpoint_certificate.go

@@ -1,9 +1,10 @@
 package service
 
 import (
+	"context"
+
 	"github.com/go-kit/kit/endpoint"
 	"github.com/kolide/kolide/server/kolide"
-	"golang.org/x/net/context"
 )
 
 type certificateResponse struct {

server/service/endpoint_change_email.go

@@ -1,9 +1,10 @@
 package service
 
 import (
+	"context"
+
 	"github.com/go-kit/kit/endpoint"
 	"github.com/kolide/kolide/server/kolide"
-	"golang.org/x/net/context"
 )
 
 type changeEmailRequest struct {

server/service/endpoint_hosts.go

@@ -1,12 +1,12 @@
 package service
 
 import (
+	"context"
 	"time"
 
 	"github.com/go-kit/kit/endpoint"
 	"github.com/kolide/kolide/server/kolide"
 	"github.com/pkg/errors"
-	"golang.org/x/net/context"
 )
 
 type hostResponse struct {

server/service/endpoint_import_config.go

@@ -1,9 +1,10 @@
 package service
 
 import (
+	"context"
+
 	"github.com/go-kit/kit/endpoint"
 	"github.com/kolide/kolide/server/kolide"
-	"golang.org/x/net/context"
 )
 
 type importRequest struct {

server/service/endpoint_invites.go

@@ -1,9 +1,10 @@
 package service
 
 import (
+	"context"
+
 	"github.com/go-kit/kit/endpoint"
 	"github.com/kolide/kolide/server/kolide"
-	"golang.org/x/net/context"
 )
 
 type createInviteRequest struct {

server/service/endpoint_labels.go

@@ -1,9 +1,10 @@
 package service
 
 import (
+	"context"
+
 	"github.com/go-kit/kit/endpoint"
 	"github.com/kolide/kolide/server/kolide"
-	"golang.org/x/net/context"
 )
 
 type getLabelRequest struct {

server/service/endpoint_licenses.go

@@ -1,11 +1,11 @@
 package service
 
 import (
+	"context"
 	"time"
 
 	"github.com/go-kit/kit/endpoint"
 	"github.com/kolide/kolide/server/kolide"
-	"golang.org/x/net/context"
 )
 
 type licenseRequest struct {

server/service/endpoint_middleware.go

@@ -1,6 +1,7 @@
 package service
 
 import (
+	"context"
 	"errors"
 	"fmt"
 	"reflect"
@@ -12,7 +13,6 @@ import (
 	"github.com/kolide/kolide/server/contexts/token"
 	"github.com/kolide/kolide/server/contexts/viewer"
 	"github.com/kolide/kolide/server/kolide"
-	"golang.org/x/net/context"
 )
 
 var errNoContext = errors.New("context key not set")

server/service/endpoint_middleware_test.go

@@ -1,6 +1,7 @@
 package service
 
 import (
+	"context"
 	"testing"
 
 	"github.com/go-kit/kit/endpoint"
@@ -10,7 +11,6 @@ import (
 	"github.com/kolide/kolide/server/kolide"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
-	"golang.org/x/net/context"
 )
 
 // TestEndpointPermissions tests that

server/service/endpoint_options.go

@@ -1,9 +1,10 @@
 package service
 
 import (
+	"context"
+
 	"github.com/go-kit/kit/endpoint"
 	"github.com/kolide/kolide/server/kolide"
-	"golang.org/x/net/context"
 )
 
 type optionsResponse struct {

server/service/endpoint_osquery.go

@@ -1,11 +1,11 @@
 package service
 
 import (
+	"context"
 	"encoding/json"
 
 	"github.com/go-kit/kit/endpoint"
 	"github.com/kolide/kolide/server/kolide"
-	"golang.org/x/net/context"
 )
 
 ////////////////////////////////////////////////////////////////////////////////

server/service/endpoint_packs.go

@@ -1,9 +1,10 @@
 package service
 
 import (
+	"context"
+
 	"github.com/go-kit/kit/endpoint"
 	"github.com/kolide/kolide/server/kolide"
-	"golang.org/x/net/context"
 )
 
 type packResponse struct {

server/service/endpoint_queries.go

@@ -1,9 +1,10 @@
 package service
 
 import (
+	"context"
+
 	"github.com/go-kit/kit/endpoint"
 	"github.com/kolide/kolide/server/kolide"
-	"golang.org/x/net/context"
 )
 
 ////////////////////////////////////////////////////////////////////////////////

server/service/endpoint_scheduled_queries.go

@@ -1,9 +1,10 @@
 package service
 
 import (
+	"context"
+
 	"github.com/go-kit/kit/endpoint"
 	"github.com/kolide/kolide/server/kolide"
-	"golang.org/x/net/context"
 )
 
 ////////////////////////////////////////////////////////////////////////////////

server/service/endpoint_sessions.go

@@ -1,11 +1,11 @@
 package service
 
 import (
+	"context"
 	"time"
 
 	"github.com/go-kit/kit/endpoint"
 	"github.com/kolide/kolide/server/kolide"
-	"golang.org/x/net/context"
 )
 
 ////////////////////////////////////////////////////////////////////////////////

server/service/endpoint_setup.go

@@ -1,7 +1,7 @@
 package service
 
 import (
-	"golang.org/x/net/context"
+	"context"
 
 	"github.com/go-kit/kit/endpoint"
 	"github.com/kolide/kolide/server/kolide"

server/service/endpoint_targets.go

@@ -1,12 +1,12 @@
 package service
 
 import (
+	"context"
 	"time"
 
 	"github.com/go-kit/kit/endpoint"
 	"github.com/kolide/kolide/server/kolide"
 	"github.com/pkg/errors"
-	"golang.org/x/net/context"
 )
 
 ////////////////////////////////////////////////////////////////////////////////

server/service/endpoint_test.go

@@ -2,6 +2,7 @@ package service
 
 import (
 	"bytes"
+	"context"
 	"encoding/json"
 	"net/http"
 	"net/http/httptest"
@@ -12,13 +13,10 @@ import (
 	"testing"
 
 	kitlog "github.com/go-kit/kit/log"
-	kithttp "github.com/go-kit/kit/transport/http"
-	"github.com/gorilla/mux"
 	"github.com/kolide/kolide/server/config"
 	"github.com/kolide/kolide/server/datastore/inmem"
 	"github.com/kolide/kolide/server/kolide"
 	"github.com/stretchr/testify/require"
-	"golang.org/x/net/context"
 )
 
 type testResource struct {
@@ -57,21 +55,11 @@ func setupEndpointTest(t *testing.T) *testResource {
 	svc = endpointService{svc}
 	createTestUsers(t, test.ds)
 	logger := kitlog.NewLogfmtLogger(os.Stdout)
-
 	jwtKey := "CHANGEME"
-	opts := []kithttp.ServerOption{
-		kithttp.ServerBefore(setRequestsContexts(svc, jwtKey)),
-		kithttp.ServerErrorLogger(logger),
-		kithttp.ServerAfter(kithttp.SetContentType("application/json; charset=utf-8")),
-	}
 
-	router := mux.NewRouter()
-	ke := MakeKolideServerEndpoints(svc, jwtKey)
-	ctxt := context.Background()
-	kh := makeKolideKitHandlers(ctxt, ke, opts)
-	attachKolideAPIRoutes(router, kh)
+	routes := MakeHandler(svc, jwtKey, logger)
 
-	test.server = httptest.NewServer(router)
+	test.server = httptest.NewServer(routes)
 
 	userParam := loginRequest{
 		Username: "admin1",

server/service/endpoint_users.go

@@ -1,11 +1,11 @@
 package service
 
 import (
+	"context"
 	"net/http"
 
 	"github.com/go-kit/kit/endpoint"
 	"github.com/kolide/kolide/server/kolide"
-	"golang.org/x/net/context"
 )
 
 ////////////////////////////////////////////////////////////////////////////////

server/service/endpoint_users_test.go

@@ -39,6 +39,7 @@ func testNonAdminUserSetAdmin(t *testing.T, r *testResource) {
 	user, err := r.ds.User("user1")
 	require.Nil(t, err)
 	assert.False(t, user.Admin)
+
 	inJson := `{"admin":true}`
 	buff := bytes.NewBufferString(inJson)
 	path := fmt.Sprintf("/api/v1/kolide/users/%d/admin", user.ID)
@@ -49,9 +50,8 @@ func testNonAdminUserSetAdmin(t *testing.T, r *testResource) {
 	client := &http.Client{}
 	resp, err := client.Do(req)
 	require.Nil(t, err)
-	assert.Equal(t, http.StatusServiceUnavailable, resp.StatusCode)
-	rb := make([]byte, 500)
-	resp.Body.Read(rb)
+	assert.Equal(t, http.StatusForbidden, resp.StatusCode)
+
 	user, err = r.ds.User("user1")
 	require.Nil(t, err)
 	assert.False(t, user.Admin)
@@ -85,6 +85,7 @@ func testNonAdminUserSetEnabled(t *testing.T, r *testResource) {
 	user, err := r.ds.User("user1")
 	require.Nil(t, err)
 	assert.True(t, user.Enabled)
+
 	inJson := `{"enabled":false}`
 	buff := bytes.NewBufferString(inJson)
 	path := fmt.Sprintf("/api/v1/kolide/users/%d/enable", user.ID)
@@ -95,9 +96,8 @@ func testNonAdminUserSetEnabled(t *testing.T, r *testResource) {
 	client := &http.Client{}
 	resp, err := client.Do(req)
 	require.Nil(t, err)
-	assert.Equal(t, http.StatusServiceUnavailable, resp.StatusCode)
-	rb := make([]byte, 500)
-	resp.Body.Read(rb)
+	assert.Equal(t, http.StatusForbidden, resp.StatusCode)
+
 	user, err = r.ds.User("user1")
 	require.Nil(t, err)
 	// shouldn't change

server/service/handler.go

@@ -1,6 +1,7 @@
 package service
 
 import (
+	"context"
 	"net/http"
 	"strings"
 
@@ -10,7 +11,6 @@ import (
 	"github.com/gorilla/mux"
 	"github.com/kolide/kolide/server/kolide"
 	"github.com/prometheus/client_golang/prometheus"
-	"golang.org/x/net/context"
 )
 
 // KolideEndpoints is a collection of RPC endpoints implemented by the Kolide API.
@@ -227,9 +227,9 @@ type kolideHandlers struct {
 	GetLicense                     http.Handler
 }
 
-func makeKolideKitHandlers(ctx context.Context, e KolideEndpoints, opts []kithttp.ServerOption) *kolideHandlers {
+func makeKolideKitHandlers(e KolideEndpoints, opts []kithttp.ServerOption) *kolideHandlers {
 	newServer := func(e endpoint.Endpoint, decodeFn kithttp.DecodeRequestFunc) http.Handler {
-		return kithttp.NewServer(ctx, e, decodeFn, encodeResponse, opts...)
+		return kithttp.NewServer(e, decodeFn, encodeResponse, opts...)
 	}
 	return &kolideHandlers{
 		Login:                          newServer(e.Login, decodeLoginRequest),
@@ -299,7 +299,7 @@ func makeKolideKitHandlers(ctx context.Context, e KolideEndpoints, opts []kithtt
 }
 
 // MakeHandler creates an HTTP handler for the Kolide server endpoints.
-func MakeHandler(ctx context.Context, svc kolide.Service, jwtKey string, logger kitlog.Logger) http.Handler {
+func MakeHandler(svc kolide.Service, jwtKey string, logger kitlog.Logger) http.Handler {
 	kolideAPIOptions := []kithttp.ServerOption{
 		kithttp.ServerBefore(
 			setRequestsContexts(svc, jwtKey),
@@ -312,7 +312,7 @@ func MakeHandler(ctx context.Context, svc kolide.Service, jwtKey string, logger
 	}
 
 	kolideEndpoints := MakeKolideServerEndpoints(svc, jwtKey)
-	kolideHandlers := makeKolideKitHandlers(ctx, kolideEndpoints, kolideAPIOptions)
+	kolideHandlers := makeKolideKitHandlers(kolideEndpoints, kolideAPIOptions)
 
 	r := mux.NewRouter()
 	attachKolideAPIRoutes(r, kolideHandlers)
@@ -420,13 +420,11 @@ func WithSetup(svc kolide.Service, logger kitlog.Logger, next http.Handler) http
 	return func(w http.ResponseWriter, r *http.Request) {
 		configRouter := http.NewServeMux()
 		configRouter.Handle("/api/v1/setup", kithttp.NewServer(
-			context.Background(),
 			makeSetupEndpoint(svc),
 			decodeSetupRequest,
 			encodeResponse,
 		))
 		configRouter.Handle("/api/v1/license", kithttp.NewServer(
-			context.Background(),
 			makeSetupLicenseEndpoint(svc),
 			decodeLicenseRequest,
 			encodeResponse,

server/service/handler_test.go

@@ -9,7 +9,6 @@ import (
 	"github.com/kolide/kolide/server/config"
 	"github.com/kolide/kolide/server/datastore/inmem"
 	"github.com/stretchr/testify/assert"
-	"golang.org/x/net/context"
 )
 
 func TestAPIRoutes(t *testing.T) {
@@ -19,11 +18,9 @@ func TestAPIRoutes(t *testing.T) {
 	svc, err := newTestService(ds, nil)
 	assert.Nil(t, err)
 
-	ctx := context.Background()
-
 	r := mux.NewRouter()
 	ke := MakeKolideServerEndpoints(svc, "CHANGEME")
-	kh := makeKolideKitHandlers(ctx, ke, nil)
+	kh := makeKolideKitHandlers(ke, nil)
 	attachKolideAPIRoutes(r, kh)
 	handler := mux.NewRouter()
 	handler.PathPrefix("/").Handler(r)

server/service/http_auth.go

@@ -1,6 +1,7 @@
 package service
 
 import (
+	"context"
 	"net/http"
 	"strings"
 
@@ -8,7 +9,6 @@ import (
 	"github.com/kolide/kolide/server/contexts/token"
 	"github.com/kolide/kolide/server/contexts/viewer"
 	"github.com/kolide/kolide/server/kolide"
-	"golang.org/x/net/context"
 )
 
 // setRequestsContexts updates the request with necessary context values for a request

server/service/http_auth_test.go

@@ -20,7 +20,6 @@ import (
 	"github.com/kolide/kolide/server/kolide"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
-	"golang.org/x/net/context"
 )
 
 func TestLogin(t *testing.T) {
@@ -40,7 +39,7 @@ func TestLogin(t *testing.T) {
 	}
 	r := mux.NewRouter()
 	ke := MakeKolideServerEndpoints(svc, "CHANGEME")
-	kh := makeKolideKitHandlers(context.Background(), ke, opts)
+	kh := makeKolideKitHandlers(ke, opts)
 	attachKolideAPIRoutes(r, kh)
 	r.Handle("/", http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
 		fmt.Fprint(w, "index")

server/service/logging_appconfig.go

@@ -1,10 +1,10 @@
 package service
 
 import (
+	"context"
 	"time"
 
 	"github.com/kolide/kolide/server/kolide"
-	"golang.org/x/net/context"
 )
 
 func (mw loggingMiddleware) NewAppConfig(ctx context.Context, p kolide.AppConfigPayload) (*kolide.AppConfig, error) {

server/service/logging_email_change.go

@@ -1,9 +1,8 @@
 package service
 
 import (
+	"context"
 	"time"
-
-	"golang.org/x/net/context"
 )
 
 func (mw loggingMiddleware) ChangeUserEmail(ctx context.Context, token string) (string, error) {

server/service/logging_hosts.go

@@ -1,10 +1,10 @@
 package service
 
 import (
+	"context"
 	"time"
 
 	"github.com/kolide/kolide/server/kolide"
-	"golang.org/x/net/context"
 )
 
 func (mw loggingMiddleware) ListHosts(ctx context.Context, opt kolide.ListOptions) ([]*kolide.Host, error) {

server/service/logging_invites.go

@@ -1,11 +1,11 @@
 package service
 
 import (
+	"context"
 	"time"
 
 	"github.com/kolide/kolide/server/contexts/viewer"
 	"github.com/kolide/kolide/server/kolide"
-	"golang.org/x/net/context"
 )
 
 func (mw loggingMiddleware) InviteNewUser(ctx context.Context, payload kolide.InvitePayload) (*kolide.Invite, error) {

server/service/logging_labels.go

@@ -1,10 +1,10 @@
 package service
 
 import (
+	"context"
 	"time"
 
 	"github.com/kolide/kolide/server/kolide"
-	"golang.org/x/net/context"
 )
 
 func (mw loggingMiddleware) ModifyLabel(ctx context.Context, id uint, p kolide.ModifyLabelPayload) (*kolide.Label, error) {

server/service/logging_licenses.go

@@ -1,10 +1,10 @@
 package service
 
 import (
+	"context"
 	"time"
 
 	"github.com/kolide/kolide/server/kolide"
-	"golang.org/x/net/context"
 )
 
 func (mw loggingMiddleware) SaveLicense(ctx context.Context, jwtToken string) (*kolide.License, error) {

server/service/logging_osquery.go

@@ -1,10 +1,10 @@
 package service
 
 import (
+	"context"
 	"time"
 
 	"github.com/kolide/kolide/server/kolide"
-	"golang.org/x/net/context"
 )
 
 func (mw loggingMiddleware) EnrollAgent(ctx context.Context, enrollSecret string, hostIdentifier string) (string, error) {

server/service/logging_packs.go

@@ -1,10 +1,10 @@
 package service
 
 import (
+	"context"
 	"time"
 
 	"github.com/kolide/kolide/server/kolide"
-	"golang.org/x/net/context"
 )
 
 func (mw loggingMiddleware) ListPacks(ctx context.Context, opt kolide.ListOptions) ([]*kolide.Pack, error) {

server/service/logging_scheduled_queries.go

@@ -1,10 +1,10 @@
 package service
 
 import (
+	"context"
 	"time"
 
 	"github.com/kolide/kolide/server/kolide"
-	"golang.org/x/net/context"
 )
 
 func (mw loggingMiddleware) GetScheduledQuery(ctx context.Context, id uint) (*kolide.ScheduledQuery, error) {

server/service/logging_sessions.go

@@ -1,10 +1,10 @@
 package service
 
 import (
+	"context"
 	"time"
 
 	"github.com/kolide/kolide/server/kolide"
-	"golang.org/x/net/context"
 )
 
 func (mw loggingMiddleware) Login(ctx context.Context, username, password string) (user *kolide.User, token string, err error) {

server/service/logging_users.go

@@ -1,11 +1,11 @@
 package service
 
 import (
+	"context"
 	"time"
 
 	"github.com/kolide/kolide/server/contexts/viewer"
 	"github.com/kolide/kolide/server/kolide"
-	"golang.org/x/net/context"
 )
 
 func (mw loggingMiddleware) ChangeUserAdmin(ctx context.Context, id uint, isAdmin bool) (*kolide.User, error) {

server/service/metrics_appconfig.go

@@ -1,11 +1,11 @@
 package service
 
 import (
+	"context"
 	"fmt"
 	"time"
 
 	"github.com/kolide/kolide/server/kolide"
-	"golang.org/x/net/context"
 )
 
 func (mw metricsMiddleware) NewAppConfig(ctx context.Context, p kolide.AppConfigPayload) (*kolide.AppConfig, error) {

server/service/metrics_change_email.go

@@ -1,10 +1,9 @@
 package service
 
 import (
+	"context"
 	"fmt"
 	"time"
-
-	"golang.org/x/net/context"
 )
 
 func (mw metricsMiddleware) ChangeUserEmail(ctx context.Context, token string) (string, error) {

server/service/metrics_invites.go

@@ -1,11 +1,11 @@
 package service
 
 import (
+	"context"
 	"fmt"
 	"time"
 
 	"github.com/kolide/kolide/server/kolide"
-	"golang.org/x/net/context"
 )
 
 func (mw metricsMiddleware) InviteNewUser(ctx context.Context, payload kolide.InvitePayload) (*kolide.Invite, error) {

server/service/metrics_labels.go

@@ -1,11 +1,11 @@
 package service
 
 import (
+	"context"
 	"fmt"
 	"time"
 
 	"github.com/kolide/kolide/server/kolide"
-	"golang.org/x/net/context"
 )
 
 func (mw metricsMiddleware) ModifyLabel(ctx context.Context, id uint, p kolide.ModifyLabelPayload) (*kolide.Label, error) {

server/service/metrics_licenses.go

@@ -1,11 +1,11 @@
 package service
 
 import (
+	"context"
 	"fmt"
 	"time"
 
 	"github.com/kolide/kolide/server/kolide"
-	"golang.org/x/net/context"
 )
 
 func (mw metricsMiddleware) SaveLicense(ctx context.Context, jwtToken string) (*kolide.License, error) {

server/service/metrics_sessions.go

@@ -1,11 +1,11 @@
 package service
 
 import (
+	"context"
 	"fmt"
 	"time"
 
 	"github.com/kolide/kolide/server/kolide"
-	"golang.org/x/net/context"
 )
 
 func (mw metricsMiddleware) Login(ctx context.Context, username string, password string) (*kolide.User, string, error) {

server/service/metrics_users.go

@@ -1,11 +1,11 @@
 package service
 
 import (
+	"context"
 	"fmt"
 	"time"
 
 	"github.com/kolide/kolide/server/kolide"
-	"golang.org/x/net/context"
 )
 
 func (mw metricsMiddleware) ChangeUserAdmin(ctx context.Context, id uint, isAdmin bool) (*kolide.User, error) {

server/service/service.go

@@ -47,7 +47,7 @@ func osqueryLogFile(path string, appLogger kitlog.Logger) io.Writer {
 		MaxBackups: 3,
 		MaxAge:     28, //days
 	}
-	appLogger = kitlog.NewContext(appLogger).With("component", "osqueryd-logger")
+	appLogger = kitlog.With(appLogger, "component", "osqueryd-logger")
 
 	sig := make(chan os.Signal)
 	signal.Notify(sig, syscall.SIGHUP)

server/service/service_appconfig.go

@@ -1,13 +1,13 @@
 package service
 
 import (
+	"context"
 	"fmt"
 
 	"github.com/kolide/kolide/server/contexts/viewer"
 	"github.com/kolide/kolide/server/kolide"
 	"github.com/kolide/kolide/server/mail"
 	"github.com/pkg/errors"
-	"golang.org/x/net/context"
 )
 
 // mailError is set when an error performing mail operations

server/service/service_appconfig_test.go

@@ -1,6 +1,7 @@
 package service
 
 import (
+	"context"
 	"testing"
 
 	"github.com/kolide/kolide/server/config"
@@ -8,7 +9,6 @@ import (
 	"github.com/kolide/kolide/server/kolide"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
-	"golang.org/x/net/context"
 )
 
 func TestCreateAppConfig(t *testing.T) {

server/service/service_campaigns.go

@@ -1,6 +1,7 @@
 package service
 
 import (
+	"context"
 	"fmt"
 	"time"
 
@@ -8,7 +9,6 @@ import (
 	"github.com/kolide/kolide/server/kolide"
 	"github.com/kolide/kolide/server/websocket"
 	"github.com/pkg/errors"
-	"golang.org/x/net/context"
 )
 
 func (svc service) NewDistributedQueryCampaign(ctx context.Context, queryString string, hosts []uint, labels []uint) (*kolide.DistributedQueryCampaign, error) {

server/service/service_certificate.go

@@ -2,6 +2,7 @@ package service
 
 import (
 	"bytes"
+	"context"
 	"crypto/tls"
 	"crypto/x509"
 	"encoding/pem"
@@ -10,7 +11,6 @@ import (
 	"net/url"
 
 	"github.com/pkg/errors"
-	"golang.org/x/net/context"
 )
 
 // Certificate returns the PEM encoded certificate chain for osqueryd TLS termination.

server/service/service_hosts.go

@@ -1,8 +1,9 @@
 package service
 
 import (
+	"context"
+
 	"github.com/kolide/kolide/server/kolide"
-	"golang.org/x/net/context"
 )
 
 func (svc service) ListHosts(ctx context.Context, opt kolide.ListOptions) ([]*kolide.Host, error) {

server/service/service_hosts_test.go

@@ -1,13 +1,13 @@
 package service
 
 import (
+	"context"
 	"testing"
 
 	"github.com/kolide/kolide/server/config"
 	"github.com/kolide/kolide/server/datastore/inmem"
 	"github.com/kolide/kolide/server/kolide"
 	"github.com/stretchr/testify/assert"
-	"golang.org/x/net/context"
 )
 
 func TestListHosts(t *testing.T) {

server/service/service_import_config.go

@@ -1,13 +1,13 @@
 package service
 
 import (
+	"context"
 	"errors"
 	"strconv"
 	"strings"
 
 	"github.com/kolide/kolide/server/contexts/viewer"
 	"github.com/kolide/kolide/server/kolide"
-	"golang.org/x/net/context"
 )
 
 func (svc service) ImportConfig(ctx context.Context, cfg *kolide.ImportConfig) (*kolide.ImportConfigResponse, error) {

server/service/service_invites.go

@@ -1,11 +1,11 @@
 package service
 
 import (
+	"context"
 	"encoding/base64"
 	"html/template"
 
 	"github.com/kolide/kolide/server/kolide"
-	"golang.org/x/net/context"
 )
 
 func (svc service) InviteNewUser(ctx context.Context, payload kolide.InvitePayload) (*kolide.Invite, error) {

server/service/service_invites_test.go

@@ -1,6 +1,7 @@
 package service
 
 import (
+	"context"
 	"testing"
 	"time"
 
@@ -10,7 +11,6 @@ import (
 	"github.com/kolide/kolide/server/mock"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
-	"golang.org/x/net/context"
 )
 
 func TestInviteNewUserMock(t *testing.T) {

server/service/service_labels.go

@@ -1,8 +1,9 @@
 package service
 
 import (
+	"context"
+
 	"github.com/kolide/kolide/server/kolide"
-	"golang.org/x/net/context"
 )
 
 func (svc service) ListLabels(ctx context.Context, opt kolide.ListOptions) ([]*kolide.Label, error) {

server/service/service_labels_test.go

@@ -1,6 +1,7 @@
 package service
 
 import (
+	"context"
 	"testing"
 
 	"github.com/kolide/kolide/server/config"
@@ -9,7 +10,6 @@ import (
 	"github.com/kolide/kolide/server/mock"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
-	"golang.org/x/net/context"
 )
 
 func TestModifyLabel(t *testing.T) {

server/service/service_licenses.go

@@ -1,8 +1,9 @@
 package service
 
 import (
+	"context"
+
 	"github.com/kolide/kolide/server/kolide"
-	"golang.org/x/net/context"
 )
 
 func (svc service) License(ctx context.Context) (*kolide.License, error) {

server/service/service_licenses_test.go

@@ -1,6 +1,7 @@
 package service
 
 import (
+	"context"
 	"testing"
 	"time"
 
@@ -9,7 +10,6 @@ import (
 	"github.com/kolide/kolide/server/mock"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
-	"golang.org/x/net/context"
 )
 
 func TestLicenseService(t *testing.T) {

server/service/service_options.go

@@ -1,11 +1,11 @@
 package service
 
 import (
+	"context"
 	"time"
 
 	"github.com/kolide/kolide/server/kolide"
 	"github.com/pkg/errors"
-	"golang.org/x/net/context"
 )
 
 const expectedCheckinIntervalMultiplier = 2

server/service/service_osquery.go

@@ -1,6 +1,7 @@
 package service
 
 import (
+	"context"
 	"encoding/json"
 	"fmt"
 	"strconv"
@@ -12,7 +13,6 @@ import (
 	"github.com/kolide/kolide/server/kolide"
 	"github.com/kolide/kolide/server/pubsub"
 	"github.com/pkg/errors"
-	"golang.org/x/net/context"
 )
 
 type osqueryError struct {

server/service/service_osquery_test.go

@@ -2,6 +2,7 @@ package service
 
 import (
 	"bytes"
+	"context"
 	"encoding/json"
 	"fmt"
 	"strings"
@@ -9,8 +10,6 @@ import (
 	"testing"
 	"time"
 
-	"golang.org/x/net/context"
-
 	"github.com/WatchBeam/clock"
 	"github.com/kolide/kolide/server/config"
 	hostctx "github.com/kolide/kolide/server/contexts/host"

server/service/service_packs.go

@@ -1,9 +1,10 @@
 package service
 
 import (
+	"context"
+
 	"github.com/kolide/kolide/server/contexts/viewer"
 	"github.com/kolide/kolide/server/kolide"
-	"golang.org/x/net/context"
 )
 
 func (svc service) ListPacks(ctx context.Context, opt kolide.ListOptions) ([]*kolide.Pack, error) {

server/service/service_packs_test.go

@@ -1,6 +1,7 @@
 package service
 
 import (
+	"context"
 	"testing"
 
 	"github.com/WatchBeam/clock"
@@ -10,7 +11,6 @@ import (
 	"github.com/kolide/kolide/server/test"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
-	"golang.org/x/net/context"
 )
 
 func TestListPacks(t *testing.T) {

server/service/service_queries.go

@@ -1,9 +1,10 @@
 package service
 
 import (
+	"context"
+
 	"github.com/kolide/kolide/server/contexts/viewer"
 	"github.com/kolide/kolide/server/kolide"
-	"golang.org/x/net/context"
 )
 
 func (svc service) ListQueries(ctx context.Context, opt kolide.ListOptions) ([]*kolide.Query, error) {

server/service/service_queries_test.go

@@ -1,6 +1,7 @@
 package service
 
 import (
+	"context"
 	"testing"
 
 	"github.com/kolide/kolide/server/config"
@@ -9,7 +10,6 @@ import (
 	"github.com/kolide/kolide/server/kolide"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
-	"golang.org/x/net/context"
 )
 
 func TestListQueries(t *testing.T) {

server/service/service_scheduled_queries.go

@@ -1,9 +1,10 @@
 package service
 
 import (
+	"context"
+
 	"github.com/kolide/kolide/server/kolide"
 	"github.com/pkg/errors"
-	"golang.org/x/net/context"
 )
 
 func (svc service) GetScheduledQuery(ctx context.Context, id uint) (*kolide.ScheduledQuery, error) {

server/service/service_scheduled_queries_test.go

@@ -1,6 +1,7 @@
 package service
 
 import (
+	"context"
 	"testing"
 
 	"github.com/kolide/kolide/server/config"
@@ -9,7 +10,6 @@ import (
 	"github.com/kolide/kolide/server/test"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
-	"golang.org/x/net/context"
 )
 
 func TestGetScheduledQueriesInPack(t *testing.T) {

server/service/service_sessions.go

@@ -1,6 +1,7 @@
 package service
 
 import (
+	"context"
 	"crypto/rand"
 	"encoding/base64"
 	"strings"
@@ -10,7 +11,6 @@ import (
 	"github.com/kolide/kolide/server/contexts/viewer"
 	"github.com/kolide/kolide/server/kolide"
 	"github.com/pkg/errors"
-	"golang.org/x/net/context"
 )
 
 func (svc service) Login(ctx context.Context, username, password string) (*kolide.User, string, error) {

server/service/service_sessions_test.go

@@ -1,6 +1,7 @@
 package service
 
 import (
+	"context"
 	"testing"
 	"time"
 
@@ -10,7 +11,6 @@ import (
 	"github.com/kolide/kolide/server/kolide"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
-	"golang.org/x/net/context"
 )
 
 const bcryptCost = 6

server/service/service_targets.go

@@ -1,9 +1,10 @@
 package service
 
 import (
+	"context"
+
 	"github.com/kolide/kolide/server/kolide"
 	"github.com/pkg/errors"
-	"golang.org/x/net/context"
 )
 
 func (svc service) SearchTargets(ctx context.Context, query string, selectedHostIDs []uint, selectedLabelIDs []uint) (*kolide.TargetSearchResults, error) {

server/service/service_targets_test.go

@@ -1,6 +1,7 @@
 package service
 
 import (
+	"context"
 	"fmt"
 	"testing"
 	"time"
@@ -11,7 +12,6 @@ import (
 	"github.com/kolide/kolide/server/kolide"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
-	"golang.org/x/net/context"
 )
 
 func TestSearchTargets(t *testing.T) {

server/service/service_users.go

@@ -1,6 +1,7 @@
 package service
 
 import (
+	"context"
 	"crypto/rand"
 	"encoding/base64"
 	"html/template"
@@ -9,7 +10,6 @@ import (
 	"github.com/kolide/kolide/server/contexts/viewer"
 	"github.com/kolide/kolide/server/kolide"
 	"github.com/pkg/errors"
-	"golang.org/x/net/context"
 )
 
 func (svc service) NewUser(ctx context.Context, p kolide.UserPayload) (*kolide.User, error) {

server/service/service_users_test.go

@@ -1,6 +1,7 @@
 package service
 
 import (
+	"context"
 	"errors"
 	"testing"
 	"time"
@@ -15,7 +16,6 @@ import (
 	pkg_errors "github.com/pkg/errors"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
-	"golang.org/x/net/context"
 )
 
 func TestAuthenticatedUser(t *testing.T) {