fix(back) adjust flows

.github/actions/build/back-app/linux/action.yaml

@@ -22,8 +22,8 @@ runs:
     - name: Build
       shell: bash
       run: |
-        cd BACK/docker-backend/
-        go build
+        cd BACK/app/
+        go build -o ogree_app_backend
 
     - name: Send to Nextcloud
       shell: bash
@@ -34,10 +34,6 @@ runs:
         curl -u $NEXT_CREDENTIALS -X MKCOL $NEXT_ADDR
 
         zip -r OGrEE_APP_Backend_Linux.zip deploy/ \
-              BACK/docker-backend/.env \
-              BACK/docker-backend/ogree_app_backend \
-              BACK/docker-backend/flutter-assets/ \
-              BACK/docker-backend/tools-assets/ \
-              BACK/docker-backend/backend-assets/
+              BACK/app/ 
 
         curl -u $NEXT_CREDENTIALS -T OGrEE_APP_Backend_Linux.zip $NEXT_ADDR/OGrEE_APP_Backend_Linux.zip

.github/actions/build/windows/action.yaml

@@ -24,7 +24,7 @@ runs:
         go-version: '1.20'
 
     - name: Windows backend build
-      run: cd ./BACK/docker-backend/ && go build
+      run: cd ./BACK/app/ && go build -o ogree_app_backend.exe
       shell: cmd
 
     - name: Download CLI from Nextcloud

BACK/app/Dockerfile

@@ -13,7 +13,7 @@ COPY . .
 
 
 # Build the Go app
-RUN CGO_ENABLED=0 GOOS=linux go build -a -o kube-admin -ldflags "-X main.version=${VERSION} -X 'main.build=$(date)'" .
+RUN CGO_ENABLED=0 GOOS=linux go build -a -o back-admin -ldflags "-X main.version=${VERSION} -X 'main.build=$(date)'" .
 
 # Start fresh from a smaller image
 FROM alpine:3.16
@@ -48,7 +48,7 @@ RUN helm repo add bootc https://charts.boo.tc
 
 WORKDIR /bin
 
-COPY --from=build /build/kube-admin .
+COPY --from=build /build/back-admin .
 COPY --from=build /build/.env .
 COPY --from=build /build/swagger.json .
 COPY --from=build /build/handlers handlers
@@ -57,4 +57,4 @@ COPY --from=build /build/netbox netbox
 
 
 # Run the binary program produced by `go install`
-CMD ["./kube-admin", "-kube"]
+CMD ["./back-admin", "-kube"]

BACK/app/go.mod

@@ -1,4 +1,4 @@
-module kube-admin
+module back-admin
 
 go 1.20
 

BACK/app/handlers/docker/app.go

