aligned users to new design

servers/images.go

@@ -1,46 +1,41 @@
 package servers
 
 import (
-	"context"
 	"fmt"
-	"strings"
 
 	"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"
-	"github.com/docker/docker/api/types/filters"
-	"github.com/docker/docker/api/types/image"
-	"github.com/docker/docker/client"
 	"github.com/gin-gonic/gin"
-	"go.mongodb.org/mongo-driver/mongo"
 )
 
 type ImageData struct {
-	Id          string
-	Name        string
-	Version     string
-	DisplayName string
+	Id          string `json:"Id"`
+	Name        string `json:"Name"`
+	Version     string `json:"Version"`
+	DisplayName string `json:"DisplayName"`
 }
 
-func convertImageToImageData(imageSummary image.Summary) *ImageData {
-	if len(imageSummary.RepoTags) == 0 {
-		return nil
-	}
-	imageId := imageSummary.RepoTags[0]
-	splitImageId := strings.Split(imageId, ":")
-	imageName, imageVersion := splitImageId[0], splitImageId[1]
+func convertImageToImageData(instanceImage instancemanager.Image) *ImageData {
+	imageId := instanceImage.Registry + ":" + instanceImage.Tag
+
 	return &ImageData{
 		Id:          imageId,
-		Name:        imageName,
-		Version:     imageVersion,
-		DisplayName: fmt.Sprintf("%s %s", imageName, imageVersion),
+		Name:        instanceImage.Registry,
+		Version:     instanceImage.Tag,
+		DisplayName: fmt.Sprintf("%s %s", instanceImage.Registry, instanceImage.Tag),
 	}
 }
-func (con Connection) GetImages(c *gin.Context) {
-	images, err := con.dockerClient.ImageList(context.TODO(), image.ListOptions{Filters: filters.NewArgs(filters.Arg("label", "type=GAME"))})
+func (con Connection) GetImages(ctx *gin.Context) {
+	images, err := con.InstanceManager.ListImages(ctx)
 	if err != nil {
-		c.AbortWithError(500, err)
+		ctx.AbortWithError(500, err)
 		return
 	}
+
 	imagesData := make([]ImageData, 0, len(images))
 
 	for _, imageSummary := range images {
@@ -52,16 +47,43 @@ func (con Connection) GetImages(c *gin.Context) {
 		imagesData = append(imagesData, *imageData)
 	}
 
-	c.JSON(200, imagesData)
+	ctx.JSON(200, imagesData)
 }
 
-func LoadeImagesGroup(group *gin.RouterGroup, mongo_client *mongo.Client, config models.GlobalConfig) {
-	apiClient, err := client.NewClientWithOpts(client.FromEnv, client.WithAPIVersionNegotiation())
-	if err != nil {
-		panic(err)
-	}
-	defer apiClient.Close()
+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)
+		}
+	}
+
+	if config.ServersDatabase.Type == models.MONGO {
+		serversDbHandler, err = mongo.NewServersDbHandler(*config.ServersDatabase.Mongo)
+		if err != nil {
+			panic(err)
+		}
+	}
+
+	if config.ServersAuthorizationDatabase.Type == models.MONGO {
+		serversAuthorizationHandler, err = mongo.NewAuthorizationHandler(*config.ServersAuthorizationDatabase.Mongo)
+		if err != nil {
+			panic(err)
+		}
+
+	}
+
+	connection := Connection{
+		ServersDbHandler:    serversDbHandler,
+		ServerAuthorization: serversAuthorizationHandler,
+		InstanceManager:     instanceManager,
+	}
 
-	connection := Connection{databaseConnection: mongo_client, dockerClient: apiClient}
 	group.GET("", auth.AuthorizedTo(0), connection.GetImages)
 }