Merge pull request #16 from onmetal/issue-9

Implements ReadFiles for reading multiple files from the specified folder

Author: afritzler

testdata/testdata.go

@@ -98,6 +98,21 @@ func UnstructuredConfigMap() *unstructured.Unstructured {
 	}
 }
 
+func UnstructuredMyConfigMap() *unstructured.Unstructured {
+	return &unstructured.Unstructured{
+		Object: map[string]interface{}{
+			"apiVersion": "v1",
+			"kind":       "ConfigMap",
+			"metadata": map[string]interface{}{
+				"name":      "my-config",
+			},
+			"data": map[string]interface{}{
+				"foo": "bar",
+			},
+		},
+	}
+}
+
 func Objects() []client.Object {
 	return []client.Object{Secret(), ConfigMap()}
 }

unstructuredutils/unstructuredutils.go

@@ -22,6 +22,7 @@ import (
 	"fmt"
 	"io"
 	"os"
+	"path/filepath"
 
 	"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
 	"k8s.io/apimachinery/pkg/runtime"
@@ -45,6 +46,24 @@ func ReadFile(filename string) ([]unstructured.Unstructured, error) {
 	return Read(f)
 }
 
+// ReadFiles reads unstructured objects from a folder with the given name (including sub folders)
+// and file name matched with the pattern.
+func ReadFiles(pattern string) ([]unstructured.Unstructured, error) {
+	var objs []unstructured.Unstructured
+	files, err := filepath.Glob(pattern)
+	if err != nil {
+		return nil, err
+	}
+	for _, file := range files {
+		uobjs, err := ReadFile(file)
+		if err != nil {
+			return nil, err
+		}
+		objs = append(objs, uobjs...)
+	}
+	return objs, nil
+}
+
 // Read treats io.Reader as an incoming YAML or JSON stream and reads all unstructured.Unstructured objects of it.
 //
 // The document has to be well-formed. For multi-doc YAMLs, '---' is used as separator.

unstructuredutils/unstructuredutils_test.go

@@ -17,13 +17,15 @@ package unstructuredutils_test
 import (
 	"bytes"
 	_ "embed"
+	"path/filepath"
 	"strings"
 
 	"github.com/onmetal/controller-utils/testdata"
 	. "github.com/onmetal/controller-utils/unstructuredutils"
 	. "github.com/onsi/ginkgo"
 	. "github.com/onsi/gomega"
 	. "github.com/onsi/gomega/gstruct"
+	"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
 )
 
 var _ = Describe("Unstructuredutils", func() {
@@ -58,6 +60,26 @@ var _ = Describe("Unstructuredutils", func() {
 		})
 	})
 
+	Describe("ReadFiles", func() {
+		It("should read all objects from the folder", func() {
+			objs, err := ReadFiles("../testdata/*.yaml")
+			Expect(err).NotTo(HaveOccurred())
+			Expect(objs).To(Equal([]unstructured.Unstructured{*testdata.UnstructuredMyConfigMap(), *testdata.UnstructuredSecret(), *testdata.UnstructuredConfigMap()}))
+		})
+
+		It("should empty result and no error if there is no folder presents", func() {
+			objs, err := ReadFiles("nonexistent-folder")
+			Expect(err).NotTo(HaveOccurred())
+			Expect(objs).NotTo(Equal([]unstructured.Unstructured{}))
+		})
+
+		It("should result an ErrBadPattern error if pattern is wrong", func() {
+			_, err := ReadFiles("nonexistent-folder[")
+			Expect(err).Should(Equal(filepath.ErrBadPattern))
+
+		})
+	})
+
 	Describe("UnstructuredSliceToObjectSliceNoCopy", func() {
 		It("should return nil if the unstructureds are nil", func() {
 			Expect(UnstructuredSliceToObjectSliceNoCopy(nil)).To(BeNil())