From 157bc207d57401f12c162eeb7041dcfa7f4aa637 Mon Sep 17 00:00:00 2001 From: Simon Alling Date: Fri, 10 Jan 2020 12:50:59 +0100 Subject: [PATCH] ref(pkg/storage): Refactor Deployed and DeployedAll The error returned from DeployedAll will never contain "not found". The error returned at the end of Deployed is already known to be nil, and we never want to return ls[0] together with a non-nil error anyway. Signed-off-by: Simon Alling --- pkg/storage/storage.go | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/pkg/storage/storage.go b/pkg/storage/storage.go index 6528c48ba..56881493b 100644 --- a/pkg/storage/storage.go +++ b/pkg/storage/storage.go @@ -112,9 +112,6 @@ func (s *Storage) ListDeployed() ([]*rspb.Release, error) { func (s *Storage) Deployed(name string) (*rspb.Release, error) { ls, err := s.DeployedAll(name) if err != nil { - if strings.Contains(err.Error(), "not found") { - return nil, errors.Errorf("%q has no deployed releases", name) - } return nil, err } @@ -122,7 +119,7 @@ func (s *Storage) Deployed(name string) (*rspb.Release, error) { return nil, errors.Errorf("%q has no deployed releases", name) } - return ls[0], err + return ls[0], nil } // DeployedAll returns all deployed releases with the provided name, or