restore error check in secrets.go

Signed-off-by: Justen Stall <39888103+justenstall@users.noreply.github.com>
pull/13460/head
Justen Stall 10 months ago
parent 6aa19b8c92
commit 62b5bdc9f6
No known key found for this signature in database

@ -72,8 +72,11 @@ func (secrets *Secrets) Get(key string) (*rspb.Release, error) {
}
// found the secret, decode the base64 data string
r, err := decodeRelease(string(obj.Data["release"]))
if err != nil {
return r, fmt.Errorf("get: failed to decode data %q: %w", key, err)
}
r.Labels = filterSystemLabels(obj.ObjectMeta.Labels)
return r, fmt.Errorf("get: failed to decode data %q: %w", key, err)
return r, nil
}
// List fetches all releases and returns the list releases such
@ -186,7 +189,10 @@ func (secrets *Secrets) Update(key string, rls *rspb.Release) error {
}
// push the secret object out into the kubiverse
_, err = secrets.impl.Update(context.Background(), obj, metav1.UpdateOptions{})
return fmt.Errorf("update: failed to update: %w", err)
if err != nil {
return fmt.Errorf("update: failed to update: %w", err)
}
return nil
}
// Delete deletes the Secret holding the release named by key.
@ -197,7 +203,10 @@ func (secrets *Secrets) Delete(key string) (rls *rspb.Release, err error) {
}
// delete the release
err = secrets.impl.Delete(context.Background(), key, metav1.DeleteOptions{})
return rls, err
if err != nil {
return nil, err
}
return rls, nil
}
// newSecretsObject constructs a kubernetes Secret object

@ -16,6 +16,7 @@ package driver
import (
"encoding/base64"
"encoding/json"
"errors"
"reflect"
"testing"
@ -245,7 +246,7 @@ func TestSecretDelete(t *testing.T) {
// fetch the deleted release
_, err = secrets.Get(key)
if !reflect.DeepEqual(ErrReleaseNotFound, err) {
if !errors.Is(err, ErrReleaseNotFound) {
t.Errorf("Expected {%v}, got {%v}", ErrReleaseNotFound, err)
}
}

Loading…
Cancel
Save