@@ -115,27 +115,29 @@ func TestSetIgnoreHostHeader(t *testing.T) {
115
115
116
116
func TestSetSslPolicy (t * testing.T ) {
117
117
var tests = []struct {
118
- SslPolicy string
119
- expected string
120
- pass bool
118
+ Annotations map [ string ] string
119
+ expected string
120
+ pass bool
121
121
}{
122
- {"" , "" , true }, // ip-address-type has a sane default
123
- {"ELBSecurityPolicy-TLS-1-2-2017-01" , "" , false },
124
- {"ELBSecurityPolicy-TLS-1-2-2017-01" , "ELBSecurityPolicy-TLS-1-2-2017-01" , true },
122
+ {map [string ]string {}, "" , true }, // ssl policy has a sane default
123
+ {map [string ]string {sslPolicyKey : "ELBSecurityPolicy-TLS-1-2-2017-01" }, "" , false },
124
+ {map [string ]string {certificateArnKey : "arn:aws:acm:" }, "ELBSecurityPolicy-2016-08" , true }, // AWS's default policy when there is a cert assigned is 'ELBSecurityPolicy-2016-08'
125
+ {map [string ]string {sslPolicyKey : "ELBSecurityPolicy-TLS-1-2-2017-01" }, "ELBSecurityPolicy-TLS-1-2-2017-01" , true },
125
126
}
126
127
127
128
for _ , tt := range tests {
128
129
a := & Annotations {}
130
+ a .setCertificateArn (tt .Annotations , fakeValidator ())
129
131
130
- err := a .setSslPolicy (map [ string ] string { sslPolicyKey : tt .SslPolicy } , fakeValidator ())
132
+ err := a .setSslPolicy (tt .Annotations , fakeValidator ())
131
133
if err != nil && tt .pass {
132
- t .Errorf ("setIpAddressType (%v): expected %v, actual %v" , tt .SslPolicy , tt .pass , err )
134
+ t .Errorf ("setSslPolicy (%v): expected %v, actual %v" , tt .Annotations [ sslPolicyKey ] , tt .pass , err )
133
135
}
134
- if err == nil && tt .pass && tt .expected != * a .SslPolicy {
135
- t .Errorf ("setIpAddressType (%v): expected %v, actual %v" , tt .SslPolicy , tt .expected , * a .SslPolicy )
136
+ if err == nil && tt .pass && a . SslPolicy != nil && tt .expected != * a .SslPolicy {
137
+ t .Errorf ("setSslPolicy (%v): expected %v, actual %v" , tt .Annotations [ sslPolicyKey ] , tt .expected , * a .SslPolicy )
136
138
}
137
139
if err == nil && ! tt .pass && tt .expected == * a .SslPolicy {
138
- t .Errorf ("setIpAddressType (%v): expected %v, actual %v" , tt .SslPolicy , tt .expected , * a .SslPolicy )
140
+ t .Errorf ("setSslPolicy (%v): expected %v, actual %v" , tt .Annotations [ sslPolicyKey ] , tt .expected , * a .SslPolicy )
139
141
}
140
142
}
141
143
}
0 commit comments