fix(storage): test system labels creation

Signed-off-by: maxime1907 <19607336+maxime1907@users.noreply.github.com>
pull/13485/head
maxime1907 10 months ago
parent 99259a83be
commit 0b22ad47ca

@ -79,7 +79,7 @@ func (cfgmaps *ConfigMaps) Get(key string) (*rspb.Release, error) {
cfgmaps.Log("get: failed to decode data %q: %s", key, err) cfgmaps.Log("get: failed to decode data %q: %s", key, err)
return nil, err return nil, err
} }
r.Labels = filterSystemLabels(obj.ObjectMeta.Labels) r.Labels = obj.ObjectMeta.Labels
// return the release object // return the release object
return r, nil return r, nil
} }

@ -46,6 +46,7 @@ func TestConfigMapGet(t *testing.T) {
t.Fatalf("Failed to get release: %s", err) t.Fatalf("Failed to get release: %s", err)
} }
// compare fetched release with original // compare fetched release with original
got.Labels = filterSystemLabels(got.Labels)
if !reflect.DeepEqual(rel, got) { if !reflect.DeepEqual(rel, got) {
t.Errorf("Expected {%v}, got {%v}", rel, got) t.Errorf("Expected {%v}, got {%v}", rel, got)
} }
@ -78,6 +79,7 @@ func TestUncompressedConfigMapGet(t *testing.T) {
t.Fatalf("Failed to get release: %s", err) t.Fatalf("Failed to get release: %s", err)
} }
// compare fetched release with original // compare fetched release with original
got.Labels = filterSystemLabels(got.Labels)
if !reflect.DeepEqual(rel, got) { if !reflect.DeepEqual(rel, got) {
t.Errorf("Expected {%v}, got {%v}", rel, got) t.Errorf("Expected {%v}, got {%v}", rel, got)
} }
@ -185,6 +187,7 @@ func TestConfigMapCreate(t *testing.T) {
} }
// compare created release with original // compare created release with original
got.Labels = filterSystemLabels(got.Labels)
if !reflect.DeepEqual(rel, got) { if !reflect.DeepEqual(rel, got) {
t.Errorf("Expected {%v}, got {%v}", rel, got) t.Errorf("Expected {%v}, got {%v}", rel, got)
} }
@ -239,6 +242,7 @@ func TestConfigMapDelete(t *testing.T) {
if err != nil { if err != nil {
t.Fatalf("Failed to delete release with key %q: %s", key, err) t.Fatalf("Failed to delete release with key %q: %s", key, err)
} }
rls.Labels = filterSystemLabels(rls.Labels)
if !reflect.DeepEqual(rel, rls) { if !reflect.DeepEqual(rel, rls) {
t.Errorf("Expected {%v}, got {%v}", rel, rls) t.Errorf("Expected {%v}, got {%v}", rel, rls)
} }

@ -73,7 +73,7 @@ func (secrets *Secrets) Get(key string) (*rspb.Release, error) {
} }
// found the secret, decode the base64 data string // found the secret, decode the base64 data string
r, err := decodeRelease(string(obj.Data["release"])) r, err := decodeRelease(string(obj.Data["release"]))
r.Labels = filterSystemLabels(obj.ObjectMeta.Labels) r.Labels = obj.ObjectMeta.Labels
return r, errors.Wrapf(err, "get: failed to decode data %q", key) return r, errors.Wrapf(err, "get: failed to decode data %q", key)
} }

@ -46,6 +46,7 @@ func TestSecretGet(t *testing.T) {
t.Fatalf("Failed to get release: %s", err) t.Fatalf("Failed to get release: %s", err)
} }
// compare fetched release with original // compare fetched release with original
got.Labels = filterSystemLabels(got.Labels)
if !reflect.DeepEqual(rel, got) { if !reflect.DeepEqual(rel, got) {
t.Errorf("Expected {%v}, got {%v}", rel, got) t.Errorf("Expected {%v}, got {%v}", rel, got)
} }
@ -78,6 +79,7 @@ func TestUNcompressedSecretGet(t *testing.T) {
t.Fatalf("Failed to get release: %s", err) t.Fatalf("Failed to get release: %s", err)
} }
// compare fetched release with original // compare fetched release with original
got.Labels = filterSystemLabels(got.Labels)
if !reflect.DeepEqual(rel, got) { if !reflect.DeepEqual(rel, got) {
t.Errorf("Expected {%v}, got {%v}", rel, got) t.Errorf("Expected {%v}, got {%v}", rel, got)
} }
@ -184,7 +186,12 @@ func TestSecretCreate(t *testing.T) {
t.Fatalf("Failed to get release with key %q: %s", key, err) t.Fatalf("Failed to get release with key %q: %s", key, err)
} }
// check release has actually been created
if _, exists := got.Labels["createdAt"]; !exists {
t.Errorf("Expected field %s", "createdAt")
}
// compare created release with original // compare created release with original
got.Labels = filterSystemLabels(got.Labels)
if !reflect.DeepEqual(rel, got) { if !reflect.DeepEqual(rel, got) {
t.Errorf("Expected {%v}, got {%v}", rel, got) t.Errorf("Expected {%v}, got {%v}", rel, got)
} }
@ -217,6 +224,9 @@ func TestSecretUpdate(t *testing.T) {
if rel.Info.Status != got.Info.Status { if rel.Info.Status != got.Info.Status {
t.Errorf("Expected status %s, got status %s", rel.Info.Status.String(), got.Info.Status.String()) t.Errorf("Expected status %s, got status %s", rel.Info.Status.String(), got.Info.Status.String())
} }
if _, exists := got.Labels["modifiedAt"]; !exists {
t.Errorf("Expected field %s", "modifiedAt")
}
} }
func TestSecretDelete(t *testing.T) { func TestSecretDelete(t *testing.T) {
@ -239,6 +249,7 @@ func TestSecretDelete(t *testing.T) {
if err != nil { if err != nil {
t.Fatalf("Failed to delete release with key %q: %s", key, err) t.Fatalf("Failed to delete release with key %q: %s", key, err)
} }
rls.Labels = filterSystemLabels(rls.Labels)
if !reflect.DeepEqual(rel, rls) { if !reflect.DeepEqual(rel, rls) {
t.Errorf("Expected {%v}, got {%v}", rel, rls) t.Errorf("Expected {%v}, got {%v}", rel, rls)
} }

Loading…
Cancel
Save