refactor(server): move server package to internal (#1083)

flipt-io · Oct 21, 2022 · 6e9c7a5 · 6e9c7a5
1 parent 071aec7
commit 6e9c7a5
Show file tree

Hide file tree

Showing 21 changed files with 9 additions and 37 deletions.
diff --git a/.github/workflows/filtered-github-webhooks.yml b/.github/workflows/filtered-github-webhooks.yml
diff --git a/cmd/flipt/main.go b/cmd/flipt/main.go
@@ -33,17 +33,17 @@ import (
 	"github.com/spf13/cobra"
 	"go.flipt.io/flipt/internal/config"
 	"go.flipt.io/flipt/internal/info"
+	"go.flipt.io/flipt/internal/server"
+	"go.flipt.io/flipt/internal/server/cache"
+	"go.flipt.io/flipt/internal/server/cache/memory"
+	"go.flipt.io/flipt/internal/server/cache/redis"
 	"go.flipt.io/flipt/internal/storage"
 	"go.flipt.io/flipt/internal/storage/sql"
 	"go.flipt.io/flipt/internal/storage/sql/mysql"
 	"go.flipt.io/flipt/internal/storage/sql/postgres"
 	"go.flipt.io/flipt/internal/storage/sql/sqlite"
 	"go.flipt.io/flipt/internal/telemetry"
 	pb "go.flipt.io/flipt/rpc/flipt"
-	"go.flipt.io/flipt/server"
-	"go.flipt.io/flipt/server/cache"
-	"go.flipt.io/flipt/server/cache/memory"
-	"go.flipt.io/flipt/server/cache/redis"
 	"go.flipt.io/flipt/swagger"
 	"go.flipt.io/flipt/ui"
 	"go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc"

diff --git a/server/cache/cache.go → internal/server/cache/cache.go b/server/cache/cache.go → internal/server/cache/cache.go
diff --git a/server/cache/memory/cache.go → internal/server/cache/memory/cache.go b/server/cache/memory/cache.go → internal/server/cache/memory/cache.go
@@ -6,7 +6,7 @@ import (
 
 	gocache "github.com/patrickmn/go-cache"
 	"go.flipt.io/flipt/internal/config"
-	"go.flipt.io/flipt/server/cache"
+	"go.flipt.io/flipt/internal/server/cache"
 )
 
 // Cache wraps gocache.Cache in order to implement Cacher

diff --git a/server/cache/memory/cache_test.go → internal/server/cache/memory/cache_test.go b/server/cache/memory/cache_test.go → internal/server/cache/memory/cache_test.go
diff --git a/server/cache/metrics.go → internal/server/cache/metrics.go b/server/cache/metrics.go → internal/server/cache/metrics.go
diff --git a/server/cache/redis/cache.go → internal/server/cache/redis/cache.go b/server/cache/redis/cache.go → internal/server/cache/redis/cache.go
@@ -7,7 +7,7 @@ import (
 
 	redis "github.com/go-redis/cache/v8"
 	"go.flipt.io/flipt/internal/config"
-	"go.flipt.io/flipt/server/cache"
+	"go.flipt.io/flipt/internal/server/cache"
 )
 
 type Cache struct {

diff --git a/server/cache/redis/cache_test.go → internal/server/cache/redis/cache_test.go b/server/cache/redis/cache_test.go → internal/server/cache/redis/cache_test.go
diff --git a/server/evaluator.go → internal/server/evaluator.go b/server/evaluator.go → internal/server/evaluator.go
diff --git a/server/evaluator_test.go → internal/server/evaluator_test.go b/server/evaluator_test.go → internal/server/evaluator_test.go
diff --git a/server/flag.go → internal/server/flag.go b/server/flag.go → internal/server/flag.go
diff --git a/server/flag_test.go → internal/server/flag_test.go b/server/flag_test.go → internal/server/flag_test.go
diff --git a/server/metrics.go → internal/server/metrics.go b/server/metrics.go → internal/server/metrics.go
diff --git a/server/middleware.go → internal/server/middleware.go b/server/middleware.go → internal/server/middleware.go
@@ -10,8 +10,8 @@ import (
 
 	"github.com/gofrs/uuid"
 	errs "go.flipt.io/flipt/errors"
+	"go.flipt.io/flipt/internal/server/cache"
 	flipt "go.flipt.io/flipt/rpc/flipt"
-	"go.flipt.io/flipt/server/cache"
 	"go.uber.org/zap"
 	"google.golang.org/grpc"
 	"google.golang.org/grpc/codes"

diff --git a/server/middleware_test.go → internal/server/middleware_test.go b/server/middleware_test.go → internal/server/middleware_test.go
@@ -7,9 +7,9 @@ import (
 
 	"go.flipt.io/flipt/errors"
 	"go.flipt.io/flipt/internal/config"
+	"go.flipt.io/flipt/internal/server/cache/memory"
 	"go.flipt.io/flipt/internal/storage"
 	flipt "go.flipt.io/flipt/rpc/flipt"
-	"go.flipt.io/flipt/server/cache/memory"
 	"go.uber.org/zap/zaptest"
 
 	"github.com/stretchr/testify/assert"

diff --git a/server/rule.go → internal/server/rule.go b/server/rule.go → internal/server/rule.go
diff --git a/server/rule_test.go → internal/server/rule_test.go b/server/rule_test.go → internal/server/rule_test.go
diff --git a/server/segment.go → internal/server/segment.go b/server/segment.go → internal/server/segment.go
diff --git a/server/segment_test.go → internal/server/segment_test.go b/server/segment_test.go → internal/server/segment_test.go
diff --git a/server/server.go → internal/server/server.go b/server/server.go → internal/server/server.go
diff --git a/server/support_test.go → internal/server/support_test.go b/server/support_test.go → internal/server/support_test.go
@@ -4,9 +4,9 @@ import (
 	"context"
 
 	"github.com/stretchr/testify/mock"
+	"go.flipt.io/flipt/internal/server/cache"
 	"go.flipt.io/flipt/internal/storage"
 	flipt "go.flipt.io/flipt/rpc/flipt"
-	"go.flipt.io/flipt/server/cache"
 )
 
 var _ storage.Store = &storeMock{}