Merge pull request #225 from ehashman/safer-nils

KObj should be able to handle nil objects
kubernetes · Mar 12, 2021 · 0f69eb5 · 0f69eb5
2 parents c1fc6e6 + 80a291b
commit 0f69eb5
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 0 deletions.
diff --git a/klog.go b/klog.go
@@ -1577,6 +1577,10 @@ type KMetadata interface {
 
 // KObj returns ObjectRef from ObjectMeta
 func KObj(obj KMetadata) ObjectRef {
+	if obj == nil {
+		return ObjectRef{}
+	}
+
 	return ObjectRef{
 		Name:      obj.GetName(),
 		Namespace: obj.GetNamespace(),

diff --git a/klog_test.go b/klog_test.go
@@ -763,6 +763,11 @@ func TestKObj(t *testing.T) {
 		obj  KMetadata
 		want ObjectRef
 	}{
+		{
+			name: "nil",
+			obj:  nil,
+			want: ObjectRef{},
+		},
 		{
 			name: "with ns",
 			obj:  mockKmeta{"test-name", "test-ns"},