diff --git a/cmd/bootcfg/main.go b/cmd/bootcfg/main.go index 33a6c7ff..009e2547 100644 --- a/cmd/bootcfg/main.go +++ b/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 ( diff --git a/cmd/bootcmd/main.go b/cmd/bootcmd/main.go index 212e1b4b..84a48db7 100644 --- a/cmd/bootcmd/main.go +++ b/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() diff --git a/matchbox/cli/group_create.go b/matchbox/cli/group_create.go index 613866b7..441be245 100644 --- a/matchbox/cli/group_create.go +++ b/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. diff --git a/matchbox/cli/group_describe.go b/matchbox/cli/group_describe.go index 80768a1c..5418c739 100644 --- a/matchbox/cli/group_describe.go +++ b/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. diff --git a/matchbox/cli/group_list.go b/matchbox/cli/group_list.go index 65970a51..47421232 100644 --- a/matchbox/cli/group_list.go +++ b/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. diff --git a/matchbox/cli/ignition_create.go b/matchbox/cli/ignition_create.go index 04eb84cd..efced277 100644 --- a/matchbox/cli/ignition_create.go +++ b/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. diff --git a/matchbox/cli/profile_create.go b/matchbox/cli/profile_create.go index 0eda6c5c..14c53863 100644 --- a/matchbox/cli/profile_create.go +++ b/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. diff --git a/matchbox/cli/profile_describe.go b/matchbox/cli/profile_describe.go index 0041ea5b..442553c8 100644 --- a/matchbox/cli/profile_describe.go +++ b/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. diff --git a/matchbox/cli/profile_list.go b/matchbox/cli/profile_list.go index fa4b7f15..9c5ea0b6 100644 --- a/matchbox/cli/profile_list.go +++ b/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. diff --git a/matchbox/cli/root.go b/matchbox/cli/root.go index d962c51a..47ea18ff 100644 --- a/matchbox/cli/root.go +++ b/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 ( diff --git a/matchbox/client/client.go b/matchbox/client/client.go index 06cc69d2..0cab7cd5 100644 --- a/matchbox/client/client.go +++ b/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 ( diff --git a/matchbox/http/cloud.go b/matchbox/http/cloud.go index a59270ad..79b9a811 100644 --- a/matchbox/http/cloud.go +++ b/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. diff --git a/matchbox/http/cloud_test.go b/matchbox/http/cloud_test.go index ff8ca460..4b3c7b9f 100644 --- a/matchbox/http/cloud_test.go +++ b/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) { diff --git a/matchbox/http/context.go b/matchbox/http/context.go index 3d2974f8..02513720 100644 --- a/matchbox/http/context.go +++ b/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 diff --git a/matchbox/http/context_test.go b/matchbox/http/context_test.go index 1ba577e1..3b88551a 100644 --- a/matchbox/http/context_test.go +++ b/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) { diff --git a/matchbox/http/generic.go b/matchbox/http/generic.go index 99431823..650b1b67 100644 --- a/matchbox/http/generic.go +++ b/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 diff --git a/matchbox/http/generic_test.go b/matchbox/http/generic_test.go index 8943194c..9bf9c0b1 100644 --- a/matchbox/http/generic_test.go +++ b/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) { diff --git a/matchbox/http/handlers.go b/matchbox/http/handlers.go index d3b46ebd..5bccff95 100644 --- a/matchbox/http/handlers.go +++ b/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 diff --git a/matchbox/http/handlers_test.go b/matchbox/http/handlers_test.go index ddcf1cc2..14a8235c 100644 --- a/matchbox/http/handlers_test.go +++ b/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) { diff --git a/matchbox/http/ignition.go b/matchbox/http/ignition.go index 8dd99187..3cd0cba2 100644 --- a/matchbox/http/ignition.go +++ b/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 diff --git a/matchbox/http/ignition_test.go b/matchbox/http/ignition_test.go index faa8e00a..12f152aa 100644 --- a/matchbox/http/ignition_test.go +++ b/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) { diff --git a/matchbox/http/ipxe_test.go b/matchbox/http/ipxe_test.go index bc87fd50..422390ca 100644 --- a/matchbox/http/ipxe_test.go +++ b/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) { diff --git a/matchbox/http/metadata_test.go b/matchbox/http/metadata_test.go index e677da88..085d02e0 100644 --- a/matchbox/http/metadata_test.go +++ b/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) { diff --git a/matchbox/http/parse.go b/matchbox/http/parse.go index 0b0a2747..352bec31 100644 --- a/matchbox/http/parse.go +++ b/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 diff --git a/matchbox/http/pixiecore.go b/matchbox/http/pixiecore.go index 53cb3062..4c4499ce 100644 --- a/matchbox/http/pixiecore.go +++ b/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 diff --git a/matchbox/http/pixiecore_test.go b/matchbox/http/pixiecore_test.go index 00d1292f..1ff8da33 100644 --- a/matchbox/http/pixiecore_test.go +++ b/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) { diff --git a/matchbox/http/server.go b/matchbox/http/server.go index aa6a73c1..e508459b 100644 --- a/matchbox/http/server.go +++ b/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. diff --git a/matchbox/http/test_fixtures.go b/matchbox/http/test_fixtures.go index 0f1186bc..792d6231 100644 --- a/matchbox/http/test_fixtures.go +++ b/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 ( diff --git a/matchbox/rpc/errors.go b/matchbox/rpc/errors.go index e64f4c96..6d789959 100644 --- a/matchbox/rpc/errors.go +++ b/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 ( diff --git a/matchbox/rpc/errors_test.go b/matchbox/rpc/errors_test.go index 974c94dd..da4796aa 100644 --- a/matchbox/rpc/errors_test.go +++ b/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) { diff --git a/matchbox/rpc/groups.go b/matchbox/rpc/groups.go index ce3e4931..250b8a0e 100644 --- a/matchbox/rpc/groups.go +++ b/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. diff --git a/matchbox/rpc/grpc.go b/matchbox/rpc/grpc.go index c4303b44..ae8560dd 100644 --- a/matchbox/rpc/grpc.go +++ b/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. diff --git a/matchbox/rpc/ignition.go b/matchbox/rpc/ignition.go index ca351f87..59b6c90c 100644 --- a/matchbox/rpc/ignition.go +++ b/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. diff --git a/matchbox/rpc/profiles.go b/matchbox/rpc/profiles.go index 05ee711b..f5fc4dd9 100644 --- a/matchbox/rpc/profiles.go +++ b/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. diff --git a/matchbox/rpc/rpcpb/rpc.pb.go b/matchbox/rpc/rpcpb/rpc.pb.go index ae70e571..84346bfb 100644 --- a/matchbox/rpc/rpcpb/rpc.pb.go +++ b/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" diff --git a/matchbox/rpc/select.go b/matchbox/rpc/select.go index 1c8c65b8..01c9b484 100644 --- a/matchbox/rpc/select.go +++ b/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. diff --git a/matchbox/server/server.go b/matchbox/server/server.go index bc89596a..fa487ea6 100644 --- a/matchbox/server/server.go +++ b/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 diff --git a/matchbox/server/server_test.go b/matchbox/server/server_test.go index b36bf49d..3b978630 100644 --- a/matchbox/server/server_test.go +++ b/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) { diff --git a/matchbox/server/serverpb/messages.pb.go b/matchbox/server/serverpb/messages.pb.go index 689387c0..882a2810 100644 --- a/matchbox/server/serverpb/messages.pb.go +++ b/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 diff --git a/matchbox/storage/filestore.go b/matchbox/storage/filestore.go index c0d110c3..c61eb1e4 100644 --- a/matchbox/storage/filestore.go +++ b/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. diff --git a/matchbox/storage/filestore_test.go b/matchbox/storage/filestore_test.go index 69095351..986d3831 100644 --- a/matchbox/storage/filestore_test.go +++ b/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) { diff --git a/matchbox/storage/storage.go b/matchbox/storage/storage.go index 315efd58..dcd4f102 100644 --- a/matchbox/storage/storage.go +++ b/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 diff --git a/matchbox/storage/testfakes/broken_store.go b/matchbox/storage/testfakes/broken_store.go index 369a5198..1ce003d5 100644 --- a/matchbox/storage/testfakes/broken_store.go +++ b/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 ( diff --git a/matchbox/storage/testfakes/empty_store.go b/matchbox/storage/testfakes/empty_store.go index 34e64f3e..a8f52ea8 100644 --- a/matchbox/storage/testfakes/empty_store.go +++ b/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. diff --git a/matchbox/storage/testfakes/fixed_store.go b/matchbox/storage/testfakes/fixed_store.go index 734b012a..5942a6d2 100644 --- a/matchbox/storage/testfakes/fixed_store.go +++ b/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. diff --git a/matchbox/storage/testfakes/fixtures.go b/matchbox/storage/testfakes/fixtures.go index 3e8eb9d2..907ca5f9 100644 --- a/matchbox/storage/testfakes/fixtures.go +++ b/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 (