Bump to 1.7 and start using new context pkg

jaheau · Aug 22, 2016 · 4fa7b32 · 4fa7b32
1 parent 3ba7600
commit 4fa7b32
Show file tree

Hide file tree

Showing 251 changed files with 287 additions and 1,081 deletions.
diff --git a/.drone.yml b/.drone.yml
@@ -2,7 +2,7 @@ clone:
   tags: true
   path: github.com/vmware/govmomi
 build:
-  image: golang:1.6
+  image: golang:1.7
   pull: true
   environment:
     - GOVC_TEST_URL=$$GOVC_TEST_URL

diff --git a/.travis.yml b/.travis.yml
@@ -3,7 +3,7 @@ sudo: false
 language: go
 
 go:
-   - 1.6
+   - 1.7
 
 before_install:
   - make vendor

diff --git a/client.go b/client.go
@@ -57,6 +57,7 @@ are kept outside the object package.
 package govmomi
 
 import (
+	"context"
 	"crypto/tls"
 	"net/url"
 
@@ -65,7 +66,6 @@ import (
 	"github.com/vmware/govmomi/vim25"
 	"github.com/vmware/govmomi/vim25/soap"
 	"github.com/vmware/govmomi/vim25/types"
-	"golang.org/x/net/context"
 )
 
 type Client struct {

diff --git a/client_test.go b/client_test.go
@@ -17,6 +17,7 @@ limitations under the License.
 package govmomi
 
 import (
+	"context"
 	"errors"
 	"net/http"
 	"net/url"
@@ -25,7 +26,6 @@ import (
 	"github.com/vmware/govmomi/test"
 	"github.com/vmware/govmomi/vim25/mo"
 	"github.com/vmware/govmomi/vim25/types"
-	"golang.org/x/net/context"
 )
 
 func TestNewClient(t *testing.T) {

diff --git a/event/helper.go b/event/helper.go
@@ -17,10 +17,9 @@ limitations under the License.
 package event
 
 import (
+	"context"
 	"fmt"
 
-	"golang.org/x/net/context"
-
 	"github.com/vmware/govmomi/property"
 	"github.com/vmware/govmomi/view"
 	"github.com/vmware/govmomi/vim25/types"

diff --git a/event/history_collector.go b/event/history_collector.go
@@ -17,12 +17,13 @@ limitations under the License.
 package event
 
 import (
+	"context"
+
 	"github.com/vmware/govmomi/object"
 	"github.com/vmware/govmomi/vim25"
 	"github.com/vmware/govmomi/vim25/methods"
 	"github.com/vmware/govmomi/vim25/mo"
 	"github.com/vmware/govmomi/vim25/types"
-	"golang.org/x/net/context"
 )
 
 type HistoryCollector struct {

diff --git a/event/manager.go b/event/manager.go
@@ -17,6 +17,7 @@ limitations under the License.
 package event
 
 import (
+	"context"
 	"fmt"
 	"reflect"
 	"sync"
@@ -27,7 +28,6 @@ import (
 	"github.com/vmware/govmomi/vim25/methods"
 	"github.com/vmware/govmomi/vim25/mo"
 	"github.com/vmware/govmomi/vim25/types"
-	"golang.org/x/net/context"
 )
 
 type Manager struct {

diff --git a/examples/datastores/main.go b/examples/datastores/main.go
@@ -22,6 +22,7 @@ be used to navigate a vSphere inventory structure using govmomi.
 package main
 
 import (
+	"context"
 	"flag"
 	"fmt"
 	"net/url"
@@ -35,7 +36,6 @@ import (
 	"github.com/vmware/govmomi/units"
 	"github.com/vmware/govmomi/vim25/mo"
 	"github.com/vmware/govmomi/vim25/types"
-	"golang.org/x/net/context"
 )
 
 // GetEnvString returns string from environment variable.

diff --git a/find/finder.go b/find/finder.go
@@ -17,6 +17,7 @@ limitations under the License.
 package find
 
 import (
+	"context"
 	"errors"
 	"path"
 
@@ -26,7 +27,6 @@ import (
 	"github.com/vmware/govmomi/vim25"
 	"github.com/vmware/govmomi/vim25/mo"
 	"github.com/vmware/govmomi/vim25/types"
-	"golang.org/x/net/context"
 )
 
 type Finder struct {

diff --git a/govc/about/command.go b/govc/about/command.go
@@ -17,13 +17,12 @@ limitations under the License.
 package about
 
 import (
+	"context"
 	"flag"
 	"fmt"
 	"io"
 	"text/tabwriter"
 
-	"golang.org/x/net/context"
-
 	"github.com/vmware/govmomi/govc/cli"
 	"github.com/vmware/govmomi/govc/flags"
 	"github.com/vmware/govmomi/vim25/types"

diff --git a/govc/cli/command.go b/govc/cli/command.go
@@ -17,14 +17,13 @@ limitations under the License.
 package cli
 
 import (
+	"context"
 	"flag"
 	"fmt"
 	"io/ioutil"
 	"os"
 	"sort"
 	"text/tabwriter"
-
-	"golang.org/x/net/context"
 )
 
 type HasFlags interface {

diff --git a/govc/cluster/add.go b/govc/cluster/add.go
@@ -17,13 +17,13 @@ limitations under the License.
 package cluster
 
 import (
+	"context"
 	"flag"
 	"fmt"
 
 	"github.com/vmware/govmomi/govc/cli"
 	"github.com/vmware/govmomi/govc/flags"
 	"github.com/vmware/govmomi/object"
-	"golang.org/x/net/context"
 )
 
 type add struct {

diff --git a/govc/cluster/change.go b/govc/cluster/change.go
@@ -17,11 +17,10 @@ limitations under the License.
 package cluster
 
 import (
+	"context"
 	"flag"
 	"strings"
 
-	"golang.org/x/net/context"
-
 	"github.com/vmware/govmomi/govc/cli"
 	"github.com/vmware/govmomi/govc/flags"
 	"github.com/vmware/govmomi/vim25/types"

diff --git a/govc/cluster/create.go b/govc/cluster/create.go
@@ -17,10 +17,9 @@ limitations under the License.
 package cluster
 
 import (
+	"context"
 	"flag"
 
-	"golang.org/x/net/context"
-
 	"github.com/vmware/govmomi/govc/cli"
 	"github.com/vmware/govmomi/govc/flags"
 	"github.com/vmware/govmomi/object"

diff --git a/govc/datacenter/create.go b/govc/datacenter/create.go
@@ -17,11 +17,11 @@ limitations under the License.
 package datacenter
 
 import (
+	"context"
 	"flag"
 
 	"github.com/vmware/govmomi/govc/cli"
 	"github.com/vmware/govmomi/govc/flags"
-	"golang.org/x/net/context"
 )
 
 type create struct {

diff --git a/govc/datacenter/destroy.go b/govc/datacenter/destroy.go
@@ -17,12 +17,12 @@ limitations under the License.
 package datacenter
 
 import (
+	"context"
 	"flag"
 
 	"github.com/vmware/govmomi/find"
 	"github.com/vmware/govmomi/govc/cli"
 	"github.com/vmware/govmomi/govc/flags"
-	"golang.org/x/net/context"
 )
 
 type destroy struct {

diff --git a/govc/datacenter/info.go b/govc/datacenter/info.go
@@ -17,6 +17,7 @@ limitations under the License.
 package datacenter
 
 import (
+	"context"
 	"flag"
 	"fmt"
 	"io"
@@ -30,7 +31,6 @@ import (
 	"github.com/vmware/govmomi/property"
 	"github.com/vmware/govmomi/vim25/mo"
 	"github.com/vmware/govmomi/vim25/types"
-	"golang.org/x/net/context"
 )
 
 type info struct {

diff --git a/govc/datastore/cp.go b/govc/datastore/cp.go
@@ -17,13 +17,13 @@ limitations under the License.
 package datastore
 
 import (
+	"context"
 	"errors"
 	"flag"
 
 	"github.com/vmware/govmomi/govc/cli"
 	"github.com/vmware/govmomi/govc/flags"
 	"github.com/vmware/govmomi/object"
-	"golang.org/x/net/context"
 )
 
 type cp struct {

diff --git a/govc/datastore/create.go b/govc/datastore/create.go
@@ -17,6 +17,7 @@ limitations under the License.
 package datastore
 
 import (
+	"context"
 	"errors"
 	"flag"
 	"fmt"
@@ -29,7 +30,6 @@ import (
 	"github.com/vmware/govmomi/object"
 	"github.com/vmware/govmomi/vim25/soap"
 	"github.com/vmware/govmomi/vim25/types"
-	"golang.org/x/net/context"
 )
 
 type create struct {

diff --git a/govc/datastore/download.go b/govc/datastore/download.go
@@ -17,13 +17,12 @@ limitations under the License.
 package datastore
 
 import (
+	"context"
 	"errors"
 	"flag"
 	"io"
 	"os"
 
-	"golang.org/x/net/context"
-
 	"github.com/vmware/govmomi/govc/cli"
 	"github.com/vmware/govmomi/govc/flags"
 	"github.com/vmware/govmomi/vim25/soap"

diff --git a/govc/datastore/info.go b/govc/datastore/info.go
@@ -17,6 +17,7 @@ limitations under the License.
 package datastore
 
 import (
+	"context"
 	"flag"
 	"fmt"
 	"io"
@@ -29,7 +30,6 @@ import (
 	"github.com/vmware/govmomi/property"
 	"github.com/vmware/govmomi/vim25/mo"
 	"github.com/vmware/govmomi/vim25/types"
-	"golang.org/x/net/context"
 )
 
 type info struct {

diff --git a/govc/datastore/ls.go b/govc/datastore/ls.go
@@ -17,6 +17,7 @@ limitations under the License.
 package datastore
 
 import (
+	"context"
 	"encoding/json"
 	"flag"
 	"fmt"
@@ -29,7 +30,6 @@ import (
 	"github.com/vmware/govmomi/object"
 	"github.com/vmware/govmomi/units"
 	"github.com/vmware/govmomi/vim25/types"
-	"golang.org/x/net/context"
 )
 
 type ls struct {

diff --git a/govc/datastore/mkdir.go b/govc/datastore/mkdir.go
@@ -17,6 +17,7 @@ limitations under the License.
 package datastore
 
 import (
+	"context"
 	"errors"
 	"flag"
 	"fmt"
@@ -26,7 +27,6 @@ import (
 	"github.com/vmware/govmomi/object"
 	"github.com/vmware/govmomi/vim25/soap"
 	"github.com/vmware/govmomi/vim25/types"
-	"golang.org/x/net/context"
 )
 
 type mkdir struct {

diff --git a/govc/datastore/mv.go b/govc/datastore/mv.go
@@ -17,13 +17,13 @@ limitations under the License.
 package datastore
 
 import (
+	"context"
 	"errors"
 	"flag"
 
 	"github.com/vmware/govmomi/govc/cli"
 	"github.com/vmware/govmomi/govc/flags"
 	"github.com/vmware/govmomi/object"
-	"golang.org/x/net/context"
 )
 
 type mv struct {

diff --git a/govc/datastore/remove.go b/govc/datastore/remove.go
@@ -17,10 +17,9 @@ limitations under the License.
 package datastore
 
 import (
+	"context"
 	"flag"
 
-	"golang.org/x/net/context"
-
 	"github.com/vmware/govmomi/govc/cli"
 	"github.com/vmware/govmomi/govc/flags"
 )

diff --git a/govc/datastore/rm.go b/govc/datastore/rm.go
@@ -17,14 +17,14 @@ limitations under the License.
 package datastore
 
 import (
+	"context"
 	"errors"
 	"flag"
 
 	"github.com/vmware/govmomi/govc/cli"
 	"github.com/vmware/govmomi/govc/flags"
 	"github.com/vmware/govmomi/object"
 	"github.com/vmware/govmomi/vim25/types"
-	"golang.org/x/net/context"
 )
 
 type rm struct {

diff --git a/govc/datastore/upload.go b/govc/datastore/upload.go
@@ -17,12 +17,11 @@ limitations under the License.
 package datastore
 
 import (
+	"context"
 	"errors"
 	"flag"
 	"os"
 
-	"golang.org/x/net/context"
-
 	"github.com/vmware/govmomi/govc/cli"
 	"github.com/vmware/govmomi/govc/flags"
 	"github.com/vmware/govmomi/vim25/soap"
-Original file line number
+Diff line change
@@ Expand Up / @@ -3,7 +3,7 @@ sudo: false @@
     language: go
     go:
-       - 1.6
+       - 1.7
     before_install:
       - make vendor
@@ Expand Down @@