56 add ssh config

Makefile

@@ -85,6 +85,6 @@ test-coverage:
 
 # use tests-integration for check integration tests cases
 # you need an installed docker to work
-.PHONY: tests-integration
-tests-integration:
+.PHONY: test-e2e
+test-e2e:
 	GO_TESTING=true go test -tags=integration ./...

README.md

@@ -405,7 +405,7 @@ make test-coverage
 Run test e2e:
 
 ```bash
-make tests-integration
+make test-e2e
 ```
 
 ## 🤝 Feedback

configs/envconst/file.go

@@ -2,6 +2,7 @@ package envconst
 
 const (
 	FilenameConnections = "connection.json"
+	FilenameConfigSSH   = "config"
 	FilenameConfig      = "configs"
 	FilenameLogger      = "log.log"
 )

configs/envconst/space.go

@@ -0,0 +1,6 @@
+package envconst
+
+const (
+	TypeStorageSpace = "storage"
+	TypeConfigSpace  = "config"
+)

configs/envconst/storage.go

@@ -0,0 +1,7 @@
+package envconst
+
+const (
+	TypeLocalStorage = "local"
+	TypeGitStorage   = "git"
+	TypeS3Storage    = "s3"
+)

configs/envname/name.go

@@ -4,4 +4,6 @@ const (
 	Theme   = "THEME"
 	Logger  = "LOGGER"
 	Testing = "GO_TESTING"
+	Space   = "SPACE"
+	Storage = "STORAGE"
 )

e2e/kernel/connect_test.go

@@ -4,6 +4,7 @@ package kernel
 
 import (
 	"context"
+	ssh2 "github.com/misha-ssh/kernel/pkg/ssh"
 	"os/exec"
 	"testing"
 	"time"
@@ -59,7 +60,7 @@ func TestIntegrationDefaultConnect(t *testing.T) {
 			},
 		}
 
-		sshConnector := &connect.Ssh{
+		sshConnector := &ssh2.Ssh{
 			Connection: connection,
 		}
 
@@ -127,7 +128,7 @@ func TestIntegrationPrivateKeyConnect(t *testing.T) {
 			},
 		}
 
-		sshConnector := &connect.Ssh{
+		sshConnector := &ssh2.Ssh{
 			Connection: connection,
 		}
 		session, err := sshConnector.Session()
@@ -193,7 +194,7 @@ func TestIntegrationPrivateKeyConnectWithPassphrase(t *testing.T) {
 			},
 		}
 
