Update imports from bootcfg to matchbox

cmd/bootcfg/main.go

@@ -11,13 +11,13 @@ import (
 	"github.com/Sirupsen/logrus"
 	"github.com/coreos/pkg/flagutil"
 
-	web "github.com/coreos/coreos-baremetal/bootcfg/http"
-	"github.com/coreos/coreos-baremetal/bootcfg/rpc"
-	"github.com/coreos/coreos-baremetal/bootcfg/server"
-	"github.com/coreos/coreos-baremetal/bootcfg/sign"
-	"github.com/coreos/coreos-baremetal/bootcfg/storage"
-	"github.com/coreos/coreos-baremetal/bootcfg/tlsutil"
-	"github.com/coreos/coreos-baremetal/bootcfg/version"
+	web "github.com/coreos/coreos-baremetal/matchbox/http"
+	"github.com/coreos/coreos-baremetal/matchbox/rpc"
+	"github.com/coreos/coreos-baremetal/matchbox/server"
+	"github.com/coreos/coreos-baremetal/matchbox/sign"
+	"github.com/coreos/coreos-baremetal/matchbox/storage"
+	"github.com/coreos/coreos-baremetal/matchbox/tlsutil"
+	"github.com/coreos/coreos-baremetal/matchbox/version"
 )
 
 var (

cmd/bootcmd/main.go

@@ -1,6 +1,6 @@
 package main
 
-import "github.com/coreos/coreos-baremetal/bootcfg/cli"
+import "github.com/coreos/coreos-baremetal/matchbox/cli"
 
 func main() {
 	cli.Execute()

matchbox/cli/group_create.go

@@ -6,8 +6,8 @@ import (
 	"github.com/spf13/cobra"
 	"golang.org/x/net/context"
 
-	pb "github.com/coreos/coreos-baremetal/bootcfg/server/serverpb"
-	"github.com/coreos/coreos-baremetal/bootcfg/storage/storagepb"
+	pb "github.com/coreos/coreos-baremetal/matchbox/server/serverpb"
+	"github.com/coreos/coreos-baremetal/matchbox/storage/storagepb"
 )
 
 // groupPutCmd creates and updates Groups.

matchbox/cli/group_describe.go

@@ -7,7 +7,7 @@ import (
 	"github.com/spf13/cobra"
 	"golang.org/x/net/context"
 
-	pb "github.com/coreos/coreos-baremetal/bootcfg/server/serverpb"
+	pb "github.com/coreos/coreos-baremetal/matchbox/server/serverpb"
 )
 
 // groupDescribeCmd describes a Group.

matchbox/cli/group_list.go

@@ -7,7 +7,7 @@ import (
 	"github.com/spf13/cobra"
 	"golang.org/x/net/context"
 
-	pb "github.com/coreos/coreos-baremetal/bootcfg/server/serverpb"
+	pb "github.com/coreos/coreos-baremetal/matchbox/server/serverpb"
 )
 
 // groupListCmd lists Groups.

matchbox/cli/ignition_create.go

@@ -7,7 +7,7 @@ import (
 	"github.com/spf13/cobra"
 	"golang.org/x/net/context"
 
-	pb "github.com/coreos/coreos-baremetal/bootcfg/server/serverpb"
+	pb "github.com/coreos/coreos-baremetal/matchbox/server/serverpb"
 )
 
 // ignitionPutCmd creates and updates Ignition templates.

matchbox/cli/profile_create.go

@@ -6,8 +6,8 @@ import (
 	"github.com/spf13/cobra"
 	"golang.org/x/net/context"
 
-	pb "github.com/coreos/coreos-baremetal/bootcfg/server/serverpb"
-	"github.com/coreos/coreos-baremetal/bootcfg/storage/storagepb"
+	pb "github.com/coreos/coreos-baremetal/matchbox/server/serverpb"
+	"github.com/coreos/coreos-baremetal/matchbox/storage/storagepb"
 )
 
 // profilePutCmd creates and updates Profiles.

matchbox/cli/profile_describe.go

@@ -7,7 +7,7 @@ import (
 	"github.com/spf13/cobra"
 	"golang.org/x/net/context"
 
-	pb "github.com/coreos/coreos-baremetal/bootcfg/server/serverpb"
+	pb "github.com/coreos/coreos-baremetal/matchbox/server/serverpb"
 )
 
 // profileDescribeCmd describes a Profile.

matchbox/cli/profile_list.go

@@ -7,7 +7,7 @@ import (
 	"github.com/spf13/cobra"
 	"golang.org/x/net/context"
 
-	pb "github.com/coreos/coreos-baremetal/bootcfg/server/serverpb"
+	pb "github.com/coreos/coreos-baremetal/matchbox/server/serverpb"
 )
 
 // profileListCmd lists Profiles.

matchbox/cli/root.go

@@ -6,8 +6,8 @@ import (
 
 	"github.com/spf13/cobra"
 
-	"github.com/coreos/coreos-baremetal/bootcfg/client"
-	"github.com/coreos/coreos-baremetal/bootcfg/tlsutil"
+	"github.com/coreos/coreos-baremetal/matchbox/client"
+	"github.com/coreos/coreos-baremetal/matchbox/tlsutil"
 )
 
 var (

matchbox/client/client.go

@@ -8,7 +8,7 @@ import (
 	"google.golang.org/grpc"
 	"google.golang.org/grpc/credentials"
 
-	"github.com/coreos/coreos-baremetal/bootcfg/rpc/rpcpb"
+	"github.com/coreos/coreos-baremetal/matchbox/rpc/rpcpb"
 )
 
 var (

matchbox/http/cloud.go

@@ -10,8 +10,8 @@ import (
 	cloudinit "github.com/coreos/coreos-cloudinit/config"
 	"golang.org/x/net/context"
 
-	"github.com/coreos/coreos-baremetal/bootcfg/server"
-	pb "github.com/coreos/coreos-baremetal/bootcfg/server/serverpb"
+	"github.com/coreos/coreos-baremetal/matchbox/server"
+	pb "github.com/coreos/coreos-baremetal/matchbox/server/serverpb"
 )
 
 // CloudConfig defines a cloud-init config.

matchbox/http/cloud_test.go

@@ -9,9 +9,9 @@ import (
 	"github.com/stretchr/testify/assert"
 	"golang.org/x/net/context"
 
-	"github.com/coreos/coreos-baremetal/bootcfg/server"
-	"github.com/coreos/coreos-baremetal/bootcfg/storage/storagepb"
-	fake "github.com/coreos/coreos-baremetal/bootcfg/storage/testfakes"
+	"github.com/coreos/coreos-baremetal/matchbox/server"
+	"github.com/coreos/coreos-baremetal/matchbox/storage/storagepb"
+	fake "github.com/coreos/coreos-baremetal/matchbox/storage/testfakes"
 )
 
 func TestCloudHandler(t *testing.T) {

matchbox/http/context.go

@@ -5,7 +5,7 @@ import (
 
 	"golang.org/x/net/context"
 
-	"github.com/coreos/coreos-baremetal/bootcfg/storage/storagepb"
+	"github.com/coreos/coreos-baremetal/matchbox/storage/storagepb"
 )
 
 // unexported key prevents collisions

matchbox/http/context_test.go

@@ -6,7 +6,7 @@ import (
 	"github.com/stretchr/testify/assert"
 	"golang.org/x/net/context"
 
-	"github.com/coreos/coreos-baremetal/bootcfg/storage/storagepb"
+	"github.com/coreos/coreos-baremetal/matchbox/storage/storagepb"
 )
 
 func TestContextProfile(t *testing.T) {

matchbox/http/generic.go

@@ -9,8 +9,8 @@ import (
 	"github.com/Sirupsen/logrus"
 	"golang.org/x/net/context"
 
-	"github.com/coreos/coreos-baremetal/bootcfg/server"
-	pb "github.com/coreos/coreos-baremetal/bootcfg/server/serverpb"
+	"github.com/coreos/coreos-baremetal/matchbox/server"
+	pb "github.com/coreos/coreos-baremetal/matchbox/server/serverpb"
 )
 
 // genericHandler returns a handler that responds with the generic config

matchbox/http/generic_test.go

@@ -9,9 +9,9 @@ import (
 	"github.com/stretchr/testify/assert"
 	"golang.org/x/net/context"
 
-	"github.com/coreos/coreos-baremetal/bootcfg/server"
-	"github.com/coreos/coreos-baremetal/bootcfg/storage/storagepb"
-	fake "github.com/coreos/coreos-baremetal/bootcfg/storage/testfakes"
+	"github.com/coreos/coreos-baremetal/matchbox/server"
+	"github.com/coreos/coreos-baremetal/matchbox/storage/storagepb"
+	fake "github.com/coreos/coreos-baremetal/matchbox/storage/testfakes"
 )
 
 func TestGenericHandler(t *testing.T) {

matchbox/http/handlers.go

@@ -6,8 +6,8 @@ import (
 
 	"golang.org/x/net/context"
 
-	"github.com/coreos/coreos-baremetal/bootcfg/server"
-	pb "github.com/coreos/coreos-baremetal/bootcfg/server/serverpb"
+	"github.com/coreos/coreos-baremetal/matchbox/server"
+	pb "github.com/coreos/coreos-baremetal/matchbox/server/serverpb"
 )
 
 // homeHandler shows the server name for rooted requests. Otherwise, a 404 is

matchbox/http/handlers_test.go

@@ -10,9 +10,9 @@ import (
 	"github.com/stretchr/testify/assert"
 	"golang.org/x/net/context"
 
-	"github.com/coreos/coreos-baremetal/bootcfg/server"
-	"github.com/coreos/coreos-baremetal/bootcfg/storage/storagepb"
-	fake "github.com/coreos/coreos-baremetal/bootcfg/storage/testfakes"
+	"github.com/coreos/coreos-baremetal/matchbox/server"
+	"github.com/coreos/coreos-baremetal/matchbox/storage/storagepb"
+	fake "github.com/coreos/coreos-baremetal/matchbox/storage/testfakes"
 )
 
 func TestSelectGroup(t *testing.T) {

matchbox/http/ignition.go

@@ -10,8 +10,8 @@ import (
 	ignition "github.com/coreos/ignition/config"
 	"golang.org/x/net/context"
 
-	"github.com/coreos/coreos-baremetal/bootcfg/server"
-	pb "github.com/coreos/coreos-baremetal/bootcfg/server/serverpb"
+	"github.com/coreos/coreos-baremetal/matchbox/server"
+	pb "github.com/coreos/coreos-baremetal/matchbox/server/serverpb"
 )
 
 // ignitionHandler returns a handler that responds with the Ignition config

matchbox/http/ignition_test.go

@@ -9,9 +9,9 @@ import (
 	"github.com/stretchr/testify/assert"
 	"golang.org/x/net/context"
 
-	"github.com/coreos/coreos-baremetal/bootcfg/server"
-	"github.com/coreos/coreos-baremetal/bootcfg/storage/storagepb"
-	fake "github.com/coreos/coreos-baremetal/bootcfg/storage/testfakes"
+	"github.com/coreos/coreos-baremetal/matchbox/server"
+	"github.com/coreos/coreos-baremetal/matchbox/storage/storagepb"
+	fake "github.com/coreos/coreos-baremetal/matchbox/storage/testfakes"
 )
 
 func TestIgnitionHandler_V2JSON(t *testing.T) {

matchbox/http/ipxe_test.go

@@ -9,8 +9,8 @@ import (
 	"github.com/stretchr/testify/assert"
 	"golang.org/x/net/context"
 
-	"github.com/coreos/coreos-baremetal/bootcfg/storage/storagepb"
-	fake "github.com/coreos/coreos-baremetal/bootcfg/storage/testfakes"
+	"github.com/coreos/coreos-baremetal/matchbox/storage/storagepb"
+	fake "github.com/coreos/coreos-baremetal/matchbox/storage/testfakes"
 )
 
 func TestIPXEInspect(t *testing.T) {

matchbox/http/metadata_test.go

@@ -11,7 +11,7 @@ import (
 	"github.com/stretchr/testify/assert"
 	"golang.org/x/net/context"
 
-	"github.com/coreos/coreos-baremetal/bootcfg/storage/storagepb"
+	"github.com/coreos/coreos-baremetal/matchbox/storage/storagepb"
 )
 
 func TestMetadataHandler(t *testing.T) {

matchbox/http/parse.go

@@ -8,7 +8,7 @@ import (
 
 	"github.com/Sirupsen/logrus"
 
-	"github.com/coreos/coreos-baremetal/bootcfg/storage/storagepb"
+	"github.com/coreos/coreos-baremetal/matchbox/storage/storagepb"
 )
 
 // collectVariables collects group selectors, metadata, and request-scoped

matchbox/http/pixiecore.go

@@ -7,8 +7,8 @@ import (
 	"github.com/Sirupsen/logrus"
 	"golang.org/x/net/context"
 
-	"github.com/coreos/coreos-baremetal/bootcfg/server"
-	pb "github.com/coreos/coreos-baremetal/bootcfg/server/serverpb"
+	"github.com/coreos/coreos-baremetal/matchbox/server"
+	pb "github.com/coreos/coreos-baremetal/matchbox/server/serverpb"
 )
 
 // pixiecoreHandler returns a handler that renders the boot config JSON for

matchbox/http/pixiecore_test.go

@@ -9,9 +9,9 @@ import (
 	"github.com/stretchr/testify/assert"
 	"golang.org/x/net/context"
 
-	"github.com/coreos/coreos-baremetal/bootcfg/server"
-	"github.com/coreos/coreos-baremetal/bootcfg/storage/storagepb"
-	fake "github.com/coreos/coreos-baremetal/bootcfg/storage/testfakes"
+	"github.com/coreos/coreos-baremetal/matchbox/server"
+	"github.com/coreos/coreos-baremetal/matchbox/storage/storagepb"
+	fake "github.com/coreos/coreos-baremetal/matchbox/storage/testfakes"
 )
 
 func TestPixiecoreHandler(t *testing.T) {

matchbox/http/server.go

@@ -5,8 +5,8 @@ import (
 
 	"github.com/Sirupsen/logrus"
 
-	"github.com/coreos/coreos-baremetal/bootcfg/server"
-	"github.com/coreos/coreos-baremetal/bootcfg/sign"
+	"github.com/coreos/coreos-baremetal/matchbox/server"
+	"github.com/coreos/coreos-baremetal/matchbox/sign"
 )
 
 // Config configures a Server.

matchbox/http/test_fixtures.go

@@ -1,7 +1,7 @@
 package http
 
 import (
-	"github.com/coreos/coreos-baremetal/bootcfg/storage/storagepb"
+	"github.com/coreos/coreos-baremetal/matchbox/storage/storagepb"
 )
 
 var (

matchbox/rpc/errors.go

@@ -4,7 +4,7 @@ import (
 	"google.golang.org/grpc"
 	"google.golang.org/grpc/codes"
 
-	"github.com/coreos/coreos-baremetal/bootcfg/server"
+	"github.com/coreos/coreos-baremetal/matchbox/server"
 )
 
 var (

matchbox/rpc/errors_test.go

@@ -7,7 +7,7 @@ import (
 	"github.com/stretchr/testify/assert"
 	"google.golang.org/grpc/codes"
 
-	"github.com/coreos/coreos-baremetal/bootcfg/server"
+	"github.com/coreos/coreos-baremetal/matchbox/server"
 )
 
 func TestGRPCError(t *testing.T) {

matchbox/rpc/groups.go

@@ -3,9 +3,9 @@ package rpc
 import (
 	"golang.org/x/net/context"
 
-	"github.com/coreos/coreos-baremetal/bootcfg/rpc/rpcpb"
-	"github.com/coreos/coreos-baremetal/bootcfg/server"
-	pb "github.com/coreos/coreos-baremetal/bootcfg/server/serverpb"
+	"github.com/coreos/coreos-baremetal/matchbox/rpc/rpcpb"
+	"github.com/coreos/coreos-baremetal/matchbox/server"
+	pb "github.com/coreos/coreos-baremetal/matchbox/server/serverpb"
 )
 
 // groupServer takes a bootcfg Server and implements a gRPC GroupsServer.

matchbox/rpc/grpc.go

@@ -6,8 +6,8 @@ import (
 	"google.golang.org/grpc"
 	"google.golang.org/grpc/credentials"
 
-	"github.com/coreos/coreos-baremetal/bootcfg/rpc/rpcpb"
-	"github.com/coreos/coreos-baremetal/bootcfg/server"
+	"github.com/coreos/coreos-baremetal/matchbox/rpc/rpcpb"
+	"github.com/coreos/coreos-baremetal/matchbox/server"
 )
 
 // NewServer wraps the bootcfg Server to return a new gRPC Server.

matchbox/rpc/ignition.go

@@ -3,9 +3,9 @@ package rpc
 import (
 	"golang.org/x/net/context"
 
-	"github.com/coreos/coreos-baremetal/bootcfg/rpc/rpcpb"
-	"github.com/coreos/coreos-baremetal/bootcfg/server"
-	pb "github.com/coreos/coreos-baremetal/bootcfg/server/serverpb"
+	"github.com/coreos/coreos-baremetal/matchbox/rpc/rpcpb"
+	"github.com/coreos/coreos-baremetal/matchbox/server"
+	pb "github.com/coreos/coreos-baremetal/matchbox/server/serverpb"
 )
 
 // ignitionServer takes a bootcfg Server and implements a gRPC IgnitionServer.

matchbox/rpc/profiles.go

@@ -3,9 +3,9 @@ package rpc
 import (
 	"golang.org/x/net/context"
 
-	"github.com/coreos/coreos-baremetal/bootcfg/rpc/rpcpb"
-	"github.com/coreos/coreos-baremetal/bootcfg/server"
-	pb "github.com/coreos/coreos-baremetal/bootcfg/server/serverpb"
+	"github.com/coreos/coreos-baremetal/matchbox/rpc/rpcpb"
+	"github.com/coreos/coreos-baremetal/matchbox/server"
+	pb "github.com/coreos/coreos-baremetal/matchbox/server/serverpb"
 )
 
 // profileServer takes a bootcfg Server and implements a gRPC ProfilesServer.

matchbox/rpc/rpcpb/rpc.pb.go

@@ -15,7 +15,7 @@ package rpcpb
 import proto "github.com/golang/protobuf/proto"
 import fmt "fmt"
 import math "math"
-import serverpb "github.com/coreos/coreos-baremetal/bootcfg/server/serverpb"
+import serverpb "github.com/coreos/coreos-baremetal/matchbox/server/serverpb"
 
 import (
 	context "golang.org/x/net/context"

matchbox/rpc/select.go

@@ -3,9 +3,9 @@ package rpc
 import (
 	"golang.org/x/net/context"
 
-	"github.com/coreos/coreos-baremetal/bootcfg/rpc/rpcpb"
-	"github.com/coreos/coreos-baremetal/bootcfg/server"
-	pb "github.com/coreos/coreos-baremetal/bootcfg/server/serverpb"
+	"github.com/coreos/coreos-baremetal/matchbox/rpc/rpcpb"
+	"github.com/coreos/coreos-baremetal/matchbox/server"
+	pb "github.com/coreos/coreos-baremetal/matchbox/server/serverpb"
 )
 
 // selectServer wraps a bootcfg Server to be suitable for gRPC registration.

matchbox/server/server.go

@@ -6,9 +6,9 @@ import (
 
 	"golang.org/x/net/context"
 
-	pb "github.com/coreos/coreos-baremetal/bootcfg/server/serverpb"
-	"github.com/coreos/coreos-baremetal/bootcfg/storage"
-	"github.com/coreos/coreos-baremetal/bootcfg/storage/storagepb"
+	pb "github.com/coreos/coreos-baremetal/matchbox/server/serverpb"
+	"github.com/coreos/coreos-baremetal/matchbox/storage"
+	"github.com/coreos/coreos-baremetal/matchbox/storage/storagepb"
 )
 
 // Possible service errors

matchbox/server/server_test.go

@@ -6,10 +6,10 @@ import (
 	"github.com/stretchr/testify/assert"
 	"golang.org/x/net/context"
 
-	pb "github.com/coreos/coreos-baremetal/bootcfg/server/serverpb"
-	"github.com/coreos/coreos-baremetal/bootcfg/storage"
-	"github.com/coreos/coreos-baremetal/bootcfg/storage/storagepb"
-	fake "github.com/coreos/coreos-baremetal/bootcfg/storage/testfakes"
+	pb "github.com/coreos/coreos-baremetal/matchbox/server/serverpb"
+	"github.com/coreos/coreos-baremetal/matchbox/storage"
+	"github.com/coreos/coreos-baremetal/matchbox/storage/storagepb"
+	fake "github.com/coreos/coreos-baremetal/matchbox/storage/testfakes"
 )
 
 func TestSelectGroup(t *testing.T) {

matchbox/server/serverpb/messages.pb.go

@@ -33,7 +33,7 @@ package serverpb
 import proto "github.com/golang/protobuf/proto"
 import fmt "fmt"
 import math "math"
-import storagepb "github.com/coreos/coreos-baremetal/bootcfg/storage/storagepb"
+import storagepb "github.com/coreos/coreos-baremetal/matchbox/storage/storagepb"
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal

matchbox/storage/filestore.go

@@ -5,7 +5,7 @@ import (
 	"path/filepath"
 	"strings"
 
-	"github.com/coreos/coreos-baremetal/bootcfg/storage/storagepb"
+	"github.com/coreos/coreos-baremetal/matchbox/storage/storagepb"
 )
 
 // Config initializes a fileStore.

matchbox/storage/filestore_test.go

@@ -9,8 +9,8 @@ import (
 
 	"github.com/stretchr/testify/assert"
 
-	"github.com/coreos/coreos-baremetal/bootcfg/storage/storagepb"
-	fake "github.com/coreos/coreos-baremetal/bootcfg/storage/testfakes"
+	"github.com/coreos/coreos-baremetal/matchbox/storage/storagepb"
+	fake "github.com/coreos/coreos-baremetal/matchbox/storage/testfakes"
 )
 
 func TestGroupPut(t *testing.T) {

matchbox/storage/storage.go

@@ -3,7 +3,7 @@ package storage
 import (
 	"errors"
 
-	"github.com/coreos/coreos-baremetal/bootcfg/storage/storagepb"
+	"github.com/coreos/coreos-baremetal/matchbox/storage/storagepb"
 )
 
 // Storage errors

matchbox/storage/testfakes/broken_store.go

@@ -3,7 +3,7 @@ package testfakes
 import (
 	"errors"
 
-	"github.com/coreos/coreos-baremetal/bootcfg/storage/storagepb"
+	"github.com/coreos/coreos-baremetal/matchbox/storage/storagepb"
 )
 
 var (

matchbox/storage/testfakes/empty_store.go

@@ -3,7 +3,7 @@ package testfakes
 import (
 	"fmt"
 
-	"github.com/coreos/coreos-baremetal/bootcfg/storage/storagepb"
+	"github.com/coreos/coreos-baremetal/matchbox/storage/storagepb"
 )
 
 // EmptyStore is used for testing purposes.

matchbox/storage/testfakes/fixed_store.go

@@ -3,7 +3,7 @@ package testfakes
 import (
 	"fmt"
 
-	"github.com/coreos/coreos-baremetal/bootcfg/storage/storagepb"
+	"github.com/coreos/coreos-baremetal/matchbox/storage/storagepb"
 )
 
 // FixedStore is used for testing purposes.

matchbox/storage/testfakes/fixtures.go

@@ -1,7 +1,7 @@
 package testfakes
 
 import (
-	"github.com/coreos/coreos-baremetal/bootcfg/storage/storagepb"
+	"github.com/coreos/coreos-baremetal/matchbox/storage/storagepb"
 )
 
 var (