Skip to content

Commit

Permalink
Moving imports to vanity url in prep for move (#898)
Browse files Browse the repository at this point in the history
* Moving imports to vanity url in prep for move

* Fix comments
  • Loading branch information
markphelps authored Jun 21, 2022
1 parent 31f3d64 commit 06aa76d
Show file tree
Hide file tree
Showing 49 changed files with 122 additions and 122 deletions.
12 changes: 6 additions & 6 deletions cmd/flipt/export.go
Original file line number Diff line number Diff line change
Expand Up @@ -9,12 +9,12 @@ import (
"syscall"
"time"

"github.com/markphelps/flipt/internal/ext"
"github.com/markphelps/flipt/storage"
"github.com/markphelps/flipt/storage/sql"
"github.com/markphelps/flipt/storage/sql/mysql"
"github.com/markphelps/flipt/storage/sql/postgres"
"github.com/markphelps/flipt/storage/sql/sqlite"
"go.flipt.io/flipt/internal/ext"
"go.flipt.io/flipt/storage"
"go.flipt.io/flipt/storage/sql"
"go.flipt.io/flipt/storage/sql/mysql"
"go.flipt.io/flipt/storage/sql/postgres"
"go.flipt.io/flipt/storage/sql/sqlite"
)

var exportFilename string
Expand Down
12 changes: 6 additions & 6 deletions cmd/flipt/import.go
Original file line number Diff line number Diff line change
Expand Up @@ -10,12 +10,12 @@ import (
"path/filepath"
"syscall"

"github.com/markphelps/flipt/internal/ext"
"github.com/markphelps/flipt/storage"
"github.com/markphelps/flipt/storage/sql"
"github.com/markphelps/flipt/storage/sql/mysql"
"github.com/markphelps/flipt/storage/sql/postgres"
"github.com/markphelps/flipt/storage/sql/sqlite"
"go.flipt.io/flipt/internal/ext"
"go.flipt.io/flipt/storage"
"go.flipt.io/flipt/storage/sql"
"go.flipt.io/flipt/storage/sql/mysql"
"go.flipt.io/flipt/storage/sql/postgres"
"go.flipt.io/flipt/storage/sql/sqlite"
)

var (
Expand Down
28 changes: 14 additions & 14 deletions cmd/flipt/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -25,24 +25,24 @@ import (
"github.com/go-chi/chi/v5/middleware"
"github.com/go-chi/cors"
"github.com/google/go-github/v32/github"
"github.com/markphelps/flipt/config"
"github.com/markphelps/flipt/internal/info"
"github.com/markphelps/flipt/internal/telemetry"
pb "github.com/markphelps/flipt/rpc/flipt"
"github.com/markphelps/flipt/server"
"github.com/markphelps/flipt/storage"
"github.com/markphelps/flipt/storage/cache"
"github.com/markphelps/flipt/storage/cache/memory"
"github.com/markphelps/flipt/storage/sql"
"github.com/markphelps/flipt/storage/sql/mysql"
"github.com/markphelps/flipt/storage/sql/postgres"
"github.com/markphelps/flipt/storage/sql/sqlite"
"github.com/markphelps/flipt/swagger"
"github.com/markphelps/flipt/ui"
"github.com/phyber/negroni-gzip/gzip"
"github.com/prometheus/client_golang/prometheus/promhttp"
"github.com/sirupsen/logrus"
"github.com/spf13/cobra"
"go.flipt.io/flipt/config"
"go.flipt.io/flipt/internal/info"
"go.flipt.io/flipt/internal/telemetry"
pb "go.flipt.io/flipt/rpc/flipt"
"go.flipt.io/flipt/server"
"go.flipt.io/flipt/storage"
"go.flipt.io/flipt/storage/cache"
"go.flipt.io/flipt/storage/cache/memory"
"go.flipt.io/flipt/storage/sql"
"go.flipt.io/flipt/storage/sql/mysql"
"go.flipt.io/flipt/storage/sql/postgres"
"go.flipt.io/flipt/storage/sql/sqlite"
"go.flipt.io/flipt/swagger"
"go.flipt.io/flipt/ui"
"golang.org/x/sync/errgroup"
"google.golang.org/grpc"
"google.golang.org/grpc/credentials"
Expand Down
2 changes: 1 addition & 1 deletion go.mod
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
module github.com/markphelps/flipt
module go.flipt.io/flipt

go 1.17

Expand Down
4 changes: 2 additions & 2 deletions internal/ext/exporter.go
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ import (
"fmt"
"io"

"github.com/markphelps/flipt/rpc/flipt"
"github.com/markphelps/flipt/storage"
"go.flipt.io/flipt/rpc/flipt"
"go.flipt.io/flipt/storage"
"gopkg.in/yaml.v2"
)

Expand Down
4 changes: 2 additions & 2 deletions internal/ext/exporter_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,9 @@ import (
"io/ioutil"
"testing"

"github.com/markphelps/flipt/rpc/flipt"
"github.com/markphelps/flipt/storage"
"github.com/stretchr/testify/assert"
"go.flipt.io/flipt/rpc/flipt"
"go.flipt.io/flipt/storage"
)

type mockLister struct {
Expand Down
2 changes: 1 addition & 1 deletion internal/ext/importer.go
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import (
"fmt"
"io"

"github.com/markphelps/flipt/rpc/flipt"
"go.flipt.io/flipt/rpc/flipt"
"gopkg.in/yaml.v2"
)

Expand Down
2 changes: 1 addition & 1 deletion internal/ext/importer_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ import (
"testing"

"github.com/gofrs/uuid"
"github.com/markphelps/flipt/rpc/flipt"
"github.com/stretchr/testify/assert"
"go.flipt.io/flipt/rpc/flipt"
)

type mockCreator struct {
Expand Down
4 changes: 2 additions & 2 deletions internal/telemetry/telemetry.go
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,9 @@ import (
"time"

"github.com/gofrs/uuid"
"github.com/markphelps/flipt/config"
"github.com/markphelps/flipt/internal/info"
"github.com/sirupsen/logrus"
"go.flipt.io/flipt/config"
"go.flipt.io/flipt/internal/info"
"gopkg.in/segmentio/analytics-go.v3"
)

Expand Down
4 changes: 2 additions & 2 deletions internal/telemetry/telemetry_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,10 @@ import (
"path/filepath"
"testing"

"github.com/markphelps/flipt/config"
"github.com/markphelps/flipt/internal/info"
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
"go.flipt.io/flipt/config"
"go.flipt.io/flipt/internal/info"

"github.com/sirupsen/logrus/hooks/test"
"gopkg.in/segmentio/analytics-go.v3"
Expand Down
2 changes: 1 addition & 1 deletion rpc/flipt/validation.go
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import (
"regexp"
"strings"

"github.com/markphelps/flipt/errors"
"go.flipt.io/flipt/errors"
)

const maxVariantAttachmentSize = 10000
Expand Down
2 changes: 1 addition & 1 deletion rpc/flipt/validation_fuzz_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import (
"errors"
"testing"

errs "github.com/markphelps/flipt/errors"
errs "go.flipt.io/flipt/errors"
)

func FuzzValidateAttachment(f *testing.F) {
Expand Down
2 changes: 1 addition & 1 deletion rpc/flipt/validation_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ import (
"fmt"
"testing"

"github.com/markphelps/flipt/errors"
"github.com/stretchr/testify/assert"
"go.flipt.io/flipt/errors"
)

func largeJsonString() string {
Expand Down
6 changes: 3 additions & 3 deletions server/evaluator.go
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,9 @@ import (
"time"

"github.com/gofrs/uuid"
errs "github.com/markphelps/flipt/errors"
flipt "github.com/markphelps/flipt/rpc/flipt"
"github.com/markphelps/flipt/storage"
errs "go.flipt.io/flipt/errors"
flipt "go.flipt.io/flipt/rpc/flipt"
"go.flipt.io/flipt/storage"
timestamp "google.golang.org/protobuf/types/known/timestamppb"
)

Expand Down
6 changes: 3 additions & 3 deletions server/evaluator_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,12 @@ import (
"testing"

"github.com/gofrs/uuid"
"github.com/markphelps/flipt/errors"
flipt "github.com/markphelps/flipt/rpc/flipt"
"github.com/markphelps/flipt/storage"
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/mock"
"github.com/stretchr/testify/require"
"go.flipt.io/flipt/errors"
flipt "go.flipt.io/flipt/rpc/flipt"
"go.flipt.io/flipt/storage"
)

var (
Expand Down
4 changes: 2 additions & 2 deletions server/flag.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@ package server
import (
"context"

flipt "github.com/markphelps/flipt/rpc/flipt"
"github.com/markphelps/flipt/storage"
flipt "go.flipt.io/flipt/rpc/flipt"
"go.flipt.io/flipt/storage"
empty "google.golang.org/protobuf/types/known/emptypb"
)

Expand Down
2 changes: 1 addition & 1 deletion server/flag_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,10 @@ import (
"context"
"testing"

flipt "github.com/markphelps/flipt/rpc/flipt"
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/mock"
"github.com/stretchr/testify/require"
flipt "go.flipt.io/flipt/rpc/flipt"
)

func TestGetFlag(t *testing.T) {
Expand Down
4 changes: 2 additions & 2 deletions server/rule.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@ package server
import (
"context"

flipt "github.com/markphelps/flipt/rpc/flipt"
"github.com/markphelps/flipt/storage"
flipt "go.flipt.io/flipt/rpc/flipt"
"go.flipt.io/flipt/storage"
empty "google.golang.org/protobuf/types/known/emptypb"
)

Expand Down
2 changes: 1 addition & 1 deletion server/rule_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,10 @@ import (
"context"
"testing"

flipt "github.com/markphelps/flipt/rpc/flipt"
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/mock"
"github.com/stretchr/testify/require"
flipt "go.flipt.io/flipt/rpc/flipt"
)

func TestGetRule(t *testing.T) {
Expand Down
4 changes: 2 additions & 2 deletions server/segment.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@ package server
import (
"context"

flipt "github.com/markphelps/flipt/rpc/flipt"
"github.com/markphelps/flipt/storage"
flipt "go.flipt.io/flipt/rpc/flipt"
"go.flipt.io/flipt/storage"
empty "google.golang.org/protobuf/types/known/emptypb"
)

Expand Down
2 changes: 1 addition & 1 deletion server/segment_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,10 @@ import (
"context"
"testing"

flipt "github.com/markphelps/flipt/rpc/flipt"
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/mock"
"github.com/stretchr/testify/require"
flipt "go.flipt.io/flipt/rpc/flipt"
)

func TestGetSegment(t *testing.T) {
Expand Down
6 changes: 3 additions & 3 deletions server/server.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@ import (
"context"
"errors"

errs "github.com/markphelps/flipt/errors"
flipt "github.com/markphelps/flipt/rpc/flipt"
"github.com/markphelps/flipt/storage"
errs "go.flipt.io/flipt/errors"
flipt "go.flipt.io/flipt/rpc/flipt"
"go.flipt.io/flipt/storage"

"github.com/sirupsen/logrus"
"google.golang.org/grpc"
Expand Down
2 changes: 1 addition & 1 deletion server/server_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import (
"context"
"testing"

"github.com/markphelps/flipt/errors"
"go.flipt.io/flipt/errors"

"github.com/sirupsen/logrus/hooks/test"
"github.com/stretchr/testify/assert"
Expand Down
4 changes: 2 additions & 2 deletions server/support_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@ package server
import (
"context"

flipt "github.com/markphelps/flipt/rpc/flipt"
"github.com/markphelps/flipt/storage"
"github.com/stretchr/testify/mock"
flipt "go.flipt.io/flipt/rpc/flipt"
"go.flipt.io/flipt/storage"
)

var (
Expand Down
2 changes: 1 addition & 1 deletion storage/cache/evaluation.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import (
"context"
"fmt"

"github.com/markphelps/flipt/storage"
"go.flipt.io/flipt/storage"
)

const (
Expand Down
2 changes: 1 addition & 1 deletion storage/cache/evaluation_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,10 @@ import (
"context"
"testing"

"github.com/markphelps/flipt/storage"
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/mock"
"github.com/stretchr/testify/require"
"go.flipt.io/flipt/storage"
)

func TestGetEvaluationRules(t *testing.T) {
Expand Down
4 changes: 2 additions & 2 deletions storage/cache/flag.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ import (
"context"
"fmt"

flipt "github.com/markphelps/flipt/rpc/flipt"
"github.com/markphelps/flipt/storage"
flipt "go.flipt.io/flipt/rpc/flipt"
"go.flipt.io/flipt/storage"
)

const flagCachePrefix = "flag:"
Expand Down
4 changes: 2 additions & 2 deletions storage/cache/flag_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,11 @@ import (
"context"
"testing"

"github.com/markphelps/flipt/errors"
flipt "github.com/markphelps/flipt/rpc/flipt"
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/mock"
"github.com/stretchr/testify/require"
"go.flipt.io/flipt/errors"
flipt "go.flipt.io/flipt/rpc/flipt"
)

func TestGetFlag(t *testing.T) {
Expand Down
4 changes: 2 additions & 2 deletions storage/cache/rule.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ import (
"context"
"fmt"

flipt "github.com/markphelps/flipt/rpc/flipt"
"github.com/markphelps/flipt/storage"
flipt "go.flipt.io/flipt/rpc/flipt"
"go.flipt.io/flipt/storage"
)

const ruleCachePrefix = "rule:"
Expand Down
4 changes: 2 additions & 2 deletions storage/cache/rule_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,11 @@ import (
"context"
"testing"

"github.com/markphelps/flipt/errors"
flipt "github.com/markphelps/flipt/rpc/flipt"
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/mock"
"github.com/stretchr/testify/require"
"go.flipt.io/flipt/errors"
flipt "go.flipt.io/flipt/rpc/flipt"
)

func TestGetRule(t *testing.T) {
Expand Down
4 changes: 2 additions & 2 deletions storage/cache/segment.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ import (
"context"
"fmt"

flipt "github.com/markphelps/flipt/rpc/flipt"
"github.com/markphelps/flipt/storage"
flipt "go.flipt.io/flipt/rpc/flipt"
"go.flipt.io/flipt/storage"
)

const segmentCachePrefix = "segment:"
Expand Down
Loading

0 comments on commit 06aa76d

Please sign in to comment.