feat: Make flag DTO public (#2376)

thomaspoignant · Sep 19, 2024 · 7e20e6a · 7e20e6a
1 parent c42b045
commit 7e20e6a
Show file tree

Hide file tree

Showing 17 changed files with 15 additions and 14 deletions.
diff --git a/cmd/editor/main.go b/cmd/editor/main.go
@@ -2,14 +2,14 @@ package main
 
 import (
 	echoadapter "github.com/awslabs/aws-lambda-go-api-proxy/echo"
+	"github.com/thomaspoignant/go-feature-flag/model/dto"
 	"net/http"
 	"os"
 
 	"github.com/labstack/echo/v4"
 	"github.com/labstack/echo/v4/middleware"
 	custommiddleware "github.com/thomaspoignant/go-feature-flag/cmd/relayproxy/api/middleware"
 	"github.com/thomaspoignant/go-feature-flag/cmd/relayproxy/log"
-	"github.com/thomaspoignant/go-feature-flag/internal/dto"
 	"github.com/thomaspoignant/go-feature-flag/internal/flag"
 	"github.com/thomaspoignant/go-feature-flag/internal/utils"
 	"github.com/thomaspoignant/go-feature-flag/model"

diff --git a/cmd/jsonschema-generator/main.go b/cmd/jsonschema-generator/main.go
@@ -6,7 +6,7 @@ import (
 	"fmt"
 	"github.com/invopop/jsonschema"
 	"github.com/jessevdk/go-flags"
-	"github.com/thomaspoignant/go-feature-flag/internal/dto"
+	"github.com/thomaspoignant/go-feature-flag/model/dto"
 	"log"
 	"os"
 )

diff --git a/cmd/lint/linter.go b/cmd/lint/linter.go
@@ -3,11 +3,11 @@ package main
 import (
 	"encoding/json"
 	"fmt"
+	"github.com/thomaspoignant/go-feature-flag/model/dto"
 	"os"
 	"strings"
 
 	"github.com/BurntSushi/toml"
-	"github.com/thomaspoignant/go-feature-flag/internal/dto"
 	"k8s.io/apimachinery/pkg/util/yaml"
 )
 

diff --git a/cmd/migrationcli/converter/converter.go b/cmd/migrationcli/converter/converter.go
@@ -4,12 +4,12 @@ import (
 	"bytes"
 	"encoding/json"
 	"fmt"
+	"github.com/thomaspoignant/go-feature-flag/model/dto"
 	"os"
 	"strings"
 
 	"github.com/BurntSushi/toml"
 
-	"github.com/thomaspoignant/go-feature-flag/internal/dto"
 	"github.com/thomaspoignant/go-feature-flag/internal/flag"
 	"gopkg.in/yaml.v3"
 )

diff --git a/feature_flag.go b/feature_flag.go
@@ -3,6 +3,7 @@ package ffclient
 import (
 	"context"
 	"fmt"
+	"github.com/thomaspoignant/go-feature-flag/model/dto"
 	"github.com/thomaspoignant/go-feature-flag/retriever/fileretriever"
 	"log"
 	"log/slog"
@@ -11,7 +12,6 @@ import (
 	"time"
 
 	"github.com/thomaspoignant/go-feature-flag/exporter"
-	"github.com/thomaspoignant/go-feature-flag/internal/dto"
 	"github.com/thomaspoignant/go-feature-flag/retriever"
 	"github.com/thomaspoignant/go-feature-flag/utils/fflog"
 

diff --git a/internal/cache/cache.go b/internal/cache/cache.go
@@ -1,8 +1,8 @@
 package cache
 
 import (
-	"github.com/thomaspoignant/go-feature-flag/internal/dto"
 	"github.com/thomaspoignant/go-feature-flag/internal/flag"
+	"github.com/thomaspoignant/go-feature-flag/model/dto"
 )
 
 // Cache is the interface to represent a cache in the system.

diff --git a/internal/cache/cache_manager.go b/internal/cache/cache_manager.go
@@ -4,6 +4,7 @@ import (
 	"encoding/json"
 	"errors"
 	"github.com/google/go-cmp/cmp"
+	"github.com/thomaspoignant/go-feature-flag/model/dto"
 	"github.com/thomaspoignant/go-feature-flag/utils/fflog"
 	"log/slog"
 	"os"
@@ -13,8 +14,6 @@ import (
 
 	"github.com/BurntSushi/toml"
 
-	"github.com/thomaspoignant/go-feature-flag/internal/dto"
-
 	"github.com/thomaspoignant/go-feature-flag/internal/flag"
 	"gopkg.in/yaml.v3"
 )

diff --git a/internal/cache/cache_manager_test.go b/internal/cache/cache_manager_test.go
@@ -1,7 +1,7 @@
 package cache_test
 
 import (
-	"github.com/thomaspoignant/go-feature-flag/internal/dto"
+	"github.com/thomaspoignant/go-feature-flag/model/dto"
 	"github.com/thomaspoignant/go-feature-flag/utils/fflog"
 	"gopkg.in/yaml.v3"
 	"log/slog"

diff --git a/internal/cache/in_memory_cache.go b/internal/cache/in_memory_cache.go
@@ -2,7 +2,7 @@ package cache
 
 import (
 	"fmt"
-	"github.com/thomaspoignant/go-feature-flag/internal/dto"
+	"github.com/thomaspoignant/go-feature-flag/model/dto"
 	"github.com/thomaspoignant/go-feature-flag/utils/fflog"
 	"log/slog"
 

diff --git a/internal/cache/in_memory_cache_test.go b/internal/cache/in_memory_cache_test.go
@@ -1,11 +1,11 @@
 package cache_test
 
 import (
+	"github.com/thomaspoignant/go-feature-flag/model/dto"
 	"testing"
 
 	"github.com/stretchr/testify/assert"
 	"github.com/thomaspoignant/go-feature-flag/internal/cache"
-	"github.com/thomaspoignant/go-feature-flag/internal/dto"
 	"github.com/thomaspoignant/go-feature-flag/internal/flag"
 	"github.com/thomaspoignant/go-feature-flag/testutils/testconvert"
 )

diff --git a/internal/dto/convert_v1.go → model/dto/convert_v1.go b/internal/dto/convert_v1.go → model/dto/convert_v1.go
diff --git a/internal/dto/converter_test.go → model/dto/converter_test.go b/internal/dto/converter_test.go → model/dto/converter_test.go
@@ -2,6 +2,7 @@ package dto_test
 
 import (
 	"github.com/thomaspoignant/go-feature-flag/ffcontext"
+	"github.com/thomaspoignant/go-feature-flag/model/dto"
 	"testing"
 	"time"
 
@@ -10,7 +11,6 @@ import (
 	"github.com/thomaspoignant/go-feature-flag/testutils/flagv1"
 
 	"github.com/stretchr/testify/assert"
-	"github.com/thomaspoignant/go-feature-flag/internal/dto"
 	"github.com/thomaspoignant/go-feature-flag/internal/flag"
 	"github.com/thomaspoignant/go-feature-flag/testutils/testconvert"
 )

diff --git a/internal/dto/converter_v0.go → model/dto/converter_v0.go b/internal/dto/converter_v0.go → model/dto/converter_v0.go
diff --git a/internal/dto/dto.go → model/dto/dto.go b/internal/dto/dto.go → model/dto/dto.go
diff --git a/internal/dto/dto_rollout.go → model/dto/dto_rollout.go b/internal/dto/dto_rollout.go → model/dto/dto_rollout.go
diff --git a/testutils/flagv1/convert.go b/testutils/flagv1/convert.go
@@ -1,6 +1,8 @@
 package flagv1
 
-import "github.com/thomaspoignant/go-feature-flag/internal/dto"
+import (
+	"github.com/thomaspoignant/go-feature-flag/model/dto"
+)
 
 func ConvertDtoToV1(d dto.DTO) FlagData {
 	var r Rollout

diff --git a/variation_test.go b/variation_test.go
@@ -11,9 +11,9 @@ import (
 	"github.com/thomaspoignant/go-feature-flag/exporter/logsexporter"
 	"github.com/thomaspoignant/go-feature-flag/ffcontext"
 	"github.com/thomaspoignant/go-feature-flag/internal/cache"
-	"github.com/thomaspoignant/go-feature-flag/internal/dto"
 	"github.com/thomaspoignant/go-feature-flag/internal/flag"
 	"github.com/thomaspoignant/go-feature-flag/model"
+	"github.com/thomaspoignant/go-feature-flag/model/dto"
 	"github.com/thomaspoignant/go-feature-flag/retriever/fileretriever"
 	"github.com/thomaspoignant/go-feature-flag/testutils"
 	"github.com/thomaspoignant/go-feature-flag/testutils/flagv1"