Fix dropin merging

ppacher · Jan 5, 2021 · 5b8c08d · 5b8c08d
1 parent 6037356
commit 5b8c08d
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/conf/dropin.go b/conf/dropin.go
@@ -50,7 +50,7 @@ func ApplyDropIns(t *File, dropins []*DropIn, secReg SectionRegistry) error {
 			}
 
 			sectionSpec, ok := secReg.OptionsForSection(sn)
-			if s == nil || !ok {
+			if sectionSpec == nil || !ok {
 				return fmt.Errorf("%s: %w", sn, ErrDropInSectionNotAllowed)
 			}
 
@@ -72,6 +72,9 @@ func ApplyDropIns(t *File, dropins []*DropIn, secReg SectionRegistry) error {
 }
 
 func mergeSections(s *Section, dropInSec Section, optReg OptionRegistry) error {
+	if optReg == nil {
+		return ErrNoOptions
+	}
 	// build a lookup map for the option values in this
 	// drop-in section
 	olm := make(map[string][]Option)

diff --git a/conf/validation_errors.go → conf/errors.go b/conf/validation_errors.go → conf/errors.go
@@ -15,4 +15,5 @@ var (
 	ErrUnknownSection          = errors.New("unknown section")
 	ErrDropInSectionNotExists  = errors.New("section defined in drop-in does not exist")
 	ErrDropInSectionNotAllowed = errors.New("drop-ins not allowed for not-unique sections")
+	ErrNoOptions               = errors.New("no options defined")
 )