mirror of
https://github.com/pocket-id/pocket-id.git
synced 2026-02-15 11:40:13 +00:00
refactor: rename file backend value fs to filesystem
This commit is contained in:
@@ -88,7 +88,7 @@ func defaultConfig() EnvConfigSchema {
|
|||||||
AppEnv: AppEnvProduction,
|
AppEnv: AppEnvProduction,
|
||||||
LogLevel: "info",
|
LogLevel: "info",
|
||||||
DbProvider: "sqlite",
|
DbProvider: "sqlite",
|
||||||
FileBackend: "fs",
|
FileBackend: "filesystem",
|
||||||
KeysPath: "data/keys",
|
KeysPath: "data/keys",
|
||||||
AppURL: AppUrl,
|
AppURL: AppUrl,
|
||||||
Port: "1411",
|
Port: "1411",
|
||||||
@@ -187,12 +187,12 @@ func validateEnvConfig(config *EnvConfigSchema) error {
|
|||||||
}
|
}
|
||||||
case "database":
|
case "database":
|
||||||
// All good, these are valid values
|
// All good, these are valid values
|
||||||
case "", "fs":
|
case "", "filesystem":
|
||||||
if config.UploadPath == "" {
|
if config.UploadPath == "" {
|
||||||
config.UploadPath = defaultFsUploadPath
|
config.UploadPath = defaultFsUploadPath
|
||||||
}
|
}
|
||||||
default:
|
default:
|
||||||
return errors.New("invalid FILE_BACKEND value. Must be 'fs', 'database', or 's3'")
|
return errors.New("invalid FILE_BACKEND value. Must be 'filesystem', 'database', or 's3'")
|
||||||
}
|
}
|
||||||
|
|
||||||
// Validate LOCAL_IPV6_RANGES
|
// Validate LOCAL_IPV6_RANGES
|
||||||
|
|||||||
@@ -214,12 +214,12 @@ func TestParseEnvConfig(t *testing.T) {
|
|||||||
t.Setenv("DB_PROVIDER", "sqlite")
|
t.Setenv("DB_PROVIDER", "sqlite")
|
||||||
t.Setenv("DB_CONNECTION_STRING", "file:test.db")
|
t.Setenv("DB_CONNECTION_STRING", "file:test.db")
|
||||||
t.Setenv("APP_URL", "http://localhost:3000")
|
t.Setenv("APP_URL", "http://localhost:3000")
|
||||||
t.Setenv("FILE_BACKEND", "FS")
|
t.Setenv("FILE_BACKEND", "FILESYSTEM")
|
||||||
t.Setenv("UPLOAD_PATH", "")
|
t.Setenv("UPLOAD_PATH", "")
|
||||||
|
|
||||||
err := parseEnvConfig()
|
err := parseEnvConfig()
|
||||||
require.NoError(t, err)
|
require.NoError(t, err)
|
||||||
assert.Equal(t, "fs", EnvConfig.FileBackend)
|
assert.Equal(t, "filesystem", EnvConfig.FileBackend)
|
||||||
assert.Equal(t, defaultFsUploadPath, EnvConfig.UploadPath)
|
assert.Equal(t, defaultFsUploadPath, EnvConfig.UploadPath)
|
||||||
})
|
})
|
||||||
|
|
||||||
|
|||||||
@@ -8,7 +8,7 @@ import (
|
|||||||
)
|
)
|
||||||
|
|
||||||
var (
|
var (
|
||||||
TypeFileSystem = "fs"
|
TypeFileSystem = "filesystem"
|
||||||
TypeS3 = "s3"
|
TypeS3 = "s3"
|
||||||
)
|
)
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user