Validate config modules earlier

bitrise-io · Jul 11, 2024 · 1a258e1 · 1a258e1
1 parent 2e721fa
commit 1a258e1
Showing 1 changed file with 8 additions and 9 deletions.
diff --git a/configmerge/configmerge.go b/configmerge/configmerge.go
@@ -123,6 +123,14 @@ func (m *Merger) buildConfigTree(configContent []byte, reference ConfigReference
 	if err := yaml.Unmarshal(configContent, &config); err != nil {
 		return nil, err
 	}
+
+	if len(config.Include) > MaxIncludeCountPerFile {
+		return nil, fmt.Errorf("max include count (%d) exceeded", MaxIncludeCountPerFile)
+	}
+	if m.filesCount+len(config.Include) > MaxFilesCountTotal {
+		return nil, fmt.Errorf("max file count (%d) exceeded", MaxFilesCountTotal)
+	}
+
 	for idx, include := range config.Include {
 		if err := include.Validate(); err != nil {
 			return nil, err
@@ -140,15 +148,6 @@ func (m *Merger) buildConfigTree(configContent []byte, reference ConfigReference
 		}
 	}
 
-	if len(config.Include) > MaxIncludeCountPerFile {
-		return nil, fmt.Errorf("max include count (%d) exceeded", MaxIncludeCountPerFile)
-
-	}
-
-	if m.filesCount+len(config.Include) > MaxFilesCountTotal {
-		return nil, fmt.Errorf("max file count (%d) exceeded", MaxFilesCountTotal)
-	}
-
 	var includedConfigTrees []models.ConfigFileTreeModel
 	for _, include := range config.Include {
 		moduleBytes, err := m.readConfigModule(include, m.repoInfo)