From 50cc61b073766b00b202378a97101d20624f54a1 Mon Sep 17 00:00:00 2001 From: Romain Dauby Date: Tue, 20 Sep 2022 14:28:11 -0400 Subject: [PATCH] fix: lint cyclomatic complexity (#1485) Signed-off-by: Romain Dauby Signed-off-by: Romain Dauby --- .../ec2/vpcpeeringconnection/setup.go | 38 ++++++++++--------- 1 file changed, 20 insertions(+), 18 deletions(-) diff --git a/pkg/controller/ec2/vpcpeeringconnection/setup.go b/pkg/controller/ec2/vpcpeeringconnection/setup.go index 63f2d33572..08a1a2ec63 100644 --- a/pkg/controller/ec2/vpcpeeringconnection/setup.go +++ b/pkg/controller/ec2/vpcpeeringconnection/setup.go @@ -102,20 +102,8 @@ func (e *custom) postObserve(_ context.Context, cr *svcapitypes.VPCPeeringConnec req := svcsdk.ModifyVpcPeeringConnectionOptionsInput{ VpcPeeringConnectionId: awsclients.String(*obj.VpcPeeringConnections[0].VpcPeeringConnectionId), } - if cr.Spec.ForProvider.AccepterPeeringOptions != nil { - req.AccepterPeeringConnectionOptions = &svcsdk.PeeringConnectionOptionsRequest{ - AllowDnsResolutionFromRemoteVpc: cr.Spec.ForProvider.AccepterPeeringOptions.AllowDNSResolutionFromRemoteVPC, - AllowEgressFromLocalClassicLinkToRemoteVpc: cr.Spec.ForProvider.AccepterPeeringOptions.AllowEgressFromLocalClassicLinkToRemoteVPC, - AllowEgressFromLocalVpcToRemoteClassicLink: cr.Spec.ForProvider.AccepterPeeringOptions.AllowEgressFromLocalVPCToRemoteClassicLink, - } - } - if cr.Spec.ForProvider.RequesterPeeringOptions != nil { - req.RequesterPeeringConnectionOptions = &svcsdk.PeeringConnectionOptionsRequest{ - AllowDnsResolutionFromRemoteVpc: cr.Spec.ForProvider.RequesterPeeringOptions.AllowDNSResolutionFromRemoteVPC, - AllowEgressFromLocalClassicLinkToRemoteVpc: cr.Spec.ForProvider.RequesterPeeringOptions.AllowEgressFromLocalClassicLinkToRemoteVPC, - AllowEgressFromLocalVpcToRemoteClassicLink: cr.Spec.ForProvider.RequesterPeeringOptions.AllowEgressFromLocalVPCToRemoteClassicLink, - } - } + setAccepterRequester(&req, cr) + request, _ := e.client.ModifyVpcPeeringConnectionOptionsRequest(&req) err := request.Send() if err != nil { @@ -131,20 +119,34 @@ func (e *custom) postObserve(_ context.Context, cr *svcapitypes.VPCPeeringConnec return obs, nil } +func setAccepterRequester(req *svcsdk.ModifyVpcPeeringConnectionOptionsInput, cr *svcapitypes.VPCPeeringConnection) { + if cr.Spec.ForProvider.AccepterPeeringOptions != nil { + req.AccepterPeeringConnectionOptions = &svcsdk.PeeringConnectionOptionsRequest{ + AllowDnsResolutionFromRemoteVpc: cr.Spec.ForProvider.AccepterPeeringOptions.AllowDNSResolutionFromRemoteVPC, + AllowEgressFromLocalClassicLinkToRemoteVpc: cr.Spec.ForProvider.AccepterPeeringOptions.AllowEgressFromLocalClassicLinkToRemoteVPC, + AllowEgressFromLocalVpcToRemoteClassicLink: cr.Spec.ForProvider.AccepterPeeringOptions.AllowEgressFromLocalVPCToRemoteClassicLink, + } + } + if cr.Spec.ForProvider.RequesterPeeringOptions != nil { + req.RequesterPeeringConnectionOptions = &svcsdk.PeeringConnectionOptionsRequest{ + AllowDnsResolutionFromRemoteVpc: cr.Spec.ForProvider.RequesterPeeringOptions.AllowDNSResolutionFromRemoteVPC, + AllowEgressFromLocalClassicLinkToRemoteVpc: cr.Spec.ForProvider.RequesterPeeringOptions.AllowEgressFromLocalClassicLinkToRemoteVPC, + AllowEgressFromLocalVpcToRemoteClassicLink: cr.Spec.ForProvider.RequesterPeeringOptions.AllowEgressFromLocalVPCToRemoteClassicLink, + } + } +} + func setCondition(code *svcsdk.VpcPeeringConnectionStateReason, cr *svcapitypes.VPCPeeringConnection) bool { switch aws.StringValue(code.Code) { case string(svcapitypes.VPCPeeringConnectionStateReasonCode_pending_acceptance): cr.SetConditions(xpv1.Creating()) return true - case string(svcapitypes.VPCPeeringConnectionStateReasonCode_deleted): + case string(svcapitypes.VPCPeeringConnectionStateReasonCode_deleted), string(svcapitypes.VPCPeeringConnectionStateReasonCode_failed): cr.SetConditions(xpv1.Unavailable()) return false case string(svcapitypes.VPCPeeringConnectionStateReasonCode_active): cr.SetConditions(xpv1.Available()) return true - case string(svcapitypes.VPCPeeringConnectionStateReasonCode_failed): - cr.SetConditions(xpv1.Unavailable()) - return false } return false }