Skip to content
Snippets Groups Projects
Commit 9cffb0d4 authored by Alena Petraki's avatar Alena Petraki
Browse files

Storge.GetStatus возвращает `Status.Installed: true` только если расширение...

Storge.GetStatus возвращает `Status.Installed: true` только если расширение полностью установлено и в состоянии `StateInstalled`
parent 55dccb1a
Branches
Tags
No related merge requests found
......@@ -2,11 +2,9 @@ package extension
import (
"context"
"fmt"
"git.perx.ru/perxis/perxis-go/pkg/content"
"git.perx.ru/perxis/perxis-go/pkg/errors"
"git.perx.ru/perxis/perxis-go/pkg/items"
pb "git.perx.ru/perxis/perxis-go/proto/extensions"
)
......@@ -28,25 +26,6 @@ type (
State = pb.State
)
//type State pb.State
//
//func (s State) Value() int {
// return int(s)
//}
//
//func (s State) String() string {
// return pb.State(s).String()
//}
//
//const (
// StatePending = State(pb.State_PENDING)
// StateInstalled = State(pb.State_INSTALLED)
// StateInProgress = State(pb.State_IN_PROGRESS)
// StateFail = State(pb.State_FAIL)
//
// //ExtensionMetadataKey = "extension"
//)
var (
ErrStart = errors.New("start failed")
ErrStop = errors.New("stop failed")
......@@ -85,26 +64,9 @@ type Extension interface {
}
func CheckInstalled(ctx context.Context, content *content.Content, spaceID, envID, extension string) (bool, error) {
res, _, err := content.Items.Find(ctx, spaceID, envID, StatusCollectionID,
&items.Filter{Q: []string{fmt.Sprintf("id == '%s'", extension)}})
status, err := NewStorage(content).GetStatus(ctx, spaceID, envID, extension)
if err != nil {
return false, err
}
if len(res) == 0 || res[0].Data["extension_state"] != int64(StateInstalled) {
return false, nil
}
return true, nil
return status.Installed, nil
}
//func ExtensionError(err error, ext string) error {
// return errors.WithContext(err, "extension", ext)
//}
//
//func ExtensionFromError(err error) string {
// v, _ := errors.ContextKey(err, "extension")
// ext, _ := v.(string)
// return ext
//}
......@@ -54,7 +54,7 @@ func statusFromItem(extension string, item *items.Item) *Status {
State: State(state),
Msg: msg,
Error: errmsg,
Installed: true,
Installed: State(state) == StateInstalled,
InstalledVersion: ver,
}
}
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment