Skip to content

Commit 90446be

Browse files
zhiying-linzhiying-lin
committed
fix the lint
Signed-off-by: Zhiying Lin <[email protected]>
1 parent 7099268 commit 90446be

File tree

1 file changed

+33
-34
lines changed

1 file changed

+33
-34
lines changed

‎pkg/utils/controller/controller_test.go‎

Lines changed: 33 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,10 @@ import (
3535
"github.com/kubefleet-dev/kubefleet/test/utils/resource"
3636
)
3737

38+
const (
39+
crpName = "my-test-crp"
40+
)
41+
3842
func TestNewUnexpectedBehaviorError(t *testing.T) {
3943
tests := []struct {
4044
name string
@@ -278,7 +282,6 @@ func serviceScheme(t *testing.T) *runtime.Scheme {
278282
}
279283

280284
func TestFetchAllClusterResourceSnapshots(t *testing.T) {
281-
crp := "my-test-crp"
282285
tests := []struct {
283286
name string
284287
master *fleetv1beta1.ClusterResourceSnapshot
@@ -290,10 +293,10 @@ func TestFetchAllClusterResourceSnapshots(t *testing.T) {
290293
name: "single resource snapshot",
291294
master: &fleetv1beta1.ClusterResourceSnapshot{
292295
ObjectMeta: metav1.ObjectMeta{
293-
Name: fmt.Sprintf(fleetv1beta1.ResourceSnapshotNameFmt, crp, 0),
296+
Name: fmt.Sprintf(fleetv1beta1.ResourceSnapshotNameFmt, crpName, 0),
294297
Labels: map[string]string{
295298
fleetv1beta1.ResourceIndexLabel: "0",
296-
fleetv1beta1.CRPTrackingLabel: crp,
299+
fleetv1beta1.CRPTrackingLabel: crpName,
297300
},
298301
Annotations: map[string]string{
299302
fleetv1beta1.ResourceGroupHashAnnotation: "abc",
@@ -302,12 +305,12 @@ func TestFetchAllClusterResourceSnapshots(t *testing.T) {
302305
},
303306
},
304307
want: map[string]*fleetv1beta1.ClusterResourceSnapshot{
305-
fmt.Sprintf(fleetv1beta1.ResourceSnapshotNameFmt, crp, 0): {
308+
fmt.Sprintf(fleetv1beta1.ResourceSnapshotNameFmt, crpName, 0): {
306309
ObjectMeta: metav1.ObjectMeta{
307-
Name: fmt.Sprintf(fleetv1beta1.ResourceSnapshotNameFmt, crp, 0),
310+
Name: fmt.Sprintf(fleetv1beta1.ResourceSnapshotNameFmt, crpName, 0),
308311
Labels: map[string]string{
309312
fleetv1beta1.ResourceIndexLabel: "0",
310-
fleetv1beta1.CRPTrackingLabel: crp,
313+
fleetv1beta1.CRPTrackingLabel: crpName,
311314
},
312315
Annotations: map[string]string{
313316
fleetv1beta1.ResourceGroupHashAnnotation: "abc",
@@ -321,10 +324,10 @@ func TestFetchAllClusterResourceSnapshots(t *testing.T) {
321324
name: "multiple resource snapshots",
322325
master: &fleetv1beta1.ClusterResourceSnapshot{
323326
ObjectMeta: metav1.ObjectMeta{
324-
Name: fmt.Sprintf(fleetv1beta1.ResourceSnapshotNameFmt, crp, 0),
327+
Name: fmt.Sprintf(fleetv1beta1.ResourceSnapshotNameFmt, crpName, 0),
325328
Labels: map[string]string{
326329
fleetv1beta1.ResourceIndexLabel: "0",
327-
fleetv1beta1.CRPTrackingLabel: crp,
330+
fleetv1beta1.CRPTrackingLabel: crpName,
328331
},
329332
Annotations: map[string]string{
330333
fleetv1beta1.ResourceGroupHashAnnotation: "abc",
@@ -335,10 +338,10 @@ func TestFetchAllClusterResourceSnapshots(t *testing.T) {
335338
snapshots: []fleetv1beta1.ClusterResourceSnapshot{
336339
{
337340
ObjectMeta: metav1.ObjectMeta{
338-
Name: fmt.Sprintf(fleetv1beta1.ResourceSnapshotNameWithSubindexFmt, crp, 0, 0),
341+
Name: fmt.Sprintf(fleetv1beta1.ResourceSnapshotNameWithSubindexFmt, crpName, 0, 0),
339342
Labels: map[string]string{
340343
fleetv1beta1.ResourceIndexLabel: "0",
341-
fleetv1beta1.CRPTrackingLabel: crp,
344+
fleetv1beta1.CRPTrackingLabel: crpName,
342345
},
343346
Annotations: map[string]string{
344347
fleetv1beta1.SubindexOfResourceSnapshotAnnotation: "0",
@@ -347,10 +350,10 @@ func TestFetchAllClusterResourceSnapshots(t *testing.T) {
347350
},
348351
{
349352
ObjectMeta: metav1.ObjectMeta{
350-
Name: fmt.Sprintf(fleetv1beta1.ResourceSnapshotNameWithSubindexFmt, crp, 0, 1),
353+
Name: fmt.Sprintf(fleetv1beta1.ResourceSnapshotNameWithSubindexFmt, crpName, 0, 1),
351354
Labels: map[string]string{
352355
fleetv1beta1.ResourceIndexLabel: "0",
353-
fleetv1beta1.CRPTrackingLabel: crp,
356+
fleetv1beta1.CRPTrackingLabel: crpName,
354357
},
355358
Annotations: map[string]string{
356359
fleetv1beta1.SubindexOfResourceSnapshotAnnotation: "1",
@@ -359,36 +362,36 @@ func TestFetchAllClusterResourceSnapshots(t *testing.T) {
359362
},
360363
},
361364
want: map[string]*fleetv1beta1.ClusterResourceSnapshot{
362-
fmt.Sprintf(fleetv1beta1.ResourceSnapshotNameWithSubindexFmt, crp, 0, 0): {
365+
fmt.Sprintf(fleetv1beta1.ResourceSnapshotNameWithSubindexFmt, crpName, 0, 0): {
363366
ObjectMeta: metav1.ObjectMeta{
364-
Name: fmt.Sprintf(fleetv1beta1.ResourceSnapshotNameWithSubindexFmt, crp, 0, 0),
367+
Name: fmt.Sprintf(fleetv1beta1.ResourceSnapshotNameWithSubindexFmt, crpName, 0, 0),
365368
Labels: map[string]string{
366369
fleetv1beta1.ResourceIndexLabel: "0",
367-
fleetv1beta1.CRPTrackingLabel: crp,
370+
fleetv1beta1.CRPTrackingLabel: crpName,
368371
},
369372
Annotations: map[string]string{
370373
fleetv1beta1.SubindexOfResourceSnapshotAnnotation: "0",
371374
},
372375
},
373376
},
374-
fmt.Sprintf(fleetv1beta1.ResourceSnapshotNameWithSubindexFmt, crp, 0, 1): {
377+
fmt.Sprintf(fleetv1beta1.ResourceSnapshotNameWithSubindexFmt, crpName, 0, 1): {
375378
ObjectMeta: metav1.ObjectMeta{
376-
Name: fmt.Sprintf(fleetv1beta1.ResourceSnapshotNameWithSubindexFmt, crp, 0, 1),
379+
Name: fmt.Sprintf(fleetv1beta1.ResourceSnapshotNameWithSubindexFmt, crpName, 0, 1),
377380
Labels: map[string]string{
378381
fleetv1beta1.ResourceIndexLabel: "0",
379-
fleetv1beta1.CRPTrackingLabel: crp,
382+
fleetv1beta1.CRPTrackingLabel: crpName,
380383
},
381384
Annotations: map[string]string{
382385
fleetv1beta1.SubindexOfResourceSnapshotAnnotation: "1",
383386
},
384387
},
385388
},
386-
fmt.Sprintf(fleetv1beta1.ResourceSnapshotNameFmt, crp, 0): {
389+
fmt.Sprintf(fleetv1beta1.ResourceSnapshotNameFmt, crpName, 0): {
387390
ObjectMeta: metav1.ObjectMeta{
388-
Name: fmt.Sprintf(fleetv1beta1.ResourceSnapshotNameFmt, crp, 0),
391+
Name: fmt.Sprintf(fleetv1beta1.ResourceSnapshotNameFmt, crpName, 0),
389392
Labels: map[string]string{
390393
fleetv1beta1.ResourceIndexLabel: "0",
391-
fleetv1beta1.CRPTrackingLabel: crp,
394+
fleetv1beta1.CRPTrackingLabel: crpName,
392395
},
393396
Annotations: map[string]string{
394397
fleetv1beta1.ResourceGroupHashAnnotation: "abc",
@@ -402,10 +405,10 @@ func TestFetchAllClusterResourceSnapshots(t *testing.T) {
402405
name: "some of resource snapshots have not been created yet",
403406
master: &fleetv1beta1.ClusterResourceSnapshot{
404407
ObjectMeta: metav1.ObjectMeta{
405-
Name: fmt.Sprintf(fleetv1beta1.ResourceSnapshotNameFmt, crp, 0),
408+
Name: fmt.Sprintf(fleetv1beta1.ResourceSnapshotNameFmt, crpName, 0),
406409
Labels: map[string]string{
407410
fleetv1beta1.ResourceIndexLabel: "0",
408-
fleetv1beta1.CRPTrackingLabel: crp,
411+
fleetv1beta1.CRPTrackingLabel: crpName,
409412
},
410413
Annotations: map[string]string{
411414
fleetv1beta1.ResourceGroupHashAnnotation: "abc",
@@ -416,10 +419,10 @@ func TestFetchAllClusterResourceSnapshots(t *testing.T) {
416419
snapshots: []fleetv1beta1.ClusterResourceSnapshot{
417420
{
418421
ObjectMeta: metav1.ObjectMeta{
419-
Name: fmt.Sprintf(fleetv1beta1.ResourceSnapshotNameWithSubindexFmt, crp, 0, 0),
422+
Name: fmt.Sprintf(fleetv1beta1.ResourceSnapshotNameWithSubindexFmt, crpName, 0, 0),
420423
Labels: map[string]string{
421424
fleetv1beta1.ResourceIndexLabel: "0",
422-
fleetv1beta1.CRPTrackingLabel: crp,
425+
fleetv1beta1.CRPTrackingLabel: crpName,
423426
},
424427
Annotations: map[string]string{
425428
fleetv1beta1.SubindexOfResourceSnapshotAnnotation: "0",
@@ -433,10 +436,10 @@ func TestFetchAllClusterResourceSnapshots(t *testing.T) {
433436
name: "invalid numberOfResourceSnapshotsAnnotation",
434437
master: &fleetv1beta1.ClusterResourceSnapshot{
435438
ObjectMeta: metav1.ObjectMeta{
436-
Name: fmt.Sprintf(fleetv1beta1.ResourceSnapshotNameFmt, crp, 0),
439+
Name: fmt.Sprintf(fleetv1beta1.ResourceSnapshotNameFmt, crpName, 0),
437440
Labels: map[string]string{
438441
fleetv1beta1.ResourceIndexLabel: "0",
439-
fleetv1beta1.CRPTrackingLabel: crp,
442+
fleetv1beta1.CRPTrackingLabel: crpName,
440443
},
441444
Annotations: map[string]string{
442445
fleetv1beta1.ResourceGroupHashAnnotation: "abc",
@@ -450,10 +453,10 @@ func TestFetchAllClusterResourceSnapshots(t *testing.T) {
450453
name: "invalid resource index label of master resource snapshot",
451454
master: &fleetv1beta1.ClusterResourceSnapshot{
452455
ObjectMeta: metav1.ObjectMeta{
453-
Name: fmt.Sprintf(fleetv1beta1.ResourceSnapshotNameFmt, crp, 0),
456+
Name: fmt.Sprintf(fleetv1beta1.ResourceSnapshotNameFmt, crpName, 0),
454457
Labels: map[string]string{
455458
fleetv1beta1.ResourceIndexLabel: "-2",
456-
fleetv1beta1.CRPTrackingLabel: crp,
459+
fleetv1beta1.CRPTrackingLabel: crpName,
457460
},
458461
Annotations: map[string]string{
459462
fleetv1beta1.ResourceGroupHashAnnotation: "abc",
@@ -476,7 +479,7 @@ func TestFetchAllClusterResourceSnapshots(t *testing.T) {
476479
WithScheme(scheme).
477480
WithObjects(objects...).
478481
Build()
479-
got, err := FetchAllClusterResourceSnapshots(context.Background(), fakeClient, crp, tc.master)
482+
got, err := FetchAllClusterResourceSnapshots(context.Background(), fakeClient, crpName, tc.master)
480483
if gotErr, wantErr := err != nil, tc.wantErr != nil; gotErr != wantErr || !errors.Is(err, tc.wantErr) {
481484
t.Fatalf("FetchAllClusterResourceSnapshots() got error %v, want error %v", err, tc.wantErr)
482485
}
@@ -497,8 +500,6 @@ func TestFetchAllClusterResourceSnapshots(t *testing.T) {
497500
}
498501

499502
func TestCollectResourceIdentifiersFromClusterResourceSnapshot(t *testing.T) {
500-
crpName := "my-test-crp"
501-
502503
namespaceResourceContent := *resource.NamespaceResourceContentForTest(t)
503504
deploymentResourceContent := *resource.DeploymentResourceContentForTest(t)
504505
clusterResourceEnvelopeContent := *resource.ClusterResourceEnvelopeResourceContentForTest(t)
@@ -788,8 +789,6 @@ func TestCollectResourceIdentifiersFromClusterResourceSnapshot(t *testing.T) {
788789
}
789790

790791
func TestCollectResourceIdentifiersUsingMasterClusterResourceSnapshot(t *testing.T) {
791-
crpName := "my-test-crp"
792-
793792
namespaceResourceContent := *resource.NamespaceResourceContentForTest(t)
794793
deploymentResourceContent := *resource.DeploymentResourceContentForTest(t)
795794
clusterResourceEnvelopeContent := *resource.ClusterResourceEnvelopeResourceContentForTest(t)

0 commit comments

Comments
 (0)