1

config/instance.go

@@ -64,6 +64,9 @@ const (
 )
 
 func EmbedDefaults(cfgInstance *Instance) {
+	if cfgInstance.StorageCnf.StorageType == "" {
+		cfgInstance.StorageCnf.StorageType = "s3"
+	}
 	if cfgInstance.StorageCnf.StorageConcurrency == 0 {
 		cfgInstance.StorageCnf.StorageConcurrency = DefaultStorageConcurrency
 	}

config/proxy.go

@@ -1,5 +1,5 @@
 package config
 
 type Proxy struct {
-	ConsolePort string `json:"console_port" toml:"console+port" yaml:"console_port"`
+	ConsolePort string `json:"console_port" toml:"console_port" yaml:"console_port"`
 }

pkg/core/core.go

@@ -116,10 +116,12 @@ func (i *Instance) Run(instanceCnf *config.Instance) error {
 		return err
 	}
 
-	s := storage.NewStorage(
+	s, err := storage.NewStorage(
 		&instanceCnf.StorageCnf,
 	)
-
+	if err != nil {
+		return err
+	}
 	var cr crypt.Crypter = nil
 	if instanceCnf.CryptoCnf.GPGKeyPath != "" {
 		cr, err = crypt.NewCrypto(&instanceCnf.CryptoCnf)

pkg/proc/interaction.go

@@ -211,7 +211,10 @@ func ProcConn(s storage.StorageInteractor, cr crypt.Crypter, ycl client.YproxyCl
 			return nil
 		}
 		config.EmbedDefaults(&instanceCnf)
-		oldStorage := storage.NewStorage(&instanceCnf.StorageCnf)
+		oldStorage, err := storage.NewStorage(&instanceCnf.StorageCnf)
+		if err != nil {
+			return err
+		}
 		fmt.Printf("ok new conf: %v\n", instanceCnf)
 
 		//list objects

pkg/storage/storage.go

@@ -1,6 +1,7 @@
 package storage
 
 import (
+	"fmt"
 	"io"
 
 	"github.com/yezzey-gp/yproxy/config"
@@ -30,16 +31,18 @@ type StorageInteractor interface {
 	StorageMover
 }
 
-func NewStorage(cnf *config.Storage) StorageInteractor {
+func NewStorage(cnf *config.Storage) (StorageInteractor, error) {
 	switch cnf.StorageType {
 	case "fs":
 		return &FileStorageInteractor{
 			cnf: cnf,
-		}
-	default:
+		}, nil
+	case "s3":
 		return &S3StorageInteractor{
 			pool: NewSessionPool(cnf),
 			cnf:  cnf,
-		}
+		}, nil
+	default:
+		return nil, fmt.Errorf("wrong storage type " + cnf.StorageType)
 	}
 }