mirror of
https://github.com/outbackdingo/matchbox.git
synced 2026-01-27 10:19:35 +00:00
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
This commit is contained in:
@@ -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
|
||||
|
||||
8
Makefile
8
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
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
package main
|
||||
|
||||
import "github.com/coreos/matchbox/matchbox/cli"
|
||||
import "github.com/poseidon/matchbox/matchbox/cli"
|
||||
|
||||
func main() {
|
||||
cli.Execute()
|
||||
|
||||
@@ -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"
|
||||
)
|
||||
|
||||
|
||||
2
go.mod
2
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
|
||||
|
||||
@@ -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.
|
||||
|
||||
@@ -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.
|
||||
|
||||
@@ -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.
|
||||
|
||||
@@ -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.
|
||||
|
||||
@@ -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.
|
||||
|
||||
@@ -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.
|
||||
|
||||
@@ -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.
|
||||
|
||||
@@ -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.
|
||||
|
||||
@@ -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 (
|
||||
|
||||
@@ -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 (
|
||||
|
||||
@@ -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()
|
||||
|
||||
@@ -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) {
|
||||
|
||||
@@ -5,7 +5,7 @@ import (
|
||||
|
||||
"context"
|
||||
|
||||
"github.com/coreos/matchbox/matchbox/storage/storagepb"
|
||||
"github.com/poseidon/matchbox/matchbox/storage/storagepb"
|
||||
)
|
||||
|
||||
// unexported key prevents collisions
|
||||
|
||||
@@ -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) {
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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) {
|
||||
|
||||
@@ -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) {
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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) {
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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) {
|
||||
|
||||
@@ -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) {
|
||||
|
||||
@@ -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) {
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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.
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
package http
|
||||
|
||||
import (
|
||||
"github.com/coreos/matchbox/matchbox/storage/storagepb"
|
||||
"github.com/poseidon/matchbox/matchbox/storage/storagepb"
|
||||
)
|
||||
|
||||
var (
|
||||
|
||||
@@ -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 (
|
||||
|
||||
@@ -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) {
|
||||
|
||||
@@ -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.
|
||||
|
||||
@@ -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.
|
||||
|
||||
@@ -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.
|
||||
|
||||
@@ -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.
|
||||
|
||||
@@ -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.
|
||||
|
||||
@@ -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"
|
||||
|
||||
@@ -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.
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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) {
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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"
|
||||
)
|
||||
|
||||
|
||||
@@ -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) {
|
||||
|
||||
@@ -3,7 +3,7 @@ package storage
|
||||
import (
|
||||
"errors"
|
||||
|
||||
"github.com/coreos/matchbox/matchbox/storage/storagepb"
|
||||
"github.com/poseidon/matchbox/matchbox/storage/storagepb"
|
||||
)
|
||||
|
||||
// Storage errors
|
||||
|
||||
@@ -3,7 +3,7 @@ package testfakes
|
||||
import (
|
||||
"errors"
|
||||
|
||||
"github.com/coreos/matchbox/matchbox/storage/storagepb"
|
||||
"github.com/poseidon/matchbox/matchbox/storage/storagepb"
|
||||
)
|
||||
|
||||
var (
|
||||
|
||||
@@ -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.
|
||||
|
||||
@@ -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.
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
package testfakes
|
||||
|
||||
import (
|
||||
"github.com/coreos/matchbox/matchbox/storage/storagepb"
|
||||
"github.com/poseidon/matchbox/matchbox/storage/storagepb"
|
||||
)
|
||||
|
||||
var (
|
||||
|
||||
Reference in New Issue
Block a user