Skip to content

Commit c1e21e8

Browse files
tao12345666333programmer04pmalek
authored
fix: correct Azure DNSConfig mapping and rename typo (#2550)
Signed-off-by: Jintao Zhang <[email protected]> Co-authored-by: Jakub Warczarek <[email protected]> Co-authored-by: Patryk Małek <[email protected]>
1 parent e1ccd8d commit c1e21e8

File tree

2 files changed

+32
-3
lines changed

2 files changed

+32
-3
lines changed

controller/konnect/ops/ops_konnecttransitgateway.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -142,15 +142,15 @@ func getKonnectTransitGatewayMatchingSpecName(
142142
return getMatchingEntryFromListResponseData(listTransitGatewayResponseDataToEntityWithIDSlice(resp.ListTransitGatewaysResponse.Data), tg)
143143
}
144144

145-
var trasitGatewayTypeToSDKTransitGatewayType = map[konnectv1alpha1.TransitGatewayType]sdkkonnectcomp.CreateTransitGatewayRequestType{
145+
var transitGatewayTypeToSDKTransitGatewayType = map[konnectv1alpha1.TransitGatewayType]sdkkonnectcomp.CreateTransitGatewayRequestType{
146146
konnectv1alpha1.TransitGatewayTypeAWSTransitGateway: sdkkonnectcomp.CreateTransitGatewayRequestTypeAWSTransitGateway,
147147
konnectv1alpha1.TransitGatewayTypeAzureTransitGateway: sdkkonnectcomp.CreateTransitGatewayRequestTypeAzureTransitGateway,
148148
}
149149

150150
func transitGatewaySpecToTransitGatewayInput(
151151
spec konnectv1alpha1.KonnectTransitGatewayAPISpec,
152152
) sdkkonnectcomp.CreateTransitGatewayRequest {
153-
typ := trasitGatewayTypeToSDKTransitGatewayType[spec.Type]
153+
typ := transitGatewayTypeToSDKTransitGatewayType[spec.Type]
154154

155155
req := sdkkonnectcomp.CreateTransitGatewayRequest{
156156
Type: typ,
@@ -176,7 +176,7 @@ func transitGatewaySpecToTransitGatewayInput(
176176
case konnectv1alpha1.TransitGatewayTypeAzureTransitGateway:
177177
req.AzureTransitGateway = &sdkkonnectcomp.AzureTransitGateway{
178178
Name: spec.AzureTransitGateway.Name,
179-
DNSConfig: lo.Map(spec.AWSTransitGateway.DNSConfig, func(dnsConf konnectv1alpha1.TransitGatewayDNSConfig, _ int) sdkkonnectcomp.TransitGatewayDNSConfig {
179+
DNSConfig: lo.Map(spec.AzureTransitGateway.DNSConfig, func(dnsConf konnectv1alpha1.TransitGatewayDNSConfig, _ int) sdkkonnectcomp.TransitGatewayDNSConfig {
180180
return sdkkonnectcomp.TransitGatewayDNSConfig{
181181
RemoteDNSServerIPAddresses: dnsConf.RemoteDNSServerIPAddresses,
182182
DomainProxyList: dnsConf.DomainProxyList,

controller/konnect/ops/ops_konnecttransitgateway_test.go

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,35 @@ import (
1919
"github.com/kong/kong-operator/test/mocks/sdkmocks"
2020
)
2121

22+
func TestTransitGatewaySpecToInput_AzureDNSConfig(t *testing.T) {
23+
spec := konnectv1alpha1.KonnectTransitGatewayAPISpec{
24+
Type: konnectv1alpha1.TransitGatewayTypeAzureTransitGateway,
25+
AzureTransitGateway: &konnectv1alpha1.AzureTransitGateway{
26+
Name: "az-tg",
27+
DNSConfig: []konnectv1alpha1.TransitGatewayDNSConfig{
28+
{RemoteDNSServerIPAddresses: []string{"10.1.0.1", "10.1.0.2"}, DomainProxyList: []string{"internal.example.com", "corp.local"}},
29+
},
30+
AttachmentConfig: konnectv1alpha1.AzureVNETPeeringAttachmentConfig{
31+
TenantID: "tenant-1",
32+
SubscriptionID: "sub-1",
33+
ResourceGroupName: "rg-1",
34+
VnetName: "vnet-1",
35+
},
36+
},
37+
}
38+
39+
req := transitGatewaySpecToTransitGatewayInput(spec)
40+
41+
require.NotNil(t, req.AzureTransitGateway)
42+
az := req.AzureTransitGateway
43+
if assert.Len(t, az.DNSConfig, 1) {
44+
cfg := az.DNSConfig[0]
45+
assert.ElementsMatch(t, []string{"10.1.0.1", "10.1.0.2"}, cfg.RemoteDNSServerIPAddresses)
46+
assert.ElementsMatch(t, []string{"internal.example.com", "corp.local"}, cfg.DomainProxyList)
47+
}
48+
assert.Equal(t, sdkkonnectcomp.CreateTransitGatewayRequestTypeAzureTransitGateway, req.Type)
49+
}
50+
2251
func TestAdoptMatchTransitGatewaySuccess(t *testing.T) {
2352
t.Parallel()
2453

0 commit comments

Comments
 (0)