Skip to content

Add nil checks to resource cache #1273

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
openshift-merge-robot merged 1 commit into from
Dec 20, 2021
Merged

Add nil checks to resource cache #1273

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 13 additions & 0 deletions pkg/operator/resource/resourceapply/resource_cache.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ import (
"crypto/md5"
"fmt"
"io"
"reflect"

"k8s.io/apimachinery/pkg/api/meta"
"k8s.io/apimachinery/pkg/runtime"
Expand Down Expand Up @@ -42,10 +43,16 @@ func NewResourceCache() *resourceCache {
var noCache *resourceCache

func getResourceMetadata(obj runtime.Object) (schema.GroupKind, string, string, string, error) {
if obj == nil {
return schema.GroupKind{}, "", "", "", fmt.Errorf("nil object has no metadata")
}
metadata, err := meta.Accessor(obj)
if err != nil {
return schema.GroupKind{}, "", "", "", err
}
if metadata == nil || reflect.ValueOf(metadata).IsNil() {
return schema.GroupKind{}, "", "", "", fmt.Errorf("object has no metadata")
}
resourceHash := hashOfResourceStruct(obj)

// retrieve kind, sometimes this can be done via the accesor, sometimes not (depends on the type)
Expand All @@ -66,10 +73,16 @@ func getResourceMetadata(obj runtime.Object) (schema.GroupKind, string, string,
}

func getResourceVersion(obj runtime.Object) (string, error) {
if obj == nil {
return "", fmt.Errorf("nil object has no resourceVersion")
}
metadata, err := meta.Accessor(obj)
if err != nil {
return "", err
}
if metadata == nil || reflect.ValueOf(metadata).IsNil() {
return "", fmt.Errorf("object has no metadata")
}
rv := metadata.GetResourceVersion()
if len(rv) == 0 {
return "", fmt.Errorf("missing resourceVersion")
Expand Down