Make context imports consistent (#359)

cli/prepare.go

@@ -1,8 +1,6 @@
 package cli
 
 import (
-	"context"
-
 	"github.com/WatchBeam/clock"
 	kitlog "github.com/go-kit/kit/log"
 	"github.com/kolide/kolide-ose/server/config"
@@ -10,6 +8,7 @@ import (
 	"github.com/kolide/kolide-ose/server/kolide"
 	"github.com/kolide/kolide-ose/server/service"
 	"github.com/spf13/cobra"
+	"golang.org/x/net/context"
 )
 
 func createPrepareCmd(configManager config.Manager) *cobra.Command {

server/contexts/host/host.go

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

server/contexts/token/token.go

@@ -3,7 +3,7 @@
 package token
 
 import (
-	"context"
+	"golang.org/x/net/context"
 	"net/http"
 	"strings"
 )

server/contexts/viewer/viewer.go

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

server/service/service_invites_test.go

@@ -1,7 +1,7 @@
 package service
 
 import (
-	"context"
+	"golang.org/x/net/context"
 	"testing"
 
 	"github.com/WatchBeam/clock"

server/service/service_osquery_test.go

@@ -2,9 +2,9 @@ package service
 
 import (
 	"bytes"
-	"context"
 	"encoding/json"
 	"fmt"
+	"golang.org/x/net/context"
 	"strings"
 	"testing"
 	"time"

server/service/transport_invites_test.go

@@ -2,7 +2,7 @@ package service
 
 import (
 	"bytes"
-	"context"
+	"golang.org/x/net/context"
 	"net/http"
 	"net/http/httptest"
 	"testing"

server/service/transport_osquery_test.go

@@ -2,7 +2,7 @@ package service
 
 import (
 	"bytes"
-	"context"
+	"golang.org/x/net/context"
 	"net/http"
 	"net/http/httptest"
 	"testing"

server/service/transport_users_test.go

@@ -2,7 +2,7 @@ package service
 
 import (
 	"bytes"
-	"context"
+	"golang.org/x/net/context"
 	"net/http"
 	"net/http/httptest"
 	"testing"