Support modify vpc peering options (#1459)

Signed-off-by: zhengjiajin <zhengjiajin@pingcap.com> Signed-off-by: zhengjiajin <zhengjiajin@pingcap.com>
crossplane-contrib · Sep 19, 2022 · ffae9f2 · ffae9f2
1 parent 6d69baf
commit ffae9f2
Show file tree

Hide file tree

Showing 4 changed files with 66 additions and 0 deletions.
diff --git a/apis/ec2/v1alpha1/custom_types.go b/apis/ec2/v1alpha1/custom_types.go
@@ -162,6 +162,13 @@ type CustomVPCPeeringConnectionParameters struct {
 	// Metadata tagging key value pairs
 	// +optional
 	Tags []Tag `json:"tags,omitempty"`
+
+	// RequesterPeeringOptions describes the Requester VPC peering connection options.
+	// +optional
+	RequesterPeeringOptions *VPCPeeringConnectionOptionsDescription `json:"requesterPeeringOptions,omitempty"`
+	// AccepterRequesterPeeringOptions describes the Accepter VPC peering connection options.
+	// +optional
+	AccepterPeeringOptions *VPCPeeringConnectionOptionsDescription `json:"accepterPeeringOptions,omitempty"`
 }
 
 // CustomTransitGatewayParameters are custom parameters for TransitGateway

diff --git a/apis/ec2/v1alpha1/zz_generated.deepcopy.go b/apis/ec2/v1alpha1/zz_generated.deepcopy.go
diff --git a/package/crds/ec2.aws.crossplane.io_vpcpeeringconnections.yaml b/package/crds/ec2.aws.crossplane.io_vpcpeeringconnections.yaml
@@ -69,6 +69,17 @@ spec:
                       will be in pending-acceptance state. This will only lead to
                       an active connection if both VPCs are in the same tenant.
                     type: boolean
+                  accepterPeeringOptions:
+                    description: AccepterRequesterPeeringOptions describes the Accepter
+                      VPC peering connection options.
+                    properties:
+                      allowDNSResolutionFromRemoteVPC:
+                        type: boolean
+                      allowEgressFromLocalClassicLinkToRemoteVPC:
+                        type: boolean
+                      allowEgressFromLocalVPCToRemoteClassicLink:
+                        type: boolean
+                    type: object
                   peerOwnerID:
                     description: "The Amazon Web Services account ID of the owner
                       of the accepter VPC. \n Default: Your Amazon Web Services account
@@ -164,6 +175,17 @@ spec:
                     description: Region is which region the VPCPeeringConnection will
                       be created.
                     type: string
+                  requesterPeeringOptions:
+                    description: RequesterPeeringOptions describes the Requester VPC
+                      peering connection options.
+                    properties:
+                      allowDNSResolutionFromRemoteVPC:
+                        type: boolean
+                      allowEgressFromLocalClassicLinkToRemoteVPC:
+                        type: boolean
+                      allowEgressFromLocalVPCToRemoteClassicLink:
+                        type: boolean
+                    type: object
                   tagSpecifications:
                     description: The tags to assign to the peering connection.
                     items:

diff --git a/pkg/controller/ec2/vpcpeeringconnection/setup.go b/pkg/controller/ec2/vpcpeeringconnection/setup.go
@@ -2,6 +2,7 @@ package vpcpeeringconnection
 
 import (
 	"context"
+	"reflect"
 	"sort"
 	"time"
 
@@ -96,6 +97,32 @@ func (e *custom) postObserve(_ context.Context, cr *svcapitypes.VPCPeeringConnec
 		}
 	}
 
+	if !reflect.DeepEqual(obj.VpcPeeringConnections[0].AccepterVpcInfo.PeeringOptions, cr.Spec.ForProvider.AccepterPeeringOptions) ||
+		!reflect.DeepEqual(obj.VpcPeeringConnections[0].RequesterVpcInfo.PeeringOptions, cr.Spec.ForProvider.RequesterPeeringOptions) {
+		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,
+			}
+		}
+		request, _ := e.client.ModifyVpcPeeringConnectionOptionsRequest(&req)
+		err := request.Send()
+		if err != nil {
+			return obs, err
+		}
+	}
+
 	available := setCondition(obj.VpcPeeringConnections[0].Status, cr)
 	if !available {
 		return managed.ExternalObservation{ResourceExists: false}, nil