replace "context" with "golang.org/x/net/context"

dependencies (specifically go-rpc) depend on "golang.org/x/net/context" and are not compatible with "context" fixes asteris-llc#318
shomodj · Oct 26, 2016 · 11eb528 · 11eb528
1 parent 90197dd
commit 11eb528
Show file tree

Hide file tree

Showing 50 changed files with 52 additions and 54 deletions.
diff --git a/apply/apply.go b/apply/apply.go
@@ -15,7 +15,6 @@
 package apply
 
 import (
-	"context"
 	"fmt"
 
 	"github.com/asteris-llc/converge/executor"
@@ -24,6 +23,7 @@ import (
 	"github.com/asteris-llc/converge/plan"
 	"github.com/asteris-llc/converge/render"
 	"github.com/pkg/errors"
+	"golang.org/x/net/context"
 )
 
 // MkPipelineF is a function to generate a pipeline given an id

diff --git a/apply/apply_test.go b/apply/apply_test.go
@@ -15,7 +15,6 @@
 package apply_test
 
 import (
-	"context"
 	"testing"
 
 	"github.com/asteris-llc/converge/apply"
@@ -27,6 +26,7 @@ import (
 	"github.com/asteris-llc/converge/resource"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
+	"golang.org/x/net/context"
 )
 
 func TestApplyNoOp(t *testing.T) {

diff --git a/cmd/apply.go b/cmd/apply.go
@@ -15,7 +15,6 @@
 package cmd
 
 import (
-	"context"
 	"errors"
 	"fmt"
 
@@ -27,6 +26,7 @@ import (
 	"github.com/asteris-llc/converge/rpc/pb"
 	"github.com/spf13/cobra"
 	"github.com/spf13/viper"
+	"golang.org/x/net/context"
 )
 
 // applyCmd represents the plan command

diff --git a/cmd/graceful_exit.go b/cmd/graceful_exit.go
@@ -15,11 +15,11 @@
 package cmd
 
 import (
-	"context"
 	"os"
 	"os/signal"
 
 	log "github.com/Sirupsen/logrus"
+	"golang.org/x/net/context"
 )
 
 // GracefulExit traps interrupt signals for a graceful exit

diff --git a/cmd/graph.go b/cmd/graph.go
@@ -15,7 +15,6 @@
 package cmd
 
 import (
-	"context"
 	"errors"
 	"fmt"
 
@@ -27,6 +26,7 @@ import (
 	"github.com/asteris-llc/converge/rpc/pb"
 	"github.com/spf13/cobra"
 	"github.com/spf13/viper"
+	"golang.org/x/net/context"
 )
 
 // graphCmd represents the graph command

diff --git a/cmd/healthcheck.go b/cmd/healthcheck.go
@@ -15,7 +15,6 @@
 package cmd
 
 import (
-	"context"
 	"errors"
 	"fmt"
 
@@ -27,6 +26,7 @@ import (
 	"github.com/asteris-llc/converge/rpc/pb"
 	"github.com/spf13/cobra"
 	"github.com/spf13/viper"
+	"golang.org/x/net/context"
 )
 
 // healthcheckCmd represents the 'healthcheck' command

diff --git a/cmd/key.go b/cmd/key.go
@@ -17,7 +17,6 @@ package cmd
 import (
 	"bufio"
 	"bytes"
-	"context"
 	"fmt"
 	"os"
 	"strings"
@@ -30,6 +29,7 @@ import (
 	"github.com/spf13/cobra"
 	"github.com/spf13/viper"
 	"golang.org/x/crypto/openpgp"
+	"golang.org/x/net/context"
 )
 
 var keyCmd = &cobra.Command{

diff --git a/cmd/plan.go b/cmd/plan.go
@@ -15,7 +15,6 @@
 package cmd
 
 import (
-	"context"
 	"errors"
 	"fmt"
 
@@ -27,6 +26,7 @@ import (
 	"github.com/asteris-llc/converge/rpc/pb"
 	"github.com/spf13/cobra"
 	"github.com/spf13/viper"
+	"golang.org/x/net/context"
 )
 
 // planCmd represents the plan command

diff --git a/cmd/rpc.go b/cmd/rpc.go
@@ -15,7 +15,6 @@
 package cmd
 
 import (
-	"context"
 	"crypto/tls"
 	"encoding/json"
 	"io"
@@ -33,6 +32,7 @@ import (
 	"github.com/pkg/errors"
 	"github.com/spf13/pflag"
 	"github.com/spf13/viper"
+	"golang.org/x/net/context"
 )
 
 const (

diff --git a/cmd/server.go b/cmd/server.go
@@ -15,7 +15,6 @@
 package cmd
 
 import (
-	"context"
 	"os"
 	"time"
 
@@ -24,6 +23,7 @@ import (
 	"github.com/pkg/errors"
 	"github.com/spf13/cobra"
 	"github.com/spf13/viper"
+	"golang.org/x/net/context"
 	"golang.org/x/sync/errgroup"
 	"google.golang.org/grpc/grpclog"
 )

diff --git a/cmd/validate.go b/cmd/validate.go
@@ -15,13 +15,13 @@
 package cmd
 
 import (
-	"context"
 	"errors"
 
 	log "github.com/Sirupsen/logrus"
 	"github.com/asteris-llc/converge/load"
 	"github.com/spf13/cobra"
 	"github.com/spf13/viper"
+	"golang.org/x/net/context"
 )
 
 // validateCmd represents the validate command

diff --git a/fetch/fetch.go b/fetch/fetch.go
@@ -15,10 +15,11 @@
 package fetch
 
 import (
-	"context"
 	"fmt"
 	"net/url"
 	"path"
+
+	"golang.org/x/net/context"
 )
 
 // Any fetches a path based on the scheme of the location

diff --git a/fetch/fetch_test.go b/fetch/fetch_test.go
@@ -15,11 +15,11 @@
 package fetch_test
 
 import (
-	"context"
 	"testing"
 
 	"github.com/asteris-llc/converge/fetch"
 	"github.com/stretchr/testify/assert"
+	"golang.org/x/net/context"
 )
 
 func TestAnyBadURL(t *testing.T) {

diff --git a/fetch/http.go b/fetch/http.go
@@ -15,10 +15,11 @@
 package fetch
 
 import (
-	"context"
 	"fmt"
 	"io/ioutil"
 	"net/http"
+
+	"golang.org/x/net/context"
 )
 
 // HTTP fetches content over HTTP

diff --git a/fetch/http_test.go b/fetch/http_test.go
@@ -15,7 +15,6 @@
 package fetch_test
 
 import (
-	"context"
 	"path"
 	"testing"
 
@@ -26,6 +25,7 @@ import (
 	"github.com/asteris-llc/converge/helpers/testing/http"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
+	"golang.org/x/net/context"
 )
 
 func TestHTTP(t *testing.T) {

diff --git a/graph/graph.go b/graph/graph.go
@@ -15,7 +15,6 @@
 package graph
 
 import (
-	"context"
 	"fmt"
 	"strings"
 	"sync"
@@ -26,6 +25,7 @@ import (
 	"github.com/hashicorp/terraform/dag"
 	"github.com/pkg/errors"
 	cmap "github.com/streamrail/concurrent-map"
+	"golang.org/x/net/context"
 )
 
 // WalkFunc is taken by the walking functions

diff --git a/graph/graph_test.go b/graph/graph_test.go
@@ -15,7 +15,6 @@
 package graph_test
 
 import (
-	"context"
 	"errors"
 	"math/rand"
 	"sort"
@@ -29,6 +28,7 @@ import (
 	"github.com/asteris-llc/converge/helpers/logging"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
+	"golang.org/x/net/context"
 )
 
 func TestGet(t *testing.T) {

diff --git a/graph/merge_duplicates.go b/graph/merge_duplicates.go
@@ -15,13 +15,13 @@
 package graph
 
 import (
-	"context"
 	"strings"
 	"sync"
 
 	"github.com/asteris-llc/converge/graph/node"
 	"github.com/asteris-llc/converge/helpers/logging"
 	"github.com/mitchellh/hashstructure"
+	"golang.org/x/net/context"
 )
 
 // SkipMergeFunc will be used to determine whether or not to merge a node

diff --git a/graph/merge_duplicates_test.go b/graph/merge_duplicates_test.go
@@ -15,14 +15,14 @@
 package graph_test
 
 import (
-	"context"
 	"testing"
 
 	"github.com/asteris-llc/converge/graph"
 	"github.com/asteris-llc/converge/graph/node"
 	"github.com/asteris-llc/converge/helpers/logging"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
+	"golang.org/x/net/context"
 )
 
 func TestMergeDuplicatesRemovesDuplicates(t *testing.T) {

diff --git a/graph/notifier_test.go b/graph/notifier_test.go
@@ -15,14 +15,14 @@
 package graph_test
 
 import (
-	"context"
 	"errors"
 	"testing"
 
 	"github.com/asteris-llc/converge/graph"
 	"github.com/asteris-llc/converge/graph/node"
 	"github.com/asteris-llc/converge/helpers/logging"
 	"github.com/stretchr/testify/assert"
+	"golang.org/x/net/context"
 )
 
 func TestNotifyTransform(t *testing.T) {

diff --git a/healthcheck/healthcheck.go b/healthcheck/healthcheck.go
@@ -15,12 +15,12 @@
 package healthcheck
 
 import (
-	"context"
 	"errors"
 
 	"github.com/asteris-llc/converge/graph"
 	"github.com/asteris-llc/converge/graph/node"
 	"github.com/asteris-llc/converge/resource"
+	"golang.org/x/net/context"
 )
 
 // Check defines the interface for a health check

diff --git a/helpers/logging/context.go b/helpers/logging/context.go
@@ -15,9 +15,8 @@
 package logging
 
 import (
-	"context"
-
 	"github.com/Sirupsen/logrus"
+	"golang.org/x/net/context"
 )
 
 var loggerKey = struct{}{}

diff --git a/helpers/testing/http/http.go b/helpers/testing/http/http.go
@@ -15,7 +15,6 @@
 package http
 
 import (
-	"context"
 	"errors"
 	"fmt"
 	"math/rand"
@@ -26,6 +25,7 @@ import (
 
 	log "github.com/Sirupsen/logrus"
 	"github.com/asteris-llc/converge/rpc"
+	"golang.org/x/net/context"
 )
 
 // ServeFile constructs a SingleFileServer on a random port, returning that

diff --git a/load/dependencyresolver.go b/load/dependencyresolver.go
@@ -15,7 +15,6 @@
 package load
 
 import (
-	"context"
 	"fmt"
 	"io/ioutil"
 	"sort"
@@ -29,6 +28,7 @@ import (
 	"github.com/asteris-llc/converge/render/extensions"
 	"github.com/asteris-llc/converge/render/preprocessor"
 	"github.com/pkg/errors"
+	"golang.org/x/net/context"
 )
 
 type dependencyGenerator func(g *graph.Graph, id string, node *parse.Node) ([]string, error)

diff --git a/load/dependencyresolver_test.go b/load/dependencyresolver_test.go
@@ -15,7 +15,6 @@
 package load_test
 
 import (
-	"context"
 	"testing"
 
 	"github.com/asteris-llc/converge/graph"
@@ -24,6 +23,7 @@ import (
 	"github.com/asteris-llc/converge/parse"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
+	"golang.org/x/net/context"
 )
 
 // TestDependencyResolverResolvesDependencies tests dependency resolution

diff --git a/load/load.go b/load/load.go
@@ -15,10 +15,9 @@
 package load
 
 import (
-	"context"
-
 	"github.com/asteris-llc/converge/graph"
 	"github.com/pkg/errors"
+	"golang.org/x/net/context"
 )
 
 // Load produces a fully-formed graph from the given root