Add check for whether file was explicitly named

carvel-dev · May 20, 2022 · 4415549 · 4415549
1 parent cbdd80d
commit 4415549
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git a/pkg/cmd/template/data_values_flags.go b/pkg/cmd/template/data_values_flags.go
@@ -156,8 +156,7 @@ func (s *DataValuesFlags) file(fullPath string, strict bool) ([]*datavalues.Enve
 
 	var result []*datavalues.Envelope
 	for _, dvFile := range dvFiles {
-		// skip non-YAML files that are contained within the specified directory
-		if strings.Contains(dvFile.RelativePath(), "/") && !(dvFile.Type() == files.TypeYAML) {
+		if dvFile.IsImplied() && !(dvFile.Type() == files.TypeYAML) {
 			continue
 		}
 		contents, err := dvFile.Bytes()

diff --git a/pkg/files/file.go b/pkg/files/file.go
@@ -233,6 +233,12 @@ func (r *File) isTemplate() bool {
 	return !r.IsLibrary() && (t == TypeYAML || t == TypeText)
 }
 
+// IsImplied reports whether this file was implicitly included (found within an explicitly named directory) or not
+// (named explicitly as input).
+func (r *File) IsImplied() bool {
+	return strings.ContainsRune(r.OriginalRelativePath(), os.PathSeparator)
+}
+
 func (r *File) IsLibrary() bool {
 	exts := strings.Split(filepath.Base(r.RelativePath()), ".")