Use import "context" everywhere.
This was made standard in Go 1.7, which we should be solidly using now.
This will break in Go 1.8, but is fine in Go 1.9 due to type aliases.
Bug: skia:
Change-Id: I12a61c51db89b8925935cdb4960ce0b1e78ead24
Reviewed-on: https://skia-review.googlesource.com/57940
Reviewed-by: Ben Wagner <benjaminwagner@google.com>
Commit-Queue: Kevin Lubick <kjlubick@google.com>
diff --git a/android_ingest/go/androidingest/main.go b/android_ingest/go/androidingest/main.go
index 494a889..c5543bf 100644
--- a/android_ingest/go/androidingest/main.go
+++ b/android_ingest/go/androidingest/main.go
@@ -2,6 +2,7 @@
import (
"bytes"
+ "context"
"encoding/json"
"flag"
"fmt"
@@ -15,7 +16,6 @@
"time"
"cloud.google.com/go/storage"
- "golang.org/x/net/context"
"google.golang.org/api/option"
"github.com/gorilla/mux"
diff --git a/comments/go/extract_comments/main.go b/comments/go/extract_comments/main.go
index 5b9837a..e78ea40 100644
--- a/comments/go/extract_comments/main.go
+++ b/comments/go/extract_comments/main.go
@@ -3,6 +3,7 @@
package main
import (
+ "context"
"encoding/json"
"flag"
"io"
@@ -18,7 +19,6 @@
"go.skia.org/infra/go/common"
"go.skia.org/infra/go/sklog"
"go.skia.org/infra/go/util"
- "golang.org/x/net/context"
"google.golang.org/api/option"
)
diff --git a/datahopper/go/bot_metrics/bot_metrics.go b/datahopper/go/bot_metrics/bot_metrics.go
index fdf4e01..6bf5a8d 100644
--- a/datahopper/go/bot_metrics/bot_metrics.go
+++ b/datahopper/go/bot_metrics/bot_metrics.go
@@ -8,6 +8,7 @@
import (
"bytes"
+ "context"
"encoding/gob"
"fmt"
"io/ioutil"
@@ -18,8 +19,6 @@
"strings"
"time"
- "golang.org/x/net/context"
-
"go.skia.org/infra/go/common"
"go.skia.org/infra/go/depot_tools"
"go.skia.org/infra/go/git/repograph"
diff --git a/datahopper/go/datahopper/jobs.go b/datahopper/go/datahopper/jobs.go
index 68ec0d8..2975470 100644
--- a/datahopper/go/datahopper/jobs.go
+++ b/datahopper/go/datahopper/jobs.go
@@ -6,13 +6,12 @@
import (
"bytes"
+ "context"
"encoding/gob"
"fmt"
"sync"
"time"
- "golang.org/x/net/context"
-
"go.skia.org/infra/go/metrics2"
"go.skia.org/infra/go/metrics2/events"
"go.skia.org/infra/go/sklog"
diff --git a/fiddle/go/store/store.go b/fiddle/go/store/store.go
index 076ea1f..173d497 100644
--- a/fiddle/go/store/store.go
+++ b/fiddle/go/store/store.go
@@ -2,6 +2,7 @@
package store
import (
+ "context"
"encoding/base64"
"fmt"
"image"
@@ -23,7 +24,6 @@
"go.skia.org/infra/go/auth"
"go.skia.org/infra/go/sklog"
"go.skia.org/infra/go/util"
- "golang.org/x/net/context"
"google.golang.org/api/iterator"
"google.golang.org/api/option"
)
diff --git a/fiddle/go/webtry_sources_extract/main.go b/fiddle/go/webtry_sources_extract/main.go
index a3b1bc6..3e0e176 100644
--- a/fiddle/go/webtry_sources_extract/main.go
+++ b/fiddle/go/webtry_sources_extract/main.go
@@ -7,6 +7,7 @@
package main
import (
+ "context"
"database/sql"
"flag"
"fmt"
@@ -19,7 +20,6 @@
"go.skia.org/infra/go/common"
"go.skia.org/infra/go/sklog"
"go.skia.org/infra/go/util"
- "golang.org/x/net/context"
"google.golang.org/api/option"
)
diff --git a/fuzzer/go/aggregator/aggregator.go b/fuzzer/go/aggregator/aggregator.go
index 8e66800..20df04c 100644
--- a/fuzzer/go/aggregator/aggregator.go
+++ b/fuzzer/go/aggregator/aggregator.go
@@ -2,6 +2,7 @@
import (
"bytes"
+ "context"
"crypto/sha1"
"fmt"
"io"
@@ -27,7 +28,6 @@
"go.skia.org/infra/go/metrics2"
"go.skia.org/infra/go/sklog"
"go.skia.org/infra/go/util"
- "golang.org/x/net/context"
)
// Aggregator is a key part of the fuzzing operation
diff --git a/fuzzer/go/backend/version_updater.go b/fuzzer/go/backend/version_updater.go
index 6873f4e..9943984 100644
--- a/fuzzer/go/backend/version_updater.go
+++ b/fuzzer/go/backend/version_updater.go
@@ -1,6 +1,7 @@
package backend
import (
+ "context"
"fmt"
"strings"
@@ -14,7 +15,6 @@
"go.skia.org/infra/go/gcs"
"go.skia.org/infra/go/metrics2"
"go.skia.org/infra/go/sklog"
- "golang.org/x/net/context"
)
// VersionUpdater is a struct that will handle the updating from one version to fuzz to another
diff --git a/fuzzer/go/deduplicator/remotededuplicator.go b/fuzzer/go/deduplicator/remotededuplicator.go
index 8665ff5..adb8e2f 100644
--- a/fuzzer/go/deduplicator/remotededuplicator.go
+++ b/fuzzer/go/deduplicator/remotededuplicator.go
@@ -1,6 +1,7 @@
package deduplicator
import (
+ "context"
"crypto/sha1"
"fmt"
"sync"
@@ -10,7 +11,6 @@
"go.skia.org/infra/go/gcs"
"go.skia.org/infra/go/sklog"
"go.skia.org/infra/go/util"
- "golang.org/x/net/context"
)
type remoteDeduplicator struct {
diff --git a/fuzzer/go/download_skia/download_skia.go b/fuzzer/go/download_skia/download_skia.go
index 701073c..228ccd2 100644
--- a/fuzzer/go/download_skia/download_skia.go
+++ b/fuzzer/go/download_skia/download_skia.go
@@ -1,6 +1,7 @@
package download_skia
import (
+ "context"
"fmt"
"os"
"path/filepath"
@@ -9,12 +10,10 @@
"time"
"cloud.google.com/go/storage"
-
"go.skia.org/infra/fuzzer/go/config"
fstorage "go.skia.org/infra/fuzzer/go/storage"
"go.skia.org/infra/go/buildskia"
"go.skia.org/infra/go/sklog"
- "golang.org/x/net/context"
)
// AtGCSRevision downloads the revision of Skia specified in Google Storage
diff --git a/fuzzer/go/frontend/version_updater.go b/fuzzer/go/frontend/version_updater.go
index c40e0b2..d5f7845 100644
--- a/fuzzer/go/frontend/version_updater.go
+++ b/fuzzer/go/frontend/version_updater.go
@@ -1,6 +1,7 @@
package frontend
import (
+ "context"
"fmt"
"go.skia.org/infra/fuzzer/go/config"
@@ -10,7 +11,6 @@
"go.skia.org/infra/fuzzer/go/storage"
"go.skia.org/infra/go/gcs"
"go.skia.org/infra/go/sklog"
- "golang.org/x/net/context"
)
// VersionUpdater is a struct that will handle the updating from one version to fuzz to another
diff --git a/fuzzer/go/fuzzer-be/main.go b/fuzzer/go/fuzzer-be/main.go
index 6b18b0c..7b4870b 100644
--- a/fuzzer/go/fuzzer-be/main.go
+++ b/fuzzer/go/fuzzer-be/main.go
@@ -5,6 +5,7 @@
*/
import (
+ "context"
"flag"
"fmt"
"os"
@@ -28,7 +29,6 @@
"go.skia.org/infra/go/common"
"go.skia.org/infra/go/fileutil"
"go.skia.org/infra/go/sklog"
- "golang.org/x/net/context"
"google.golang.org/api/option"
)
diff --git a/fuzzer/go/fuzzer-fe/main.go b/fuzzer/go/fuzzer-fe/main.go
index 5b6d52a..eade853 100644
--- a/fuzzer/go/fuzzer-fe/main.go
+++ b/fuzzer/go/fuzzer-fe/main.go
@@ -5,6 +5,7 @@
*/
import (
+ "context"
"encoding/base64"
"encoding/json"
"flag"
@@ -43,7 +44,6 @@
"go.skia.org/infra/go/sklog"
"go.skia.org/infra/go/util"
"go.skia.org/infra/go/vcsinfo"
- "golang.org/x/net/context"
"google.golang.org/api/option"
)
diff --git a/fuzzer/go/generator/afl_generation.go b/fuzzer/go/generator/afl_generation.go
index 579a318..af1382f 100644
--- a/fuzzer/go/generator/afl_generation.go
+++ b/fuzzer/go/generator/afl_generation.go
@@ -1,6 +1,7 @@
package generator
import (
+ "context"
"fmt"
"io/ioutil"
"os"
@@ -16,7 +17,6 @@
"go.skia.org/infra/go/fileutil"
"go.skia.org/infra/go/metrics2"
"go.skia.org/infra/go/sklog"
- "golang.org/x/net/context"
)
type Generator struct {
diff --git a/fuzzer/go/storage/client.go b/fuzzer/go/storage/client.go
index e4ceb0f..34c7617 100644
--- a/fuzzer/go/storage/client.go
+++ b/fuzzer/go/storage/client.go
@@ -1,6 +1,7 @@
package storage
import (
+ "context"
"fmt"
"io/ioutil"
"os"
@@ -14,7 +15,6 @@
"go.skia.org/infra/go/fileutil"
"go.skia.org/infra/go/gcs"
"go.skia.org/infra/go/sklog"
- "golang.org/x/net/context"
)
// FuzzerGCSClient is the interface for all fuzzer-specific Google Cloud Storage (GCS)
diff --git a/go/auth/auth.go b/go/auth/auth.go
index b59a97b..6d4df1a 100644
--- a/go/auth/auth.go
+++ b/go/auth/auth.go
@@ -1,6 +1,7 @@
package auth
import (
+ "context"
"encoding/json"
"fmt"
"io/ioutil"
@@ -8,18 +9,15 @@
"os"
"cloud.google.com/go/pubsub"
-
- "google.golang.org/api/compute/v1"
- storage "google.golang.org/api/storage/v1"
-
"go.skia.org/infra/go/httputils"
"go.skia.org/infra/go/metadata"
"go.skia.org/infra/go/sklog"
"go.skia.org/infra/go/util"
- "golang.org/x/net/context"
"golang.org/x/oauth2"
"golang.org/x/oauth2/google"
+ "google.golang.org/api/compute/v1"
oauth2_api "google.golang.org/api/oauth2/v2"
+ storage "google.golang.org/api/storage/v1"
)
const (
diff --git a/go/gcs/gcs.go b/go/gcs/gcs.go
index e8cc70c..e27b91b 100644
--- a/go/gcs/gcs.go
+++ b/go/gcs/gcs.go
@@ -2,6 +2,7 @@
package gcs
import (
+ "context"
"crypto/sha1"
"fmt"
"io"
@@ -18,7 +19,6 @@
"cloud.google.com/go/storage"
"go.skia.org/infra/go/sklog"
"go.skia.org/infra/go/util"
- "golang.org/x/net/context"
"google.golang.org/api/iterator"
)
diff --git a/go/gcs/gcs_test.go b/go/gcs/gcs_test.go
index 062e86a..a1197ca 100644
--- a/go/gcs/gcs_test.go
+++ b/go/gcs/gcs_test.go
@@ -1,6 +1,7 @@
package gcs
import (
+ "context"
"crypto/sha1"
"fmt"
"io/ioutil"
@@ -12,7 +13,6 @@
"cloud.google.com/go/storage"
assert "github.com/stretchr/testify/require"
"go.skia.org/infra/go/testutils"
- "golang.org/x/net/context"
)
// compareStringSlices compares two string slices, and returns true iff the
diff --git a/go/gcs/storage.go b/go/gcs/storage.go
index 121d76e..1744783 100644
--- a/go/gcs/storage.go
+++ b/go/gcs/storage.go
@@ -1,13 +1,13 @@
package gcs
import (
+ "context"
"fmt"
"io"
"io/ioutil"
"cloud.google.com/go/storage"
"go.skia.org/infra/go/util"
- "golang.org/x/net/context"
"google.golang.org/api/iterator"
)
diff --git a/go/gcs/testing.go b/go/gcs/testing.go
index 7fb7104..19a537f 100644
--- a/go/gcs/testing.go
+++ b/go/gcs/testing.go
@@ -3,6 +3,7 @@
import (
"archive/tar"
"compress/gzip"
+ "context"
"fmt"
"io"
"os"
@@ -12,7 +13,6 @@
"cloud.google.com/go/storage"
assert "github.com/stretchr/testify/require"
"go.skia.org/infra/go/httputils"
- "golang.org/x/net/context"
"google.golang.org/api/option"
)
diff --git a/go/ingestion/helpers.go b/go/ingestion/helpers.go
index b771a4d..99946c2 100644
--- a/go/ingestion/helpers.go
+++ b/go/ingestion/helpers.go
@@ -2,6 +2,7 @@
import (
"bytes"
+ "context"
"encoding/hex"
"fmt"
"io"
@@ -13,7 +14,6 @@
"sync"
"cloud.google.com/go/storage"
- "golang.org/x/net/context"
"google.golang.org/api/option"
"go.skia.org/infra/go/depot_tools"
diff --git a/go/isolate/isolate.go b/go/isolate/isolate.go
index 768c8e9..a1759bc 100644
--- a/go/isolate/isolate.go
+++ b/go/isolate/isolate.go
@@ -1,6 +1,7 @@
package isolate
import (
+ "context"
"encoding/json"
"fmt"
"io"
@@ -13,14 +14,11 @@
"strconv"
"strings"
- "google.golang.org/api/option"
-
+ "cloud.google.com/go/storage"
"go.skia.org/infra/go/exec"
"go.skia.org/infra/go/gcs"
"go.skia.org/infra/go/util"
-
- "cloud.google.com/go/storage"
- "golang.org/x/net/context"
+ "google.golang.org/api/option"
)
const (
diff --git a/go/metrics2/events/events.go b/go/metrics2/events/events.go
index 26febf5d..6af0b11 100644
--- a/go/metrics2/events/events.go
+++ b/go/metrics2/events/events.go
@@ -11,12 +11,11 @@
*/
import (
+ "context"
"fmt"
"sync"
"time"
- "golang.org/x/net/context"
-
"go.skia.org/infra/go/metrics2"
"go.skia.org/infra/go/sklog"
"go.skia.org/infra/go/util"
diff --git a/go/metrics2/liveness.go b/go/metrics2/liveness.go
index 2136187..b0a5319 100644
--- a/go/metrics2/liveness.go
+++ b/go/metrics2/liveness.go
@@ -1,12 +1,11 @@
package metrics2
import (
+ "context"
"fmt"
"sync"
"time"
- "golang.org/x/net/context"
-
"go.skia.org/infra/go/util"
)
diff --git a/go/mockgcsclient/mock_gcs_client.go b/go/mockgcsclient/mock_gcs_client.go
index 89b4577..c73a08f 100644
--- a/go/mockgcsclient/mock_gcs_client.go
+++ b/go/mockgcsclient/mock_gcs_client.go
@@ -1,12 +1,12 @@
package mockgcsclient
import (
+ "context"
"io"
"cloud.google.com/go/storage"
"github.com/stretchr/testify/mock"
"go.skia.org/infra/go/gcs"
- "golang.org/x/net/context"
)
// MockGCSClient is a mock of gcs.GCSClient. All the methods are mocked using testify's mocking
diff --git a/go/sharedb/impl.go b/go/sharedb/impl.go
index 4dce43c..7ae1e76 100644
--- a/go/sharedb/impl.go
+++ b/go/sharedb/impl.go
@@ -5,6 +5,7 @@
import (
"bytes"
+ "context"
"fmt"
"io/ioutil"
"path/filepath"
@@ -13,7 +14,6 @@
"github.com/boltdb/bolt"
"go.skia.org/infra/go/fileutil"
- "golang.org/x/net/context"
"google.golang.org/grpc"
)
diff --git a/go/sharedb/sharedb_test.go b/go/sharedb/sharedb_test.go
index 90fd823..1fecb13 100644
--- a/go/sharedb/sharedb_test.go
+++ b/go/sharedb/sharedb_test.go
@@ -1,6 +1,7 @@
package sharedb
import (
+ "context"
"fmt"
"net"
"sort"
@@ -11,7 +12,6 @@
assert "github.com/stretchr/testify/require"
"go.skia.org/infra/go/testutils"
"go.skia.org/infra/go/util"
- "golang.org/x/net/context"
"google.golang.org/grpc"
)
diff --git a/go/sklog/cloud_logging.go b/go/sklog/cloud_logging.go
index f3b3325..507b402 100644
--- a/go/sklog/cloud_logging.go
+++ b/go/sklog/cloud_logging.go
@@ -1,6 +1,7 @@
package sklog
import (
+ "context"
"fmt"
"net/http"
"os"
@@ -10,7 +11,6 @@
"github.com/davecgh/go-spew/spew"
"github.com/skia-dev/glog"
- "golang.org/x/net/context"
logging "google.golang.org/api/logging/v2"
)
diff --git a/go/swarming/pubsub.go b/go/swarming/pubsub.go
index 891fa52..93814df 100644
--- a/go/swarming/pubsub.go
+++ b/go/swarming/pubsub.go
@@ -1,17 +1,15 @@
package swarming
import (
+ "context"
"encoding/json"
"fmt"
"net/http"
"strings"
"time"
- "github.com/gorilla/mux"
-
- "golang.org/x/net/context"
-
"cloud.google.com/go/pubsub"
+ "github.com/gorilla/mux"
"go.skia.org/infra/go/common"
"go.skia.org/infra/go/httputils"
)
diff --git a/go/trace/db/db.go b/go/trace/db/db.go
index e6f48e4..3d5bb7b 100644
--- a/go/trace/db/db.go
+++ b/go/trace/db/db.go
@@ -2,6 +2,7 @@
package db
import (
+ "context"
"fmt"
"sync"
"time"
@@ -11,7 +12,6 @@
"go.skia.org/infra/go/sklog"
"go.skia.org/infra/go/tiling"
"go.skia.org/infra/go/trace/service"
- "golang.org/x/net/context"
"google.golang.org/grpc"
)
diff --git a/go/trace/service/impl.go b/go/trace/service/impl.go
index 66865a0..ad7eaf7 100644
--- a/go/trace/service/impl.go
+++ b/go/trace/service/impl.go
@@ -5,6 +5,7 @@
import (
"bytes"
+ "context"
"crypto/md5"
"encoding/binary"
"fmt"
@@ -16,7 +17,6 @@
"github.com/golang/groupcache/lru"
"github.com/golang/protobuf/proto"
"go.skia.org/infra/go/metrics2"
- "golang.org/x/net/context"
)
const (
diff --git a/go/trace/service/traceservice_test.go b/go/trace/service/traceservice_test.go
index 5c43632..b4cd343 100644
--- a/go/trace/service/traceservice_test.go
+++ b/go/trace/service/traceservice_test.go
@@ -1,6 +1,7 @@
package traceservice
import (
+ "context"
"encoding/binary"
"fmt"
"math"
@@ -12,7 +13,6 @@
"go.skia.org/infra/go/testutils"
"go.skia.org/infra/go/trace/db/perftypes"
"go.skia.org/infra/go/util"
- "golang.org/x/net/context"
)
const (
diff --git a/go/util/util.go b/go/util/util.go
index d179727..95a90dc 100644
--- a/go/util/util.go
+++ b/go/util/util.go
@@ -3,6 +3,7 @@
import (
"bufio"
"compress/gzip"
+ "context"
"crypto/md5"
"crypto/rand"
"crypto/sha256"
@@ -22,8 +23,6 @@
"strings"
"time"
- "golang.org/x/net/context"
-
"github.com/zeebo/bencode"
"go.skia.org/infra/go/sklog"
)
diff --git a/golden/go/diffstore/diffservice_impl.go b/golden/go/diffstore/diffservice_impl.go
index e5af3d6..4e92537 100644
--- a/golden/go/diffstore/diffservice_impl.go
+++ b/golden/go/diffstore/diffservice_impl.go
@@ -1,7 +1,7 @@
package diffstore
import (
- context "golang.org/x/net/context"
+ "context"
"go.skia.org/infra/go/util"
"go.skia.org/infra/golden/go/diff"
diff --git a/golden/go/diffstore/imgloader.go b/golden/go/diffstore/imgloader.go
index 54d4731..8dd731d 100644
--- a/golden/go/diffstore/imgloader.go
+++ b/golden/go/diffstore/imgloader.go
@@ -2,6 +2,7 @@
import (
"bytes"
+ "context"
"crypto/md5"
"errors"
"fmt"
@@ -18,7 +19,6 @@
"go.skia.org/infra/go/sklog"
"go.skia.org/infra/go/util"
"go.skia.org/infra/golden/go/diff"
- "golang.org/x/net/context"
"google.golang.org/api/option"
)
diff --git a/golden/go/diffstore/net_diffstore.go b/golden/go/diffstore/net_diffstore.go
index 2c1b463..06afb80 100644
--- a/golden/go/diffstore/net_diffstore.go
+++ b/golden/go/diffstore/net_diffstore.go
@@ -1,12 +1,12 @@
package diffstore
import (
+ "context"
"fmt"
"net/http"
"net/http/httputil"
"net/url"
- context "golang.org/x/net/context"
"google.golang.org/grpc"
"go.skia.org/infra/go/sklog"
diff --git a/golden/go/goldingestion/storage.go b/golden/go/goldingestion/storage.go
index 1c8ef8b..8343ece 100644
--- a/golden/go/goldingestion/storage.go
+++ b/golden/go/goldingestion/storage.go
@@ -1,13 +1,13 @@
package goldingestion
import (
+ "context"
"fmt"
"strconv"
"go.skia.org/infra/go/sharedb"
"go.skia.org/infra/go/sklog"
"go.skia.org/infra/go/util"
- "golang.org/x/net/context"
)
const (
diff --git a/golden/go/pdfingestion/pdfingestion.go b/golden/go/pdfingestion/pdfingestion.go
index 845d287..6bfe3bf 100644
--- a/golden/go/pdfingestion/pdfingestion.go
+++ b/golden/go/pdfingestion/pdfingestion.go
@@ -5,6 +5,7 @@
import (
"bytes"
+ "context"
"encoding/hex"
"encoding/json"
"fmt"
@@ -24,7 +25,6 @@
"go.skia.org/infra/go/vcsinfo"
"go.skia.org/infra/golden/go/config"
"go.skia.org/infra/golden/go/goldingestion"
- "golang.org/x/net/context"
"google.golang.org/api/option"
)
diff --git a/golden/go/pdfingestion/pdfingestion_test.go b/golden/go/pdfingestion/pdfingestion_test.go
index de1c4f8..0503ecb 100644
--- a/golden/go/pdfingestion/pdfingestion_test.go
+++ b/golden/go/pdfingestion/pdfingestion_test.go
@@ -1,6 +1,7 @@
package pdfingestion
import (
+ "context"
"net/http"
"path/filepath"
"testing"
@@ -15,7 +16,6 @@
"go.skia.org/infra/go/testutils"
"go.skia.org/infra/go/util"
"go.skia.org/infra/golden/go/goldingestion"
- "golang.org/x/net/context"
"google.golang.org/api/option"
)
diff --git a/logmetrics/go/logmetrics/main.go b/logmetrics/go/logmetrics/main.go
index 4330a5a..40f31d4 100644
--- a/logmetrics/go/logmetrics/main.go
+++ b/logmetrics/go/logmetrics/main.go
@@ -3,6 +3,7 @@
package main
import (
+ "context"
"flag"
"fmt"
"time"
@@ -12,7 +13,6 @@
"go.skia.org/infra/go/metrics2"
"go.skia.org/infra/go/sklog"
"go.skia.org/infra/logmetrics/go/config"
- "golang.org/x/net/context"
"google.golang.org/api/logging/v2"
)
diff --git a/perf/go/skiaperf/main.go b/perf/go/skiaperf/main.go
index d104fe9..b559d52 100644
--- a/perf/go/skiaperf/main.go
+++ b/perf/go/skiaperf/main.go
@@ -1,6 +1,7 @@
package main
import (
+ "context"
"encoding/json"
"flag"
"fmt"
@@ -20,8 +21,6 @@
"strings"
"time"
- "golang.org/x/net/context"
-
storage "cloud.google.com/go/storage"
"github.com/gorilla/mux"
"go.skia.org/infra/go/email"
diff --git a/skolo/go/file-backup/main.go b/skolo/go/file-backup/main.go
index ca5fd68..03cfabd 100644
--- a/skolo/go/file-backup/main.go
+++ b/skolo/go/file-backup/main.go
@@ -6,6 +6,7 @@
import (
"bytes"
"compress/gzip"
+ "context"
"flag"
"fmt"
"io/ioutil"
@@ -23,7 +24,6 @@
"go.skia.org/infra/go/metrics2"
"go.skia.org/infra/go/sklog"
"go.skia.org/infra/go/util"
- "golang.org/x/net/context"
"google.golang.org/api/option"
)
diff --git a/status/go/capacity/capacity.go b/status/go/capacity/capacity.go
index 6365f36..2ffedf3 100644
--- a/status/go/capacity/capacity.go
+++ b/status/go/capacity/capacity.go
@@ -5,13 +5,12 @@
// swarming data is used as the basis for these metrics.
import (
+ "context"
"fmt"
"sort"
"strings"
"time"
- "golang.org/x/net/context"
-
"go.skia.org/infra/go/cq"
"go.skia.org/infra/go/git/repograph"
"go.skia.org/infra/go/sklog"
diff --git a/status/go/status/main.go b/status/go/status/main.go
index eb43e5b..200df01 100644
--- a/status/go/status/main.go
+++ b/status/go/status/main.go
@@ -5,6 +5,7 @@
package main
import (
+ "context"
"encoding/json"
"flag"
"fmt"
@@ -19,8 +20,6 @@
"time"
"unicode"
- "golang.org/x/net/context"
-
"github.com/gorilla/mux"
"go.skia.org/infra/go/common"
"go.skia.org/infra/go/git/repograph"
diff --git a/status/go/status/tasks_per_commit.go b/status/go/status/tasks_per_commit.go
index c9e8fb0..1a36452 100644
--- a/status/go/status/tasks_per_commit.go
+++ b/status/go/status/tasks_per_commit.go
@@ -1,14 +1,13 @@
package main
import (
+ "context"
"fmt"
"os"
"path"
"sync"
"time"
- "golang.org/x/net/context"
-
"go.skia.org/infra/go/common"
"go.skia.org/infra/go/git"
"go.skia.org/infra/go/sklog"
diff --git a/task_scheduler/go/db/recovery/backups.go b/task_scheduler/go/db/recovery/backups.go
index c1eed06..d096f7f 100644
--- a/task_scheduler/go/db/recovery/backups.go
+++ b/task_scheduler/go/db/recovery/backups.go
@@ -4,6 +4,7 @@
import (
"bytes"
"compress/gzip"
+ "context"
"encoding/gob"
"errors"
"fmt"
@@ -22,7 +23,6 @@
"go.skia.org/infra/go/sklog"
"go.skia.org/infra/go/util"
"go.skia.org/infra/task_scheduler/go/db"
- "golang.org/x/net/context"
"google.golang.org/api/iterator"
"google.golang.org/api/option"
)
diff --git a/task_scheduler/go/db/recovery/backups_test.go b/task_scheduler/go/db/recovery/backups_test.go
index 569b3a6..4d65979 100644
--- a/task_scheduler/go/db/recovery/backups_test.go
+++ b/task_scheduler/go/db/recovery/backups_test.go
@@ -3,6 +3,7 @@
import (
"bytes"
"compress/gzip"
+ "context"
"encoding/gob"
"encoding/json"
"fmt"
@@ -23,7 +24,6 @@
"time"
"cloud.google.com/go/storage"
- "golang.org/x/net/context"
"google.golang.org/api/option"
"github.com/gorilla/mux"
diff --git a/task_scheduler/go/db/recovery/gs_jobs_viewer/main.go b/task_scheduler/go/db/recovery/gs_jobs_viewer/main.go
index 461812c..01da67c 100644
--- a/task_scheduler/go/db/recovery/gs_jobs_viewer/main.go
+++ b/task_scheduler/go/db/recovery/gs_jobs_viewer/main.go
@@ -5,6 +5,7 @@
package main
import (
+ "context"
"encoding/json"
"flag"
"fmt"
@@ -13,7 +14,6 @@
"time"
"cloud.google.com/go/storage"
- "golang.org/x/net/context"
"google.golang.org/api/option"
"go.skia.org/infra/go/auth"
diff --git a/task_scheduler/go/scheduling/task_scheduler.go b/task_scheduler/go/scheduling/task_scheduler.go
index 54342da..a008f56 100644
--- a/task_scheduler/go/scheduling/task_scheduler.go
+++ b/task_scheduler/go/scheduling/task_scheduler.go
@@ -1,6 +1,7 @@
package scheduling
import (
+ "context"
"errors"
"fmt"
"math"
@@ -12,8 +13,6 @@
"sync"
"time"
- "golang.org/x/net/context"
-
swarming_api "go.chromium.org/luci/common/api/swarming/swarming/v1"
"go.skia.org/infra/go/common"
"go.skia.org/infra/go/gerrit"
diff --git a/task_scheduler/go/task_scheduler/main.go b/task_scheduler/go/task_scheduler/main.go
index 16714e6..04520e9 100644
--- a/task_scheduler/go/task_scheduler/main.go
+++ b/task_scheduler/go/task_scheduler/main.go
@@ -2,6 +2,7 @@
import (
"bytes"
+ "context"
"encoding/json"
"flag"
"fmt"
@@ -14,8 +15,6 @@
"runtime"
"time"
- "golang.org/x/net/context"
-
"github.com/gorilla/mux"
"go.skia.org/infra/go/auth"
"go.skia.org/infra/go/common"
diff --git a/task_scheduler/go/tryjobs/tryjobs.go b/task_scheduler/go/tryjobs/tryjobs.go
index c03e977..4d0fe52 100644
--- a/task_scheduler/go/tryjobs/tryjobs.go
+++ b/task_scheduler/go/tryjobs/tryjobs.go
@@ -1,6 +1,7 @@
package tryjobs
import (
+ "context"
"encoding/json"
"fmt"
"net/http"
@@ -8,8 +9,6 @@
"sync"
"time"
- "golang.org/x/net/context"
-
buildbucket_api "go.chromium.org/luci/common/api/buildbucket/buildbucket/v1"
"go.skia.org/infra/go/buildbucket"
"go.skia.org/infra/go/gerrit"
diff --git a/tracedb/go/tracetool/main.go b/tracedb/go/tracetool/main.go
index 4da97e2..95cf82f 100644
--- a/tracedb/go/tracetool/main.go
+++ b/tracedb/go/tracetool/main.go
@@ -2,6 +2,7 @@
package main
import (
+ "context"
"crypto/md5"
"flag"
"fmt"
@@ -17,7 +18,6 @@
"go.skia.org/infra/go/sklog"
"go.skia.org/infra/go/trace/service"
"go.skia.org/infra/go/util"
- "golang.org/x/net/context"
"google.golang.org/grpc"
)
