Merge pull request #30 from flanksource/fix/handle-nil-resource

Fix/handle nil resource

Author: moshloop

controllers/output.go

@@ -93,7 +93,10 @@ func (r *KonfigReconciler) getResources(config pkg.Config) ([]pkg.Resource, erro
 		if err != nil {
 			return nil, err
 		}
-		resources = append(resources, pkg.Resource{Item: obj})
+		if obj != nil {
+			resources = append(resources, pkg.Resource{Item: obj})
+		}
+
 	}
 	return resources, nil
 }

pkg/hierarchy.go

@@ -39,7 +39,7 @@ func (item Item) String() string {
 
 func (item Item) FindIn(resources []Resource) *Resource {
 	for _, resource := range resources {
-		if resource.Item.GetKind() == item.Kind &&
+		if resource.Item != nil && resource.Item.GetKind() == item.Kind &&
 			resource.Item.GetName() == item.Name &&
 			(item.Namespace == "" || item.Namespace == resource.Item.GetNamespace()) {
 			return &resource
@@ -105,7 +105,7 @@ func (config Config) GenerateJsPropertiesFile(resources []Resource) string {
 		if len(list) == 0 {
 			continue
 		}
-		properties += fmt.Sprintf("#\n# %s\n#\n", item.String())
+		properties += fmt.Sprintf("//\n// %s\n//\n", item.String())
 		for _, property := range list {
 			if _, err := strconv.Atoi(property.Value); err == nil {
 				properties += fmt.Sprintf("window['__%v__']=%v;\n", property.Key, property.Value)

test/e2e_test.go

@@ -79,6 +79,9 @@ func TestGenerateJs(t *testing.T) {
 				t.Error(err)
 			}
 
+			// Adding an empty resource tests the ability of the function to exclude them without panicking.
+			resources = append([]pkg.Resource{pkg.Resource{}}, resources...)
+
 			for _, name := range test.applications {
 				hierarchy, err := pkg.GetHierarchy(test.config, name)
 				if err != nil {
@@ -124,12 +127,14 @@ func TestGenerate(t *testing.T) {
 				t.Error(err)
 			}
 
+			// Adding an empty resource tests the ability of the function to exclude them without panicking.
+			resources = append([]pkg.Resource{pkg.Resource{}}, resources...)
+
 			for _, name := range test.applications {
 				hierarchy, err := pkg.GetHierarchy(test.config, name)
 				if err != nil {
 					t.Error(err)
 				}
-
 				file := hierarchy.GeneratePropertiesFile(resources)
 
 				p := properties.MustLoadString(file)