Fixes Requested

konflux-ci · Sep 30, 2024 · 1a653e7 · 1a653e7
1 parent 8e977a0
commit 1a653e7
Show file tree

Hide file tree

Showing 9 changed files with 514 additions and 499 deletions.
diff --git a/api/v1alpha1/release_types.go b/api/v1alpha1/release_types.go
@@ -240,39 +240,39 @@ func (r *Release) IsValid() bool {
 	return meta.IsStatusConditionTrue(r.Status.Conditions, validatedConditionType.String())
 }
 
-// MarkManagedPipelineProcessed marks the Release Managed Pipeline as processed.
-func (r *Release) MarkManagedPipelineProcessed() {
-	if !r.IsManagedPipelineProcessing() || r.HasManagedPipelineProcessingFinished() {
+// MarkFinalPipelineProcessed marks the Release Final Pipeline as processed.
+func (r *Release) MarkFinalPipelineProcessed() {
+	if !r.IsFinalPipelineProcessing() || r.HasFinalPipelineProcessingFinished() {
 		return
 	}
 
-	r.Status.ManagedProcessing.CompletionTime = &metav1.Time{Time: time.Now()}
-	conditions.SetCondition(&r.Status.Conditions, managedProcessedConditionType, metav1.ConditionTrue, SucceededReason)
+	r.Status.FinalProcessing.CompletionTime = &metav1.Time{Time: time.Now()}
+	conditions.SetCondition(&r.Status.Conditions, finalProcessedConditionType, metav1.ConditionTrue, SucceededReason)
 
 	go metrics.RegisterCompletedReleasePipelineProcessing(
-		r.Status.ManagedProcessing.StartTime,
-		r.Status.ManagedProcessing.CompletionTime,
+		r.Status.FinalProcessing.StartTime,
+		r.Status.FinalProcessing.CompletionTime,
 		SucceededReason.String(),
 		r.Status.Target,
-		metadata.ManagedPipelineType,
+		metadata.FinalPipelineType,
 	)
 }
 
-// MarkFinalPipelineProcessed marks the Release Final Pipeline as processed.
-func (r *Release) MarkFinalPipelineProcessed() {
-	if !r.IsFinalPipelineProcessing() || r.HasFinalPipelineProcessingFinished() {
+// MarkManagedPipelineProcessed marks the Release Managed Pipeline as processed.
+func (r *Release) MarkManagedPipelineProcessed() {
+	if !r.IsManagedPipelineProcessing() || r.HasManagedPipelineProcessingFinished() {
 		return
 	}
 
-	r.Status.FinalProcessing.CompletionTime = &metav1.Time{Time: time.Now()}
-	conditions.SetCondition(&r.Status.Conditions, finalProcessedConditionType, metav1.ConditionTrue, SucceededReason)
+	r.Status.ManagedProcessing.CompletionTime = &metav1.Time{Time: time.Now()}
+	conditions.SetCondition(&r.Status.Conditions, managedProcessedConditionType, metav1.ConditionTrue, SucceededReason)
 
 	go metrics.RegisterCompletedReleasePipelineProcessing(
-		r.Status.FinalProcessing.StartTime,
-		r.Status.FinalProcessing.CompletionTime,
+		r.Status.ManagedProcessing.StartTime,
+		r.Status.ManagedProcessing.CompletionTime,
 		SucceededReason.String(),
 		r.Status.Target,
-		metadata.FinalPipelineType,
+		metadata.ManagedPipelineType,
 	)
 }