change(config): rename git backend filesystem to local (#3110)

Signed-off-by: George MacRorie <me@georgemac.com>
flipt-io · May 24, 2024 · 21e9e7e · 21e9e7e
1 parent 4f30e3d
commit 21e9e7e
Show file tree

Hide file tree

Showing 6 changed files with 18 additions and 12 deletions.
diff --git a/config/flipt.schema.cue b/config/flipt.schema.cue
@@ -129,9 +129,9 @@ import "strings"
 			min_idle_conn?:      int | *0
 			conn_max_idle_time?: =~#duration | int | *0
 			net_timeout?:        =~#duration | int | *0
-			ca_cert_path?:      string
-			ca_cert_bytes?:     string
-			insecure_skip_tls?: bool | *false
+			ca_cert_path?:       string
+			ca_cert_bytes?:      string
+			insecure_skip_tls?:  bool | *false
 		}
 
 		memory?: {
@@ -142,9 +142,9 @@ import "strings"
 	}
 
 	#cloud: {
-		host?: string | *"flipt.cloud"
-		organization?:  string
-		instance?:  string
+		host?:         string | *"flipt.cloud"
+		organization?: string
+		instance?:     string
 		authentication?: {
 			api_key?: string
 		}
@@ -176,6 +176,7 @@ import "strings"
 		local?: path: string | *"."
 		git?: {
 			repository:         string
+			backend?:           *"memory" | "local"
 			ref?:               string | *"main"
 			ref_type?:          *"static" | "semver"
 			directory?:         string
@@ -347,7 +348,7 @@ import "strings"
 					body: string
 					headers?: [string]: string
 				}]
-			},
+			}
 			cloud?: {
 				enabled?: bool | *false
 			}

diff --git a/config/flipt.schema.json b/config/flipt.schema.json
@@ -607,6 +607,11 @@
             "repository": {
               "type": "string"
             },
+            "backend": {
+              "type": "string",
+              "enum": ["memory", "local"],
+              "default": "local"
+            },
             "ref": {
               "type": "string",
               "default": "main"

diff --git a/internal/config/config_test.go b/internal/config/config_test.go
@@ -921,7 +921,7 @@ func TestLoad(t *testing.T) {
 					Type: GitStorageType,
 					Git: &Git{
 						Backend: GitBackend{
-							Type: GitBackendFilesystem,
+							Type: GitBackendLocal,
 							Path: "/path/to/gitdir",
 						},
 						Ref:          "main",

diff --git a/internal/config/storage.go b/internal/config/storage.go
@@ -191,8 +191,8 @@ func (g *Git) validate() error {
 type GitBackendType string
 
 const (
-	GitBackendMemory     = GitBackendType("memory")
-	GitBackendFilesystem = GitBackendType("filesystem")
+	GitBackendMemory = GitBackendType("memory")
+	GitBackendLocal  = GitBackendType("local")
 )
 
 type GitBackend struct {

diff --git a/internal/config/testdata/storage/git_provided_with_backend_type.yml b/internal/config/testdata/storage/git_provided_with_backend_type.yml
@@ -3,5 +3,5 @@ storage:
   git:
     repository: "git@github.com:foo/bar.git"
     backend:
-      type: "filesystem"
+      type: "local"
       path: "/path/to/gitdir"
diff --git a/internal/storage/fs/store/store.go b/internal/storage/fs/store/store.go
@@ -47,7 +47,7 @@ func NewStore(ctx context.Context, logger *zap.Logger, cfg *config.Config) (_ st
 		}
 
 		switch storage.Backend.Type {
-		case config.GitBackendFilesystem:
+		case config.GitBackendLocal:
 			path := storage.Backend.Path
 			if path == "" {
 				path, err = os.MkdirTemp(os.TempDir(), "flipt-git-*")