few more fixes

Signed-off-by: Britania Rodriguez Reyes <britaniar@microsoft.com>

Author: britaniar

pkg/controllers/updaterun/execution.go

@@ -426,7 +426,7 @@ func (r *Reconciler) handleStageApprovalTask(
 	stageTaskStatus *placementv1beta1.StageTaskStatus,
 	updatingStage *placementv1beta1.StageConfig,
 	updateRun placementv1beta1.UpdateRunObj,
-	stageTaskName string,
+	stageTaskType string,
 ) (bool, error) {
 	updateRunRef := klog.KObj(updateRun)
 
@@ -437,7 +437,7 @@ func (r *Reconciler) handleStageApprovalTask(
 	}
 
 	// Check if the approval request has been created.
-	approvalRequest := buildApprovalRequestObject(types.NamespacedName{Name: stageTaskStatus.ApprovalRequestName, Namespace: updateRun.GetNamespace()}, updatingStage.Name, updateRun.GetName(), stageTaskName)
+	approvalRequest := buildApprovalRequestObject(types.NamespacedName{Name: stageTaskStatus.ApprovalRequestName, Namespace: updateRun.GetNamespace()}, updatingStage.Name, updateRun.GetName(), stageTaskType)
 	requestRef := klog.KObj(approvalRequest)
 	if err := r.Client.Create(ctx, approvalRequest); err != nil {
 		if apierrors.IsAlreadyExists(err) {

pkg/controllers/updaterun/execution_test.go

@@ -346,7 +346,7 @@ func TestBuildApprovalRequestObject(t *testing.T) {
 		namespacedName types.NamespacedName
 		stageName      string
 		updateRunName  string
-		stageTaskName  string
+		stageTaskType  string
 		want           placementv1beta1.ApprovalRequestObj
 	}{
 		{
@@ -357,7 +357,7 @@ func TestBuildApprovalRequestObject(t *testing.T) {
 			},
 			stageName:     "test-stage",
 			updateRunName: "test-update-run",
-			stageTaskName: placementv1beta1.BeforeStageTaskLabelValue,
+			stageTaskType: placementv1beta1.BeforeStageTaskLabelValue,
 			want: &placementv1beta1.ClusterApprovalRequest{
 				ObjectMeta: metav1.ObjectMeta{
 					Name: fmt.Sprintf(placementv1beta1.BeforeStageApprovalTaskNameFmt, "test-update-run", "test-stage"),
@@ -382,7 +382,7 @@ func TestBuildApprovalRequestObject(t *testing.T) {
 			},
 			stageName:     "test-stage",
 			updateRunName: "test-update-run",
-			stageTaskName: placementv1beta1.AfterStageTaskLabelValue,
+			stageTaskType: placementv1beta1.AfterStageTaskLabelValue,
 			want: &placementv1beta1.ApprovalRequest{
 				ObjectMeta: metav1.ObjectMeta{
 					Name:      fmt.Sprintf(placementv1beta1.AfterStageApprovalTaskNameFmt, "test-update-run", "test-stage"),
@@ -404,7 +404,7 @@ func TestBuildApprovalRequestObject(t *testing.T) {
 
 	for _, test := range tests {
 		t.Run(test.name, func(t *testing.T) {
-			got := buildApprovalRequestObject(test.namespacedName, test.stageName, test.updateRunName, test.stageTaskName)
+			got := buildApprovalRequestObject(test.namespacedName, test.stageName, test.updateRunName, test.stageTaskType)
 
 			// Compare the whole objects using cmp.Diff with ignore options
 			if diff := cmp.Diff(test.want, got); diff != "" {

test/e2e/cluster_staged_updaterun_test.go

@@ -2087,13 +2087,13 @@ func createClusterStagedUpdateRunSucceedWithNoResourceSnapshotIndex(updateRunNam
 	Expect(hubClient.Create(ctx, updateRun)).To(Succeed(), "Failed to create ClusterStagedUpdateRun %s", updateRunName)
 }
 
-func validateAndApproveClusterApprovalRequests(updateRunName, stageName, approvalRequestNameFmt, stageTaskName string) {
+func validateAndApproveClusterApprovalRequests(updateRunName, stageName, approvalRequestNameFmt, stageTaskType string) {
 	Eventually(func() error {
 		appReqList := &placementv1beta1.ClusterApprovalRequestList{}
 		if err := hubClient.List(ctx, appReqList, client.MatchingLabels{
 			placementv1beta1.TargetUpdatingStageNameLabel: stageName,
 			placementv1beta1.TargetUpdateRunLabel:         updateRunName,
-			placementv1beta1.TargetStageTaskLabel:         stageTaskName,
+			placementv1beta1.TargetStageTaskLabel:         stageTaskType,
 		}); err != nil {
 			return fmt.Errorf("failed to list approval requests: %w", err)
 		}

test/e2e/staged_updaterun_test.go

@@ -1650,13 +1650,13 @@ func createStagedUpdateRunSucceedWithNoResourceSnapshotIndex(updateRunName, name
 	Expect(hubClient.Create(ctx, updateRun)).To(Succeed(), "Failed to create StagedUpdateRun %s", updateRunName)
 }
 
-func validateAndApproveNamespacedApprovalRequests(updateRunName, namespace, stageName, approvalRequestNameFmt, stageTaskName string) {
+func validateAndApproveNamespacedApprovalRequests(updateRunName, namespace, stageName, approvalRequestNameFmt, stageTaskType string) {
 	Eventually(func() error {
 		appReqList := &placementv1beta1.ApprovalRequestList{}
 		if err := hubClient.List(ctx, appReqList, client.InNamespace(namespace), client.MatchingLabels{
 			placementv1beta1.TargetUpdatingStageNameLabel: stageName,
 			placementv1beta1.TargetUpdateRunLabel:         updateRunName,
-			placementv1beta1.TargetStageTaskLabel:         stageTaskName,
+			placementv1beta1.TargetStageTaskLabel:         stageTaskType,
 		}); err != nil {
 			return fmt.Errorf("failed to list approval requests: %w", err)
 		}