@@ -568,115 +568,3 @@ func TestPremiumSuperSet(t *testing.T) {
568
568
require .NotContains (t , enterprise .Features (), "" , "enterprise should not contain empty string" )
569
569
require .NotContains (t , premium .Features (), "" , "premium should not contain empty string" )
570
570
}
571
-
572
- func TestEmailValuesTakeCorrectPrecedent (t * testing.T ) {
573
- t .Parallel ()
574
-
575
- tests := []struct {
576
- name string
577
- envs []serpent.EnvVar
578
- oldEnv string
579
- newEnv string
580
- expectedValue string
581
- }{
582
- {
583
- name : "CODER_NOTIFICATIONS_EMAIL_SMARTHOST is not discarded" ,
584
- envs : []serpent.EnvVar {
585
- {
586
- Name : "CODER_NOTIFICATIONS_EMAIL_SMARTHOST" ,
587
- Value : "localhost:999" ,
588
- },
589
- },
590
- oldEnv : "CODER_NOTIFICATIONS_EMAIL_SMARTHOST" ,
591
- newEnv : "CODER_EMAIL_SMARTHOST" ,
592
- expectedValue : "localhost:999" ,
593
- },
594
- {
595
- name : "CODER_EMAIL_SMARTHOST is not discarded" ,
596
- envs : []serpent.EnvVar {
597
- {
598
- Name : "CODER_EMAIL_SMARTHOST" ,
599
- Value : "localhost:999" ,
600
- },
601
- },
602
- oldEnv : "CODER_NOTIFICATIONS_EMAIL_SMARTHOST" ,
603
- newEnv : "CODER_EMAIL_SMARTHOST" ,
604
- expectedValue : "localhost:999" ,
605
- },
606
- {
607
- name : "CODER_EMAIL_SMARTHOST is prioritized" ,
608
- envs : []serpent.EnvVar {
609
- {
610
- Name : "CODER_NOTIFICATIONS_EMAIL_SMARTHOST" ,
611
- Value : "localhost:999" ,
612
- },
613
- {
614
- Name : "CODER_EMAIL_SMARTHOST" ,
615
- Value : "localhost:1000" ,
616
- },
617
- },
618
- oldEnv : "CODER_NOTIFICATIONS_EMAIL_SMARTHOST" ,
619
- newEnv : "CODER_EMAIL_SMARTHOST" ,
620
- expectedValue : "localhost:1000" ,
621
- },
622
- {
623
- name : "CODER_NOTIFICATIONS_EMAIL_HELLO is not discarded" ,
624
- envs : []serpent.EnvVar {
625
- {
626
- Name : "CODER_NOTIFICATIONS_EMAIL_HELLO" ,
627
- Value : "not-localhost" ,
628
- },
629
- },
630
- oldEnv : "CODER_NOTIFICATIONS_EMAIL_HELLO" ,
631
- newEnv : "CODER_EMAIL_HELLO" ,
632
- expectedValue : "not-localhost" ,
633
- },
634
- {
635
- name : "CODER_EMAIL_HELLO is not discarded" ,
636
- envs : []serpent.EnvVar {
637
- {
638
- Name : "CODER_EMAIL_HELLO" ,
639
- Value : "not-localhost" ,
640
- },
641
- },
642
- oldEnv : "CODER_NOTIFICATIONS_EMAIL_HELLO" ,
643
- newEnv : "CODER_EMAIL_HELLO" ,
644
- expectedValue : "not-localhost" ,
645
- },
646
- }
647
-
648
- for _ , tt := range tests {
649
- tt := tt
650
- t .Run (tt .name , func (t * testing.T ) {
651
- t .Parallel ()
652
-
653
- dv := codersdk.DeploymentValues {}
654
- opts := dv .Options ()
655
-
656
- err := opts .ParseEnv (tt .envs )
657
- require .NoError (t , err )
658
-
659
- err = opts .SetDefaults ()
660
- require .NoError (t , err )
661
-
662
- var oldEnvValue string
663
- var newEnvValue string
664
-
665
- for _ , opt := range opts {
666
- switch {
667
- case opt .Env == tt .oldEnv :
668
- oldEnvValue = opt .Value .String ()
669
- case opt .Env == tt .newEnv :
670
- newEnvValue = opt .Value .String ()
671
- }
672
-
673
- if oldEnvValue != "" && newEnvValue != "" {
674
- break
675
- }
676
- }
677
-
678
- require .Equal (t , tt .expectedValue , oldEnvValue )
679
- require .Equal (t , tt .expectedValue , newEnvValue )
680
- })
681
- }
682
- }
0 commit comments