feat(layers): do not run plan/apply without a LastRelevantCommit

Author: corrieriluca

internal/controllers/terraformlayer/states.go

@@ -65,11 +65,10 @@ func (s *PlanNeeded) getHandler() Handler {
 		if isActionBlocked(r, layer, repository, syncwindow.PlanAction) {
 			return ctrl.Result{RequeueAfter: r.Config.Controller.Timers.WaitAction}, nil
 		}
-		// TODO: use relevant commit instead of last commit when repo controller will set it
-		revision, ok := layer.Annotations[annotations.LastBranchCommit]
+		revision, ok := layer.Annotations[annotations.LastRelevantCommit]
 		if !ok {
-			r.Recorder.Event(layer, corev1.EventTypeWarning, "Reconciliation", "Layer has no last branch commit annotation, Plan run not created")
-			log.Errorf("layer %s has no last branch commit annotation, run not created", layer.Name)
+			r.Recorder.Event(layer, corev1.EventTypeWarning, "Reconciliation", "Layer has no last relevant commit annotation, Plan run not created")
+			log.Errorf("layer %s has no last relevant commit annotation, run not created", layer.Name)
 			return ctrl.Result{RequeueAfter: r.Config.Controller.Timers.OnError}, nil
 		}
 		run := r.getRun(layer, revision, PlanAction)
@@ -98,11 +97,10 @@ func (s *ApplyNeeded) getHandler() Handler {
 		if isActionBlocked(r, layer, repository, syncwindow.ApplyAction) {
 			return ctrl.Result{RequeueAfter: r.Config.Controller.Timers.WaitAction}, nil
 		}
-		// TODO: use relevant commit instead of last commit when repo controller will set it
-		revision, ok := layer.Annotations[annotations.LastBranchCommit]
+		revision, ok := layer.Annotations[annotations.LastRelevantCommit]
 		if !ok {
-			r.Recorder.Event(layer, corev1.EventTypeWarning, "Reconciliation", "Layer has no last branch commit annotation, Apply run not created")
-			log.Errorf("layer %s has no last branch commit annotation, run not created", layer.Name)
+			r.Recorder.Event(layer, corev1.EventTypeWarning, "Reconciliation", "Layer has no last relevant commit annotation, Apply run not created")
+			log.Errorf("layer %s has no last relevant commit annotation, run not created", layer.Name)
 			return ctrl.Result{RequeueAfter: r.Config.Controller.Timers.OnError}, nil
 		}
 		run := r.getRun(layer, revision, ApplyAction)

internal/webhook/event/push.go

@@ -6,7 +6,6 @@ import (
 
 	configv1alpha1 "github.com/padok-team/burrito/api/v1alpha1"
 	"github.com/padok-team/burrito/internal/annotations"
-	controller "github.com/padok-team/burrito/internal/controllers/terraformlayer"
 	utils "github.com/padok-team/burrito/internal/utils/url"
 	log "github.com/sirupsen/logrus"
 
@@ -54,30 +53,6 @@ func (e *PushEvent) Handle(c client.Client) error {
 		}
 	}
 
-	// TODO: Remove this loop once the repo controller implements the same behavior
-	for _, layer := range e.getAffectedLayers(layers.Items, affectedRepositories) {
-		ann := map[string]string{}
-		log.Printf("evaluating TerraformLayer %s for revision %s", layer.Name, e.Reference)
-		if layer.Spec.Branch != e.Reference {
-			log.Infof("branch %s for TerraformLayer %s not matching revision %s", layer.Spec.Branch, layer.Name, e.Reference)
-			continue
-		}
-		ann[annotations.LastBranchCommit] = e.ChangeInfo.ShaAfter
-		ann[annotations.LastBranchCommitDate] = date
-
-		if controller.LayerFilesHaveChanged(layer, e.Changes) {
-			log.Infof("layer %s is affected by push event", layer.Name)
-			ann[annotations.LastRelevantCommit] = e.ChangeInfo.ShaAfter
-			ann[annotations.LastRelevantCommitDate] = date
-		}
-
-		err := annotations.Add(context.TODO(), c, &layer, ann)
-		if err != nil {
-			log.Errorf("could not add annotation to TerraformLayer %s", err)
-			return err
-		}
-	}
-
 	// TODO: Remove this loop once the repo controller implements the same behavior
 	for _, pr := range e.getAffectedPullRequests(prs.Items, affectedRepositories) {
 		ann := map[string]string{}
@@ -104,16 +79,6 @@ func (e *PushEvent) getAffectedRepositories(repositories []configv1alpha1.Terraf
 	return affectedRepositories
 }
 
-func (e *PushEvent) getAffectedLayers(allLayers []configv1alpha1.TerraformLayer, affectedRepositories []configv1alpha1.TerraformRepository) []configv1alpha1.TerraformLayer {
-	layers := []configv1alpha1.TerraformLayer{}
-	for _, layer := range allLayers {
-		if isLayerLinkedToAnyRepositories(affectedRepositories, layer) {
-			layers = append(layers, layer)
-		}
-	}
-	return layers
-}
-
 func (e *PushEvent) getAffectedPullRequests(prs []configv1alpha1.TerraformPullRequest, affectedRepositories []configv1alpha1.TerraformRepository) []configv1alpha1.TerraformPullRequest {
 	affectedPRs := []configv1alpha1.TerraformPullRequest{}
 	for _, pr := range prs {