Fixes bug when validating ResourceGroup after storing zero inventory

kptdev · Nov 12, 2020 · a37430d · a37430d
1 parent d59063c
commit a37430d
Showing 1 changed file with 12 additions and 6 deletions.
diff --git a/pkg/live/inventoryrg.go b/pkg/live/inventoryrg.go
@@ -128,12 +128,18 @@ func (icm *InventoryResourceGroup) GetObject() (*unstructured.Unstructured, erro
 	}
 	// Create the inventory object by copying the template.
 	invCopy := icm.inv.DeepCopy()
-	// Adds the inventory ObjMetadata to the ResourceGroup "spec.resources" section
-	klog.V(4).Infof("storing inventory resources")
-	err := unstructured.SetNestedSlice(invCopy.UnstructuredContent(),
-		objs, "spec", "resources")
-	if err != nil {
-		return nil, err
+	// Adds or clears the inventory ObjMetadata to the ResourceGroup "spec.resources" section
+	if len(objs) == 0 {
+		klog.V(4).Infoln("clearing inventory resources")
+		unstructured.RemoveNestedField(invCopy.UnstructuredContent(),
+			"spec", "resources")
+	} else {
+		klog.V(4).Infof("storing inventory (%d) resources", len(objs))
+		err := unstructured.SetNestedSlice(invCopy.UnstructuredContent(),
+			objs, "spec", "resources")
+		if err != nil {
+			return nil, err
+		}
 	}
 	return invCopy, nil
 }