Add back bad commit list

The bad commit list is scoped down to the
target itself.

This commit also adds a config option to
the config in order give users the choice
to enable to badCommitList.

Signed-off-by: Joseph Sawaya <[email protected]>

Author: Joseph Sawaya

pkg/engine/common.go

@@ -67,7 +67,7 @@ func zeroToCurrent(ctx, conn context.Context, m Method, target *Target, tag *[]s
 type empty struct {
 }
 
-var BadCommitMethods map[string]map[plumbing.Hash]empty = make(map[string]map[plumbing.Hash]empty)
+var BadCommitList map[string]map[string]map[plumbing.Hash]empty = make(map[string]map[string]map[plumbing.Hash]empty)
 
 func currentToLatest(ctx, conn context.Context, m Method, target *Target, tag *[]string) error {
 	if target.disconnected && len(target.url) > 0 {
@@ -85,13 +85,19 @@ func currentToLatest(ctx, conn context.Context, m Method, target *Target, tag *[
 		return fmt.Errorf("Failed to get current commit: %v", err)
 	}
 
-	if _, ok := BadCommitMethods[m.GetKind()]; !ok {
-		BadCommitMethods[m.GetKind()] = make(map[plumbing.Hash]empty)
-	}
+	if target.trackBadCommits {
+		if _, ok := BadCommitList[target.name]; !ok {
+			BadCommitList[target.name] = make(map[string]map[plumbing.Hash]empty)
+		}
 
-	if _, ok := BadCommitMethods[m.GetKind()][latest]; ok {
-		klog.Infof("No changes applied to target %s this run, %s currently at %s", target.name, m.GetKind(), current)
-		return nil
+		if _, ok := BadCommitList[target.name][m.GetKind()]; !ok {
+			BadCommitList[target.name][m.GetKind()] = make(map[plumbing.Hash]empty)
+		}
+
+		if _, ok := BadCommitList[target.name][m.GetKind()][latest]; ok {
+			klog.Infof("No changes applied to target %s this run, %s currently at %s", target.name, m.GetKind(), current)
+			return nil
+		}
 	}
 
 	if latest != current {
@@ -108,7 +114,9 @@ func currentToLatest(ctx, conn context.Context, m Method, target *Target, tag *[
 				// Roll back failed
 				return fmt.Errorf("Roll back failed, state between %s and %s: %v", current, latest, err)
 			}
-			BadCommitMethods[m.GetKind()][latest] = empty{}
+			if target.trackBadCommits {
+				BadCommitList[target.name][m.GetKind()][latest] = empty{}
+			}
 			return fmt.Errorf("Rolled back to %v: %v", current, err)
 		}
 

pkg/engine/fetchit.go

@@ -245,11 +245,12 @@ func getMethodTargetScheds(targetConfigs []*TargetConfig, fetchit *Fetchit) *Fet
 		tc.mu.Lock()
 		defer tc.mu.Unlock()
 		internalTarget := &Target{
-			name:         tc.Name,
-			url:          tc.Url,
-			device:       tc.Device,
-			branch:       tc.Branch,
-			disconnected: tc.Disconnected,
+			name:            tc.Name,
+			url:             tc.Url,
+			device:          tc.Device,
+			branch:          tc.Branch,
+			disconnected:    tc.Disconnected,
+			trackBadCommits: tc.trackBadCommits,
 		}
 
 		if tc.configReload != nil {

pkg/engine/types.go

@@ -31,16 +31,17 @@ type FetchitConfig struct {
 }
 
 type TargetConfig struct {
-	Name         string          `mapstructure:"name"`
-	Url          string          `mapstructure:"url"`
-	Device       string          `mapstructure:"device"`
-	Disconnected bool            `mapstructure:"disconnected"`
-	Branch       string          `mapstructure:"branch"`
-	Ansible      []*Ansible      `mapstructure:"ansible"`
-	FileTransfer []*FileTransfer `mapstructure:"filetransfer"`
-	Kube         []*Kube         `mapstructure:"kube"`
-	Raw          []*Raw          `mapstructure:"raw"`
-	Systemd      []*Systemd      `mapstructure:"systemd"`
+	Name            string          `mapstructure:"name"`
+	Url             string          `mapstructure:"url"`
+	Device          string          `mapstructure:"device"`
+	Disconnected    bool            `mapstructure:"disconnected"`
+	trackBadCommits bool            `mapstructure:"trackBadCommits"`
+	Branch          string          `mapstructure:"branch"`
+	Ansible         []*Ansible      `mapstructure:"ansible"`
+	FileTransfer    []*FileTransfer `mapstructure:"filetransfer"`
+	Kube            []*Kube         `mapstructure:"kube"`
+	Raw             []*Raw          `mapstructure:"raw"`
+	Systemd         []*Systemd      `mapstructure:"systemd"`
 
 	image        *Image
 	prune        *Prune
@@ -49,13 +50,14 @@ type TargetConfig struct {
 }
 
 type Target struct {
-	name         string
-	url          string
-	device       string
-	localPath    string
-	branch       string
-	mu           sync.Mutex
-	disconnected bool
+	name            string
+	url             string
+	device          string
+	localPath       string
+	branch          string
+	mu              sync.Mutex
+	disconnected    bool
+	trackBadCommits bool
 }
 
 type SchedInfo struct {