-		sshConnector := &connect.Ssh{
+		sshConnector := &ssh2.Ssh{
 			Connection: connection,
 		}
 		session, err := sshConnector.Session()

examples/ssh/external_port/main.go

@@ -1,23 +1,24 @@
 package main
 
 import (
+	"github.com/misha-ssh/kernel/pkg/ssh"
 	"time"
 
 	"github.com/misha-ssh/kernel/pkg/connect"
 )
 
 // main for success connect start make command: up-ssh-port
 func main() {
-	ssh := &connect.Ssh{
+	ssh := &ssh.Ssh{
 		Connection: &connect.Connect{
 			Alias:     "test",
 			Login:     "root",
 			Password:  "password",
 			Address:   "localhost",
 			Type:      connect.TypeSSH,
 			CreatedAt: time.Now().Format(time.RFC3339),
 			UpdatedAt: time.Now().Format(time.RFC3339),
 			SshOptions: &connect.SshOptions{
 				Port:       2222,
 				PrivateKey: "",
 				Passphrase: "",

examples/ssh/password/main.go

@@ -1,14 +1,15 @@
 package main
 
 import (
+	"github.com/misha-ssh/kernel/pkg/ssh"
 	"time"
 
 	"github.com/misha-ssh/kernel/pkg/connect"
 )
 
 // main for success connect start make command: up-ssh
 func main() {
-	ssh := &connect.Ssh{
+	ssh := &ssh.Ssh{
 		Connection: &connect.Connect{
 			Alias:     "test",
 			Login:     "root",

examples/ssh/private_key/main.go

@@ -1,14 +1,15 @@
 package main
 
 import (
+	"github.com/misha-ssh/kernel/pkg/ssh"
 	"time"
 
 	"github.com/misha-ssh/kernel/pkg/connect"
 )
 
 // main for success connect start make command: up-ssh-key
 func main() {
-	ssh := &connect.Ssh{
+	ssh := &ssh.Ssh{
 		Connection: &connect.Connect{
 			Alias:     "test",
 			Login:     "root",

examples/ssh/private_key_passphare/main.go

@@ -1,14 +1,15 @@
 package main
 
 import (
+	"github.com/misha-ssh/kernel/pkg/ssh"
 	"time"
 
 	"github.com/misha-ssh/kernel/pkg/connect"
 )
 
 // main for success connect start make command: up-ssh-key-pass
 func main() {
-	ssh := &connect.Ssh{
+	ssh := &ssh.Ssh{
 		Connection: &connect.Connect{
 			Alias:     "test",
 			Login:     "root",

internal/logger/storage.go

@@ -11,25 +11,27 @@ import (
 	"github.com/misha-ssh/kernel/internal/storage"
 )
 
-const FileName = envconst.FilenameLogger
+const Filename = envconst.FilenameLogger
 
 var (
-	DirectionApp = storage.GetAppDir()
-
 	ErrGetStorageInfo = errors.New("err get info use log - storage")
 	ErrCreateStorage  = errors.New("err at created log file")
 	ErrGetOpenFile    = errors.New("err get open log file")
 )
 
-type StorageLogger struct{}
+type StorageLogger struct {
+	storage *storage.Local
+}
 
 func NewStorageLogger() *StorageLogger {
-	return &StorageLogger{}
+	return &StorageLogger{
+		storage: storage.NewLocal(),
+	}
 }
 
-func (sl *StorageLogger) createLogFile() error {
-	if !storage.Exists(DirectionApp, FileName) {
-		err := storage.Create(DirectionApp, FileName)
+func (s *StorageLogger) createLogFile() error {
+	if !s.storage.Exists(Filename) {
+		err := s.storage.Create(Filename)
 		if err != nil {
 			return err
 		}
@@ -38,8 +40,8 @@ func (sl *StorageLogger) createLogFile() error {
 	return nil
 }
 
-func (sl *StorageLogger) log(value any, status StatusLog) error {
-	err := sl.createLogFile()
+func (s *StorageLogger) log(value any, status StatusLog) error {
+	err := s.createLogFile()
 	if err != nil {
 		return ErrCreateStorage
 	}
@@ -51,7 +53,7 @@ func (sl *StorageLogger) log(value any, status StatusLog) error {
 
 	logInfo := fmt.Sprintf("|%v| file: %s, line: %v, message: %#v", status, calledFile, line, value)
 
-	openLogFile, err := storage.GetOpenFile(DirectionApp, FileName, os.O_WRONLY|os.O_APPEND|os.O_CREATE)
+	openLogFile, err := s.storage.GetOpenFile(Filename, os.O_WRONLY|os.O_APPEND|os.O_CREATE)
 	defer func(openLogFile *os.File) {
 		err = openLogFile.Close()
 	}(openLogFile)
@@ -65,29 +67,29 @@ func (sl *StorageLogger) log(value any, status StatusLog) error {
 	return nil
 }
 
-func (sl *StorageLogger) Error(value any) {
-	err := sl.log(value, ErrorStatus)
+func (s *StorageLogger) Error(value any) {
+	err := s.log(value, ErrorStatus)
 	if err != nil {
 		panic(err)
 	}
 }
 
-func (sl *StorageLogger) Debug(value any) {
-	err := sl.log(value, DebugStatus)
+func (s *StorageLogger) Debug(value any) {
+	err := s.log(value, DebugStatus)
 	if err != nil {
 		panic(err)
 	}
 }
 
-func (sl *StorageLogger) Info(value any) {
-	err := sl.log(value, InfoStatus)
+func (s *StorageLogger) Info(value any) {
+	err := s.log(value, InfoStatus)
 	if err != nil {
 		panic(err)
 	}
 }
 
-func (sl *StorageLogger) Warn(value any) {
-	err := sl.log(value, WarnStatus)
+func (s *StorageLogger) Warn(value any) {
+	err := s.log(value, WarnStatus)
 	if err != nil {
 		panic(err)
 	}

internal/setup/setup.go

@@ -3,6 +3,8 @@ package setup
 import (
 	"encoding/json"
 	"errors"
+	"github.com/misha-ssh/kernel/internal/space"
+	"github.com/misha-ssh/kernel/pkg/ssh"
 	"os/user"
 
 	"github.com/misha-ssh/kernel/configs/envconst"
@@ -17,7 +19,9 @@ import (
 
 var (
 	ErrCreateFileConnection = errors.New("err create file connection")
-	ErrSetLoggerFromConfig  = errors.New("err set logger from configs")
+	ErrSetLoggerFromConfig  = errors.New("err set logger from config")
+	ErrSetStorageFromConfig = errors.New("err set storage from config")
+	ErrSetSpaceFromConfig   = errors.New("err set space from config")
 	ErrSetDefaultValue      = errors.New("err set default value")
 	ErrMarshalJson          = errors.New("failed to marshal json")
 	ErrWriteJson            = errors.New("failed to write json")
@@ -92,8 +96,10 @@ func initFileConfig() error {
 	}
 
 	defaultValues := map[string]string{
-		envname.Theme:  envconst.Theme,
-		envname.Logger: envconst.TypeStorageLogger,
+		envname.Theme:   envconst.Theme,
+		envname.Logger:  envconst.TypeStorageLogger,
+		envname.Space:   envconst.TypeStorageSpace,
+		envname.Storage: envconst.TypeLocalStorage,
 	}
 
 	for key, value := range defaultValues {
@@ -163,6 +169,42 @@ func initLoggerFromConfig() error {
 	return nil
 }
 
+func initStorageFromConfig() error {
+	storageType := config.Get(envname.Storage)
+
+	switch storageType {
+	case envconst.TypeLocalStorage:
+		storage.Set(storage.NewLocal())
+	default:
+		return ErrSetStorageFromConfig
+	}
+
+	return nil
+}
+
+func initSpaceFromConfig() error {
+	storageType := config.Get(envname.Space)
+
+	switch storageType {
+	case envconst.TypeStorageSpace:
+		space.Set(
+			&space.Storage{
+				Storage: storage.Get(),
+			},
+		)
+	case envconst.TypeConfigSpace:
+		space.Set(
+			&space.SSHConfig{
+				Config: ssh.NewConfig(),
+			},
+		)
+	default:
+		return ErrSetSpaceFromConfig
+	}
+
+	return nil
+}
+
 // Init performs complete application initialization:
 // 1. Config file setup
 // 2. Logger configuration
@@ -187,6 +229,16 @@ func Init() {
 		panic(err)
 	}
 
+	err = initStorageFromConfig()
+	if err != nil {
+		panic(err)
+	}
+
+	err = initSpaceFromConfig()
+	if err != nil {
+		panic(err)
+	}
+
 	err = initFileConnections()
 	if err != nil {
 		panic(err)

internal/space/space.go

@@ -0,0 +1,29 @@
+package space
+
+import (
+	"github.com/misha-ssh/kernel/internal/storage"
+	"github.com/misha-ssh/kernel/pkg/connect"
+)
+
+type Space interface {
+	GetConnections() (*connect.Connections, error)
+	SaveConnection(connection *connect.Connect) error
+	UpdateConnection(connection *connect.Connect) (*connect.Connect, error)
+	DeleteConnection(connection *connect.Connect) error
+}
+
+var defaultSpace Space
+
+func Get() Space {
+	if defaultSpace == nil {
+		defaultSpace = &Storage{
+			Storage: storage.Get(),
+		}
+	}
+
+	return defaultSpace
+}
+
+func Set(space Space) {
+	defaultSpace = space
+}

internal/space/ssh_config.go

@@ -0,0 +1,26 @@
+package space
+
+import (
+	"github.com/misha-ssh/kernel/pkg/connect"
+	"github.com/misha-ssh/kernel/pkg/ssh"
+)
+
+type SSHConfig struct {
+	Config *ssh.Config
+}
+
+func (s *SSHConfig) GetConnections() (*connect.Connections, error) {
+	return nil, nil
+}
+
+func (s *SSHConfig) SaveConnection(connection *connect.Connect) error {
+	return nil
+}
+
+func (s *SSHConfig) UpdateConnection(connection *connect.Connect) (*connect.Connect, error) {
+	return nil, nil
+}
+
+func (s *SSHConfig) DeleteConnection(connection *connect.Connect) error {
+	return nil
+}