From 8a4da0cf7b44c0253841afb85e5e201612e00496 Mon Sep 17 00:00:00 2001 From: Dalton Hubble Date: Thu, 2 May 2019 21:56:06 -0700 Subject: [PATCH] Rename Go module/packages org to poseidon * Matchbox has moved to a new home in Poseidon * Update Makefile so container image name uses poseidon instead of coreos * Publish container images to quay.io/poseidon/matchbox --- CHANGES.md | 2 ++ Makefile | 8 ++++---- cmd/bootcmd/main.go | 2 +- cmd/matchbox/main.go | 14 +++++++------- go.mod | 2 +- matchbox/cli/generic_create.go | 2 +- matchbox/cli/group_create.go | 4 ++-- matchbox/cli/group_describe.go | 2 +- matchbox/cli/group_list.go | 2 +- matchbox/cli/ignition_create.go | 2 +- matchbox/cli/profile_create.go | 4 ++-- matchbox/cli/profile_describe.go | 2 +- matchbox/cli/profile_list.go | 2 +- matchbox/cli/root.go | 4 ++-- matchbox/client/client.go | 2 +- matchbox/http/cloud.go | 6 +++--- matchbox/http/cloud_test.go | 6 +++--- matchbox/http/context.go | 2 +- matchbox/http/context_test.go | 2 +- matchbox/http/generic.go | 4 ++-- matchbox/http/generic_test.go | 6 +++--- matchbox/http/grub_test.go | 2 +- matchbox/http/handlers.go | 4 ++-- matchbox/http/handlers_test.go | 6 +++--- matchbox/http/ignition.go | 4 ++-- matchbox/http/ignition_test.go | 6 +++--- matchbox/http/ipxe_test.go | 4 ++-- matchbox/http/metadata_test.go | 2 +- matchbox/http/parse.go | 2 +- matchbox/http/server.go | 4 ++-- matchbox/http/test_fixtures.go | 2 +- matchbox/rpc/errors.go | 2 +- matchbox/rpc/errors_test.go | 2 +- matchbox/rpc/generic.go | 6 +++--- matchbox/rpc/groups.go | 6 +++--- matchbox/rpc/grpc.go | 4 ++-- matchbox/rpc/ignition.go | 6 +++--- matchbox/rpc/profiles.go | 6 +++--- matchbox/rpc/rpcpb/rpc.pb.go | 2 +- matchbox/rpc/select.go | 6 +++--- matchbox/server/server.go | 6 +++--- matchbox/server/server_test.go | 8 ++++---- matchbox/server/serverpb/messages.pb.go | 2 +- matchbox/storage/filestore.go | 2 +- matchbox/storage/filestore_test.go | 4 ++-- matchbox/storage/storage.go | 2 +- matchbox/storage/testfakes/broken_store.go | 2 +- matchbox/storage/testfakes/empty_store.go | 2 +- matchbox/storage/testfakes/fixed_store.go | 2 +- matchbox/storage/testfakes/fixtures.go | 2 +- 50 files changed, 95 insertions(+), 93 deletions(-) diff --git a/CHANGES.md b/CHANGES.md index 44d391e0..73967c7b 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -4,6 +4,8 @@ Notable changes between releases. ## Latest +* Transfer Matchbox from coreos to poseidon GitHub Org +* Publish container images at [quay.io/poseidon/matchbox](https://quay.io/repository/poseidon/matchbox) * Build Matchbox with Go v1.11.5 for images and binaries * Update container image base from alpine:3.6 to alpine:3.9 * Render Container Linux Configs as Ignition v2.2.0 diff --git a/Makefile b/Makefile index f00bb8ab..47d807a3 100644 --- a/Makefile +++ b/Makefile @@ -3,11 +3,11 @@ export GO111MODULE=on export GOFLAGS=-mod=vendor VERSION=$(shell git describe --tags --match=v* --always --dirty) -LD_FLAGS="-w -X github.com/coreos/matchbox/matchbox/version.Version=$(VERSION)" +LD_FLAGS="-w -X github.com/poseidon/matchbox/matchbox/version.Version=$(VERSION)" -REPO=github.com/coreos/matchbox -LOCAL_REPO=coreos/matchbox -IMAGE_REPO=quay.io/coreos/matchbox +REPO=github.com/poseidon/matchbox +LOCAL_REPO=poseidon/matchbox +IMAGE_REPO=quay.io/poseidon/matchbox .PHONY: all all: build test vet lint fmt diff --git a/cmd/bootcmd/main.go b/cmd/bootcmd/main.go index 7a90e3a2..df6ed280 100644 --- a/cmd/bootcmd/main.go +++ b/cmd/bootcmd/main.go @@ -1,6 +1,6 @@ package main -import "github.com/coreos/matchbox/matchbox/cli" +import "github.com/poseidon/matchbox/matchbox/cli" func main() { cli.Execute() diff --git a/cmd/matchbox/main.go b/cmd/matchbox/main.go index aba2bad0..5d293594 100644 --- a/cmd/matchbox/main.go +++ b/cmd/matchbox/main.go @@ -7,14 +7,14 @@ import ( "net/http" "os" - web "github.com/coreos/matchbox/matchbox/http" - "github.com/coreos/matchbox/matchbox/rpc" - "github.com/coreos/matchbox/matchbox/server" - "github.com/coreos/matchbox/matchbox/sign" - "github.com/coreos/matchbox/matchbox/storage" - "github.com/coreos/matchbox/matchbox/tlsutil" - "github.com/coreos/matchbox/matchbox/version" "github.com/coreos/pkg/flagutil" + web "github.com/poseidon/matchbox/matchbox/http" + "github.com/poseidon/matchbox/matchbox/rpc" + "github.com/poseidon/matchbox/matchbox/server" + "github.com/poseidon/matchbox/matchbox/sign" + "github.com/poseidon/matchbox/matchbox/storage" + "github.com/poseidon/matchbox/matchbox/tlsutil" + "github.com/poseidon/matchbox/matchbox/version" "github.com/sirupsen/logrus" ) diff --git a/go.mod b/go.mod index 515234fe..ed74fd96 100644 --- a/go.mod +++ b/go.mod @@ -1,4 +1,4 @@ -module github.com/coreos/matchbox +module github.com/poseidon/matchbox require ( github.com/ajeddeloh/go-json v0.0.0-20160803184958-73d058cf8437 // indirect diff --git a/matchbox/cli/generic_create.go b/matchbox/cli/generic_create.go index 68188099..75dd4341 100644 --- a/matchbox/cli/generic_create.go +++ b/matchbox/cli/generic_create.go @@ -7,7 +7,7 @@ import ( "context" "github.com/spf13/cobra" - pb "github.com/coreos/matchbox/matchbox/server/serverpb" + pb "github.com/poseidon/matchbox/matchbox/server/serverpb" ) // genericPutCmd creates and updates Generic templates. diff --git a/matchbox/cli/group_create.go b/matchbox/cli/group_create.go index d8ddd4a9..bc9c72e4 100644 --- a/matchbox/cli/group_create.go +++ b/matchbox/cli/group_create.go @@ -6,8 +6,8 @@ import ( "context" "github.com/spf13/cobra" - pb "github.com/coreos/matchbox/matchbox/server/serverpb" - "github.com/coreos/matchbox/matchbox/storage/storagepb" + pb "github.com/poseidon/matchbox/matchbox/server/serverpb" + "github.com/poseidon/matchbox/matchbox/storage/storagepb" ) // groupPutCmd creates and updates Groups. diff --git a/matchbox/cli/group_describe.go b/matchbox/cli/group_describe.go index d1111fe5..24ad8061 100644 --- a/matchbox/cli/group_describe.go +++ b/matchbox/cli/group_describe.go @@ -7,7 +7,7 @@ import ( "context" "github.com/spf13/cobra" - pb "github.com/coreos/matchbox/matchbox/server/serverpb" + pb "github.com/poseidon/matchbox/matchbox/server/serverpb" ) // groupDescribeCmd describes a Group. diff --git a/matchbox/cli/group_list.go b/matchbox/cli/group_list.go index 2238c886..d4bb17e9 100644 --- a/matchbox/cli/group_list.go +++ b/matchbox/cli/group_list.go @@ -7,7 +7,7 @@ import ( "context" "github.com/spf13/cobra" - pb "github.com/coreos/matchbox/matchbox/server/serverpb" + pb "github.com/poseidon/matchbox/matchbox/server/serverpb" ) // groupListCmd lists Groups. diff --git a/matchbox/cli/ignition_create.go b/matchbox/cli/ignition_create.go index f0af2590..57dbd9b1 100644 --- a/matchbox/cli/ignition_create.go +++ b/matchbox/cli/ignition_create.go @@ -7,7 +7,7 @@ import ( "context" "github.com/spf13/cobra" - pb "github.com/coreos/matchbox/matchbox/server/serverpb" + pb "github.com/poseidon/matchbox/matchbox/server/serverpb" ) // ignitionPutCmd creates and updates Ignition templates. diff --git a/matchbox/cli/profile_create.go b/matchbox/cli/profile_create.go index 8ba06351..1ec3da01 100644 --- a/matchbox/cli/profile_create.go +++ b/matchbox/cli/profile_create.go @@ -6,8 +6,8 @@ import ( "context" "github.com/spf13/cobra" - pb "github.com/coreos/matchbox/matchbox/server/serverpb" - "github.com/coreos/matchbox/matchbox/storage/storagepb" + pb "github.com/poseidon/matchbox/matchbox/server/serverpb" + "github.com/poseidon/matchbox/matchbox/storage/storagepb" ) // profilePutCmd creates and updates Profiles. diff --git a/matchbox/cli/profile_describe.go b/matchbox/cli/profile_describe.go index 0052817c..3c58a22c 100644 --- a/matchbox/cli/profile_describe.go +++ b/matchbox/cli/profile_describe.go @@ -7,7 +7,7 @@ import ( "context" "github.com/spf13/cobra" - pb "github.com/coreos/matchbox/matchbox/server/serverpb" + pb "github.com/poseidon/matchbox/matchbox/server/serverpb" ) // profileDescribeCmd describes a Profile. diff --git a/matchbox/cli/profile_list.go b/matchbox/cli/profile_list.go index 6f9bea76..3b54697d 100644 --- a/matchbox/cli/profile_list.go +++ b/matchbox/cli/profile_list.go @@ -7,7 +7,7 @@ import ( "context" "github.com/spf13/cobra" - pb "github.com/coreos/matchbox/matchbox/server/serverpb" + pb "github.com/poseidon/matchbox/matchbox/server/serverpb" ) // profileListCmd lists Profiles. diff --git a/matchbox/cli/root.go b/matchbox/cli/root.go index 49328f24..2b805af9 100644 --- a/matchbox/cli/root.go +++ b/matchbox/cli/root.go @@ -6,8 +6,8 @@ import ( "github.com/spf13/cobra" - "github.com/coreos/matchbox/matchbox/client" - "github.com/coreos/matchbox/matchbox/tlsutil" + "github.com/poseidon/matchbox/matchbox/client" + "github.com/poseidon/matchbox/matchbox/tlsutil" ) var ( diff --git a/matchbox/client/client.go b/matchbox/client/client.go index 53bd96ab..5d19be8d 100644 --- a/matchbox/client/client.go +++ b/matchbox/client/client.go @@ -10,7 +10,7 @@ import ( "google.golang.org/grpc" "google.golang.org/grpc/credentials" - "github.com/coreos/matchbox/matchbox/rpc/rpcpb" + "github.com/poseidon/matchbox/matchbox/rpc/rpcpb" ) var ( diff --git a/matchbox/http/cloud.go b/matchbox/http/cloud.go index 60a7fc48..8c527604 100644 --- a/matchbox/http/cloud.go +++ b/matchbox/http/cloud.go @@ -9,8 +9,8 @@ import ( cloudinit "github.com/coreos/coreos-cloudinit/config" "github.com/sirupsen/logrus" - "github.com/coreos/matchbox/matchbox/server" - pb "github.com/coreos/matchbox/matchbox/server/serverpb" + "github.com/poseidon/matchbox/matchbox/server" + pb "github.com/poseidon/matchbox/matchbox/server/serverpb" ) // CloudConfig defines a cloud-init config. @@ -21,7 +21,7 @@ type CloudConfig struct { // cloudHandler returns a handler that responds with the cloud config matching // the request. // DEPRECATED: Please migrate to using Container Linux configs. -// https://github.com/coreos/matchbox/blob/master/Documentation/cloud-config.md +// https://github.com/poseidon/matchbox/blob/master/Documentation/cloud-config.md func (s *Server) cloudHandler(core server.Server) http.Handler { fn := func(w http.ResponseWriter, req *http.Request) { ctx := req.Context() diff --git a/matchbox/http/cloud_test.go b/matchbox/http/cloud_test.go index f37e4be1..6ef9b65a 100644 --- a/matchbox/http/cloud_test.go +++ b/matchbox/http/cloud_test.go @@ -9,9 +9,9 @@ import ( logtest "github.com/sirupsen/logrus/hooks/test" "github.com/stretchr/testify/assert" - "github.com/coreos/matchbox/matchbox/server" - "github.com/coreos/matchbox/matchbox/storage/storagepb" - fake "github.com/coreos/matchbox/matchbox/storage/testfakes" + "github.com/poseidon/matchbox/matchbox/server" + "github.com/poseidon/matchbox/matchbox/storage/storagepb" + fake "github.com/poseidon/matchbox/matchbox/storage/testfakes" ) func TestCloudHandler(t *testing.T) { diff --git a/matchbox/http/context.go b/matchbox/http/context.go index bd0f1f7d..088f19e9 100644 --- a/matchbox/http/context.go +++ b/matchbox/http/context.go @@ -5,7 +5,7 @@ import ( "context" - "github.com/coreos/matchbox/matchbox/storage/storagepb" + "github.com/poseidon/matchbox/matchbox/storage/storagepb" ) // unexported key prevents collisions diff --git a/matchbox/http/context_test.go b/matchbox/http/context_test.go index 8756077c..068c6f7c 100644 --- a/matchbox/http/context_test.go +++ b/matchbox/http/context_test.go @@ -6,7 +6,7 @@ import ( "context" "github.com/stretchr/testify/assert" - "github.com/coreos/matchbox/matchbox/storage/storagepb" + "github.com/poseidon/matchbox/matchbox/storage/storagepb" ) func TestContextProfile(t *testing.T) { diff --git a/matchbox/http/generic.go b/matchbox/http/generic.go index 748dfb37..1bd9bc22 100644 --- a/matchbox/http/generic.go +++ b/matchbox/http/generic.go @@ -8,8 +8,8 @@ import ( "github.com/sirupsen/logrus" - "github.com/coreos/matchbox/matchbox/server" - pb "github.com/coreos/matchbox/matchbox/server/serverpb" + "github.com/poseidon/matchbox/matchbox/server" + pb "github.com/poseidon/matchbox/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 8672b2f8..a5e548e1 100644 --- a/matchbox/http/generic_test.go +++ b/matchbox/http/generic_test.go @@ -9,9 +9,9 @@ import ( logtest "github.com/sirupsen/logrus/hooks/test" "github.com/stretchr/testify/assert" - "github.com/coreos/matchbox/matchbox/server" - "github.com/coreos/matchbox/matchbox/storage/storagepb" - fake "github.com/coreos/matchbox/matchbox/storage/testfakes" + "github.com/poseidon/matchbox/matchbox/server" + "github.com/poseidon/matchbox/matchbox/storage/storagepb" + fake "github.com/poseidon/matchbox/matchbox/storage/testfakes" ) func TestGenericHandler(t *testing.T) { diff --git a/matchbox/http/grub_test.go b/matchbox/http/grub_test.go index d9d41662..10d9b714 100644 --- a/matchbox/http/grub_test.go +++ b/matchbox/http/grub_test.go @@ -9,7 +9,7 @@ import ( logtest "github.com/sirupsen/logrus/hooks/test" "github.com/stretchr/testify/assert" - fake "github.com/coreos/matchbox/matchbox/storage/testfakes" + fake "github.com/poseidon/matchbox/matchbox/storage/testfakes" ) func TestGrubHandler(t *testing.T) { diff --git a/matchbox/http/handlers.go b/matchbox/http/handlers.go index 9494f534..521bd16b 100644 --- a/matchbox/http/handlers.go +++ b/matchbox/http/handlers.go @@ -4,8 +4,8 @@ import ( "fmt" "net/http" - "github.com/coreos/matchbox/matchbox/server" - pb "github.com/coreos/matchbox/matchbox/server/serverpb" + "github.com/poseidon/matchbox/matchbox/server" + pb "github.com/poseidon/matchbox/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 3c76a41d..bbb109cd 100644 --- a/matchbox/http/handlers_test.go +++ b/matchbox/http/handlers_test.go @@ -9,9 +9,9 @@ import ( logtest "github.com/sirupsen/logrus/hooks/test" "github.com/stretchr/testify/assert" - "github.com/coreos/matchbox/matchbox/server" - "github.com/coreos/matchbox/matchbox/storage/storagepb" - fake "github.com/coreos/matchbox/matchbox/storage/testfakes" + "github.com/poseidon/matchbox/matchbox/server" + "github.com/poseidon/matchbox/matchbox/storage/storagepb" + fake "github.com/poseidon/matchbox/matchbox/storage/testfakes" ) func TestSelectGroup(t *testing.T) { diff --git a/matchbox/http/ignition.go b/matchbox/http/ignition.go index 02567e6a..6ad951d9 100644 --- a/matchbox/http/ignition.go +++ b/matchbox/http/ignition.go @@ -9,8 +9,8 @@ import ( ignition "github.com/coreos/ignition/config/v2_2" "github.com/sirupsen/logrus" - "github.com/coreos/matchbox/matchbox/server" - pb "github.com/coreos/matchbox/matchbox/server/serverpb" + "github.com/poseidon/matchbox/matchbox/server" + pb "github.com/poseidon/matchbox/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 38ab428d..ff08e057 100644 --- a/matchbox/http/ignition_test.go +++ b/matchbox/http/ignition_test.go @@ -9,9 +9,9 @@ import ( logtest "github.com/sirupsen/logrus/hooks/test" "github.com/stretchr/testify/assert" - "github.com/coreos/matchbox/matchbox/server" - "github.com/coreos/matchbox/matchbox/storage/storagepb" - fake "github.com/coreos/matchbox/matchbox/storage/testfakes" + "github.com/poseidon/matchbox/matchbox/server" + "github.com/poseidon/matchbox/matchbox/storage/storagepb" + fake "github.com/poseidon/matchbox/matchbox/storage/testfakes" ) func TestIgnitionHandler_V2_1_JSON(t *testing.T) { diff --git a/matchbox/http/ipxe_test.go b/matchbox/http/ipxe_test.go index ef5edd18..76543b69 100644 --- a/matchbox/http/ipxe_test.go +++ b/matchbox/http/ipxe_test.go @@ -9,8 +9,8 @@ import ( logtest "github.com/sirupsen/logrus/hooks/test" "github.com/stretchr/testify/assert" - "github.com/coreos/matchbox/matchbox/storage/storagepb" - fake "github.com/coreos/matchbox/matchbox/storage/testfakes" + "github.com/poseidon/matchbox/matchbox/storage/storagepb" + fake "github.com/poseidon/matchbox/matchbox/storage/testfakes" ) func TestIPXEInspect(t *testing.T) { diff --git a/matchbox/http/metadata_test.go b/matchbox/http/metadata_test.go index ec12f70f..e6b0f3ea 100644 --- a/matchbox/http/metadata_test.go +++ b/matchbox/http/metadata_test.go @@ -11,7 +11,7 @@ import ( logtest "github.com/sirupsen/logrus/hooks/test" "github.com/stretchr/testify/assert" - "github.com/coreos/matchbox/matchbox/storage/storagepb" + "github.com/poseidon/matchbox/matchbox/storage/storagepb" ) func TestMetadataHandler(t *testing.T) { diff --git a/matchbox/http/parse.go b/matchbox/http/parse.go index 4a152869..79956661 100644 --- a/matchbox/http/parse.go +++ b/matchbox/http/parse.go @@ -8,7 +8,7 @@ import ( "github.com/sirupsen/logrus" - "github.com/coreos/matchbox/matchbox/storage/storagepb" + "github.com/poseidon/matchbox/matchbox/storage/storagepb" ) // collectVariables collects group selectors, metadata, and request-scoped diff --git a/matchbox/http/server.go b/matchbox/http/server.go index 44edac31..024cbe8f 100644 --- a/matchbox/http/server.go +++ b/matchbox/http/server.go @@ -5,8 +5,8 @@ import ( "github.com/sirupsen/logrus" - "github.com/coreos/matchbox/matchbox/server" - "github.com/coreos/matchbox/matchbox/sign" + "github.com/poseidon/matchbox/matchbox/server" + "github.com/poseidon/matchbox/matchbox/sign" ) // Config configures a Server. diff --git a/matchbox/http/test_fixtures.go b/matchbox/http/test_fixtures.go index 34122ac8..5bc3744e 100644 --- a/matchbox/http/test_fixtures.go +++ b/matchbox/http/test_fixtures.go @@ -1,7 +1,7 @@ package http import ( - "github.com/coreos/matchbox/matchbox/storage/storagepb" + "github.com/poseidon/matchbox/matchbox/storage/storagepb" ) var ( diff --git a/matchbox/rpc/errors.go b/matchbox/rpc/errors.go index 7f0d6dea..e743ac7f 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/matchbox/matchbox/server" + "github.com/poseidon/matchbox/matchbox/server" ) var ( diff --git a/matchbox/rpc/errors_test.go b/matchbox/rpc/errors_test.go index a29cc51e..917ec0a9 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/matchbox/matchbox/server" + "github.com/poseidon/matchbox/matchbox/server" ) func TestGRPCError(t *testing.T) { diff --git a/matchbox/rpc/generic.go b/matchbox/rpc/generic.go index 4e6a47df..8740db60 100644 --- a/matchbox/rpc/generic.go +++ b/matchbox/rpc/generic.go @@ -3,9 +3,9 @@ package rpc import ( "golang.org/x/net/context" - "github.com/coreos/matchbox/matchbox/rpc/rpcpb" - "github.com/coreos/matchbox/matchbox/server" - pb "github.com/coreos/matchbox/matchbox/server/serverpb" + "github.com/poseidon/matchbox/matchbox/rpc/rpcpb" + "github.com/poseidon/matchbox/matchbox/server" + pb "github.com/poseidon/matchbox/matchbox/server/serverpb" ) // genericServer takes a matchbox Server and implements a gRPC GenericServer. diff --git a/matchbox/rpc/groups.go b/matchbox/rpc/groups.go index 48472345..18123148 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/matchbox/matchbox/rpc/rpcpb" - "github.com/coreos/matchbox/matchbox/server" - pb "github.com/coreos/matchbox/matchbox/server/serverpb" + "github.com/poseidon/matchbox/matchbox/rpc/rpcpb" + "github.com/poseidon/matchbox/matchbox/server" + pb "github.com/poseidon/matchbox/matchbox/server/serverpb" ) // groupServer takes a matchbox Server and implements a gRPC GroupsServer. diff --git a/matchbox/rpc/grpc.go b/matchbox/rpc/grpc.go index 2c23c635..fff104ec 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/matchbox/matchbox/rpc/rpcpb" - "github.com/coreos/matchbox/matchbox/server" + "github.com/poseidon/matchbox/matchbox/rpc/rpcpb" + "github.com/poseidon/matchbox/matchbox/server" ) // NewServer wraps the matchbox Server to return a new gRPC Server. diff --git a/matchbox/rpc/ignition.go b/matchbox/rpc/ignition.go index ce50b20c..88971ab2 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/matchbox/matchbox/rpc/rpcpb" - "github.com/coreos/matchbox/matchbox/server" - pb "github.com/coreos/matchbox/matchbox/server/serverpb" + "github.com/poseidon/matchbox/matchbox/rpc/rpcpb" + "github.com/poseidon/matchbox/matchbox/server" + pb "github.com/poseidon/matchbox/matchbox/server/serverpb" ) // ignitionServer takes a matchbox Server and implements a gRPC IgnitionServer. diff --git a/matchbox/rpc/profiles.go b/matchbox/rpc/profiles.go index 78c16727..fe18c2c3 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/matchbox/matchbox/rpc/rpcpb" - "github.com/coreos/matchbox/matchbox/server" - pb "github.com/coreos/matchbox/matchbox/server/serverpb" + "github.com/poseidon/matchbox/matchbox/rpc/rpcpb" + "github.com/poseidon/matchbox/matchbox/server" + pb "github.com/poseidon/matchbox/matchbox/server/serverpb" ) // profileServer takes a matchbox Server and implements a gRPC ProfilesServer. diff --git a/matchbox/rpc/rpcpb/rpc.pb.go b/matchbox/rpc/rpcpb/rpc.pb.go index c2865dcc..e67d1e54 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/matchbox/matchbox/server/serverpb" +import serverpb "github.com/poseidon/matchbox/matchbox/server/serverpb" import ( context "golang.org/x/net/context" diff --git a/matchbox/rpc/select.go b/matchbox/rpc/select.go index 6378dd17..a29554ac 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/matchbox/matchbox/rpc/rpcpb" - "github.com/coreos/matchbox/matchbox/server" - pb "github.com/coreos/matchbox/matchbox/server/serverpb" + "github.com/poseidon/matchbox/matchbox/rpc/rpcpb" + "github.com/poseidon/matchbox/matchbox/server" + pb "github.com/poseidon/matchbox/matchbox/server/serverpb" ) // selectServer wraps a matchbox Server to be suitable for gRPC registration. diff --git a/matchbox/server/server.go b/matchbox/server/server.go index 45fc36f9..1ae1671a 100644 --- a/matchbox/server/server.go +++ b/matchbox/server/server.go @@ -6,9 +6,9 @@ import ( "context" - pb "github.com/coreos/matchbox/matchbox/server/serverpb" - "github.com/coreos/matchbox/matchbox/storage" - "github.com/coreos/matchbox/matchbox/storage/storagepb" + pb "github.com/poseidon/matchbox/matchbox/server/serverpb" + "github.com/poseidon/matchbox/matchbox/storage" + "github.com/poseidon/matchbox/matchbox/storage/storagepb" ) // Possible service errors diff --git a/matchbox/server/server_test.go b/matchbox/server/server_test.go index 7bb99391..d170b48e 100644 --- a/matchbox/server/server_test.go +++ b/matchbox/server/server_test.go @@ -6,10 +6,10 @@ import ( "context" "github.com/stretchr/testify/assert" - pb "github.com/coreos/matchbox/matchbox/server/serverpb" - "github.com/coreos/matchbox/matchbox/storage" - "github.com/coreos/matchbox/matchbox/storage/storagepb" - fake "github.com/coreos/matchbox/matchbox/storage/testfakes" + pb "github.com/poseidon/matchbox/matchbox/server/serverpb" + "github.com/poseidon/matchbox/matchbox/storage" + "github.com/poseidon/matchbox/matchbox/storage/storagepb" + fake "github.com/poseidon/matchbox/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 263f622f..ff567086 100644 --- a/matchbox/server/serverpb/messages.pb.go +++ b/matchbox/server/serverpb/messages.pb.go @@ -47,7 +47,7 @@ package serverpb import proto "github.com/golang/protobuf/proto" import fmt "fmt" import math "math" -import storagepb "github.com/coreos/matchbox/matchbox/storage/storagepb" +import storagepb "github.com/poseidon/matchbox/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 1fc4d4e7..d3c0617a 100644 --- a/matchbox/storage/filestore.go +++ b/matchbox/storage/filestore.go @@ -5,7 +5,7 @@ import ( "path/filepath" "strings" - "github.com/coreos/matchbox/matchbox/storage/storagepb" + "github.com/poseidon/matchbox/matchbox/storage/storagepb" "github.com/sirupsen/logrus" ) diff --git a/matchbox/storage/filestore_test.go b/matchbox/storage/filestore_test.go index 35a6ec1b..aaaf2211 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/matchbox/matchbox/storage/storagepb" - fake "github.com/coreos/matchbox/matchbox/storage/testfakes" + "github.com/poseidon/matchbox/matchbox/storage/storagepb" + fake "github.com/poseidon/matchbox/matchbox/storage/testfakes" ) func TestGroupCRUD(t *testing.T) { diff --git a/matchbox/storage/storage.go b/matchbox/storage/storage.go index a795f952..6efea511 100644 --- a/matchbox/storage/storage.go +++ b/matchbox/storage/storage.go @@ -3,7 +3,7 @@ package storage import ( "errors" - "github.com/coreos/matchbox/matchbox/storage/storagepb" + "github.com/poseidon/matchbox/matchbox/storage/storagepb" ) // Storage errors diff --git a/matchbox/storage/testfakes/broken_store.go b/matchbox/storage/testfakes/broken_store.go index 5d713e62..1d1d29a9 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/matchbox/matchbox/storage/storagepb" + "github.com/poseidon/matchbox/matchbox/storage/storagepb" ) var ( diff --git a/matchbox/storage/testfakes/empty_store.go b/matchbox/storage/testfakes/empty_store.go index 21e9a71b..6e389716 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/matchbox/matchbox/storage/storagepb" + "github.com/poseidon/matchbox/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 22c5c312..910731cd 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/matchbox/matchbox/storage/storagepb" + "github.com/poseidon/matchbox/matchbox/storage/storagepb" ) // FixedStore is used for testing purposes. diff --git a/matchbox/storage/testfakes/fixtures.go b/matchbox/storage/testfakes/fixtures.go index 1778a4db..b5267025 100644 --- a/matchbox/storage/testfakes/fixtures.go +++ b/matchbox/storage/testfakes/fixtures.go @@ -1,7 +1,7 @@ package testfakes import ( - "github.com/coreos/matchbox/matchbox/storage/storagepb" + "github.com/poseidon/matchbox/matchbox/storage/storagepb" ) var (