Remove old strings from setting

Signed-off-by: Andrew Thornton <[email protected]>

Author: zeripath

cmd/migrate_storage.go

@@ -32,8 +32,8 @@ var CmdMigrateStorage = cli.Command{
 		},
 		cli.StringFlag{
 			Name:  "storage, s",
-			Value: setting.LocalStorageType,
-			Usage: "New storage type, local or minio",
+			Value: "",
+			Usage: "New storage type: local (default) or minio",
 		},
 		cli.StringFlag{
 			Name:  "path, p",
@@ -116,7 +116,9 @@ func runMigrateStorage(ctx *cli.Context) error {
 	var dstStorage storage.ObjectStorage
 	var err error
 	switch strings.ToLower(ctx.String("storage")) {
-	case setting.LocalStorageType:
+	case "":
+		fallthrough
+	case string(storage.LocalStorageType):
 		p := ctx.String("path")
 		if p == "" {
 			log.Fatal("Path must be given when storage is loal")
@@ -127,7 +129,7 @@ func runMigrateStorage(ctx *cli.Context) error {
 			storage.LocalStorageConfig{
 				Path: p,
 			})
-	case setting.MinioStorageType:
+	case string(storage.MinioStorageType):
 		dstStorage, err = storage.NewMinioStorage(
 			goCtx,
 			storage.MinioStorageConfig{

models/unit_tests.go

@@ -67,10 +67,8 @@ func MainTest(m *testing.M, pathToGiteaRoot string) {
 	if err != nil {
 		fatalTestError("url.Parse: %v\n", err)
 	}
-	setting.Attachment.Storage.Type = setting.LocalStorageType
 	setting.Attachment.Storage.Path = filepath.Join(setting.AppDataPath, "attachments")
 
-	setting.LFS.Storage.Type = setting.LocalStorageType
 	setting.LFS.Storage.Path = filepath.Join(setting.AppDataPath, "lfs")
 	if err = storage.Init(); err != nil {
 		fatalTestError("storage.Init: %v\n", err)

modules/setting/attachment.go

@@ -18,7 +18,6 @@ var (
 		Enabled      bool
 	}{
 		Storage: Storage{
-			Type:        LocalStorageType,
 			ServeDirect: false,
 		},
 		AllowedTypes: "image/jpeg,image/png,application/zip,application/gzip",

modules/setting/storage.go

@@ -11,12 +11,6 @@ import (
 	ini "gopkg.in/ini.v1"
 )
 
-// enumerate all storage types
-const (
-	LocalStorageType = "local"
-	MinioStorageType = "minio"
-)
-
 // Storage represents configuration of storages
 type Storage struct {
 	Type        string
@@ -52,7 +46,7 @@ func getStorage(name, typ string, overrides ...*ini.Section) Storage {
 
 	var storage Storage
 
-	storage.Type = sec.Key("STORAGE_TYPE").MustString(LocalStorageType)
+	storage.Type = sec.Key("STORAGE_TYPE").MustString("")
 	storage.ServeDirect = sec.Key("SERVE_DIRECT").MustBool(false)
 
 	// Global Defaults

modules/storage/storage.go

@@ -101,6 +101,9 @@ func Init() error {
 
 // NewStorage takes a storage type and some config and returns an ObjectStorage or an error
 func NewStorage(typStr string, cfg interface{}) (ObjectStorage, error) {
+	if len(typStr) == 0 {
+		typStr = string(LocalStorageType)
+	}
 	fn, ok := storageMap[Type(typStr)]
 	if !ok {
 		return nil, fmt.Errorf("Unsupported storage type: %s", typStr)