Refactor providers data

internal/controllers/environments.go

@@ -5,11 +5,12 @@ import (
 	"errors"
 	"fmt"
 	"log"
-	"strings"
 
 	"github.com/joho/godotenv"
 
 	"git.badhouseplants.net/softplayer/softplayer-backend/internal/helpers/kube"
+	"git.badhouseplants.net/softplayer/softplayer-backend/internal/providers"
+	proto "git.badhouseplants.net/softplayer/softplayer-go-proto/pkg/environments"
 	corev1 "k8s.io/api/core/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/types"
@@ -28,29 +29,38 @@ type Environemnt struct {
 type EnvironemntData struct {
 	Name        string
 	Description string
-	Provider    string
+	Provider    proto.Provider
 	Kubernetes  string
-	HetznerData HetznerData
+	HetznerData proto.HetznerOptions
 }
 
-type HetznerData struct {
-	ServerLocation string
-	ServerType     string
-}
+func (e *EnvironemntData) buildVars() (string, error) {
+	provider, err := providers.GetProvider(e.Provider)
+	if err != nil {
+		return "", err
+	}
 
-func (e *EnvironemntData) buildVars() string {
-	vars := fmt.Sprintf("SP_PROVIDER=%s\nSP_KUBERNETES=%s", e.providerFmt(), e.kubernetesFmt())
-	return vars
-}
+	serverType, err := provider.GetServerType(e.HetznerData.ServerType)
+	if err != nil {
+		return "", err
+	}
 
-func (e *EnvironemntData) providerFmt() string {
-	res := strings.Replace(e.Provider, "PROVIDER_", "", -1)
-	return strings.ToLower(res)
-}
+	serverLocation, err := provider.GetServerLocation(e.HetznerData.ServerLocation.String())
+	if err != nil {
+		return "", err
+	}
+	vars := fmt.Sprintf(`# -- Generated by the softplayer controller
+SP_PROVIDER=%s
+SP_KUBERNETES=%s
+SP_SERVER_TYPE=%s
+SP_SERVER_LOCATION=%s`,
+		e.Provider,
+		e.Kubernetes,
+		serverType,
+		serverLocation,
+	)
 
-func (e *EnvironemntData) kubernetesFmt() string {
-	res := strings.Replace(e.Kubernetes, "KUBERNETES_", "", -1)
-	return strings.ToLower(res)
+	return vars, nil
 }
 
 func (env *Environemnt) isNsVerified(ctx context.Context) error {
@@ -74,6 +84,7 @@ func (env *Environemnt) Create(ctx context.Context) error {
 		log.Println("Can't verify ns")
 		return err
 	}
+
 	env.Controller.GetClient()
 	conf := &rest.Config{
 		Host:        "https://kubernetes.default.svc.cluster.local:443",
@@ -89,6 +100,10 @@ func (env *Environemnt) Create(ctx context.Context) error {
 		return err
 	}
 
+	vars, err := env.Data.buildVars()
+	if err != nil {
+		return err
+	}
 	obj := corev1.ConfigMap{
 		ObjectMeta: metav1.ObjectMeta{
 			Name:      env.Data.Name,
@@ -100,7 +115,7 @@ func (env *Environemnt) Create(ctx context.Context) error {
 		},
 		Data: map[string]string{
 			"description": env.Data.Description,
-			"vars":        env.Data.buildVars(),
+			"vars":        vars,
 		},
 	}
 	if err := kube.Create(ctx, controller.GetClient(), &obj, false); err != nil {
@@ -125,7 +140,6 @@ func (env *Environemnt) Delete(ctx context.Context) error {
 	if err != nil {
 		return err
 	}
-
 	obj := corev1.ConfigMap{
 		ObjectMeta: metav1.ObjectMeta{
 			Name:      env.Data.Name,
@@ -134,9 +148,6 @@ func (env *Environemnt) Delete(ctx context.Context) error {
 				"component": "bootstrap",
 			},
 		},
-		Data: map[string]string{
-			"vars": env.Data.buildVars(),
-		},
 	}
 	if err := kube.Delete(ctx, controller.GetClient(), &obj, false); err != nil {
 		return err
@@ -194,7 +205,7 @@ func (env *Environemnt) Get(ctx context.Context) error {
 		return err
 	}
 
-	env.Data.Provider = res["SP_PROVIDER"]
+	// env.Data.Provider = res["SP_PROVIDER"]
 	env.Data.Kubernetes = res["SP_KUBERNETES"]
 	return nil
 }