Generate typedefs for payload fields in Spec and Status (#146)

Issue #, if available: aws-controllers-k8s/community#864

Description of changes:
When checking payload type defs, if they are used in the spec or status are included, otherwise they are still excluded. 

By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 license.

Author: RedbackThomson

pkg/model/crd.go

@@ -148,6 +148,11 @@ func (r *CRD) HasShapeAsMember(toFind string) bool {
 			return true
 		}
 	}
+	for _, field := range r.StatusFields {
+		if shapeHasMember(field.ShapeRef.Shape, toFind) {
+			return true
+		}
+	}
 	return false
 }
 

pkg/model/model.go

@@ -293,8 +293,8 @@ func (m *Model) GetTypeDefs() ([]*TypeDef, error) {
 	payloads := m.SDKAPI.GetPayloads()
 
 	for shapeName, shape := range m.SDKAPI.API.Shapes {
-		if util.InStrings(shapeName, payloads) {
-			// Payloads are not type defs
+		if util.InStrings(shapeName, payloads) && !m.IsShapeUsedInCRDs(shapeName) {
+			// Payloads are not type defs, unless explicitly used
 			continue
 		}
 		if shape.Type != "structure" {

pkg/model/model_ec2_test.go

@@ -101,3 +101,54 @@ func TestEC2_LaunchTemplate(t *testing.T) {
 	assert.Nil(crd.Ops.ReadOne)
 	assert.NotNil(crd.Ops.ReadMany)
 }
+
+func TestEC2_Volume(t *testing.T) {
+	assert := assert.New(t)
+	require := require.New(t)
+
+	g := testutil.NewModelForService(t, "ec2")
+
+	crds, err := g.GetCRDs()
+	require.Nil(err)
+
+	crd := getCRDByName("Volume", crds)
+	require.NotNil(crd)
+
+	assert.Equal("Volume", crd.Names.Camel)
+	assert.Equal("volume", crd.Names.CamelLower)
+	assert.Equal("volume", crd.Names.Snake)
+
+	specFields := crd.SpecFields
+	statusFields := crd.StatusFields
+
+	expSpecFieldCamel := []string{
+		"AvailabilityZone",
+		"DryRun",
+		"Encrypted",
+		"IOPS",
+		"KMSKeyID",
+		"MultiAttachEnabled",
+		"OutpostARN",
+		"Size",
+		"SnapshotID",
+		"TagSpecifications",
+		"VolumeType",
+	}
+	assert.Equal(expSpecFieldCamel, attrCamelNames(specFields))
+
+	expStatusFieldCamel := []string{
+		"Attachments",
+		"CreateTime",
+		"FastRestored",
+		"State",
+		"Tags",
+		"VolumeID",
+	}
+	assert.Equal(expStatusFieldCamel, attrCamelNames(statusFields))
+
+	// Ensure that we generate TypeDefs for the VolumeAttachment field.
+	// This field is the payload of the `AttachVolume` payload, but should
+	// be included because it is the field value for the `attachments` status
+	// field
+	assert.NotNil(testutil.GetTypeDefByName(t, g, "VolumeAttachment"))
+}

pkg/testdata/models/apis/ec2/0000-00-00/generator.yaml

@@ -0,0 +1,60 @@
+ignore:
+  resource_names:
+    - AccountAttribute
+    - CapacityReservation
+    - CarrierGateway
+    - ClientVpnEndpoint
+    - ClientVpnRoute
+    - CustomerGateway
+    - DefaultSubnet
+    - DefaultVpc
+    - EgressOnlyInternetGateway
+    - Fleet
+    - FpgaImage
+    - Image
+    - Instance
+    - InstanceExportTask
+    - InternetGateway
+    - KeyPair
+    - LaunchTemplateVersion
+    # - LaunchTemplate
+    - LocalGatewayRouteTableVpcAssociation
+    - LocalGatewayRoute
+    - ManagedPrefixList
+    - NatGateway
+    - NetworkAclEntry
+    - NetworkAcl
+    - NetworkInsightsPath
+    - NetworkInterfacePermission
+    - NetworkInterface
+    - PlacementGroup
+    - ReservedInstancesListing
+    - RouteTable
+    - Route
+    - SecurityGroup
+    - Snapshot
+    - SpotDatafeedSubscription
+    - Subnet 
+    - TrafficMirrorFilterRule
+    - TrafficMirrorFilter
+    - TrafficMirrorSession
+    - TrafficMirrorTarget
+    - TransitGatewayConnectPeer
+    - TransitGatewayConnect
+    - TransitGatewayMulticastDomain
+    - TransitGatewayPeeringAttachment
+    - TransitGatewayPrefixListReference
+    - TransitGatewayRouteTable
+    - TransitGatewayRoute
+    - TransitGatewayVpcAttachment
+    - TransitGateway
+    # - Volume
+    - VpcEndpointConnectionNotification
+    - VpcEndpointServiceConfiguration
+    - VpcEndpoint
+    - Vpc
+    - VpcCidrBlock
+    - VpcPeeringConnection
+    - VpnConnectionRoute
+    - VpnConnection
+    - VpnGateway