Merge pull request crossplane-contrib#1430 from crossplane-contrib/ba…

…ckport-1429-to-release-0.30 [Backport release-0.30] fix: Fixed generation of flowlog
AlexMichaelJonesNC · Aug 17, 2022 · 6549c08 · 6549c08
2 parents 67f59ae + 0bc8090
commit 6549c08
Show file tree

Hide file tree

Showing 7 changed files with 17 additions and 32 deletions.
diff --git a/apis/ec2/generator-config.yaml b/apis/ec2/generator-config.yaml
@@ -123,7 +123,7 @@ ignore:
     - CreateFlowLogsInput.ResourceIds
     - CreateFlowLogsInput.ResourceType
     - CreateFlowLogsInput.TagSpecifications
-    - CreateFlowLogsInput.DeliverLogsPermissionARN
+    - CreateFlowLogsInput.DeliverLogsPermissionArn
     - DescribeFlowLogsInput.FlowLogIds
     - DescribeFlowLogsInput.DryRun
     - CreateFlowLogsOutput.FlowLogIds

diff --git a/apis/ec2/v1alpha1/custom_types.go b/apis/ec2/v1alpha1/custom_types.go
@@ -527,7 +527,10 @@ type CustomFlowLogParameters struct {
 	// +optional
 	NetworkInterfaceID *string `json:"networkInterfaceId"`
 
-	// The Amazon Resource Names (ARNs) of an IAM Role.
+	// The ARN for the IAM role that permits Amazon EC2
+	// to publish flow logs to a CloudWatch Logs log group in your
+	// account. \n If you specify LogDestinationType as s3, do not
+	// specify DeliverLogsPermissionArn or LogGroupName.
 	// +crossplane:generate:reference:type=github.com/crossplane-contrib/provider-aws/apis/iam/v1beta1.Role
 	// +crossplane:generate:reference:extractor=github.com/crossplane-contrib/provider-aws/apis/iam/v1beta1.RoleARN()
 	DeliverLogsPermissionARN *string `json:"deliverLogsPermissionArn,omitempty"`

diff --git a/apis/ec2/v1alpha1/zz_flow_log.go b/apis/ec2/v1alpha1/zz_flow_log.go
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_flowlogs.yaml b/package/crds/ec2.aws.crossplane.io_flowlogs.yaml
@@ -145,14 +145,11 @@ spec:
                             type: string
                         type: object
                     type: object
-                  deliverLogsPermissionARN:
-                    description: "The ARN for the IAM role that permits Amazon EC2
+                  deliverLogsPermissionArn:
+                    description: The ARN for the IAM role that permits Amazon EC2
                       to publish flow logs to a CloudWatch Logs log group in your
                       account. \n If you specify LogDestinationType as s3, do not
-                      specify DeliverLogsPermissionArn or LogGroupName."
-                    type: string
-                  deliverLogsPermissionArn:
-                    description: The Amazon Resource Names (ARNs) of an IAM Role.
+                      specify DeliverLogsPermissionArn or LogGroupName.
                     type: string
                   deliverLogsPermissionArnRef:
                     description: DeliverLogsPermissionARNRef is a reference to DeliverLogsPermissionARN

diff --git a/pkg/controller/ec2/flowlog/setup.go b/pkg/controller/ec2/flowlog/setup.go
@@ -153,6 +153,10 @@ func preCreate(_ context.Context, cr *svcapitypes.FlowLog, obj *svcsdk.CreateFlo
 		obj.LogDestination = cr.Spec.ForProvider.CloudWatchLogDestination
 	}
 
+	if cr.Spec.ForProvider.DeliverLogsPermissionARN != nil {
+		obj.DeliverLogsPermissionArn = cr.Spec.ForProvider.DeliverLogsPermissionARN
+	}
+
 	if cr.Spec.ForProvider.Tags != nil {
 
 		obj.SetTagSpecifications(generateTagSpecifications(cr))

diff --git a/pkg/controller/ec2/flowlog/zz_conversions.go b/pkg/controller/ec2/flowlog/zz_conversions.go