@@ -1,7 +1,7 @@
 package docker
 
 import (
-	"kube-admin/models"
+	"back-admin/models"
 	"net/http"
 	"os"
 	"text/template"

BACK/app/handlers/docker/server.go

@@ -1,9 +1,9 @@
 package docker
 
 import (
+	"back-admin/models"
+	sshcmd "back-admin/services/ssh"
 	"fmt"
-	"kube-admin/models"
-	sshcmd "kube-admin/services/ssh"
 	"net/http"
 	"os"
 	"strings"

BACK/app/handlers/docker/tenant.go

@@ -1,14 +1,14 @@
 package docker
 
 import (
+	"back-admin/models"
 	"bufio"
 	"bytes"
 	"encoding/json"
 	"errors"
 	"fmt"
 	"io"
 	"io/ioutil"
-	"kube-admin/models"
 	"net/http"
 	"os"
 	"os/exec"

BACK/app/handlers/docker/tools.go

@@ -1,9 +1,9 @@
 package docker
 
 import (
+	"back-admin/models"
 	"bytes"
 	"fmt"
-	"kube-admin/models"
 	"net/http"
 	"os"
 	"os/exec"

BACK/app/handlers/kube/app.go

@@ -1,8 +1,8 @@
 package kube
 
 import (
-	"kube-admin/models"
-	"kube-admin/services/k8s"
+	"back-admin/models"
+	"back-admin/services/k8s"
 	"net/http"
 	"os"
 

BACK/app/handlers/kube/auth.go

@@ -1,8 +1,8 @@
 package kube
 
 import (
-	"kube-admin/auth"
-	"kube-admin/models"
+	"back-admin/auth"
+	"back-admin/models"
 	"net/http"
 	"os"
 

BACK/app/handlers/kube/container.go

@@ -1,7 +1,7 @@
 package kube
 
 import (
-	"kube-admin/services/k8s"
+	"back-admin/services/k8s"
 	"net/http"
 	"strings"
 

BACK/app/handlers/kube/netbox.go

@@ -1,8 +1,8 @@
 package kube
 
 import (
-	"kube-admin/models"
-	"kube-admin/services/k8s"
+	"back-admin/models"
+	"back-admin/services/k8s"
 	"net/http"
 	"os"
 	"os/exec"

BACK/app/handlers/kube/tenants.go

@@ -1,10 +1,10 @@
 package kube
 
 import (
-	"kube-admin/models"
-	"kube-admin/services/cmd"
-	"kube-admin/services/helm"
-	"kube-admin/services/k8s"
+	"back-admin/models"
+	"back-admin/services/cmd"
+	"back-admin/services/helm"
+	"back-admin/services/k8s"
 	"net/http"
 	"os"
 	"os/exec"

BACK/app/helm/admin-values.yaml

@@ -1,7 +1,7 @@
 
 replicaCount: 1
 image:
-  repository: registry.ogree.ditrit.io/kube-admin
+  repository: registry.ogree.ditrit.io/back-admin
   pullPolicy: Always
   tag: latest
 serviceAccountName: ogree-admin

BACK/app/main.go

@@ -1,4 +1,4 @@
-//	 Kube-admin:
+//	 back-admin:
 //	  version: 1.0.0
 //	  title: Awsome API
 //	 Schemes: http, https
@@ -17,8 +17,8 @@
 package main
 
 import (
+	"back-admin/services"
 	"flag"
-	"kube-admin/services"
 	"strconv"
 
 	"github.com/joho/godotenv"

BACK/app/services/helm/helm.go

@@ -1,19 +1,19 @@
 package helm
 
 import (
-	"kube-admin/models"
-	"kube-admin/services/cmd"
+	"back-admin/models"
+	"back-admin/services/cmd"
 	"os"
 	"strings"
 
 	"gopkg.in/yaml.v3"
 )
 
-func GetDataFromYaml(filename string, output interface{}) (error) {
+func GetDataFromYaml(filename string, output interface{}) error {
 
-	file, err := os.Open("helm/"+filename) // For read access.
+	file, err := os.Open("helm/" + filename) // For read access.
 	if err != nil {
-		if strings.Contains(err.Error(),"no such file or directory"){
+		if strings.Contains(err.Error(), "no such file or directory") {
 			return nil
 		}
 		return err
@@ -26,18 +26,18 @@ func GetDataFromYaml(filename string, output interface{}) (error) {
 
 	err = yaml.Unmarshal(data[:count], output)
 	if err != nil {
-        return err
-    }
+		return err
+	}
 	defer file.Close()
 	return nil
 }
 
-func DeploytoYaml(filename string,deploy models.Deployement) error{
-	
+func DeploytoYaml(filename string, deploy models.Deployement) error {
+
 	b, err := yaml.Marshal(&deploy)
-    if err != nil {
-        return err
-    }
+	if err != nil {
+		return err
+	}
 
 	err = os.WriteFile("helm/"+filename, b, 0644)
 	if err != nil {
@@ -46,62 +46,62 @@ func DeploytoYaml(filename string,deploy models.Deployement) error{
 	return nil
 }
 
-func WriteDeployementFile(deploy models.Deployement,data models.Tenant) error {
-	if deploy.Ingress.Enabled{
-		deploy.Service.Type="NodePort"
-		deploy.Ingress.Hosts[0].Host += "."+data.Name+"."+os.Getenv("HOST")
-	}else{
-		deploy.Service.Type="ClusterIP"
+func WriteDeployementFile(deploy models.Deployement, data models.Tenant) error {
+	if deploy.Ingress.Enabled {
+		deploy.Service.Type = "NodePort"
+		deploy.Ingress.Hosts[0].Host += "." + data.Name + "." + os.Getenv("HOST")
+	} else {
+		deploy.Service.Type = "ClusterIP"
 	}
-	setBDDPassword(deploy.Env,data.CustomerPassword)
-	setAPPUrl(deploy.ConfigMap,data.Name)
-	if err := DeploytoYaml("values.yaml",deploy);err != nil {
+	setBDDPassword(deploy.Env, data.CustomerPassword)
+	setAPPUrl(deploy.ConfigMap, data.Name)
+	if err := DeploytoYaml("values.yaml", deploy); err != nil {
 		return err
 	}
 	return nil
 }
 
-func setAPPUrl(config []models.ConfigMap,name string){
-	for i := range config{
-		if config[i].Name == "webapp-env"{
-			h:= "https://"
-			if os.Getenv("HOST") =="localhost"{
-				h = "http://" 
+func setAPPUrl(config []models.ConfigMap, name string) {
+	for i := range config {
+		if config[i].Name == "webapp-env" {
+			h := "https://"
+			if os.Getenv("HOST") == "localhost" {
+				h = "http://"
 			}
-			apiUrl := h+"api."+name+"."+os.Getenv("HOST")
-			configValue:="API_URL="+apiUrl+"\nALLOW_SET_BACK=false"
+			apiUrl := h + "api." + name + "." + os.Getenv("HOST")
+			configValue := "API_URL=" + apiUrl + "\nALLOW_SET_BACK=false"
 			config[i].Data[0].Value = configValue
 		}
 	}
 }
 
-func setBDDPassword(env []models.Env,pass string){
-	for i := range env{
-		if env[i].Name =="db_pass" ||
-			env[i].Name =="ARANGO_PASSWORD" ||
-			env[i].Name =="CUSTOMER_API_PASSWORD"||
-			env[i].Name =="ARANGO_ROOT_PASSWORD"{
+func setBDDPassword(env []models.Env, pass string) {
+	for i := range env {
+		if env[i].Name == "db_pass" ||
+			env[i].Name == "ARANGO_PASSWORD" ||
+			env[i].Name == "CUSTOMER_API_PASSWORD" ||
+			env[i].Name == "ARANGO_ROOT_PASSWORD" {
 			env[i].Value = pass
 		}
 	}
 }
 
-func InstallYaml(name,ns string,install bool) error {
+func InstallYaml(name, ns string, install bool) error {
 	verb := "install"
-	if install{
-		verb= "upgrade"
+	if install {
+		verb = "upgrade"
 	}
-	command := "helm "+verb+" "+name+" helm/ogree -f "+"helm/values.yaml -n "+ns
-	_ ,err := cmd.ExecCommand(command)
+	command := "helm " + verb + " " + name + " helm/ogree -f " + "helm/values.yaml -n " + ns
+	_, err := cmd.ExecCommand(command)
 	if err != nil {
 		return err
 	}
 	return nil
 }
 
-func Uninstall(name,ns string) error{
-	command := "helm uninstall "+name+" -n "+ns
-	_ ,err := cmd.ExecCommand(command)
+func Uninstall(name, ns string) error {
+	command := "helm uninstall " + name + " -n " + ns
+	_, err := cmd.ExecCommand(command)
 	if err != nil {
 		return err
 	}

BACK/app/services/k8s/k8s.go

@@ -1,12 +1,12 @@
 package k8s
 
 import (
+	"back-admin/models"
+	"back-admin/services/cmd"
 	"bytes"
 	"encoding/json"
 	"errors"
 	"fmt"
-	"kube-admin/models"
-	"kube-admin/services/cmd"
 	"os/exec"
 	"strconv"
 	"strings"

BACK/app/services/router.go

@@ -1,9 +1,9 @@
 package services
 
 import (
-	"kube-admin/auth"
-	"kube-admin/handlers/docker"
-	"kube-admin/handlers/kube"
+	"back-admin/auth"
+	"back-admin/handlers/docker"
+	"back-admin/handlers/kube"
 	"net/http"
 
 	"github.com/gin-gonic/gin"

BACK/app/swagger.json

@@ -11,7 +11,7 @@
   ],
   "swagger": "2.0",
   "info": {
-    "title": "Kube-admin:",
+    "title": "back-admin:",
     "version": "1.0.0"
   },
   "basePath": "/api",