Fix directory being used during reseed (#1121)

"/data" directory was hardcoded previously, needed to use config's Seed instead.
fsouza · Apr 6, 2023 · f98b60b · f98b60b
1 parent cdaefa5
commit f98b60b
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/fakestorage/server.go b/fakestorage/server.go
@@ -77,6 +77,7 @@ func NewServerWithHostPort(objects []Object, host string, port uint16) (*Server,
 type Options struct {
 	InitialObjects []Object
 	StorageRoot    string
+	Seed           string
 	Scheme         string
 	Host           string
 	Port           uint16
@@ -292,8 +293,7 @@ func (s *Server) buildMuxer() {
 }
 
 func (s *Server) reseedServer(r *http.Request) jsonResponse {
-	folder := "/data"
-	initialObjects, emptyBuckets := generateObjectsFromFiles(folder)
+	initialObjects, emptyBuckets := generateObjectsFromFiles(s.options.Seed)
 
 	backendObjects := bufferedObjectsToBackendObjects(initialObjects)
 

diff --git a/internal/config/config.go b/internal/config/config.go
@@ -169,6 +169,7 @@ func (c *Config) ToFakeGcsOptions() fakestorage.Options {
 	logger.SetLevel(c.LogLevel)
 	opts := fakestorage.Options{
 		StorageRoot:         storageRoot,
+		Seed:                c.Seed,
 		Scheme:              c.scheme,
 		Host:                c.host,
 		Port:                uint16(c.port),