bugfix(nil): crossplane-contrib#1367 check for nil

Signed-off-by: haarchri <chhaar30@googlemail.com>
haarchri · Jun 29, 2022 · 8cc8995 · 8cc8995
1 parent 2db1de6
commit 8cc8995
Showing 1 changed file with 9 additions and 7 deletions.
diff --git 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...)