19889: Stop using old x/net/context library.

Arvados-DCO-1.1-Signed-off-by: Tom Clegg <tom@curii.com>

diff --git a/lib/crunchrun/container_gateway.go b/lib/crunchrun/container_gateway.go
index 4c835088a8d6cd6f841b77245076167f7edef3d4..e0f3b386f3ce39877d7665d5cf5fc29673312d56 100644 (file)
--- a/lib/crunchrun/container_gateway.go
+++ b/lib/crunchrun/container_gateway.go
@@ -5,6 +5,7 @@
 package crunchrun
 
 import (
+       "context"
        "crypto/hmac"
        "crypto/rand"
        "crypto/rsa"
@@ -33,7 +34,6 @@ import (
        "github.com/google/shlex"
        "github.com/hashicorp/yamux"
        "golang.org/x/crypto/ssh"
-       "golang.org/x/net/context"
        "golang.org/x/net/webdav"
 )
 

diff --git a/lib/crunchrun/crunchrun_test.go b/lib/crunchrun/crunchrun_test.go
index 56a605bdb8bdf5f109018a0520d579fcdc9e1056..9c4fe20bc1d29121897237425156f940b8466830 100644 (file)
--- a/lib/crunchrun/crunchrun_test.go
+++ b/lib/crunchrun/crunchrun_test.go
@@ -6,6 +6,7 @@ package crunchrun
 
 import (
        "bytes"
+       "context"
        "crypto/md5"
        "encoding/json"
        "errors"
@@ -35,7 +36,6 @@ import (
        "git.arvados.org/arvados.git/sdk/go/arvadosclient"
        "git.arvados.org/arvados.git/sdk/go/arvadostest"
        "git.arvados.org/arvados.git/sdk/go/manifest"
-       "golang.org/x/net/context"
 
        . "gopkg.in/check.v1"
 )

diff --git a/lib/crunchrun/docker.go b/lib/crunchrun/docker.go
index bb635265862fff8a4bf36127000297bbad16e051..8d8cdfc8ba620a4317d4f48bf0f654c04cf58bef 100644 (file)
--- a/lib/crunchrun/docker.go
+++ b/lib/crunchrun/docker.go
@@ -4,6 +4,7 @@
 package crunchrun
 
 import (
+       "context"
        "fmt"
        "io"
        "io/ioutil"
@@ -17,7 +18,6 @@ import (
        dockertypes "github.com/docker/docker/api/types"
        dockercontainer "github.com/docker/docker/api/types/container"
        dockerclient "github.com/docker/docker/client"
-       "golang.org/x/net/context"
 )
 
 // Docker daemon won't let you set a limit less than ~10 MiB

diff --git a/lib/crunchrun/executor.go b/lib/crunchrun/executor.go
index 1ed460acd966c3a64d32e11d749a6ac04e8260f1..6ec5b838f681fe3c03a778f966c58979763f9031 100644 (file)
--- a/lib/crunchrun/executor.go
+++ b/lib/crunchrun/executor.go
@@ -4,10 +4,10 @@
 package crunchrun
 
 import (
+       "context"
        "io"
 
        "git.arvados.org/arvados.git/sdk/go/arvados"
-       "golang.org/x/net/context"
 )
 
 type bindmount struct {

diff --git a/lib/crunchrun/executor_test.go b/lib/crunchrun/executor_test.go
index e757f579fe957eff333892c2fc7a12de9fff82e2..f1a873ae8dcc9b86d79ddc0170c8a44743f8dd81 100644 (file)
--- a/lib/crunchrun/executor_test.go
+++ b/lib/crunchrun/executor_test.go
@@ -6,6 +6,7 @@ package crunchrun
 
 import (
        "bytes"
+       "context"
        "fmt"
        "io"
        "io/ioutil"
@@ -18,7 +19,6 @@ import (
        "git.arvados.org/arvados.git/lib/diagnostics"
        "git.arvados.org/arvados.git/sdk/go/arvados"
        "git.arvados.org/arvados.git/sdk/go/arvadostest"
-       "golang.org/x/net/context"
        . "gopkg.in/check.v1"
 )
 

diff --git a/lib/crunchrun/singularity.go b/lib/crunchrun/singularity.go
index 1da401f859f94b36655f771e5fea5af750b0cbe7..8c0d8f5bc96eaac9733c37f187feba3376737a3c 100644 (file)
--- a/lib/crunchrun/singularity.go
+++ b/lib/crunchrun/singularity.go
@@ -6,6 +6,7 @@ package crunchrun
 
 import (
        "bytes"
+       "context"
        "errors"
        "fmt"
        "io/ioutil"
@@ -21,7 +22,6 @@ import (
        "time"
 
        "git.arvados.org/arvados.git/sdk/go/arvados"
-       "golang.org/x/net/context"
 )
 
 type singularityExecutor struct {

diff --git a/lib/webdavfs/fs.go b/lib/webdavfs/fs.go
index b0c3d4f09ea84366fd3fff53f5b2d7ffad9a3c2f..ee968e6f4ef0b345c8ffa9c5a88e3631d41c0f20 100644 (file)
--- a/lib/webdavfs/fs.go
+++ b/lib/webdavfs/fs.go
@@ -7,6 +7,7 @@
 package webdavfs
 
 import (
+       "context"
        "crypto/rand"
        "errors"
        "fmt"
@@ -19,8 +20,6 @@ import (
        "time"
 
        "git.arvados.org/arvados.git/sdk/go/arvados"
-
-       "golang.org/x/net/context"
        "golang.org/x/net/webdav"
 )