Refactor providers data
This commit is contained in:
@ -2,9 +2,9 @@ package v1
|
||||
|
||||
import (
|
||||
"context"
|
||||
"fmt"
|
||||
|
||||
"git.badhouseplants.net/softplayer/softplayer-backend/internal/controllers"
|
||||
"git.badhouseplants.net/softplayer/softplayer-backend/internal/kubernetes"
|
||||
"git.badhouseplants.net/softplayer/softplayer-backend/internal/providers"
|
||||
proto "git.badhouseplants.net/softplayer/softplayer-go-proto/pkg/environments"
|
||||
"github.com/golang/protobuf/ptypes/empty"
|
||||
@ -29,18 +29,17 @@ func (e *EnvironmentsServer) Create(ctx context.Context, in *proto.CreateOptions
|
||||
return nil, err
|
||||
}
|
||||
|
||||
var location string
|
||||
switch in.GetSpec().GetProvider() {
|
||||
case proto.Provider_PROVIDER_HETZNER:
|
||||
location, err = provider.GetServerLocation(in.GetSpec().GetHetznerOptions().GetServerLocation().String())
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
default:
|
||||
return nil, fmt.Errorf("unknown provider: %s", in.GetSpec().GetProvider())
|
||||
k8s, err := kubernetes.GetKubernetes(in.GetSpec().GetKubernetes())
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
|
||||
serverType, err := provider.GetServerType(in.Spec.HetznerOptions.ServerType)
|
||||
location, err := provider.GetServerLocation(in.GetSpec().GetServerLocation().String())
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
|
||||
serverType, err := provider.GetServerType(in.Spec.ServerType.String())
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
@ -48,8 +47,8 @@ func (e *EnvironmentsServer) Create(ctx context.Context, in *proto.CreateOptions
|
||||
data := &controllers.EnvironemntData{
|
||||
Name: in.GetMetadata().GetName(),
|
||||
Description: in.GetMetadata().GetDescription(),
|
||||
Provider: in.GetSpec().GetProvider(),
|
||||
Kubernetes: in.GetSpec().GetKubernetes().String(),
|
||||
Provider: provider.GetProviderName(),
|
||||
Kubernetes: k8s.GetKubernetesName(),
|
||||
Location: location,
|
||||
ServerType: serverType,
|
||||
}
|
||||
|
Reference in New Issue
Block a user