REORG/MINOR: split ErrorFiles handler in smaller functions

Author: Mo3m3n

controller/handler.go

@@ -41,7 +41,7 @@ func (c *HAProxyController) initHandlers() {
 			Port:     c.OSArgs.HTTPSBindPort,
 		},
 		handler.ProxyProtocol{},
-		&handler.ErrorFile{},
+		&handler.ErrorFiles{},
 		handler.TCPServices{
 			CertDir:  c.Cfg.Env.FrontendCertDir,
 			IPv4:     !c.OSArgs.DisableIPV4,

controller/handler/errorfile.go controller/handler/errorfiles.gocontroller/handler/errorfile.go renamed to controller/handler/errorfiles.go

@@ -26,42 +26,53 @@ import (
 	"github.com/haproxytech/kubernetes-ingress/controller/store"
 )
 
-type ErrorFile struct {
-	files     files
-	updateAPI bool
+type ErrorFiles struct {
+	files files
 }
 
-func (h *ErrorFile) Update(k store.K8s, cfg *config.ControllerCfg, api api.HAProxyClient) (reload bool, err error) {
+func (h *ErrorFiles) Update(k store.K8s, cfg *config.ControllerCfg, api api.HAProxyClient) (reload bool, err error) {
 	h.files.dir = cfg.Env.ErrFileDir
 	if k.ConfigMaps.Errorfiles == nil {
 		return false, nil
 	}
+	// Update Files
+	for code, content := range k.ConfigMaps.Errorfiles.Annotations {
+		logger.Error(h.writeFile(code, content))
+	}
+	var apiInput []*models.Errorfile
+	apiInput, reload = h.refresh()
+	// Update API
+	defaults, err := api.DefaultsGetConfiguration()
+	if err != nil {
+		return false, err
+	}
+	defaults.ErrorFiles = apiInput
+	if err = api.DefaultsPushConfiguration(*defaults); err != nil {
+		return false, err
+	}
+	return reload, nil
+}
 
-	for code, v := range k.ConfigMaps.Errorfiles.Annotations {
-		_, ok := h.files.data[code]
-		if ok {
-			err = h.files.updateFile(code, v)
-			if err != nil {
-				logger.Errorf("failed updating errorfile for code '%s': %s", code, err)
-			}
-			continue
-		}
+func (h *ErrorFiles) writeFile(code, content string) (err error) {
+	// Update file
+	if _, ok := h.files.data[code]; !ok {
 		err = checkCode(code)
 		if err != nil {
-			logger.Errorf("failed creating errorfile for code '%s': %s", code, err)
+			return
 		}
-		err = h.files.newFile(code, v)
-		if err != nil {
-			logger.Errorf("failed creating errorfile for code '%s': %s", code, err)
-		}
-		h.updateAPI = true
 	}
+	err = h.files.writeFile(code, content)
+	if err != nil {
+		err = fmt.Errorf("failed writing errorfile for code '%s': %w", code, err)
+	}
+	return
+}
 
-	var apiInput = []*models.Errorfile{}
+func (h *ErrorFiles) refresh() (result []*models.Errorfile, reload bool) {
 	for code, f := range h.files.data {
 		if !f.inUse {
-			h.updateAPI = true
-			err = h.files.deleteFile(code)
+			reload = true
+			err := h.files.deleteFile(code)
 			if err != nil {
 				logger.Errorf("failed deleting errorfile for code '%s': %s", code, err)
 			}
@@ -72,28 +83,14 @@ func (h *ErrorFile) Update(k store.K8s, cfg *config.ControllerCfg, api api.HAPro
 			reload = true
 		}
 		c, _ := strconv.Atoi(code) // code already checked in newCode
-		apiInput = append(apiInput, &models.Errorfile{
+		result = append(result, &models.Errorfile{
 			Code: int64(c),
 			File: filepath.Join(h.files.dir, code),
 		})
 		f.inUse = false
 		f.updated = false
 	}
-	// HAProxy config update
-	if h.updateAPI {
-		defaults, err := api.DefaultsGetConfiguration()
-		if err != nil {
-			logger.Error(err)
-			return reload, err
-		}
-		defaults.ErrorFiles = apiInput
-		if err = api.DefaultsPushConfiguration(*defaults); err != nil {
-			logger.Error(err)
-			return reload, err
-		}
-		h.updateAPI = false
-	}
-	return reload, nil
+	return
 }
 
 func checkCode(code string) error {

controller/handler/pattern-files.go

@@ -36,30 +36,22 @@ func (h *PatternFiles) Update(k store.K8s, cfg *config.ControllerCfg, api api.HA
 		return false, nil
 	}
 	for name, v := range k.ConfigMaps.PatternFiles.Annotations {
-		_, ok := h.files.data[name]
-		if ok {
-			err = h.files.updateFile(name, v)
-			if err != nil {
-				logger.Errorf("failed updating patternFile '%s': %s", name, err)
-			}
-		} else {
-			err = h.files.newFile(name, v)
-			if err != nil {
-				logger.Errorf("failed creating patternFile '%s': %s", name, err)
-			}
+		err = h.files.writeFile(name, v)
+		if err != nil {
+			logger.Errorf("failed writing patternfile '%s': %s", name, err)
 		}
 	}
 
 	for name, f := range h.files.data {
 		if !f.inUse {
 			err = h.files.deleteFile(name)
 			if err != nil {
-				logger.Errorf("failed deleting PatternFile '%s': %s", name, err)
+				logger.Errorf("failed deleting atternfile '%s': %s", name, err)
 			}
 			continue
 		}
 		if f.updated {
-			logger.Debugf("updating PatternFile '%s': reload required", name)
+			logger.Debugf("patternfile '%s' updated: reload required", name)
 			reload = true
 		}
 		f.inUse = false
@@ -79,39 +71,29 @@ type file struct {
 	updated bool
 }
 
-func (f *files) deleteFile(code string) error {
-	delete(f.data, code)
-	err := os.Remove(filepath.Join(f.dir, code))
+func (f *files) deleteFile(name string) error {
+	delete(f.data, name)
+	err := os.Remove(filepath.Join(f.dir, name))
 	return err
 }
 
-func (f *files) newFile(code, value string) error {
-	if err := renameio.WriteFile(filepath.Join(f.dir, code), []byte(value), os.ModePerm); err != nil {
-		return err
-	}
+// writeFile checks if content hash has changed before writing it.
+func (f *files) writeFile(name, content string) error {
+	newHash := utils.Hash([]byte(content))
 	if f.data == nil {
 		f.data = map[string]*file{}
 	}
-	f.data[code] = &file{
-		hash:    utils.Hash([]byte(value)),
-		inUse:   true,
-		updated: true,
+	if f.data[name] == nil {
+		f.data[name] = &file{}
 	}
-	return nil
-}
-
-func (f *files) updateFile(name, value string) error {
-	newHash := utils.Hash([]byte(value))
 	file := f.data[name]
 	if file.hash != newHash {
-		err := renameio.WriteFile(filepath.Join(f.dir, name), []byte(value), os.ModePerm)
-		if err != nil {
+		if err := renameio.WriteFile(filepath.Join(f.dir, name), []byte(content), os.ModePerm); err != nil {
 			return err
 		}
 		file.hash = newHash
 		file.updated = true
 	}
 	file.inUse = true
-	f.data[name] = file
 	return nil
 }

main.go

@@ -115,7 +115,7 @@ func main() {
 		logger.Printf("TCP Services provided in '%s'", osArgs.ConfigMapTCPServices)
 	}
 	if osArgs.ConfigMapErrorFiles.Name != "" {
-		logger.Printf("Errofile pages provided in '%s'", osArgs.ConfigMapErrorFiles)
+		logger.Printf("Errorfiles provided in '%s'", osArgs.ConfigMapErrorFiles)
 	}
 	if osArgs.ConfigMapPatternFiles.Name != "" {
 		logger.Printf("Pattern files provided in '%s'", osArgs.ConfigMapPatternFiles)