Merge remote-tracking branch 'origin/feature/PRXS-1609-AddURLStruct' into...

Merge remote-tracking branch 'origin/feature/PRXS-1609-AddURLStruct' into feature/PRXS-1609-AddURLStruct

# Conflicts:
#	pkg/action/action.go

pkg/extension/server.go

@@ -87,8 +87,10 @@ func (srv *Server) Action(ctx context.Context, in *pb.ActionRequest) (*pb.Action
 		if err != nil {
 			return nil, err
 		}
+		if actionURL.Scheme == "grpc" {
 			ext = actionURL.Extension()
 		}
+	}
 
 	svc, ok := srv.services[ext]
 	if !ok {

pkg/extension/service/extension.go

@@ -162,8 +162,10 @@ func (s *Extension) Action(ctx context.Context, in *extension.ActionRequest) (*e
 		if err != nil {
 			return nil, err
 		}
+		if actionURL.Scheme == "grpc" {
 			ext = actionURL.Extension()
 		}
+	}
 	ok, err := extension.CheckInstalled(ctx, s.Content, in.SpaceId, in.EnvId, ext)
 	if err != nil {
 		return nil, errors.Wrap(err, "check extension installed")