@@ -481,92 +481,86 @@ func TestParseFlags(t *testing.T) {
481481 "boolean false test flag" ,
482482 )
483483
484- intFlagDefault := intValidatingValue {
484+ customIntFlagDefault := intValidatingValue {
485485 validator : validatePort ,
486486 value : 8080 ,
487487 }
488488 flagSet .Var (
489- & intFlagDefault ,
490- "intFlagDefault " ,
491- "default int test flag" ,
489+ & customIntFlagDefault ,
490+ "customIntFlagDefault " ,
491+ "default custom int test flag" ,
492492 )
493493
494- intFlagUserDefined := intValidatingValue {
494+ customIntFlagUserDefined := intValidatingValue {
495495 validator : validatePort ,
496496 value : 8080 ,
497497 }
498498 flagSet .Var (
499- & intFlagUserDefined ,
500- "intFlagUserDefined " ,
501- "user defined int test flag" ,
499+ & customIntFlagUserDefined ,
500+ "customIntFlagUserDefined " ,
501+ "user defined custom int test flag" ,
502502 )
503- err := flagSet .Set ("intFlagUserDefined " , "8081" )
503+ err := flagSet .Set ("customIntFlagUserDefined " , "8081" )
504504 g .Expect (err ).To (Not (HaveOccurred ()))
505505
506- stringFlagDefault := stringValidatingValue {
506+ customStringFlagDefault := stringValidatingValue {
507507 validator : validateResourceName ,
508- value : "default-string-test-flag" ,
508+ value : "default-custom- string-test-flag" ,
509509 }
510510 flagSet .Var (
511- & stringFlagDefault ,
512- "stringFlagDefault " ,
513- "default string test flag" ,
511+ & customStringFlagDefault ,
512+ "customStringFlagDefault " ,
513+ "default custom string test flag" ,
514514 )
515515
516- stringFlagUserDefined := stringValidatingValue {
516+ customStringFlagUserDefined := stringValidatingValue {
517517 validator : validateResourceName ,
518- value : "user-defined-string-test-flag" ,
518+ value : "user-defined-custom- string-test-flag" ,
519519 }
520520 flagSet .Var (
521- & stringFlagUserDefined ,
522- "stringFlagUserDefined " ,
523- "user defined string test flag" ,
521+ & customStringFlagUserDefined ,
522+ "customStringFlagUserDefined " ,
523+ "user defined custom string test flag" ,
524524 )
525- err = flagSet .Set ("stringFlagUserDefined " , "changed-test-flag-value" )
525+ err = flagSet .Set ("customStringFlagUserDefined " , "changed-test-flag-value" )
526526 g .Expect (err ).To (Not (HaveOccurred ()))
527527
528- namespacedNameFlagDefault := namespacedNameValue {
529- value : types.NamespacedName {
530- Namespace : "test" ,
531- Name : "test-flag" ,
532- },
528+ customStringFlagNoDefaultValueUnset := namespacedNameValue {
529+ value : types.NamespacedName {},
533530 }
534531 flagSet .Var (
535- & namespacedNameFlagDefault ,
536- "namespacedNameFlagDefault " ,
537- "default namespacedName test flag" ,
532+ & customStringFlagNoDefaultValueUnset ,
533+ "customStringFlagNoDefaultValueUnset " ,
534+ "no default value custom string test flag" ,
538535 )
539536
540- namespacedNameFlagUserDefined := namespacedNameValue {
541- value : types.NamespacedName {
542- Namespace : "test" ,
543- Name : "test-flag" ,
544- },
537+ customStringFlagNoDefaultValueUserDefined := namespacedNameValue {
538+ value : types.NamespacedName {},
545539 }
546540 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" ,
550544 )
551545 userDefinedNamespacedName := types.NamespacedName {
552546 Namespace : "changed-namespace" ,
553547 Name : "changed-name" ,
554548 }
555- err = flagSet .Set ("namespacedNameFlagUserDefined " , userDefinedNamespacedName .String ())
549+ err = flagSet .Set ("customStringFlagNoDefaultValueUserDefined " , userDefinedNamespacedName .String ())
556550 g .Expect (err ).To (Not (HaveOccurred ()))
557551
558552 expectedKeys := []string {
559553 "boolFlagTrue" ,
560554 "boolFlagFalse" ,
561555
562- "intFlagDefault " ,
563- "intFlagUserDefined " ,
556+ "customIntFlagDefault " ,
557+ "customIntFlagUserDefined " ,
564558
565- "stringFlagDefault " ,
566- "stringFlagUserDefined " ,
559+ "customStringFlagDefault " ,
560+ "customStringFlagUserDefined " ,
567561
568- "namespacedNameFlagDefault " ,
569- "namespacedNameFlagUserDefined " ,
562+ "customStringFlagNoDefaultValueUnset " ,
563+ "customStringFlagNoDefaultValueUserDefined " ,
570564 }
571565 expectedValues := []string {
572566 "true" ,
0 commit comments