Skip to content

Commit 13c80f3

Browse files
britaniarbritaniar
committed
address comments
Signed-off-by: Britania Rodriguez Reyes <britaniar@microsoft.com>
1 parent 15931b8 commit 13c80f3

File tree

6 files changed

+87
-87
lines changed

6 files changed

+87
-87
lines changed

‎apis/placement/v1beta1/commons.go‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -170,11 +170,11 @@ const (
170170
// TargetUpdatingStageNameLabel indicates the updating stage name on a staged run related object.
171171
TargetUpdatingStageNameLabel = FleetPrefix + "targetUpdatingStage"
172172

173-
// BeforeStageTaskName is the name of the before stage task label value.
174-
BeforeStageTaskName = "beforeStage"
173+
// BeforeStageTaskLabelValue is the before stage task label value.
174+
BeforeStageTaskLabelValue = "beforeStage"
175175

176-
// AfterStageTaskName is the name of the after stage task label value.
177-
AfterStageTaskName = "afterStage"
176+
// AfterStageTaskLabelValue is the after stage task label value.
177+
AfterStageTaskLabelValue = "afterStage"
178178

179179
// BeforeStageApprovalTaskNameFmt is the format of the before stage approval task name.
180180
BeforeStageApprovalTaskNameFmt = "%s-before-%s"

‎pkg/controllers/updaterun/execution.go‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -121,7 +121,7 @@ func (r *Reconciler) checkBeforeStageTasksStatus(ctx context.Context, updatingSt
121121
for i, task := range updatingStage.BeforeStageTasks {
122122
switch task.Type {
123123
case placementv1beta1.StageTaskTypeApproval:
124-
approved, err := r.handleStageApprovalTask(ctx, &updatingStageStatus.BeforeStageTaskStatus[i], updatingStage, updateRun, placementv1beta1.BeforeStageTaskName)
124+
approved, err := r.handleStageApprovalTask(ctx, &updatingStageStatus.BeforeStageTaskStatus[i], updatingStage, updateRun, placementv1beta1.BeforeStageTaskLabelValue)
125125
if err != nil {
126126
return false, err
127127
}
@@ -404,7 +404,7 @@ func (r *Reconciler) checkAfterStageTasksStatus(ctx context.Context, updatingSta
404404
klog.V(2).InfoS("The after stage wait task has completed", "stage", updatingStage.Name, "updateRun", updateRunRef)
405405
}
406406
case placementv1beta1.StageTaskTypeApproval:
407-
approved, err := r.handleStageApprovalTask(ctx, &updatingStageStatus.AfterStageTaskStatus[i], updatingStage, updateRun, placementv1beta1.AfterStageTaskName)
407+
approved, err := r.handleStageApprovalTask(ctx, &updatingStageStatus.AfterStageTaskStatus[i], updatingStage, updateRun, placementv1beta1.AfterStageTaskLabelValue)
408408
if err != nil {
409409
return false, -1, err
410410
}
@@ -607,7 +607,7 @@ func checkClusterUpdateResult(
607607

608608
// buildApprovalRequestObject creates an approval request object for before-stage or after-stage tasks.
609609
// It returns a ClusterApprovalRequest if namespace is empty, otherwise returns an ApprovalRequest.
610-
func buildApprovalRequestObject(namespacedName types.NamespacedName, stageName, updateRunName, stageTaskName string) placementv1beta1.ApprovalRequestObj {
610+
func buildApprovalRequestObject(namespacedName types.NamespacedName, stageName, updateRunName, stageTaskType string) placementv1beta1.ApprovalRequestObj {
611611
var approvalRequest placementv1beta1.ApprovalRequestObj
612612
if namespacedName.Namespace == "" {
613613
approvalRequest = &placementv1beta1.ClusterApprovalRequest{
@@ -616,7 +616,7 @@ func buildApprovalRequestObject(namespacedName types.NamespacedName, stageName,
616616
Labels: map[string]string{
617617
placementv1beta1.TargetUpdatingStageNameLabel: stageName,
618618
placementv1beta1.TargetUpdateRunLabel: updateRunName,
619-
placementv1beta1.TargetStageTaskLabel: stageTaskName,
619+
placementv1beta1.TargetStageTaskLabel: stageTaskType,
620620
placementv1beta1.IsLatestUpdateRunApprovalLabel: "true",
621621
},
622622
},
@@ -633,7 +633,7 @@ func buildApprovalRequestObject(namespacedName types.NamespacedName, stageName,
633633
Labels: map[string]string{
634634
placementv1beta1.TargetUpdatingStageNameLabel: stageName,
635635
placementv1beta1.TargetUpdateRunLabel: updateRunName,
636-
placementv1beta1.TargetStageTaskLabel: stageTaskName,
636+
placementv1beta1.TargetStageTaskLabel: stageTaskType,
637637
placementv1beta1.IsLatestUpdateRunApprovalLabel: "true",
638638
},
639639
},

‎pkg/controllers/updaterun/execution_integration_test.go‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -172,7 +172,7 @@ var _ = Describe("UpdateRun execution tests - double stages", func() {
172172
Labels: map[string]string{
173173
placementv1beta1.TargetUpdatingStageNameLabel: updateRun.Status.StagesStatus[0].StageName,
174174
placementv1beta1.TargetUpdateRunLabel: updateRun.Name,
175-
placementv1beta1.TargetStageTaskLabel: placementv1beta1.BeforeStageTaskName,
175+
placementv1beta1.TargetStageTaskLabel: placementv1beta1.BeforeStageTaskLabelValue,
176176
placementv1beta1.IsLatestUpdateRunApprovalLabel: "true",
177177
},
178178
},
@@ -324,7 +324,7 @@ var _ = Describe("UpdateRun execution tests - double stages", func() {
324324
Labels: map[string]string{
325325
placementv1beta1.TargetUpdatingStageNameLabel: updateRun.Status.StagesStatus[0].StageName,
326326
placementv1beta1.TargetUpdateRunLabel: updateRun.Name,
327-
placementv1beta1.TargetStageTaskLabel: placementv1beta1.AfterStageTaskName,
327+
placementv1beta1.TargetStageTaskLabel: placementv1beta1.AfterStageTaskLabelValue,
328328
placementv1beta1.IsLatestUpdateRunApprovalLabel: "true",
329329
},
330330
},
@@ -380,7 +380,7 @@ var _ = Describe("UpdateRun execution tests - double stages", func() {
380380
Labels: map[string]string{
381381
placementv1beta1.TargetUpdatingStageNameLabel: updateRun.Status.StagesStatus[1].StageName,
382382
placementv1beta1.TargetUpdateRunLabel: updateRun.Name,
383-
placementv1beta1.TargetStageTaskLabel: placementv1beta1.BeforeStageTaskName,
383+
placementv1beta1.TargetStageTaskLabel: placementv1beta1.BeforeStageTaskLabelValue,
384384
placementv1beta1.IsLatestUpdateRunApprovalLabel: "true",
385385
},
386386
},
@@ -533,7 +533,7 @@ var _ = Describe("UpdateRun execution tests - double stages", func() {
533533
Labels: map[string]string{
534534
placementv1beta1.TargetUpdatingStageNameLabel: updateRun.Status.StagesStatus[1].StageName,
535535
placementv1beta1.TargetUpdateRunLabel: updateRun.Name,
536-
placementv1beta1.TargetStageTaskLabel: placementv1beta1.AfterStageTaskName,
536+
placementv1beta1.TargetStageTaskLabel: placementv1beta1.AfterStageTaskLabelValue,
537537
placementv1beta1.IsLatestUpdateRunApprovalLabel: "true",
538538
},
539539
},
@@ -1088,7 +1088,7 @@ var _ = Describe("UpdateRun execution tests - single stage", func() {
10881088
Labels: map[string]string{
10891089
placementv1beta1.TargetUpdatingStageNameLabel: updateRun.Status.StagesStatus[0].StageName,
10901090
placementv1beta1.TargetUpdateRunLabel: updateRun.Name,
1091-
placementv1beta1.TargetStageTaskLabel: placementv1beta1.AfterStageTaskName,
1091+
placementv1beta1.TargetStageTaskLabel: placementv1beta1.AfterStageTaskLabelValue,
10921092
placementv1beta1.IsLatestUpdateRunApprovalLabel: "true",
10931093
},
10941094
},
@@ -1310,7 +1310,7 @@ var _ = Describe("UpdateRun execution tests - single stage", func() {
13101310
Labels: map[string]string{
13111311
placementv1beta1.TargetUpdatingStageNameLabel: updateRun.Status.StagesStatus[0].StageName,
13121312
placementv1beta1.TargetUpdateRunLabel: updateRun.Name,
1313-
placementv1beta1.TargetStageTaskLabel: placementv1beta1.BeforeStageTaskName,
1313+
placementv1beta1.TargetStageTaskLabel: placementv1beta1.BeforeStageTaskLabelValue,
13141314
placementv1beta1.IsLatestUpdateRunApprovalLabel: "true",
13151315
},
13161316
},
@@ -1344,7 +1344,7 @@ var _ = Describe("UpdateRun execution tests - single stage", func() {
13441344
Labels: map[string]string{
13451345
placementv1beta1.TargetUpdatingStageNameLabel: updateRun.Status.StagesStatus[0].StageName,
13461346
placementv1beta1.TargetUpdateRunLabel: updateRun.Name,
1347-
placementv1beta1.TargetStageTaskLabel: placementv1beta1.BeforeStageTaskName,
1347+
placementv1beta1.TargetStageTaskLabel: placementv1beta1.BeforeStageTaskLabelValue,
13481348
placementv1beta1.IsLatestUpdateRunApprovalLabel: "true",
13491349
},
13501350
},
@@ -1447,7 +1447,7 @@ var _ = Describe("UpdateRun execution tests - single stage", func() {
14471447
Labels: map[string]string{
14481448
placementv1beta1.TargetUpdatingStageNameLabel: updateRun.Status.StagesStatus[0].StageName,
14491449
placementv1beta1.TargetUpdateRunLabel: updateRun.Name,
1450-
placementv1beta1.TargetStageTaskLabel: placementv1beta1.AfterStageTaskName,
1450+
placementv1beta1.TargetStageTaskLabel: placementv1beta1.AfterStageTaskLabelValue,
14511451
placementv1beta1.IsLatestUpdateRunApprovalLabel: "true",
14521452
},
14531453
},

‎pkg/controllers/updaterun/execution_test.go‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -357,14 +357,14 @@ func TestBuildApprovalRequestObject(t *testing.T) {
357357
},
358358
stageName: "test-stage",
359359
updateRunName: "test-update-run",
360-
stageTaskName: placementv1beta1.BeforeStageTaskName,
360+
stageTaskName: placementv1beta1.BeforeStageTaskLabelValue,
361361
want: &placementv1beta1.ClusterApprovalRequest{
362362
ObjectMeta: metav1.ObjectMeta{
363363
Name: fmt.Sprintf(placementv1beta1.BeforeStageApprovalTaskNameFmt, "test-update-run", "test-stage"),
364364
Labels: map[string]string{
365365
placementv1beta1.TargetUpdatingStageNameLabel: "test-stage",
366366
placementv1beta1.TargetUpdateRunLabel: "test-update-run",
367-
placementv1beta1.TargetStageTaskLabel: placementv1beta1.BeforeStageTaskName,
367+
placementv1beta1.TargetStageTaskLabel: placementv1beta1.BeforeStageTaskLabelValue,
368368
placementv1beta1.IsLatestUpdateRunApprovalLabel: "true",
369369
},
370370
},
@@ -382,15 +382,15 @@ func TestBuildApprovalRequestObject(t *testing.T) {
382382
},
383383
stageName: "test-stage",
384384
updateRunName: "test-update-run",
385-
stageTaskName: placementv1beta1.AfterStageTaskName,
385+
stageTaskName: placementv1beta1.AfterStageTaskLabelValue,
386386
want: &placementv1beta1.ApprovalRequest{
387387
ObjectMeta: metav1.ObjectMeta{
388388
Name: fmt.Sprintf(placementv1beta1.AfterStageApprovalTaskNameFmt, "test-update-run", "test-stage"),
389389
Namespace: "test-namespace",
390390
Labels: map[string]string{
391391
placementv1beta1.TargetUpdatingStageNameLabel: "test-stage",
392392
placementv1beta1.TargetUpdateRunLabel: "test-update-run",
393-
placementv1beta1.TargetStageTaskLabel: placementv1beta1.AfterStageTaskName,
393+
placementv1beta1.TargetStageTaskLabel: placementv1beta1.AfterStageTaskLabelValue,
394394
placementv1beta1.IsLatestUpdateRunApprovalLabel: "true",
395395
},
396396
},
@@ -1040,7 +1040,7 @@ func TestCheckBeforeStageTasksStatus_NegativeCases(t *testing.T) {
10401040
Labels: map[string]string{
10411041
placementv1beta1.TargetUpdatingStageNameLabel: stageName,
10421042
placementv1beta1.TargetUpdateRunLabel: testUpdateRunName,
1043-
placementv1beta1.TargetStageTaskLabel: placementv1beta1.BeforeStageTaskName,
1043+
placementv1beta1.TargetStageTaskLabel: placementv1beta1.BeforeStageTaskLabelValue,
10441044
placementv1beta1.IsLatestUpdateRunApprovalLabel: "true",
10451045
},
10461046
},
@@ -1097,7 +1097,7 @@ func TestCheckBeforeStageTasksStatus_NegativeCases(t *testing.T) {
10971097
Labels: map[string]string{
10981098
placementv1beta1.TargetUpdatingStageNameLabel: stageName,
10991099
placementv1beta1.TargetUpdateRunLabel: testUpdateRunName,
1100-
placementv1beta1.TargetStageTaskLabel: placementv1beta1.BeforeStageTaskName,
1100+
placementv1beta1.TargetStageTaskLabel: placementv1beta1.BeforeStageTaskLabelValue,
11011101
placementv1beta1.IsLatestUpdateRunApprovalLabel: "true",
11021102
},
11031103
},
@@ -1154,7 +1154,7 @@ func TestCheckBeforeStageTasksStatus_NegativeCases(t *testing.T) {
11541154
Labels: map[string]string{
11551155
placementv1beta1.TargetUpdatingStageNameLabel: stageName,
11561156
placementv1beta1.TargetUpdateRunLabel: testUpdateRunName,
1157-
placementv1beta1.TargetStageTaskLabel: placementv1beta1.BeforeStageTaskName,
1157+
placementv1beta1.TargetStageTaskLabel: placementv1beta1.BeforeStageTaskLabelValue,
11581158
placementv1beta1.IsLatestUpdateRunApprovalLabel: "true",
11591159
},
11601160
},

0 commit comments

Comments
 (0)