reset old FileMatch values

Author: bakito

pkg/makefile/make_test.go

@@ -113,6 +113,14 @@ var _ = Describe("Make", func() {
 			Ω(withRenovate).Should(BeTrue())
 			Ω(string(cfg)).Should(Equal(readFile(testDataDir, "renovate.other-managers.expected.json")))
 		})
+		It("should add the toolbox customManager with fileMatch", func() {
+			withRenovate, cfg, err := updateRenovateConfInternal(
+				filepath.Join(testDataDir, "renovate.other-managers-fileMatch.json"),
+			)
+			Ω(err).ShouldNot(HaveOccurred())
+			Ω(withRenovate).Should(BeTrue())
+			Ω(string(cfg)).Should(Equal(readFile(testDataDir, "renovate.other-managers.expected.json")))
+		})
 		It("should update the toolbox customManager", func() {
 			withRenovate, cfg, err := updateRenovateConfInternal(
 				filepath.Join(testDataDir, "renovate.incorrect-managers.json"),

pkg/makefile/renovate.go

@@ -42,6 +42,12 @@ func updateRenovateConfInternal(renovateCfgFile string) (bool, []byte, error) {
 				found = true
 				manager.UpdateParams()
 				cms[i] = manager
+			} else {
+				if len(manager.FileMatch) > 0 && len(manager.ManagerFilePatterns) == 0 {
+					manager.ManagerFilePatterns = manager.FileMatch
+					manager.FileMatch = nil
+					cms[i] = manager
+				}
 			}
 		}
 		if !found {

pkg/types/renovate/renovate.go

@@ -25,16 +25,21 @@ type CustomManagers []CustomManager
 type CustomManager struct {
 	CustomType          string   `json:"customType"`
 	Description         string   `json:"description"`
-	ManagerFilePatterns []string `json:"managerFilePatterns"`
+	ManagerFilePatterns []string `json:"managerFilePatterns,omitempty"`
+	FileMatch           []string `json:"fileMatch,omitempty"`
 	MatchStrings        []string `json:"matchStrings"`
 	DatasourceTemplate  string   `json:"datasourceTemplate"`
 }
 
 func (m *CustomManager) UpdateParams() {
 	m.Description = Description
+	if len(m.FileMatch) > 0 {
+		m.FileMatch = nil
+	}
 	m.ManagerFilePatterns = []string{ManagerFilePatterns}
 	m.MatchStrings = []string{MatchString}
 	m.DatasourceTemplate = DatasourceTemplate
+
 }
 
 func (m *CustomManager) IsToolbox() bool {

testdata/renovate.other-managers-fileMatch.json

@@ -0,0 +1,16 @@
+{
+  "$schema": "https://docs.renovatebot.com/renovate-schema.json",
+  "customManagers": [
+    {
+      "customType": "regex",
+      "datasourceTemplate": "go",
+      "description": "this is an existing manager and should not be touched",
+      "fileMatch": [
+        "^Dockerfile"
+      ],
+      "matchStrings": [
+        "..."
+      ]
+    }
+  ]
+}