Skip to content

Commit 36fb0ca

Browse files
hongkailiuhongkailiu
committed
Remove redundant type casting
1 parent cd6c7c2 commit 36fb0ca

File tree

2 files changed

+21
-21
lines changed

2 files changed

+21
-21
lines changed

‎pkg/cvo/cvo_test.go‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1350,9 +1350,9 @@ func TestOperator_sync(t *testing.T) {
13501350
name: "default",
13511351
upgradeable: &upgradeable{
13521352
Conditions: []configv1.ClusterOperatorStatusCondition{
1353-
{Type: configv1.ClusterStatusConditionType("Upgradeable"), Status: configv1.ConditionFalse},
1354-
{Type: configv1.ClusterStatusConditionType("UpgradeableA"), Status: configv1.ConditionFalse},
1355-
{Type: configv1.ClusterStatusConditionType("UpgradeableB"), Status: configv1.ConditionFalse},
1353+
{Type: "Upgradeable", Status: configv1.ConditionFalse},
1354+
{Type: "UpgradeableA", Status: configv1.ConditionFalse},
1355+
{Type: "UpgradeableB", Status: configv1.ConditionFalse},
13561356
},
13571357
},
13581358
client: fakeClientsetWithUpdates(&configv1.ClusterVersion{
@@ -1406,9 +1406,9 @@ func TestOperator_sync(t *testing.T) {
14061406
{Type: configv1.OperatorProgressing, Status: configv1.ConditionFalse, Message: "Cluster version is 0.0.1-abc"},
14071407
{Type: internal.ClusterStatusFailing, Status: configv1.ConditionFalse},
14081408
{Type: configv1.RetrievedUpdates, Status: configv1.ConditionFalse},
1409-
{Type: configv1.ClusterStatusConditionType("Upgradeable"), Status: configv1.ConditionFalse},
1410-
{Type: configv1.ClusterStatusConditionType("UpgradeableA"), Status: configv1.ConditionFalse},
1411-
{Type: configv1.ClusterStatusConditionType("UpgradeableB"), Status: configv1.ConditionFalse},
1409+
{Type: "Upgradeable", Status: configv1.ConditionFalse},
1410+
{Type: "UpgradeableA", Status: configv1.ConditionFalse},
1411+
{Type: "UpgradeableB", Status: configv1.ConditionFalse},
14121412
},
14131413
},
14141414
})
@@ -1430,8 +1430,8 @@ func TestOperator_sync(t *testing.T) {
14301430
name: "default",
14311431
upgradeable: &upgradeable{
14321432
Conditions: []configv1.ClusterOperatorStatusCondition{
1433-
{Type: configv1.ClusterStatusConditionType("Upgradeable"), Status: configv1.ConditionFalse},
1434-
{Type: configv1.ClusterStatusConditionType("UpgradeableB"), Status: configv1.ConditionFalse},
1433+
{Type: "Upgradeable", Status: configv1.ConditionFalse},
1434+
{Type: "UpgradeableB", Status: configv1.ConditionFalse},
14351435
},
14361436
},
14371437
client: fakeClientsetWithUpdates(&configv1.ClusterVersion{
@@ -1452,7 +1452,7 @@ func TestOperator_sync(t *testing.T) {
14521452
{Type: configv1.OperatorProgressing, Status: configv1.ConditionFalse, Message: "Cluster version is 0.0.1-abc"},
14531453
{Type: internal.ClusterStatusFailing, Status: configv1.ConditionFalse},
14541454
{Type: configv1.RetrievedUpdates, Status: configv1.ConditionFalse},
1455-
{Type: configv1.ClusterStatusConditionType("UpgradeableA"), Status: configv1.ConditionFalse},
1455+
{Type: "UpgradeableA", Status: configv1.ConditionFalse},
14561456
},
14571457
},
14581458
}),
@@ -1486,8 +1486,8 @@ func TestOperator_sync(t *testing.T) {
14861486
{Type: configv1.OperatorProgressing, Status: configv1.ConditionFalse, Message: "Cluster version is 0.0.1-abc"},
14871487
{Type: internal.ClusterStatusFailing, Status: configv1.ConditionFalse},
14881488
{Type: configv1.RetrievedUpdates, Status: configv1.ConditionFalse},
1489-
{Type: configv1.ClusterStatusConditionType("Upgradeable"), Status: configv1.ConditionFalse},
1490-
{Type: configv1.ClusterStatusConditionType("UpgradeableB"), Status: configv1.ConditionFalse},
1489+
{Type: "Upgradeable", Status: configv1.ConditionFalse},
1490+
{Type: "UpgradeableB", Status: configv1.ConditionFalse},
14911491
},
14921492
},
14931493
})
@@ -1528,9 +1528,9 @@ func TestOperator_sync(t *testing.T) {
15281528
{Type: configv1.OperatorProgressing, Status: configv1.ConditionFalse, Message: "Cluster version is 0.0.1-abc"},
15291529
{Type: internal.ClusterStatusFailing, Status: configv1.ConditionFalse},
15301530
{Type: configv1.RetrievedUpdates, Status: configv1.ConditionFalse},
1531-
{Type: configv1.ClusterStatusConditionType("Upgradeable"), Status: configv1.ConditionFalse},
1532-
{Type: configv1.ClusterStatusConditionType("UpgradeableA"), Status: configv1.ConditionFalse},
1533-
{Type: configv1.ClusterStatusConditionType("UpgradeableB"), Status: configv1.ConditionFalse},
1531+
{Type: "Upgradeable", Status: configv1.ConditionFalse},
1532+
{Type: "UpgradeableA", Status: configv1.ConditionFalse},
1533+
{Type: "UpgradeableB", Status: configv1.ConditionFalse},
15341534
},
15351535
},
15361536
}),

