softplayer/softplayer-backend
1
0
Fork 0
Code Issues 1 Pull Requests Actions Packages Projects Releases Activity

Return the created env on create req

Browse Source
This commit is contained in:
Nikolai Rodionov
2024-04-30 10:20:46 +02:00
parent 99ee44b431
commit c49e885255
4 changed files with 20 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
api/v1/environments.go
View File

@@ -113,16 +113,6 @@ func (e *EnvironmentsServer) Get(ctx context.Context, in *proto.GetOptions) (*pr
return nil, err
}
serverType, err := provider.RawServerType(environment.Data.ServerType)
if err != nil {
return nil, err
}
location, err := provider.RawServerLocation(environment.Data.Location)
if err != nil {
return nil, err
}
k8s, err := kubernetes.GetKubernetes(environment.Data.Kubernetes)
if err != nil {
return nil, err
@@ -132,8 +122,8 @@ func (e *EnvironmentsServer) Get(ctx context.Context, in *proto.GetOptions) (*pr
Spec: &proto.EnvironmentSpec{
Provider: proto.Provider(proto.Provider_value[provider.RawProviderName()]),
Kubernetes: proto.Kubernetes(proto.Kubernetes_value[k8s.RawKubernetesName()]),
ServerLocation: proto.Location(proto.Location_value[location]),
ServerType: proto.ServerType(proto.ServerType_value[serverType]),
ServerLocation: proto.Location(proto.Location_value[provider.RawServerLocation(environment.Data.Location)]),
ServerType: proto.ServerType(proto.ServerType_value[provider.RawServerType(environment.Data.ServerType)]),
},
Metadata: &proto.EnvironmentMetadata{
Name: environment.Data.Name,
@@ -160,16 +150,6 @@ func (e *EnvironmentsServer) List(in *proto.ListOptions, stream proto.Environmen
return err
}
serverType, err := provider.RawServerType(environment.Data.ServerType)
if err != nil {
return err
}
location, err := provider.RawServerLocation(environment.Data.Location)
if err != nil {
return err
}
k8s, err := kubernetes.GetKubernetes(environment.Data.Kubernetes)
if err != nil {
return err
@@ -183,8 +163,8 @@ func (e *EnvironmentsServer) List(in *proto.ListOptions, stream proto.Environmen
Spec: &proto.EnvironmentSpec{
Provider: proto.Provider(proto.Provider_value[provider.RawProviderName()]),
Kubernetes: proto.Kubernetes(proto.Kubernetes_value[k8s.RawKubernetesName()]),
ServerLocation: proto.Location(proto.Location_value[location]),
ServerType: proto.ServerType(proto.ServerType_value[serverType]),
ServerLocation: proto.Location(proto.Location_value[provider.RawServerLocation(environment.Data.Location)]),
ServerType: proto.ServerType(proto.ServerType_value[provider.RawServerType(environment.Data.ServerType)]),
},
}); err != nil {
return err