@@ -481,92 +481,86 @@ func TestParseFlags(t *testing.T) {
481
481
"boolean false test flag" ,
482
482
)
483
483
484
- intFlagDefault := intValidatingValue {
484
+ customIntFlagDefault := intValidatingValue {
485
485
validator : validatePort ,
486
486
value : 8080 ,
487
487
}
488
488
flagSet .Var (
489
- & intFlagDefault ,
490
- "intFlagDefault " ,
491
- "default int test flag" ,
489
+ & customIntFlagDefault ,
490
+ "customIntFlagDefault " ,
491
+ "default custom int test flag" ,
492
492
)
493
493
494
- intFlagUserDefined := intValidatingValue {
494
+ customIntFlagUserDefined := intValidatingValue {
495
495
validator : validatePort ,
496
496
value : 8080 ,
497
497
}
498
498
flagSet .Var (
499
- & intFlagUserDefined ,
500
- "intFlagUserDefined " ,
501
- "user defined int test flag" ,
499
+ & customIntFlagUserDefined ,
500
+ "customIntFlagUserDefined " ,
501
+ "user defined custom int test flag" ,
502
502
)
503
- err := flagSet .Set ("intFlagUserDefined " , "8081" )
503
+ err := flagSet .Set ("customIntFlagUserDefined " , "8081" )
504
504
g .Expect (err ).To (Not (HaveOccurred ()))
505
505
506
- stringFlagDefault := stringValidatingValue {
506
+ customStringFlagDefault := stringValidatingValue {
507
507
validator : validateResourceName ,
508
- value : "default-string-test-flag" ,
508
+ value : "default-custom- string-test-flag" ,
509
509
}
510
510
flagSet .Var (
511
- & stringFlagDefault ,
512
- "stringFlagDefault " ,
513
- "default string test flag" ,
511
+ & customStringFlagDefault ,
512
+ "customStringFlagDefault " ,
513
+ "default custom string test flag" ,
514
514
)
515
515
516
- stringFlagUserDefined := stringValidatingValue {
516
+ customStringFlagUserDefined := stringValidatingValue {
517
517
validator : validateResourceName ,
518
- value : "user-defined-string-test-flag" ,
518
+ value : "user-defined-custom- string-test-flag" ,
519
519
}
520
520
flagSet .Var (
521
- & stringFlagUserDefined ,
522
- "stringFlagUserDefined " ,
523
- "user defined string test flag" ,
521
+ & customStringFlagUserDefined ,
522
+ "customStringFlagUserDefined " ,
523
+ "user defined custom string test flag" ,
524
524
)
525
- err = flagSet .Set ("stringFlagUserDefined " , "changed-test-flag-value" )
525
+ err = flagSet .Set ("customStringFlagUserDefined " , "changed-test-flag-value" )
526
526
g .Expect (err ).To (Not (HaveOccurred ()))
527
527
528
- namespacedNameFlagDefault := namespacedNameValue {
529
- value : types.NamespacedName {
530
- Namespace : "test" ,
531
- Name : "test-flag" ,
532
- },
528
+ customStringFlagNoDefaultValueUnset := namespacedNameValue {
529
+ value : types.NamespacedName {},
533
530
}
534
531
flagSet .Var (
535
- & namespacedNameFlagDefault ,
536
- "namespacedNameFlagDefault " ,
537
- "default namespacedName test flag" ,
532
+ & customStringFlagNoDefaultValueUnset ,
533
+ "customStringFlagNoDefaultValueUnset " ,
534
+ "no default value custom string test flag" ,
538
535
)
539
536
540
- namespacedNameFlagUserDefined := namespacedNameValue {
541
- value : types.NamespacedName {
542
- Namespace : "test" ,
543
- Name : "test-flag" ,
544
- },
537
+ customStringFlagNoDefaultValueUserDefined := namespacedNameValue {
538
+ value : types.NamespacedName {},
545
539
}
546
540
flagSet .Var (
547
- & namespacedNameFlagUserDefined ,
548
- "namespacedNameFlagUserDefined " ,
549
- "user defined namespacedName test flag" ,
541
+ & customStringFlagNoDefaultValueUserDefined ,
542
+ "customStringFlagNoDefaultValueUserDefined " ,
543
+ "no default value but with user defined namespacedName test flag" ,
550
544
)
551
545
userDefinedNamespacedName := types.NamespacedName {
552
546
Namespace : "changed-namespace" ,
553
547
Name : "changed-name" ,
554
548
}
555
- err = flagSet .Set ("namespacedNameFlagUserDefined " , userDefinedNamespacedName .String ())
549
+ err = flagSet .Set ("customStringFlagNoDefaultValueUserDefined " , userDefinedNamespacedName .String ())
556
550
g .Expect (err ).To (Not (HaveOccurred ()))
557
551
558
552
expectedKeys := []string {
559
553
"boolFlagTrue" ,
560
554
"boolFlagFalse" ,
561
555
562
- "intFlagDefault " ,
563
- "intFlagUserDefined " ,
556
+ "customIntFlagDefault " ,
557
+ "customIntFlagUserDefined " ,
564
558
565
- "stringFlagDefault " ,
566
- "stringFlagUserDefined " ,
559
+ "customStringFlagDefault " ,
560
+ "customStringFlagUserDefined " ,
567
561
568
- "namespacedNameFlagDefault " ,
569
- "namespacedNameFlagUserDefined " ,
562
+ "customStringFlagNoDefaultValueUnset " ,
563
+ "customStringFlagNoDefaultValueUserDefined " ,
570
564
}
571
565
expectedValues := []string {
572
566
"true" ,
0 commit comments