refactor: Cleanup UpdateApplication mechanism, get rid of the SKIP func (#9)

Author: patrykwozinski

internal/app/updater/commit.go

@@ -37,7 +37,6 @@ func commitChangesLocked(cfg HelmUpdaterConfig, state *SyncIterationState) (*[]C
 // after the UpdateApplication cycle has finished.
 func commitChangesGit(cfg HelmUpdaterConfig, write changeWriter) (*[]ChangeEntry, error) {
 	var apps []ChangeEntry
-	var skip bool
 	var gitCommitMessage string
 
 	logCtx := log.WithContext().AddField("application", cfg.AppName)
@@ -97,11 +96,8 @@ func commitChangesGit(cfg HelmUpdaterConfig, write changeWriter) (*[]ChangeEntry
 	}
 
 	// write changes to files
-	if err, skip, apps = write(cfg, gitC); err != nil {
+	if apps, err = write(cfg, gitC); err != nil {
 		return nil, err
-		//TODO: Review how to do when skip
-	} else if skip {
-		return nil, nil
 	}
 
 	commitOpts := &git.CommitOptions{}

internal/app/updater/override.go

@@ -12,43 +12,37 @@ import (
 
 var _ changeWriter = writeOverrides
 
-type changeWriter func(cfg HelmUpdaterConfig, gitC git.Client) (err error, skip bool, apps []ChangeEntry)
+type changeWriter func(cfg HelmUpdaterConfig, gitC git.Client) (apps []ChangeEntry, err error)
 
 //writeOverrides writes the overrides to the git files
-func writeOverrides(cfg HelmUpdaterConfig, gitC git.Client) (err error, skip bool, apps []ChangeEntry) {
+func writeOverrides(cfg HelmUpdaterConfig, gitC git.Client) (apps []ChangeEntry, err error) {
 	targetFile := path.Join(gitC.Root(), cfg.GitConf.File, cfg.File)
 
+	apps = make([]ChangeEntry, 0)
+
 	_, err = os.Stat(targetFile)
 	if err != nil {
 		log.WithContext().
 			AddField("application", cfg.AppName).
 			Errorf("target file %s doesn't exist.", cfg.File)
 
-		return err, true, nil
+		return apps, err
 	}
 
-	apps, err = overrideValues(cfg, targetFile)
-	if err == fmt.Errorf("no changes") {
-		return fmt.Errorf("target and marshaled keys for all targets are the same, skipping commit"), true, nil
-	}
+	apps = overrideValues(apps, cfg, targetFile)
 
 	if len(apps) == 0 {
-		return fmt.Errorf("nothing to update, skipping commit"), true, nil
+		return apps, fmt.Errorf("nothing to update, skipping commit")
 	}
 
-	err = gitC.Add(targetFile)
-
-	return err, false, apps
+	return apps, gitC.Add(targetFile)
 }
 
 // overrideValues overrides values in the given file
-func overrideValues(cfg HelmUpdaterConfig, targetFile string) ([]ChangeEntry, error) {
-	var noChange int
+func overrideValues(apps []ChangeEntry, cfg HelmUpdaterConfig, targetFile string) []ChangeEntry {
 	var err error
 
-	apps := make([]ChangeEntry, 0)
 	logCtx := log.WithContext().AddField("application", cfg.AppName)
-
 	for _, app := range cfg.UpdateApps {
 		// define new entry
 		var newEntry ChangeEntry
@@ -87,18 +81,14 @@ func overrideValues(cfg HelmUpdaterConfig, targetFile string) ([]ChangeEntry, er
 		newEntry.NewValue = *newValue
 
 		// check if there is any change
-		if oldValue != newValue {
-			apps = append(apps, newEntry)
-		} else {
+		if oldValue == newValue {
 			logCtx.Infof("target for key %s is the same, skipping", app.Key)
 
-			noChange++
+			continue
 		}
-	}
 
-	if noChange == len(cfg.UpdateApps) {
-		return nil, fmt.Errorf("no changes")
+		apps = append(apps, newEntry)
 	}
 
-	return apps, nil
+	return apps
 }