@@ -1664,9 +1664,6 @@ func TestFindBackendTLSPolicyForService(t *testing.T) {
1664
1664
},
1665
1665
}
1666
1666
}
1667
- oldestBtp := getBtp ("oldest" , oldCreationTimestamp )
1668
- newestBtp := getBtp ("newest" , newCreationTimestamp )
1669
- alphaFirstBtp := getBtp ("alphabeticallyfirst" , oldCreationTimestamp )
1670
1667
1671
1668
ref := gatewayv1.HTTPBackendRef {
1672
1669
BackendRef : gatewayv1.BackendRef {
@@ -1678,26 +1675,39 @@ func TestFindBackendTLSPolicyForService(t *testing.T) {
1678
1675
},
1679
1676
}
1680
1677
1678
+ getBTPMap := func (nameAndTimestamp map [string ]metav1.Time ) map [types.NamespacedName ]* BackendTLSPolicy {
1679
+ m := make (map [types.NamespacedName ]* BackendTLSPolicy , len (nameAndTimestamp ))
1680
+ for n , ts := range nameAndTimestamp {
1681
+ btp := getBtp (n , ts )
1682
+ m [client .ObjectKeyFromObject (btp .Source )] = btp
1683
+ }
1684
+ return m
1685
+ }
1686
+
1681
1687
tests := []struct {
1682
1688
name string
1683
1689
backendTLSPolicies map [types.NamespacedName ]* BackendTLSPolicy
1684
1690
expectedBtpName string
1685
1691
}{
1686
1692
{
1687
1693
name : "oldest wins" ,
1688
- backendTLSPolicies : map [types.NamespacedName ]* BackendTLSPolicy {
1689
- client .ObjectKeyFromObject (newestBtp .Source ): newestBtp ,
1690
- client .ObjectKeyFromObject (oldestBtp .Source ): oldestBtp ,
1691
- },
1694
+ backendTLSPolicies : getBTPMap (
1695
+ map [string ]metav1.Time {
1696
+ "newest" : newCreationTimestamp ,
1697
+ "oldest" : oldCreationTimestamp ,
1698
+ },
1699
+ ),
1692
1700
expectedBtpName : "oldest" ,
1693
1701
},
1694
1702
{
1695
1703
name : "alphabetically first wins" ,
1696
- backendTLSPolicies : map [types.NamespacedName ]* BackendTLSPolicy {
1697
- client .ObjectKeyFromObject (oldestBtp .Source ): oldestBtp ,
1698
- client .ObjectKeyFromObject (alphaFirstBtp .Source ): alphaFirstBtp ,
1699
- client .ObjectKeyFromObject (newestBtp .Source ): newestBtp ,
1700
- },
1704
+ backendTLSPolicies : getBTPMap (
1705
+ map [string ]metav1.Time {
1706
+ "alphabeticallyfirst" : oldCreationTimestamp ,
1707
+ "newest" : newCreationTimestamp ,
1708
+ "oldest" : oldCreationTimestamp ,
1709
+ },
1710
+ ),
1701
1711
expectedBtpName : "alphabeticallyfirst" ,
1702
1712
},
1703
1713
}
0 commit comments