Merge pull request #414 from coreos/standard-context

matchbox: Switch to Go 1.7+ standard context

.travis.yml

@@ -3,7 +3,6 @@ sudo: required
 services:
   - docker
 go:
-  - 1.6.4
   - 1.7.4
   - 1.8rc1
   - tip

CHANGES.md

@@ -8,6 +8,13 @@ Rename `bootcfg` to CoreOS `matchbox`!
 
 * Add Profile `args` field to list kernel args
 * Update [Fuze](https://github.com/coreos/container-linux-config-transpiler) and [Ignition](https://github.com/coreos/ignition) to v0.11.2
+* Switch from `golang.org/x/net/context` to `context`
+* Deprecate Profile `cmd` field map of kernel args
+* Deprecate Pixiecore support
+* Drop build support for Go 1.6
+
+#### Rename
+
 * Rename `bootcfg` binary to `matchbox`
 * Rename `bootcfg` packages to `matchbox`
 * Publish a `quay.io/coreos/matchbox` container image. The `quay.io/coreos/bootcfg` image will no longer be updated.
@@ -15,8 +22,6 @@ Rename `bootcfg` to CoreOS `matchbox`!
 * Change config directory to `/etc/matchbox`
 * Change default `-data-path` to `/var/lib/matchbox`
 * Change default `-assets-path` to `/var/lib/matchbox/assets`
-* Deprecate Profile `cmd` field map of kernel args
-* Deprecate Pixiecore support
 
 #### Examples
 

matchbox/cli/group_create.go

@@ -3,8 +3,8 @@ package cli
 import (
 	"io/ioutil"
 
+	"context"
 	"github.com/spf13/cobra"
-	"golang.org/x/net/context"
 
 	pb "github.com/coreos/coreos-baremetal/matchbox/server/serverpb"
 	"github.com/coreos/coreos-baremetal/matchbox/storage/storagepb"

matchbox/cli/group_describe.go

@@ -4,8 +4,8 @@ import (
 	"fmt"
 	"os"
 
+	"context"
 	"github.com/spf13/cobra"
-	"golang.org/x/net/context"
 
 	pb "github.com/coreos/coreos-baremetal/matchbox/server/serverpb"
 )

matchbox/cli/group_list.go

@@ -4,8 +4,8 @@ import (
 	"fmt"
 	"os"
 
+	"context"
 	"github.com/spf13/cobra"
-	"golang.org/x/net/context"
 
 	pb "github.com/coreos/coreos-baremetal/matchbox/server/serverpb"
 )

matchbox/cli/ignition_create.go

@@ -4,8 +4,8 @@ import (
 	"io/ioutil"
 	"path/filepath"
 
+	"context"
 	"github.com/spf13/cobra"
-	"golang.org/x/net/context"
 
 	pb "github.com/coreos/coreos-baremetal/matchbox/server/serverpb"
 )

matchbox/cli/profile_create.go

@@ -3,8 +3,8 @@ package cli
 import (
 	"io/ioutil"
 
+	"context"
 	"github.com/spf13/cobra"
-	"golang.org/x/net/context"
 
 	pb "github.com/coreos/coreos-baremetal/matchbox/server/serverpb"
 	"github.com/coreos/coreos-baremetal/matchbox/storage/storagepb"

matchbox/cli/profile_describe.go

@@ -4,8 +4,8 @@ import (
 	"fmt"
 	"os"
 
+	"context"
 	"github.com/spf13/cobra"
-	"golang.org/x/net/context"
 
 	pb "github.com/coreos/coreos-baremetal/matchbox/server/serverpb"
 )

matchbox/cli/profile_list.go

@@ -4,8 +4,8 @@ import (
 	"fmt"
 	"os"
 
+	"context"
 	"github.com/spf13/cobra"
-	"golang.org/x/net/context"
 
 	pb "github.com/coreos/coreos-baremetal/matchbox/server/serverpb"
 )

matchbox/http/cloud.go

@@ -6,9 +6,9 @@ import (
 	"strings"
 	"time"
 
+	"context"
 	"github.com/Sirupsen/logrus"
 	cloudinit "github.com/coreos/coreos-cloudinit/config"
-	"golang.org/x/net/context"
 
 	"github.com/coreos/coreos-baremetal/matchbox/server"
 	pb "github.com/coreos/coreos-baremetal/matchbox/server/serverpb"

matchbox/http/cloud_test.go

@@ -5,9 +5,9 @@ import (
 	"net/http/httptest"
 	"testing"
 
+	"context"
 	logtest "github.com/Sirupsen/logrus/hooks/test"
 	"github.com/stretchr/testify/assert"
-	"golang.org/x/net/context"
 
 	"github.com/coreos/coreos-baremetal/matchbox/server"
 	"github.com/coreos/coreos-baremetal/matchbox/storage/storagepb"

matchbox/http/context.go

@@ -3,7 +3,7 @@ package http
 import (
 	"errors"
 
-	"golang.org/x/net/context"
+	"context"
 
 	"github.com/coreos/coreos-baremetal/matchbox/storage/storagepb"
 )

matchbox/http/context_test.go

@@ -3,8 +3,8 @@ package http
 import (
 	"testing"
 
+	"context"
 	"github.com/stretchr/testify/assert"
-	"golang.org/x/net/context"
 
 	"github.com/coreos/coreos-baremetal/matchbox/storage/storagepb"
 )

matchbox/http/ctxh.go

@@ -3,7 +3,7 @@ package http
 import (
 	"net/http"
 
-	"golang.org/x/net/context"
+	"context"
 )
 
 // ContextHandler defines a handler which receives a passed context.Context

matchbox/http/ctxh_test.go

@@ -6,8 +6,8 @@ import (
 	"net/http/httptest"
 	"testing"
 
+	"context"
 	"github.com/stretchr/testify/assert"
-	"golang.org/x/net/context"
 )
 
 func TestNewHandler(t *testing.T) {

matchbox/http/generic.go

@@ -6,8 +6,8 @@ import (
 	"strings"
 	"time"
 
+	"context"
 	"github.com/Sirupsen/logrus"
-	"golang.org/x/net/context"
 
 	"github.com/coreos/coreos-baremetal/matchbox/server"
 	pb "github.com/coreos/coreos-baremetal/matchbox/server/serverpb"

matchbox/http/generic_test.go

@@ -5,9 +5,9 @@ import (
 	"net/http/httptest"
 	"testing"
 
+	"context"
 	logtest "github.com/Sirupsen/logrus/hooks/test"
 	"github.com/stretchr/testify/assert"
-	"golang.org/x/net/context"
 
 	"github.com/coreos/coreos-baremetal/matchbox/server"
 	"github.com/coreos/coreos-baremetal/matchbox/storage/storagepb"

matchbox/http/grub.go

@@ -5,8 +5,8 @@ import (
 	"net/http"
 	"text/template"
 
+	"context"
 	"github.com/Sirupsen/logrus"
-	"golang.org/x/net/context"
 )
 
 var grubTemplate = template.Must(template.New("GRUB2 config").Parse(`default=0

matchbox/http/handlers.go

@@ -4,7 +4,7 @@ import (
 	"fmt"
 	"net/http"
 
-	"golang.org/x/net/context"
+	"context"
 
 	"github.com/coreos/coreos-baremetal/matchbox/server"
 	pb "github.com/coreos/coreos-baremetal/matchbox/server/serverpb"

matchbox/http/handlers_test.go

@@ -6,9 +6,9 @@ import (
 	"net/http/httptest"
 	"testing"
 
+	"context"
 	logtest "github.com/Sirupsen/logrus/hooks/test"
 	"github.com/stretchr/testify/assert"
-	"golang.org/x/net/context"
 
 	"github.com/coreos/coreos-baremetal/matchbox/server"
 	"github.com/coreos/coreos-baremetal/matchbox/storage/storagepb"

matchbox/http/ignition.go

@@ -5,10 +5,10 @@ import (
 	"net/http"
 	"strings"
 
+	"context"
 	"github.com/Sirupsen/logrus"
 	fuze "github.com/coreos/fuze/config"
 	ignition "github.com/coreos/ignition/config"
-	"golang.org/x/net/context"
 
 	"github.com/coreos/coreos-baremetal/matchbox/server"
 	pb "github.com/coreos/coreos-baremetal/matchbox/server/serverpb"

matchbox/http/ignition_test.go

@@ -5,9 +5,9 @@ import (
 	"net/http/httptest"
 	"testing"
 
+	"context"
 	logtest "github.com/Sirupsen/logrus/hooks/test"
 	"github.com/stretchr/testify/assert"
-	"golang.org/x/net/context"
 
 	"github.com/coreos/coreos-baremetal/matchbox/server"
 	"github.com/coreos/coreos-baremetal/matchbox/storage/storagepb"

matchbox/http/ipxe.go

@@ -6,8 +6,8 @@ import (
 	"net/http"
 	"text/template"
 
+	"context"
 	"github.com/Sirupsen/logrus"
-	"golang.org/x/net/context"
 )
 
 const ipxeBootstrap = `#!ipxe

matchbox/http/ipxe_test.go

@@ -5,9 +5,9 @@ import (
 	"net/http/httptest"
 	"testing"
 
+	"context"
 	logtest "github.com/Sirupsen/logrus/hooks/test"
 	"github.com/stretchr/testify/assert"
-	"golang.org/x/net/context"
 
 	"github.com/coreos/coreos-baremetal/matchbox/storage/storagepb"
 	fake "github.com/coreos/coreos-baremetal/matchbox/storage/testfakes"

matchbox/http/metadata.go

@@ -6,8 +6,8 @@ import (
 	"net/http"
 	"strings"
 
+	"context"
 	"github.com/Sirupsen/logrus"
-	"golang.org/x/net/context"
 )
 
 const plainContentType = "plain/text"

matchbox/http/metadata_test.go

@@ -7,9 +7,9 @@ import (
 	"strings"
 	"testing"
 
+	"context"
 	logtest "github.com/Sirupsen/logrus/hooks/test"
 	"github.com/stretchr/testify/assert"
-	"golang.org/x/net/context"
 
 	"github.com/coreos/coreos-baremetal/matchbox/storage/storagepb"
 )

matchbox/http/pixiecore.go

@@ -4,8 +4,8 @@ import (
 	"net/http"
 	"path/filepath"
 
+	"context"
 	"github.com/Sirupsen/logrus"
-	"golang.org/x/net/context"
 
 	"github.com/coreos/coreos-baremetal/matchbox/server"
 	pb "github.com/coreos/coreos-baremetal/matchbox/server/serverpb"

matchbox/http/pixiecore_test.go

@@ -5,9 +5,9 @@ import (
 	"net/http/httptest"
 	"testing"
 
+	"context"
 	logtest "github.com/Sirupsen/logrus/hooks/test"
 	"github.com/stretchr/testify/assert"
-	"golang.org/x/net/context"
 
 	"github.com/coreos/coreos-baremetal/matchbox/server"
 	"github.com/coreos/coreos-baremetal/matchbox/storage/storagepb"

matchbox/server/server.go

@@ -4,7 +4,7 @@ import (
 	"errors"
 	"sort"
 
-	"golang.org/x/net/context"
+	"context"
 
 	pb "github.com/coreos/coreos-baremetal/matchbox/server/serverpb"
 	"github.com/coreos/coreos-baremetal/matchbox/storage"

matchbox/server/server_test.go

@@ -3,8 +3,8 @@ package server
 import (
 	"testing"
 
+	"context"
 	"github.com/stretchr/testify/assert"
-	"golang.org/x/net/context"
 
 	pb "github.com/coreos/coreos-baremetal/matchbox/server/serverpb"
 	"github.com/coreos/coreos-baremetal/matchbox/storage"