Skip to content
Snippets Groups Projects
Commit c9c1d1b5 authored by ko_oler's avatar ko_oler
Browse files

правки по ПР: изменено условие

parent cb82db6c
No related branches found
No related tags found
No related merge requests found
...@@ -81,13 +81,13 @@ func (srv *Server) Update(ctx context.Context, request *UpdateRequest) (*UpdateR ...@@ -81,13 +81,13 @@ func (srv *Server) Update(ctx context.Context, request *UpdateRequest) (*UpdateR
} }
func (srv *Server) Action(ctx context.Context, in *pb.ActionRequest) (*pb.ActionResponse, error) { func (srv *Server) Action(ctx context.Context, in *pb.ActionRequest) (*pb.ActionResponse, error) {
ext := in.Extension
if ext == "" {
actionURL, err := action.NewURL(in.Action) actionURL, err := action.NewURL(in.Action)
if err != nil { if err != nil {
return nil, err return nil, err
} }
ext = actionURL.Extension() ext := actionURL.Extension()
if ext == "" && in.Extension != "" {
ext = in.Extension
} }
svc, ok := srv.services[ext] svc, ok := srv.services[ext]
......
...@@ -156,13 +156,13 @@ func (s *Extension) Uninstall(ctx context.Context, in *extension.UninstallReques ...@@ -156,13 +156,13 @@ func (s *Extension) Uninstall(ctx context.Context, in *extension.UninstallReques
} }
func (s *Extension) Action(ctx context.Context, in *extension.ActionRequest) (*extension.ActionResponse, error) { func (s *Extension) Action(ctx context.Context, in *extension.ActionRequest) (*extension.ActionResponse, error) {
ext := in.Extension
if ext == "" {
actionURL, err := action.NewURL(in.Action) actionURL, err := action.NewURL(in.Action)
if err != nil { if err != nil {
return nil, err return nil, err
} }
ext = actionURL.Extension() ext := actionURL.Extension()
if ext == "" && in.Extension != "" {
ext = in.Extension
} }
ok, err := extension.CheckInstalled(ctx, s.Content, in.SpaceId, in.EnvId, ext) ok, err := extension.CheckInstalled(ctx, s.Content, in.SpaceId, in.EnvId, ext)
if err != nil { if err != nil {
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment