refactored
This commit is contained in:
@@ -3,12 +3,10 @@ package servers
|
||||
import (
|
||||
"fmt"
|
||||
|
||||
"git.acooldomain.co/server-manager/backend-kubernetes-go/auth"
|
||||
"git.acooldomain.co/server-manager/backend-kubernetes-go/db_handler/mongo"
|
||||
"git.acooldomain.co/server-manager/backend-kubernetes-go/dbhandler"
|
||||
instancemanager "git.acooldomain.co/server-manager/backend-kubernetes-go/instance_manager"
|
||||
"git.acooldomain.co/server-manager/backend-kubernetes-go/instance_manager/docker"
|
||||
"git.acooldomain.co/server-manager/backend-kubernetes-go/models"
|
||||
"git.acooldomain.co/server-manager/backend/auth"
|
||||
"git.acooldomain.co/server-manager/backend/factories"
|
||||
instancemanager "git.acooldomain.co/server-manager/backend/instancemanager"
|
||||
"git.acooldomain.co/server-manager/backend/models"
|
||||
"github.com/gin-gonic/gin"
|
||||
)
|
||||
|
||||
@@ -29,7 +27,7 @@ func convertImageToImageData(instanceImage instancemanager.Image) *ImageData {
|
||||
DisplayName: fmt.Sprintf("%s %s", instanceImage.Registry, instanceImage.Tag),
|
||||
}
|
||||
}
|
||||
func (con Connection) GetImages(ctx *gin.Context) {
|
||||
func (con ServersApi) GetImages(ctx *gin.Context) {
|
||||
images, err := con.InstanceManager.ListImages(ctx)
|
||||
if err != nil {
|
||||
ctx.AbortWithError(500, err)
|
||||
@@ -51,35 +49,22 @@ func (con Connection) GetImages(ctx *gin.Context) {
|
||||
}
|
||||
|
||||
func LoadeImagesGroup(group *gin.RouterGroup, config models.GlobalConfig) {
|
||||
var instanceManager instancemanager.InstanceManager
|
||||
var serversDbHandler dbhandler.ServersDbHandler
|
||||
var serversAuthorizationHandler dbhandler.ServersAuthorizationDbHandler
|
||||
|
||||
var err error
|
||||
|
||||
if config.InstanceManager.Type == models.DOCKER {
|
||||
instanceManager, err = docker.NewInstanceManager(config.InstanceManager.Docker)
|
||||
if err != nil {
|
||||
panic(err)
|
||||
}
|
||||
instanceManager, err := factories.GetInstanceManager(config.InstanceManager)
|
||||
if err != nil {
|
||||
panic(err)
|
||||
}
|
||||
|
||||
if config.ServersDatabase.Type == models.MONGO {
|
||||
serversDbHandler, err = mongo.NewServersDbHandler(*config.ServersDatabase.Mongo)
|
||||
if err != nil {
|
||||
panic(err)
|
||||
}
|
||||
serversDbHandler, err := factories.GetServersDbHandler(config.ServersDatabase)
|
||||
if err != nil {
|
||||
panic(err)
|
||||
}
|
||||
|
||||
if config.ServersAuthorizationDatabase.Type == models.MONGO {
|
||||
serversAuthorizationHandler, err = mongo.NewAuthorizationHandler(*config.ServersAuthorizationDatabase.Mongo)
|
||||
if err != nil {
|
||||
panic(err)
|
||||
}
|
||||
|
||||
serversAuthorizationHandler, err := factories.GetServersAuthorizationDbHandler(config.ServersAuthorizationDatabase)
|
||||
if err != nil {
|
||||
panic(err)
|
||||
}
|
||||
|
||||
connection := Connection{
|
||||
connection := ServersApi{
|
||||
ServersDbHandler: serversDbHandler,
|
||||
ServerAuthorization: serversAuthorizationHandler,
|
||||
InstanceManager: instanceManager,
|
||||
|
Reference in New Issue
Block a user