From cfe9478196eef8736a3c0bb2eccda826263420ea Mon Sep 17 00:00:00 2001 From: Dmitry Vyukov Date: Fri, 26 Apr 2024 12:19:46 +0200 Subject: all: go fix everything --- dashboard/app/access.go | 2 +- dashboard/app/access_test.go | 2 +- dashboard/app/admin.go | 2 +- dashboard/app/api.go | 2 +- dashboard/app/asset_storage.go | 2 +- dashboard/app/cache.go | 2 +- dashboard/app/config.go | 2 +- dashboard/app/discussion.go | 2 +- dashboard/app/email_test.go | 2 +- dashboard/app/entities.go | 2 +- dashboard/app/graphs.go | 2 +- dashboard/app/handler.go | 2 +- dashboard/app/jobs.go | 2 +- dashboard/app/kcidb.go | 2 +- dashboard/app/label.go | 2 +- dashboard/app/main.go | 2 +- dashboard/app/main_test.go | 2 +- dashboard/app/notifications_test.go | 2 +- dashboard/app/reporting.go | 2 +- dashboard/app/reporting_email.go | 2 +- dashboard/app/reporting_external.go | 2 +- dashboard/app/reporting_lists.go | 2 +- dashboard/app/reporting_test.go | 2 +- dashboard/app/stats.go | 2 +- dashboard/app/subsystem.go | 2 +- dashboard/app/tree.go | 2 +- dashboard/app/util_test.go | 2 +- 27 files changed, 27 insertions(+), 27 deletions(-) (limited to 'dashboard') diff --git a/dashboard/app/access.go b/dashboard/app/access.go index 10a4ac3e9..b63eb9294 100644 --- a/dashboard/app/access.go +++ b/dashboard/app/access.go @@ -9,7 +9,7 @@ import ( "net/http" "strings" - "golang.org/x/net/context" + "context" db "google.golang.org/appengine/v2/datastore" "google.golang.org/appengine/v2/log" "google.golang.org/appengine/v2/user" diff --git a/dashboard/app/access_test.go b/dashboard/app/access_test.go index 208d79a29..3fb305f76 100644 --- a/dashboard/app/access_test.go +++ b/dashboard/app/access_test.go @@ -11,8 +11,8 @@ import ( "strconv" "testing" + "context" "github.com/google/syzkaller/dashboard/dashapi" - "golang.org/x/net/context" "google.golang.org/appengine/v2/user" ) diff --git a/dashboard/app/admin.go b/dashboard/app/admin.go index 58f2e05b2..af349c061 100644 --- a/dashboard/app/admin.go +++ b/dashboard/app/admin.go @@ -8,8 +8,8 @@ import ( "net/http" "time" + "context" "github.com/google/syzkaller/dashboard/dashapi" - "golang.org/x/net/context" db "google.golang.org/appengine/v2/datastore" "google.golang.org/appengine/v2/log" aemail "google.golang.org/appengine/v2/mail" diff --git a/dashboard/app/api.go b/dashboard/app/api.go index 114213426..64db7aa28 100644 --- a/dashboard/app/api.go +++ b/dashboard/app/api.go @@ -19,6 +19,7 @@ import ( "time" "unicode/utf8" + "context" "github.com/google/syzkaller/dashboard/dashapi" "github.com/google/syzkaller/pkg/asset" "github.com/google/syzkaller/pkg/auth" @@ -27,7 +28,6 @@ import ( "github.com/google/syzkaller/pkg/hash" "github.com/google/syzkaller/pkg/subsystem" "github.com/google/syzkaller/sys/targets" - "golang.org/x/net/context" "google.golang.org/appengine/v2" db "google.golang.org/appengine/v2/datastore" "google.golang.org/appengine/v2/log" diff --git a/dashboard/app/asset_storage.go b/dashboard/app/asset_storage.go index 5e33931a5..016975e6f 100644 --- a/dashboard/app/asset_storage.go +++ b/dashboard/app/asset_storage.go @@ -10,10 +10,10 @@ import ( "sort" "time" + "context" "github.com/google/syzkaller/dashboard/dashapi" "github.com/google/syzkaller/pkg/asset" "github.com/google/syzkaller/sys/targets" - "golang.org/x/net/context" "golang.org/x/sync/errgroup" "google.golang.org/appengine/v2" db "google.golang.org/appengine/v2/datastore" diff --git a/dashboard/app/cache.go b/dashboard/app/cache.go index 5867f4782..58322c703 100644 --- a/dashboard/app/cache.go +++ b/dashboard/app/cache.go @@ -11,9 +11,9 @@ import ( "sort" "time" + "context" "github.com/google/syzkaller/pkg/hash" "github.com/google/syzkaller/pkg/image" - "golang.org/x/net/context" "google.golang.org/appengine/v2" "google.golang.org/appengine/v2/log" "google.golang.org/appengine/v2/memcache" diff --git a/dashboard/app/config.go b/dashboard/app/config.go index f55a5f0ce..d0b01ff24 100644 --- a/dashboard/app/config.go +++ b/dashboard/app/config.go @@ -11,13 +11,13 @@ import ( "regexp" "time" + "context" "github.com/google/go-cmp/cmp" "github.com/google/syzkaller/dashboard/dashapi" "github.com/google/syzkaller/pkg/auth" "github.com/google/syzkaller/pkg/email" "github.com/google/syzkaller/pkg/subsystem" "github.com/google/syzkaller/pkg/vcs" - "golang.org/x/net/context" ) // There are multiple configurable aspects of the app (namespaces, reporting, API clients, etc). diff --git a/dashboard/app/discussion.go b/dashboard/app/discussion.go index 64878f61c..bb9857bec 100644 --- a/dashboard/app/discussion.go +++ b/dashboard/app/discussion.go @@ -8,9 +8,9 @@ import ( "sort" "strings" + "context" "github.com/google/syzkaller/dashboard/dashapi" "github.com/google/syzkaller/pkg/email" - "golang.org/x/net/context" db "google.golang.org/appengine/v2/datastore" ) diff --git a/dashboard/app/email_test.go b/dashboard/app/email_test.go index ae40d9e8a..8926774ad 100644 --- a/dashboard/app/email_test.go +++ b/dashboard/app/email_test.go @@ -9,11 +9,11 @@ import ( "testing" "time" + "context" "github.com/google/syzkaller/dashboard/dashapi" "github.com/google/syzkaller/pkg/email" "github.com/google/syzkaller/sys/targets" "github.com/stretchr/testify/assert" - "golang.org/x/net/context" ) // nolint: funlen diff --git a/dashboard/app/entities.go b/dashboard/app/entities.go index cdb8761dd..645d792c5 100644 --- a/dashboard/app/entities.go +++ b/dashboard/app/entities.go @@ -10,10 +10,10 @@ import ( "strings" "time" + "context" "github.com/google/syzkaller/dashboard/dashapi" "github.com/google/syzkaller/pkg/hash" "github.com/google/syzkaller/pkg/subsystem" - "golang.org/x/net/context" db "google.golang.org/appengine/v2/datastore" ) diff --git a/dashboard/app/graphs.go b/dashboard/app/graphs.go index 7c023ca89..af453f474 100644 --- a/dashboard/app/graphs.go +++ b/dashboard/app/graphs.go @@ -12,7 +12,7 @@ import ( "strconv" "time" - "golang.org/x/net/context" + "context" db "google.golang.org/appengine/v2/datastore" ) diff --git a/dashboard/app/handler.go b/dashboard/app/handler.go index f547de6a9..5b2337a30 100644 --- a/dashboard/app/handler.go +++ b/dashboard/app/handler.go @@ -14,8 +14,8 @@ import ( "strings" "time" + "context" "github.com/google/syzkaller/pkg/html" - "golang.org/x/net/context" "google.golang.org/appengine/v2" "google.golang.org/appengine/v2/log" "google.golang.org/appengine/v2/user" diff --git a/dashboard/app/jobs.go b/dashboard/app/jobs.go index b86d1ac8c..8898265e3 100644 --- a/dashboard/app/jobs.go +++ b/dashboard/app/jobs.go @@ -12,10 +12,10 @@ import ( "strings" "time" + "context" "github.com/google/syzkaller/dashboard/dashapi" "github.com/google/syzkaller/pkg/email" "github.com/google/syzkaller/pkg/vcs" - "golang.org/x/net/context" db "google.golang.org/appengine/v2/datastore" "google.golang.org/appengine/v2/log" "google.golang.org/appengine/v2/user" diff --git a/dashboard/app/kcidb.go b/dashboard/app/kcidb.go index 19b704882..badff6513 100644 --- a/dashboard/app/kcidb.go +++ b/dashboard/app/kcidb.go @@ -8,8 +8,8 @@ import ( "net/http" "time" + "context" "github.com/google/syzkaller/pkg/kcidb" - "golang.org/x/net/context" "google.golang.org/appengine/v2" db "google.golang.org/appengine/v2/datastore" "google.golang.org/appengine/v2/log" diff --git a/dashboard/app/label.go b/dashboard/app/label.go index 18215911e..bd5bb21fa 100644 --- a/dashboard/app/label.go +++ b/dashboard/app/label.go @@ -8,7 +8,7 @@ import ( "sort" "strings" - "golang.org/x/net/context" + "context" ) const ( diff --git a/dashboard/app/main.go b/dashboard/app/main.go index 6e8b34b19..fdf86fb86 100644 --- a/dashboard/app/main.go +++ b/dashboard/app/main.go @@ -19,6 +19,7 @@ import ( "cloud.google.com/go/logging" "cloud.google.com/go/logging/logadmin" + "context" "github.com/google/syzkaller/dashboard/dashapi" "github.com/google/syzkaller/pkg/debugtracer" "github.com/google/syzkaller/pkg/email" @@ -26,7 +27,6 @@ import ( "github.com/google/syzkaller/pkg/html" "github.com/google/syzkaller/pkg/subsystem" "github.com/google/syzkaller/pkg/vcs" - "golang.org/x/net/context" "golang.org/x/sync/errgroup" "google.golang.org/api/iterator" "google.golang.org/appengine/v2" diff --git a/dashboard/app/main_test.go b/dashboard/app/main_test.go index 7875d60ba..5444f2e75 100644 --- a/dashboard/app/main_test.go +++ b/dashboard/app/main_test.go @@ -10,9 +10,9 @@ import ( "testing" "time" + "context" "github.com/google/syzkaller/dashboard/dashapi" "github.com/stretchr/testify/assert" - "golang.org/x/net/context" ) func TestOnlyManagerFilter(t *testing.T) { diff --git a/dashboard/app/notifications_test.go b/dashboard/app/notifications_test.go index 4e680baba..9ae20b770 100644 --- a/dashboard/app/notifications_test.go +++ b/dashboard/app/notifications_test.go @@ -9,10 +9,10 @@ import ( "testing" "time" + "context" "github.com/google/go-cmp/cmp" "github.com/google/syzkaller/dashboard/dashapi" "github.com/google/syzkaller/pkg/email" - "golang.org/x/net/context" ) func TestEmailNotifUpstreamEmbargo(t *testing.T) { diff --git a/dashboard/app/reporting.go b/dashboard/app/reporting.go index ccb7fa1ea..51cffc13f 100644 --- a/dashboard/app/reporting.go +++ b/dashboard/app/reporting.go @@ -13,11 +13,11 @@ import ( "strings" "time" + "context" "github.com/google/syzkaller/dashboard/dashapi" "github.com/google/syzkaller/pkg/email" "github.com/google/syzkaller/pkg/html" "github.com/google/syzkaller/sys/targets" - "golang.org/x/net/context" db "google.golang.org/appengine/v2/datastore" "google.golang.org/appengine/v2/log" ) diff --git a/dashboard/app/reporting_email.go b/dashboard/app/reporting_email.go index 8eaf5e5ff..d68b2c0ae 100644 --- a/dashboard/app/reporting_email.go +++ b/dashboard/app/reporting_email.go @@ -19,12 +19,12 @@ import ( "text/tabwriter" "time" + "context" "github.com/google/syzkaller/dashboard/dashapi" "github.com/google/syzkaller/pkg/email" "github.com/google/syzkaller/pkg/email/lore" "github.com/google/syzkaller/pkg/html" "github.com/google/syzkaller/sys/targets" - "golang.org/x/net/context" "google.golang.org/appengine/v2" db "google.golang.org/appengine/v2/datastore" "google.golang.org/appengine/v2/log" diff --git a/dashboard/app/reporting_external.go b/dashboard/app/reporting_external.go index 625476918..1336cbc1c 100644 --- a/dashboard/app/reporting_external.go +++ b/dashboard/app/reporting_external.go @@ -9,8 +9,8 @@ import ( "fmt" "net/http" + "context" "github.com/google/syzkaller/dashboard/dashapi" - "golang.org/x/net/context" "google.golang.org/appengine/v2/log" ) diff --git a/dashboard/app/reporting_lists.go b/dashboard/app/reporting_lists.go index ec13136f2..5dd3b8693 100644 --- a/dashboard/app/reporting_lists.go +++ b/dashboard/app/reporting_lists.go @@ -11,9 +11,9 @@ import ( "strings" "time" + "context" "github.com/google/syzkaller/dashboard/dashapi" "github.com/google/syzkaller/pkg/hash" - "golang.org/x/net/context" "google.golang.org/appengine/v2" db "google.golang.org/appengine/v2/datastore" "google.golang.org/appengine/v2/log" diff --git a/dashboard/app/reporting_test.go b/dashboard/app/reporting_test.go index 7515cd810..c9ad1c8c2 100644 --- a/dashboard/app/reporting_test.go +++ b/dashboard/app/reporting_test.go @@ -11,12 +11,12 @@ import ( "testing" "time" + "context" "github.com/google/go-cmp/cmp" "github.com/google/syzkaller/dashboard/dashapi" "github.com/google/syzkaller/pkg/email" "github.com/google/syzkaller/sys/targets" "github.com/stretchr/testify/assert" - "golang.org/x/net/context" ) func TestReportBug(t *testing.T) { diff --git a/dashboard/app/stats.go b/dashboard/app/stats.go index 4133690cc..decbe6bc7 100644 --- a/dashboard/app/stats.go +++ b/dashboard/app/stats.go @@ -8,9 +8,9 @@ import ( "fmt" "time" + "context" "github.com/google/syzkaller/dashboard/dashapi" "github.com/google/syzkaller/pkg/stats/syzbotstats" - "golang.org/x/net/context" "google.golang.org/appengine/v2" db "google.golang.org/appengine/v2/datastore" ) diff --git a/dashboard/app/subsystem.go b/dashboard/app/subsystem.go index 5940612cc..07d52dcd5 100644 --- a/dashboard/app/subsystem.go +++ b/dashboard/app/subsystem.go @@ -9,9 +9,9 @@ import ( "sort" "time" + "context" "github.com/google/syzkaller/pkg/debugtracer" "github.com/google/syzkaller/pkg/subsystem" - "golang.org/x/net/context" db "google.golang.org/appengine/v2/datastore" "google.golang.org/appengine/v2/log" ) diff --git a/dashboard/app/tree.go b/dashboard/app/tree.go index 08da1a804..9cec1e70c 100644 --- a/dashboard/app/tree.go +++ b/dashboard/app/tree.go @@ -14,8 +14,8 @@ import ( "sync" "time" + "context" "github.com/google/syzkaller/dashboard/dashapi" - "golang.org/x/net/context" "golang.org/x/sync/errgroup" db "google.golang.org/appengine/v2/datastore" "google.golang.org/appengine/v2/log" diff --git a/dashboard/app/util_test.go b/dashboard/app/util_test.go index db92174e4..19e03ff78 100644 --- a/dashboard/app/util_test.go +++ b/dashboard/app/util_test.go @@ -23,11 +23,11 @@ import ( "testing" "time" + "context" "github.com/google/go-cmp/cmp" "github.com/google/syzkaller/dashboard/dashapi" "github.com/google/syzkaller/pkg/email" "github.com/google/syzkaller/pkg/subsystem" - "golang.org/x/net/context" "google.golang.org/appengine/v2/aetest" db "google.golang.org/appengine/v2/datastore" "google.golang.org/appengine/v2/log" -- cgit mrf-deployment