‎pkg/cvo/metrics_test.go‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -331,8 +331,8 @@ func Test_operatorMetrics_Collect(t *testing.T) {
331331
Status: configv1.ClusterOperatorStatus{
332332
Conditions: []configv1.ClusterOperatorStatusCondition{
333333
{Type: configv1.OperatorAvailable, Status: configv1.ConditionTrue},
334-
{Type: configv1.ClusterStatusConditionType("Custom"), Status: configv1.ConditionFalse, Reason: "CustomReason"},
335-
{Type: configv1.ClusterStatusConditionType("Unknown"), Status: configv1.ConditionUnknown},
334+
{Type: "Custom", Status: configv1.ConditionFalse, Reason: "CustomReason"},
335+
{Type: "Unknown", Status: configv1.ConditionUnknown},
336336
},
337337
},
338338
},
@@ -719,7 +719,7 @@ func Test_operatorMetrics_CollectTransitions(t *testing.T) {
719719
Status: configv1.ClusterOperatorStatus{
720720
Conditions: []configv1.ClusterOperatorStatusCondition{
721721
{Type: configv1.OperatorAvailable, Status: configv1.ConditionTrue},
722-
{Type: configv1.ClusterStatusConditionType("Custom"), Status: configv1.ConditionFalse},
722+
{Type: "Custom", Status: configv1.ConditionFalse},
723723
},
724724
},
725725
},
@@ -728,17 +728,17 @@ func Test_operatorMetrics_CollectTransitions(t *testing.T) {
728728
Status: configv1.ClusterOperatorStatus{
729729
Conditions: []configv1.ClusterOperatorStatusCondition{
730730
{Type: configv1.OperatorAvailable, Status: configv1.ConditionFalse},
731-
{Type: configv1.ClusterStatusConditionType("Custom"), Status: configv1.ConditionFalse},
732-
{Type: configv1.ClusterStatusConditionType("Unknown"), Status: configv1.ConditionUnknown},
731+
{Type: "Custom", Status: configv1.ConditionFalse},
732+
{Type: "Unknown", Status: configv1.ConditionUnknown},
733733
},
734734
},
735735
},
736736
&configv1.ClusterOperator{
737737
ObjectMeta: metav1.ObjectMeta{Name: "test"},
738738
Status: configv1.ClusterOperatorStatus{
739739
Conditions: []configv1.ClusterOperatorStatusCondition{
740-
{Type: configv1.ClusterStatusConditionType("Custom"), Status: configv1.ConditionTrue},
741-
{Type: configv1.ClusterStatusConditionType("Unknown"), Status: configv1.ConditionTrue},
740+
{Type: "Custom", Status: configv1.ConditionTrue},
741+
{Type: "Unknown", Status: configv1.ConditionTrue},
742742
},
743743
},
744744
},

0 commit comments

Comments
 (0)