Mv config internal (#1036)

flipt-io · Sep 22, 2022 · 073d08f · 073d08f
1 parent 71e3026
commit 073d08f
Show file tree

Hide file tree

Showing 25 changed files with 13 additions and 13 deletions.
diff --git a/.dockerignore b/.dockerignore
@@ -14,7 +14,7 @@
 .github/
 .vscode/
 .task/
-Dockerfile
+Dockerfile*
 LICENSE
 bin/
 examples/

diff --git a/cmd/flipt/main.go b/cmd/flipt/main.go
@@ -31,7 +31,7 @@ import (
 	"github.com/phyber/negroni-gzip/gzip"
 	"github.com/prometheus/client_golang/prometheus/promhttp"
 	"github.com/spf13/cobra"
-	"go.flipt.io/flipt/config"
+	"go.flipt.io/flipt/internal/config"
 	"go.flipt.io/flipt/internal/info"
 	"go.flipt.io/flipt/internal/telemetry"
 	pb "go.flipt.io/flipt/rpc/flipt"

diff --git a/config/config.go → internal/config/config.go b/config/config.go → internal/config/config.go
diff --git a/config/config_test.go → internal/config/config_test.go b/config/config_test.go → internal/config/config_test.go
diff --git a/config/testdata/advanced.yml → internal/config/testdata/advanced.yml b/config/testdata/advanced.yml → internal/config/testdata/advanced.yml
diff --git a/config/testdata/cache/default.yml → internal/config/testdata/cache/default.yml b/config/testdata/cache/default.yml → internal/config/testdata/cache/default.yml
diff --git a/config/testdata/cache/memory.yml → internal/config/testdata/cache/memory.yml b/config/testdata/cache/memory.yml → internal/config/testdata/cache/memory.yml
diff --git a/config/testdata/cache/redis.yml → internal/config/testdata/cache/redis.yml b/config/testdata/cache/redis.yml → internal/config/testdata/cache/redis.yml
diff --git a/config/testdata/database.yml → internal/config/testdata/database.yml b/config/testdata/database.yml → internal/config/testdata/database.yml
diff --git a/config/testdata/default.yml → internal/config/testdata/default.yml b/config/testdata/default.yml → internal/config/testdata/default.yml
diff --git a/...tdata/deprecated/cache_memory_enabled.yml → ...tdata/deprecated/cache_memory_enabled.yml b/...tdata/deprecated/cache_memory_enabled.yml → ...tdata/deprecated/cache_memory_enabled.yml
diff --git a/...estdata/deprecated/cache_memory_items.yml → ...estdata/deprecated/cache_memory_items.yml b/...estdata/deprecated/cache_memory_items.yml → ...estdata/deprecated/cache_memory_items.yml
diff --git a/config/testdata/ssl_cert.pem → internal/config/testdata/ssl_cert.pem b/config/testdata/ssl_cert.pem → internal/config/testdata/ssl_cert.pem
diff --git a/config/testdata/ssl_key.pem → internal/config/testdata/ssl_key.pem b/config/testdata/ssl_key.pem → internal/config/testdata/ssl_key.pem
diff --git a/internal/telemetry/telemetry.go b/internal/telemetry/telemetry.go
@@ -11,7 +11,7 @@ import (
 	"time"
 
 	"github.com/gofrs/uuid"
-	"go.flipt.io/flipt/config"
+	"go.flipt.io/flipt/internal/config"
 	"go.flipt.io/flipt/internal/info"
 	"go.uber.org/zap"
 	"gopkg.in/segmentio/analytics-go.v3"

diff --git a/internal/telemetry/telemetry_test.go b/internal/telemetry/telemetry_test.go
@@ -11,7 +11,7 @@ import (
 
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
-	"go.flipt.io/flipt/config"
+	"go.flipt.io/flipt/internal/config"
 	"go.flipt.io/flipt/internal/info"
 	"go.uber.org/zap/zaptest"
 

diff --git a/server/cache/memory/cache.go b/server/cache/memory/cache.go
@@ -5,7 +5,7 @@ import (
 	"sync/atomic"
 
 	gocache "github.com/patrickmn/go-cache"
-	"go.flipt.io/flipt/config"
+	"go.flipt.io/flipt/internal/config"
 	"go.flipt.io/flipt/server/cache"
 )
 

diff --git a/server/cache/memory/cache_test.go b/server/cache/memory/cache_test.go
@@ -5,7 +5,7 @@ import (
 	"testing"
 
 	"github.com/stretchr/testify/assert"
-	"go.flipt.io/flipt/config"
+	"go.flipt.io/flipt/internal/config"
 )
 
 func TestNewCache(t *testing.T) {

diff --git a/server/cache/redis/cache.go b/server/cache/redis/cache.go
@@ -6,7 +6,7 @@ import (
 	"sync/atomic"
 
 	redis "github.com/go-redis/cache/v8"
-	"go.flipt.io/flipt/config"
+	"go.flipt.io/flipt/internal/config"
 	"go.flipt.io/flipt/server/cache"
 )
 

diff --git a/server/cache/redis/cache_test.go b/server/cache/redis/cache_test.go
@@ -11,7 +11,7 @@ import (
 	"github.com/stretchr/testify/assert"
 	"github.com/testcontainers/testcontainers-go"
 	"github.com/testcontainers/testcontainers-go/wait"
-	"go.flipt.io/flipt/config"
+	"go.flipt.io/flipt/internal/config"
 )
 
 func TestSet(t *testing.T) {

diff --git a/server/middleware_test.go b/server/middleware_test.go
@@ -5,8 +5,8 @@ import (
 	"testing"
 	"time"
 
-	"go.flipt.io/flipt/config"
 	"go.flipt.io/flipt/errors"
+	"go.flipt.io/flipt/internal/config"
 	flipt "go.flipt.io/flipt/rpc/flipt"
 	"go.flipt.io/flipt/server/cache/memory"
 	"go.flipt.io/flipt/storage"

diff --git a/storage/sql/db.go b/storage/sql/db.go
@@ -12,7 +12,7 @@ import (
 	"github.com/luna-duclos/instrumentedsql/opentracing"
 	"github.com/mattn/go-sqlite3"
 	"github.com/xo/dburl"
-	"go.flipt.io/flipt/config"
+	"go.flipt.io/flipt/internal/config"
 )
 
 // Open opens a connection to the db

diff --git a/storage/sql/db_test.go b/storage/sql/db_test.go
@@ -15,7 +15,7 @@ import (
 	"github.com/golang-migrate/migrate/database/sqlite3"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
-	"go.flipt.io/flipt/config"
+	"go.flipt.io/flipt/internal/config"
 	"go.flipt.io/flipt/storage"
 	"go.flipt.io/flipt/storage/sql/mysql"
 	"go.flipt.io/flipt/storage/sql/postgres"

diff --git a/storage/sql/metrics.go b/storage/sql/metrics.go
@@ -16,7 +16,7 @@ type statsGetter interface {
 	Stats() sql.DBStats
 }
 
-//nolint
+// nolint
 func registerMetrics(d Driver, s statsGetter) {
 	labels := prometheus.Labels{"driver": d.String()}
 

diff --git a/storage/sql/migrator.go b/storage/sql/migrator.go
@@ -10,7 +10,7 @@ import (
 	"github.com/golang-migrate/migrate/database/mysql"
 	"github.com/golang-migrate/migrate/database/postgres"
 	"github.com/golang-migrate/migrate/database/sqlite3"
-	"go.flipt.io/flipt/config"
+	"go.flipt.io/flipt/internal/config"
 	"go.uber.org/zap"
 )