From 8cc8995a5a2333b9c06aad412562a55f0b2f2565 Mon Sep 17 00:00:00 2001 From: haarchri Date: Wed, 29 Jun 2022 19:56:03 +0200 Subject: [PATCH] bugfix(nil): #1367 check for nil Signed-off-by: haarchri --- .../ec2/vpcendpointserviceconfiguration/setup.go | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/pkg/controller/ec2/vpcendpointserviceconfiguration/setup.go b/pkg/controller/ec2/vpcendpointserviceconfiguration/setup.go index 646a7974d2..a66171059c 100644 --- a/pkg/controller/ec2/vpcendpointserviceconfiguration/setup.go +++ b/pkg/controller/ec2/vpcendpointserviceconfiguration/setup.go @@ -271,8 +271,7 @@ func DifferenceARN(local []*string, remote []*string) ([]*string, []*string) { return createKey, removeKey } -// GenerateObservation is used to produce v1beta1.ClusterObservation from -// ekstypes.Cluster. +// GenerateObservation is used to produce v1alpha1.vpcendpointserviceconfigurationObservation func GenerateObservation(obj *svcsdk.ServiceConfiguration) *svcapitypes.ServiceConfiguration { // nolint:gocyclo if obj == nil { return &svcapitypes.ServiceConfiguration{} @@ -283,15 +282,18 @@ func GenerateObservation(obj *svcsdk.ServiceConfiguration) *svcapitypes.ServiceC BaseEndpointDNSNames: obj.BaseEndpointDnsNames, ManagesVPCEndpoints: obj.ManagesVpcEndpoints, PrivateDNSName: obj.PrivateDnsName, - PrivateDNSNameConfiguration: &svcapitypes.PrivateDNSNameConfiguration{ + ServiceID: obj.ServiceId, + ServiceName: obj.ServiceName, + ServiceState: obj.ServiceState, + } + + if obj.PrivateDnsNameConfiguration != nil { + o.PrivateDNSNameConfiguration = &svcapitypes.PrivateDNSNameConfiguration{ Name: obj.PrivateDnsNameConfiguration.Name, State: obj.PrivateDnsNameConfiguration.State, Value: obj.PrivateDnsNameConfiguration.Value, Type: obj.PrivateDnsNameConfiguration.Type, - }, - ServiceID: obj.ServiceId, - ServiceName: obj.ServiceName, - ServiceState: obj.ServiceState, + } } o.NetworkLoadBalancerARNs = append(o.NetworkLoadBalancerARNs, obj.NetworkLoadBalancerArns...)