diff --git a/cloudformation/connect/aws-connect-contactflow.go b/cloudformation/connect/aws-connect-contactflow.go
index 16dab58be0..8df5b1d827 100644
--- a/cloudformation/connect/aws-connect-contactflow.go
+++ b/cloudformation/connect/aws-connect-contactflow.go
@@ -45,9 +45,9 @@ type ContactFlow struct {
 	Tags *[]tags.Tag `json:"Tags,omitempty"`
 
 	// Type AWS CloudFormation Property
-	// Required: false
+	// Required: true
 	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-connect-contactflow.html#cfn-connect-contactflow-type
-	Type *string `json:"Type,omitempty"`
+	Type string `json:"Type"`
 
 	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
 	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
diff --git a/cloudformation/ec2/aws-ec2-launchtemplate.go b/cloudformation/ec2/aws-ec2-launchtemplate.go
index 27c286947b..c37f6e85f4 100644
--- a/cloudformation/ec2/aws-ec2-launchtemplate.go
+++ b/cloudformation/ec2/aws-ec2-launchtemplate.go
@@ -28,6 +28,11 @@ type LaunchTemplate struct {
 	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-launchtemplate.html#cfn-ec2-launchtemplate-tagspecifications
 	TagSpecifications *[]LaunchTemplate_LaunchTemplateTagSpecification `json:"TagSpecifications,omitempty"`
 
+	// VersionDescription AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-launchtemplate.html#cfn-ec2-launchtemplate-versiondescription
+	VersionDescription *string `json:"VersionDescription,omitempty"`
+
 	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
 	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
 
diff --git a/cloudformation/ec2/aws-ec2-networkinsightsanalysis_additionaldetail.go b/cloudformation/ec2/aws-ec2-networkinsightsanalysis_additionaldetail.go
new file mode 100644
index 0000000000..32e1ba944d
--- /dev/null
+++ b/cloudformation/ec2/aws-ec2-networkinsightsanalysis_additionaldetail.go
@@ -0,0 +1,42 @@
+// Code generated by "go generate". Please don't change this file directly.
+
+package ec2
+
+import (
+	"github.com/awslabs/goformation/v6/cloudformation/policies"
+)
+
+// NetworkInsightsAnalysis_AdditionalDetail AWS CloudFormation Resource (AWS::EC2::NetworkInsightsAnalysis.AdditionalDetail)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-networkinsightsanalysis-additionaldetail.html
+type NetworkInsightsAnalysis_AdditionalDetail struct {
+
+	// AdditionalDetailType AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-networkinsightsanalysis-additionaldetail.html#cfn-ec2-networkinsightsanalysis-additionaldetail-additionaldetailtype
+	AdditionalDetailType *string `json:"AdditionalDetailType,omitempty"`
+
+	// Component AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-networkinsightsanalysis-additionaldetail.html#cfn-ec2-networkinsightsanalysis-additionaldetail-component
+	Component *NetworkInsightsAnalysis_AnalysisComponent `json:"Component,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *NetworkInsightsAnalysis_AdditionalDetail) AWSCloudFormationType() string {
+	return "AWS::EC2::NetworkInsightsAnalysis.AdditionalDetail"
+}
diff --git a/cloudformation/ec2/aws-ec2-networkinsightsanalysis_analysisroutetableroute.go b/cloudformation/ec2/aws-ec2-networkinsightsanalysis_analysisroutetableroute.go
index 3592dab37d..bed2afdc4f 100644
--- a/cloudformation/ec2/aws-ec2-networkinsightsanalysis_analysisroutetableroute.go
+++ b/cloudformation/ec2/aws-ec2-networkinsightsanalysis_analysisroutetableroute.go
@@ -25,6 +25,11 @@ type NetworkInsightsAnalysis_AnalysisRouteTableRoute struct {
 	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-networkinsightsanalysis-analysisroutetableroute.html#cfn-ec2-networkinsightsanalysis-analysisroutetableroute-origin
 	Origin *string `json:"Origin,omitempty"`
 
+	// State AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-networkinsightsanalysis-analysisroutetableroute.html#cfn-ec2-networkinsightsanalysis-analysisroutetableroute-state
+	State *string `json:"State,omitempty"`
+
 	// TransitGatewayId AWS CloudFormation Property
 	// Required: false
 	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-networkinsightsanalysis-analysisroutetableroute.html#cfn-ec2-networkinsightsanalysis-analysisroutetableroute-transitgatewayid
diff --git a/cloudformation/ec2/aws-ec2-networkinsightsanalysis_explanation.go b/cloudformation/ec2/aws-ec2-networkinsightsanalysis_explanation.go
index b733a42eca..614e4156ee 100644
--- a/cloudformation/ec2/aws-ec2-networkinsightsanalysis_explanation.go
+++ b/cloudformation/ec2/aws-ec2-networkinsightsanalysis_explanation.go
@@ -55,6 +55,16 @@ type NetworkInsightsAnalysis_Explanation struct {
 	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-networkinsightsanalysis-explanation.html#cfn-ec2-networkinsightsanalysis-explanation-component
 	Component *NetworkInsightsAnalysis_AnalysisComponent `json:"Component,omitempty"`
 
+	// ComponentAccount AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-networkinsightsanalysis-explanation.html#cfn-ec2-networkinsightsanalysis-explanation-componentaccount
+	ComponentAccount *string `json:"ComponentAccount,omitempty"`
+
+	// ComponentRegion AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-networkinsightsanalysis-explanation.html#cfn-ec2-networkinsightsanalysis-explanation-componentregion
+	ComponentRegion *string `json:"ComponentRegion,omitempty"`
+
 	// CustomerGateway AWS CloudFormation Property
 	// Required: false
 	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-networkinsightsanalysis-explanation.html#cfn-ec2-networkinsightsanalysis-explanation-customergateway
diff --git a/cloudformation/ec2/aws-ec2-networkinsightsanalysis_pathcomponent.go b/cloudformation/ec2/aws-ec2-networkinsightsanalysis_pathcomponent.go
index 2b45f50a30..4c810f4068 100644
--- a/cloudformation/ec2/aws-ec2-networkinsightsanalysis_pathcomponent.go
+++ b/cloudformation/ec2/aws-ec2-networkinsightsanalysis_pathcomponent.go
@@ -15,6 +15,11 @@ type NetworkInsightsAnalysis_PathComponent struct {
 	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-networkinsightsanalysis-pathcomponent.html#cfn-ec2-networkinsightsanalysis-pathcomponent-aclrule
 	AclRule *NetworkInsightsAnalysis_AnalysisAclRule `json:"AclRule,omitempty"`
 
+	// AdditionalDetails AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-networkinsightsanalysis-pathcomponent.html#cfn-ec2-networkinsightsanalysis-pathcomponent-additionaldetails
+	AdditionalDetails *[]NetworkInsightsAnalysis_AdditionalDetail `json:"AdditionalDetails,omitempty"`
+
 	// Component AWS CloudFormation Property
 	// Required: false
 	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-networkinsightsanalysis-pathcomponent.html#cfn-ec2-networkinsightsanalysis-pathcomponent-component
@@ -25,6 +30,16 @@ type NetworkInsightsAnalysis_PathComponent struct {
 	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-networkinsightsanalysis-pathcomponent.html#cfn-ec2-networkinsightsanalysis-pathcomponent-destinationvpc
 	DestinationVpc *NetworkInsightsAnalysis_AnalysisComponent `json:"DestinationVpc,omitempty"`
 
+	// ElasticLoadBalancerListener AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-networkinsightsanalysis-pathcomponent.html#cfn-ec2-networkinsightsanalysis-pathcomponent-elasticloadbalancerlistener
+	ElasticLoadBalancerListener *NetworkInsightsAnalysis_AnalysisComponent `json:"ElasticLoadBalancerListener,omitempty"`
+
+	// Explanations AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-networkinsightsanalysis-pathcomponent.html#cfn-ec2-networkinsightsanalysis-pathcomponent-explanations
+	Explanations *[]NetworkInsightsAnalysis_Explanation `json:"Explanations,omitempty"`
+
 	// InboundHeader AWS CloudFormation Property
 	// Required: false
 	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-networkinsightsanalysis-pathcomponent.html#cfn-ec2-networkinsightsanalysis-pathcomponent-inboundheader
diff --git a/cloudformation/lambda/aws-lambda-eventsourcemapping.go b/cloudformation/lambda/aws-lambda-eventsourcemapping.go
index f9848a514a..3b20dcaa89 100644
--- a/cloudformation/lambda/aws-lambda-eventsourcemapping.go
+++ b/cloudformation/lambda/aws-lambda-eventsourcemapping.go
@@ -13,6 +13,11 @@ import (
 // See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-lambda-eventsourcemapping.html
 type EventSourceMapping struct {
 
+	// AmazonManagedKafkaEventSourceConfig AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-lambda-eventsourcemapping.html#cfn-lambda-eventsourcemapping-amazonmanagedkafkaeventsourceconfig
+	AmazonManagedKafkaEventSourceConfig *EventSourceMapping_AmazonManagedKafkaEventSourceConfig `json:"AmazonManagedKafkaEventSourceConfig,omitempty"`
+
 	// BatchSize AWS CloudFormation Property
 	// Required: false
 	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-lambda-eventsourcemapping.html#cfn-lambda-eventsourcemapping-batchsize
@@ -83,6 +88,11 @@ type EventSourceMapping struct {
 	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-lambda-eventsourcemapping.html#cfn-lambda-eventsourcemapping-selfmanagedeventsource
 	SelfManagedEventSource *EventSourceMapping_SelfManagedEventSource `json:"SelfManagedEventSource,omitempty"`
 
+	// SelfManagedKafkaEventSourceConfig AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-lambda-eventsourcemapping.html#cfn-lambda-eventsourcemapping-selfmanagedkafkaeventsourceconfig
+	SelfManagedKafkaEventSourceConfig *EventSourceMapping_SelfManagedKafkaEventSourceConfig `json:"SelfManagedKafkaEventSourceConfig,omitempty"`
+
 	// SourceAccessConfigurations AWS CloudFormation Property
 	// Required: false
 	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-lambda-eventsourcemapping.html#cfn-lambda-eventsourcemapping-sourceaccessconfigurations
diff --git a/cloudformation/lambda/aws-lambda-eventsourcemapping_amazonmanagedkafkaeventsourceconfig.go b/cloudformation/lambda/aws-lambda-eventsourcemapping_amazonmanagedkafkaeventsourceconfig.go
new file mode 100644
index 0000000000..47781f373c
--- /dev/null
+++ b/cloudformation/lambda/aws-lambda-eventsourcemapping_amazonmanagedkafkaeventsourceconfig.go
@@ -0,0 +1,37 @@
+// Code generated by "go generate". Please don't change this file directly.
+
+package lambda
+
+import (
+	"github.com/awslabs/goformation/v6/cloudformation/policies"
+)
+
+// EventSourceMapping_AmazonManagedKafkaEventSourceConfig AWS CloudFormation Resource (AWS::Lambda::EventSourceMapping.AmazonManagedKafkaEventSourceConfig)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-lambda-eventsourcemapping-amazonmanagedkafkaeventsourceconfig.html
+type EventSourceMapping_AmazonManagedKafkaEventSourceConfig struct {
+
+	// ConsumerGroupId AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-lambda-eventsourcemapping-amazonmanagedkafkaeventsourceconfig.html#cfn-lambda-eventsourcemapping-amazonmanagedkafkaeventsourceconfig-consumergroupid
+	ConsumerGroupId *string `json:"ConsumerGroupId,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *EventSourceMapping_AmazonManagedKafkaEventSourceConfig) AWSCloudFormationType() string {
+	return "AWS::Lambda::EventSourceMapping.AmazonManagedKafkaEventSourceConfig"
+}
diff --git a/cloudformation/lambda/aws-lambda-eventsourcemapping_selfmanagedkafkaeventsourceconfig.go b/cloudformation/lambda/aws-lambda-eventsourcemapping_selfmanagedkafkaeventsourceconfig.go
new file mode 100644
index 0000000000..a9c35632d6
--- /dev/null
+++ b/cloudformation/lambda/aws-lambda-eventsourcemapping_selfmanagedkafkaeventsourceconfig.go
@@ -0,0 +1,37 @@
+// Code generated by "go generate". Please don't change this file directly.
+
+package lambda
+
+import (
+	"github.com/awslabs/goformation/v6/cloudformation/policies"
+)
+
+// EventSourceMapping_SelfManagedKafkaEventSourceConfig AWS CloudFormation Resource (AWS::Lambda::EventSourceMapping.SelfManagedKafkaEventSourceConfig)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-lambda-eventsourcemapping-selfmanagedkafkaeventsourceconfig.html
+type EventSourceMapping_SelfManagedKafkaEventSourceConfig struct {
+
+	// ConsumerGroupId AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-lambda-eventsourcemapping-selfmanagedkafkaeventsourceconfig.html#cfn-lambda-eventsourcemapping-selfmanagedkafkaeventsourceconfig-consumergroupid
+	ConsumerGroupId *string `json:"ConsumerGroupId,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *EventSourceMapping_SelfManagedKafkaEventSourceConfig) AWSCloudFormationType() string {
+	return "AWS::Lambda::EventSourceMapping.SelfManagedKafkaEventSourceConfig"
+}
diff --git a/cloudformation/opensearchservice/aws-opensearchservice-domain_ebsoptions.go b/cloudformation/opensearchservice/aws-opensearchservice-domain_ebsoptions.go
index 0e45f79395..af7c97515b 100644
--- a/cloudformation/opensearchservice/aws-opensearchservice-domain_ebsoptions.go
+++ b/cloudformation/opensearchservice/aws-opensearchservice-domain_ebsoptions.go
@@ -20,6 +20,11 @@ type Domain_EBSOptions struct {
 	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-opensearchservice-domain-ebsoptions.html#cfn-opensearchservice-domain-ebsoptions-iops
 	Iops *int `json:"Iops,omitempty"`
 
+	// Throughput AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-opensearchservice-domain-ebsoptions.html#cfn-opensearchservice-domain-ebsoptions-throughput
+	Throughput *int `json:"Throughput,omitempty"`
+
 	// VolumeSize AWS CloudFormation Property
 	// Required: false
 	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-opensearchservice-domain-ebsoptions.html#cfn-opensearchservice-domain-ebsoptions-volumesize
diff --git a/cloudformation/rds/aws-rds-dbparametergroup.go b/cloudformation/rds/aws-rds-dbparametergroup.go
index 6913f27f63..00f7fa4a36 100644
--- a/cloudformation/rds/aws-rds-dbparametergroup.go
+++ b/cloudformation/rds/aws-rds-dbparametergroup.go
@@ -11,27 +11,27 @@ import (
 )
 
 // DBParameterGroup AWS CloudFormation Resource (AWS::RDS::DBParameterGroup)
-// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-rds-dbparametergroup.html
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-rds-dbparametergroup.html
 type DBParameterGroup struct {
 
 	// Description AWS CloudFormation Property
 	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-rds-dbparametergroup.html#cfn-rds-dbparametergroup-description
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-rds-dbparametergroup.html#cfn-rds-dbparametergroup-description
 	Description string `json:"Description"`
 
 	// Family AWS CloudFormation Property
 	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-rds-dbparametergroup.html#cfn-rds-dbparametergroup-family
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-rds-dbparametergroup.html#cfn-rds-dbparametergroup-family
 	Family string `json:"Family"`
 
 	// Parameters AWS CloudFormation Property
 	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-rds-dbparametergroup.html#cfn-rds-dbparametergroup-parameters
-	Parameters *interface{} `json:"Parameters,omitempty"`
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-rds-dbparametergroup.html#cfn-rds-dbparametergroup-parameters
+	Parameters *map[string]string `json:"Parameters,omitempty"`
 
 	// Tags AWS CloudFormation Property
 	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-rds-dbparametergroup.html#cfn-rds-dbparametergroup-tags
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-rds-dbparametergroup.html#cfn-rds-dbparametergroup-tags
 	Tags *[]tags.Tag `json:"Tags,omitempty"`
 
 	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
diff --git a/cloudformation/redshift/aws-redshift-endpointaccess.go b/cloudformation/redshift/aws-redshift-endpointaccess.go
index c768024560..5bb108d365 100644
--- a/cloudformation/redshift/aws-redshift-endpointaccess.go
+++ b/cloudformation/redshift/aws-redshift-endpointaccess.go
@@ -14,9 +14,9 @@ import (
 type EndpointAccess struct {
 
 	// ClusterIdentifier AWS CloudFormation Property
-	// Required: false
+	// Required: true
 	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-redshift-endpointaccess.html#cfn-redshift-endpointaccess-clusteridentifier
-	ClusterIdentifier *string `json:"ClusterIdentifier,omitempty"`
+	ClusterIdentifier string `json:"ClusterIdentifier"`
 
 	// EndpointName AWS CloudFormation Property
 	// Required: true
@@ -29,9 +29,9 @@ type EndpointAccess struct {
 	ResourceOwner *string `json:"ResourceOwner,omitempty"`
 
 	// SubnetGroupName AWS CloudFormation Property
-	// Required: false
+	// Required: true
 	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-redshift-endpointaccess.html#cfn-redshift-endpointaccess-subnetgroupname
-	SubnetGroupName *string `json:"SubnetGroupName,omitempty"`
+	SubnetGroupName string `json:"SubnetGroupName"`
 
 	// VpcSecurityGroupIds AWS CloudFormation Property
 	// Required: true
diff --git a/schema/cdk.go b/schema/cdk.go
index 474ada9c82..5067717a41 100644
--- a/schema/cdk.go
+++ b/schema/cdk.go
@@ -31397,7 +31397,8 @@ var CdkSchema = `{
                     "required": [
                         "Content",
                         "InstanceArn",
-                        "Name"
+                        "Name",
+                        "Type"
                     ],
                     "type": "object"
                 },
@@ -42960,6 +42961,9 @@ var CdkSchema = `{
                                 "$ref": "#/definitions/AWS::EC2::LaunchTemplate.LaunchTemplateTagSpecification"
                             },
                             "type": "array"
+                        },
+                        "VersionDescription": {
+                            "type": "string"
                         }
                     },
                     "required": [
@@ -44455,6 +44459,18 @@ var CdkSchema = `{
             ],
             "type": "object"
         },
+        "AWS::EC2::NetworkInsightsAnalysis.AdditionalDetail": {
+            "additionalProperties": false,
+            "properties": {
+                "AdditionalDetailType": {
+                    "type": "string"
+                },
+                "Component": {
+                    "$ref": "#/definitions/AWS::EC2::NetworkInsightsAnalysis.AnalysisComponent"
+                }
+            },
+            "type": "object"
+        },
         "AWS::EC2::NetworkInsightsAnalysis.AlternatePathHint": {
             "additionalProperties": false,
             "properties": {
@@ -44578,6 +44594,9 @@ var CdkSchema = `{
                 "Origin": {
                     "type": "string"
                 },
+                "State": {
+                    "type": "string"
+                },
                 "TransitGatewayId": {
                     "type": "string"
                 },
@@ -44665,6 +44684,12 @@ var CdkSchema = `{
                 "Component": {
                     "$ref": "#/definitions/AWS::EC2::NetworkInsightsAnalysis.AnalysisComponent"
                 },
+                "ComponentAccount": {
+                    "type": "string"
+                },
+                "ComponentRegion": {
+                    "type": "string"
+                },
                 "CustomerGateway": {
                     "$ref": "#/definitions/AWS::EC2::NetworkInsightsAnalysis.AnalysisComponent"
                 },
@@ -44806,12 +44831,27 @@ var CdkSchema = `{
                 "AclRule": {
                     "$ref": "#/definitions/AWS::EC2::NetworkInsightsAnalysis.AnalysisAclRule"
                 },
+                "AdditionalDetails": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::EC2::NetworkInsightsAnalysis.AdditionalDetail"
+                    },
+                    "type": "array"
+                },
                 "Component": {
                     "$ref": "#/definitions/AWS::EC2::NetworkInsightsAnalysis.AnalysisComponent"
                 },
                 "DestinationVpc": {
                     "$ref": "#/definitions/AWS::EC2::NetworkInsightsAnalysis.AnalysisComponent"
                 },
+                "ElasticLoadBalancerListener": {
+                    "$ref": "#/definitions/AWS::EC2::NetworkInsightsAnalysis.AnalysisComponent"
+                },
+                "Explanations": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::EC2::NetworkInsightsAnalysis.Explanation"
+                    },
+                    "type": "array"
+                },
                 "InboundHeader": {
                     "$ref": "#/definitions/AWS::EC2::NetworkInsightsAnalysis.AnalysisPacketHeader"
                 },
@@ -88818,6 +88858,9 @@ var CdkSchema = `{
                 "Properties": {
                     "additionalProperties": false,
                     "properties": {
+                        "AmazonManagedKafkaEventSourceConfig": {
+                            "$ref": "#/definitions/AWS::Lambda::EventSourceMapping.AmazonManagedKafkaEventSourceConfig"
+                        },
                         "BatchSize": {
                             "type": "number"
                         },
@@ -88866,6 +88909,9 @@ var CdkSchema = `{
                         "SelfManagedEventSource": {
                             "$ref": "#/definitions/AWS::Lambda::EventSourceMapping.SelfManagedEventSource"
                         },
+                        "SelfManagedKafkaEventSourceConfig": {
+                            "$ref": "#/definitions/AWS::Lambda::EventSourceMapping.SelfManagedKafkaEventSourceConfig"
+                        },
                         "SourceAccessConfigurations": {
                             "items": {
                                 "$ref": "#/definitions/AWS::Lambda::EventSourceMapping.SourceAccessConfiguration"
@@ -88914,6 +88960,15 @@ var CdkSchema = `{
             ],
             "type": "object"
         },
+        "AWS::Lambda::EventSourceMapping.AmazonManagedKafkaEventSourceConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "ConsumerGroupId": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
         "AWS::Lambda::EventSourceMapping.DestinationConfig": {
             "additionalProperties": false,
             "properties": {
@@ -88974,6 +89029,15 @@ var CdkSchema = `{
             },
             "type": "object"
         },
+        "AWS::Lambda::EventSourceMapping.SelfManagedKafkaEventSourceConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "ConsumerGroupId": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
         "AWS::Lambda::EventSourceMapping.SourceAccessConfiguration": {
             "additionalProperties": false,
             "properties": {
@@ -105595,6 +105659,9 @@ var CdkSchema = `{
                 "Iops": {
                     "type": "number"
                 },
+                "Throughput": {
+                    "type": "number"
+                },
                 "VolumeSize": {
                     "type": "number"
                 },
@@ -113714,6 +113781,12 @@ var CdkSchema = `{
                             "type": "string"
                         },
                         "Parameters": {
+                            "additionalProperties": true,
+                            "patternProperties": {
+                                "^[a-zA-Z0-9]+$": {
+                                    "type": "string"
+                                }
+                            },
                             "type": "object"
                         },
                         "Tags": {
@@ -115407,7 +115480,9 @@ var CdkSchema = `{
                         }
                     },
                     "required": [
+                        "ClusterIdentifier",
                         "EndpointName",
+                        "SubnetGroupName",
                         "VpcSecurityGroupIds"
                     ],
                     "type": "object"
diff --git a/schema/cdk.schema.json b/schema/cdk.schema.json
index e2b484e5f9..862a3569e7 100644
--- a/schema/cdk.schema.json
+++ b/schema/cdk.schema.json
@@ -31392,7 +31392,8 @@
                     "required": [
                         "Content",
                         "InstanceArn",
-                        "Name"
+                        "Name",
+                        "Type"
                     ],
                     "type": "object"
                 },
@@ -42955,6 +42956,9 @@
                                 "$ref": "#/definitions/AWS::EC2::LaunchTemplate.LaunchTemplateTagSpecification"
                             },
                             "type": "array"
+                        },
+                        "VersionDescription": {
+                            "type": "string"
                         }
                     },
                     "required": [
@@ -44450,6 +44454,18 @@
             ],
             "type": "object"
         },
+        "AWS::EC2::NetworkInsightsAnalysis.AdditionalDetail": {
+            "additionalProperties": false,
+            "properties": {
+                "AdditionalDetailType": {
+                    "type": "string"
+                },
+                "Component": {
+                    "$ref": "#/definitions/AWS::EC2::NetworkInsightsAnalysis.AnalysisComponent"
+                }
+            },
+            "type": "object"
+        },
         "AWS::EC2::NetworkInsightsAnalysis.AlternatePathHint": {
             "additionalProperties": false,
             "properties": {
@@ -44573,6 +44589,9 @@
                 "Origin": {
                     "type": "string"
                 },
+                "State": {
+                    "type": "string"
+                },
                 "TransitGatewayId": {
                     "type": "string"
                 },
@@ -44660,6 +44679,12 @@
                 "Component": {
                     "$ref": "#/definitions/AWS::EC2::NetworkInsightsAnalysis.AnalysisComponent"
                 },
+                "ComponentAccount": {
+                    "type": "string"
+                },
+                "ComponentRegion": {
+                    "type": "string"
+                },
                 "CustomerGateway": {
                     "$ref": "#/definitions/AWS::EC2::NetworkInsightsAnalysis.AnalysisComponent"
                 },
@@ -44801,12 +44826,27 @@
                 "AclRule": {
                     "$ref": "#/definitions/AWS::EC2::NetworkInsightsAnalysis.AnalysisAclRule"
                 },
+                "AdditionalDetails": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::EC2::NetworkInsightsAnalysis.AdditionalDetail"
+                    },
+                    "type": "array"
+                },
                 "Component": {
                     "$ref": "#/definitions/AWS::EC2::NetworkInsightsAnalysis.AnalysisComponent"
                 },
                 "DestinationVpc": {
                     "$ref": "#/definitions/AWS::EC2::NetworkInsightsAnalysis.AnalysisComponent"
                 },
+                "ElasticLoadBalancerListener": {
+                    "$ref": "#/definitions/AWS::EC2::NetworkInsightsAnalysis.AnalysisComponent"
+                },
+                "Explanations": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::EC2::NetworkInsightsAnalysis.Explanation"
+                    },
+                    "type": "array"
+                },
                 "InboundHeader": {
                     "$ref": "#/definitions/AWS::EC2::NetworkInsightsAnalysis.AnalysisPacketHeader"
                 },
@@ -88813,6 +88853,9 @@
                 "Properties": {
                     "additionalProperties": false,
                     "properties": {
+                        "AmazonManagedKafkaEventSourceConfig": {
+                            "$ref": "#/definitions/AWS::Lambda::EventSourceMapping.AmazonManagedKafkaEventSourceConfig"
+                        },
                         "BatchSize": {
                             "type": "number"
                         },
@@ -88861,6 +88904,9 @@
                         "SelfManagedEventSource": {
                             "$ref": "#/definitions/AWS::Lambda::EventSourceMapping.SelfManagedEventSource"
                         },
+                        "SelfManagedKafkaEventSourceConfig": {
+                            "$ref": "#/definitions/AWS::Lambda::EventSourceMapping.SelfManagedKafkaEventSourceConfig"
+                        },
                         "SourceAccessConfigurations": {
                             "items": {
                                 "$ref": "#/definitions/AWS::Lambda::EventSourceMapping.SourceAccessConfiguration"
@@ -88909,6 +88955,15 @@
             ],
             "type": "object"
         },
+        "AWS::Lambda::EventSourceMapping.AmazonManagedKafkaEventSourceConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "ConsumerGroupId": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
         "AWS::Lambda::EventSourceMapping.DestinationConfig": {
             "additionalProperties": false,
             "properties": {
@@ -88969,6 +89024,15 @@
             },
             "type": "object"
         },
+        "AWS::Lambda::EventSourceMapping.SelfManagedKafkaEventSourceConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "ConsumerGroupId": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
         "AWS::Lambda::EventSourceMapping.SourceAccessConfiguration": {
             "additionalProperties": false,
             "properties": {
@@ -105590,6 +105654,9 @@
                 "Iops": {
                     "type": "number"
                 },
+                "Throughput": {
+                    "type": "number"
+                },
                 "VolumeSize": {
                     "type": "number"
                 },
@@ -113709,6 +113776,12 @@
                             "type": "string"
                         },
                         "Parameters": {
+                            "additionalProperties": true,
+                            "patternProperties": {
+                                "^[a-zA-Z0-9]+$": {
+                                    "type": "string"
+                                }
+                            },
                             "type": "object"
                         },
                         "Tags": {
@@ -115402,7 +115475,9 @@
                         }
                     },
                     "required": [
+                        "ClusterIdentifier",
                         "EndpointName",
+                        "SubnetGroupName",
                         "VpcSecurityGroupIds"
                     ],
                     "type": "object"
diff --git a/schema/cloudformation.go b/schema/cloudformation.go
index 9c83f510d2..81898cc2c2 100644
--- a/schema/cloudformation.go
+++ b/schema/cloudformation.go
@@ -31336,7 +31336,8 @@ var CloudformationSchema = `{
                     "required": [
                         "Content",
                         "InstanceArn",
-                        "Name"
+                        "Name",
+                        "Type"
                     ],
                     "type": "object"
                 },
@@ -42899,6 +42900,9 @@ var CloudformationSchema = `{
                                 "$ref": "#/definitions/AWS::EC2::LaunchTemplate.LaunchTemplateTagSpecification"
                             },
                             "type": "array"
+                        },
+                        "VersionDescription": {
+                            "type": "string"
                         }
                     },
                     "required": [
@@ -44394,6 +44398,18 @@ var CloudformationSchema = `{
             ],
             "type": "object"
         },
+        "AWS::EC2::NetworkInsightsAnalysis.AdditionalDetail": {
+            "additionalProperties": false,
+            "properties": {
+                "AdditionalDetailType": {
+                    "type": "string"
+                },
+                "Component": {
+                    "$ref": "#/definitions/AWS::EC2::NetworkInsightsAnalysis.AnalysisComponent"
+                }
+            },
+            "type": "object"
+        },
         "AWS::EC2::NetworkInsightsAnalysis.AlternatePathHint": {
             "additionalProperties": false,
             "properties": {
@@ -44517,6 +44533,9 @@ var CloudformationSchema = `{
                 "Origin": {
                     "type": "string"
                 },
+                "State": {
+                    "type": "string"
+                },
                 "TransitGatewayId": {
                     "type": "string"
                 },
@@ -44604,6 +44623,12 @@ var CloudformationSchema = `{
                 "Component": {
                     "$ref": "#/definitions/AWS::EC2::NetworkInsightsAnalysis.AnalysisComponent"
                 },
+                "ComponentAccount": {
+                    "type": "string"
+                },
+                "ComponentRegion": {
+                    "type": "string"
+                },
                 "CustomerGateway": {
                     "$ref": "#/definitions/AWS::EC2::NetworkInsightsAnalysis.AnalysisComponent"
                 },
@@ -44745,12 +44770,27 @@ var CloudformationSchema = `{
                 "AclRule": {
                     "$ref": "#/definitions/AWS::EC2::NetworkInsightsAnalysis.AnalysisAclRule"
                 },
+                "AdditionalDetails": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::EC2::NetworkInsightsAnalysis.AdditionalDetail"
+                    },
+                    "type": "array"
+                },
                 "Component": {
                     "$ref": "#/definitions/AWS::EC2::NetworkInsightsAnalysis.AnalysisComponent"
                 },
                 "DestinationVpc": {
                     "$ref": "#/definitions/AWS::EC2::NetworkInsightsAnalysis.AnalysisComponent"
                 },
+                "ElasticLoadBalancerListener": {
+                    "$ref": "#/definitions/AWS::EC2::NetworkInsightsAnalysis.AnalysisComponent"
+                },
+                "Explanations": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::EC2::NetworkInsightsAnalysis.Explanation"
+                    },
+                    "type": "array"
+                },
                 "InboundHeader": {
                     "$ref": "#/definitions/AWS::EC2::NetworkInsightsAnalysis.AnalysisPacketHeader"
                 },
@@ -88757,6 +88797,9 @@ var CloudformationSchema = `{
                 "Properties": {
                     "additionalProperties": false,
                     "properties": {
+                        "AmazonManagedKafkaEventSourceConfig": {
+                            "$ref": "#/definitions/AWS::Lambda::EventSourceMapping.AmazonManagedKafkaEventSourceConfig"
+                        },
                         "BatchSize": {
                             "type": "number"
                         },
@@ -88805,6 +88848,9 @@ var CloudformationSchema = `{
                         "SelfManagedEventSource": {
                             "$ref": "#/definitions/AWS::Lambda::EventSourceMapping.SelfManagedEventSource"
                         },
+                        "SelfManagedKafkaEventSourceConfig": {
+                            "$ref": "#/definitions/AWS::Lambda::EventSourceMapping.SelfManagedKafkaEventSourceConfig"
+                        },
                         "SourceAccessConfigurations": {
                             "items": {
                                 "$ref": "#/definitions/AWS::Lambda::EventSourceMapping.SourceAccessConfiguration"
@@ -88853,6 +88899,15 @@ var CloudformationSchema = `{
             ],
             "type": "object"
         },
+        "AWS::Lambda::EventSourceMapping.AmazonManagedKafkaEventSourceConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "ConsumerGroupId": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
         "AWS::Lambda::EventSourceMapping.DestinationConfig": {
             "additionalProperties": false,
             "properties": {
@@ -88913,6 +88968,15 @@ var CloudformationSchema = `{
             },
             "type": "object"
         },
+        "AWS::Lambda::EventSourceMapping.SelfManagedKafkaEventSourceConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "ConsumerGroupId": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
         "AWS::Lambda::EventSourceMapping.SourceAccessConfiguration": {
             "additionalProperties": false,
             "properties": {
@@ -105534,6 +105598,9 @@ var CloudformationSchema = `{
                 "Iops": {
                     "type": "number"
                 },
+                "Throughput": {
+                    "type": "number"
+                },
                 "VolumeSize": {
                     "type": "number"
                 },
@@ -113653,6 +113720,12 @@ var CloudformationSchema = `{
                             "type": "string"
                         },
                         "Parameters": {
+                            "additionalProperties": true,
+                            "patternProperties": {
+                                "^[a-zA-Z0-9]+$": {
+                                    "type": "string"
+                                }
+                            },
                             "type": "object"
                         },
                         "Tags": {
@@ -115346,7 +115419,9 @@ var CloudformationSchema = `{
                         }
                     },
                     "required": [
+                        "ClusterIdentifier",
                         "EndpointName",
+                        "SubnetGroupName",
                         "VpcSecurityGroupIds"
                     ],
                     "type": "object"
diff --git a/schema/cloudformation.schema.json b/schema/cloudformation.schema.json
index 72bc6cacfd..272cc6f936 100644
--- a/schema/cloudformation.schema.json
+++ b/schema/cloudformation.schema.json
@@ -31331,7 +31331,8 @@
                     "required": [
                         "Content",
                         "InstanceArn",
-                        "Name"
+                        "Name",
+                        "Type"
                     ],
                     "type": "object"
                 },
@@ -42894,6 +42895,9 @@
                                 "$ref": "#/definitions/AWS::EC2::LaunchTemplate.LaunchTemplateTagSpecification"
                             },
                             "type": "array"
+                        },
+                        "VersionDescription": {
+                            "type": "string"
                         }
                     },
                     "required": [
@@ -44389,6 +44393,18 @@
             ],
             "type": "object"
         },
+        "AWS::EC2::NetworkInsightsAnalysis.AdditionalDetail": {
+            "additionalProperties": false,
+            "properties": {
+                "AdditionalDetailType": {
+                    "type": "string"
+                },
+                "Component": {
+                    "$ref": "#/definitions/AWS::EC2::NetworkInsightsAnalysis.AnalysisComponent"
+                }
+            },
+            "type": "object"
+        },
         "AWS::EC2::NetworkInsightsAnalysis.AlternatePathHint": {
             "additionalProperties": false,
             "properties": {
@@ -44512,6 +44528,9 @@
                 "Origin": {
                     "type": "string"
                 },
+                "State": {
+                    "type": "string"
+                },
                 "TransitGatewayId": {
                     "type": "string"
                 },
@@ -44599,6 +44618,12 @@
                 "Component": {
                     "$ref": "#/definitions/AWS::EC2::NetworkInsightsAnalysis.AnalysisComponent"
                 },
+                "ComponentAccount": {
+                    "type": "string"
+                },
+                "ComponentRegion": {
+                    "type": "string"
+                },
                 "CustomerGateway": {
                     "$ref": "#/definitions/AWS::EC2::NetworkInsightsAnalysis.AnalysisComponent"
                 },
@@ -44740,12 +44765,27 @@
                 "AclRule": {
                     "$ref": "#/definitions/AWS::EC2::NetworkInsightsAnalysis.AnalysisAclRule"
                 },
+                "AdditionalDetails": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::EC2::NetworkInsightsAnalysis.AdditionalDetail"
+                    },
+                    "type": "array"
+                },
                 "Component": {
                     "$ref": "#/definitions/AWS::EC2::NetworkInsightsAnalysis.AnalysisComponent"
                 },
                 "DestinationVpc": {
                     "$ref": "#/definitions/AWS::EC2::NetworkInsightsAnalysis.AnalysisComponent"
                 },
+                "ElasticLoadBalancerListener": {
+                    "$ref": "#/definitions/AWS::EC2::NetworkInsightsAnalysis.AnalysisComponent"
+                },
+                "Explanations": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::EC2::NetworkInsightsAnalysis.Explanation"
+                    },
+                    "type": "array"
+                },
                 "InboundHeader": {
                     "$ref": "#/definitions/AWS::EC2::NetworkInsightsAnalysis.AnalysisPacketHeader"
                 },
@@ -88752,6 +88792,9 @@
                 "Properties": {
                     "additionalProperties": false,
                     "properties": {
+                        "AmazonManagedKafkaEventSourceConfig": {
+                            "$ref": "#/definitions/AWS::Lambda::EventSourceMapping.AmazonManagedKafkaEventSourceConfig"
+                        },
                         "BatchSize": {
                             "type": "number"
                         },
@@ -88800,6 +88843,9 @@
                         "SelfManagedEventSource": {
                             "$ref": "#/definitions/AWS::Lambda::EventSourceMapping.SelfManagedEventSource"
                         },
+                        "SelfManagedKafkaEventSourceConfig": {
+                            "$ref": "#/definitions/AWS::Lambda::EventSourceMapping.SelfManagedKafkaEventSourceConfig"
+                        },
                         "SourceAccessConfigurations": {
                             "items": {
                                 "$ref": "#/definitions/AWS::Lambda::EventSourceMapping.SourceAccessConfiguration"
@@ -88848,6 +88894,15 @@
             ],
             "type": "object"
         },
+        "AWS::Lambda::EventSourceMapping.AmazonManagedKafkaEventSourceConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "ConsumerGroupId": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
         "AWS::Lambda::EventSourceMapping.DestinationConfig": {
             "additionalProperties": false,
             "properties": {
@@ -88908,6 +88963,15 @@
             },
             "type": "object"
         },
+        "AWS::Lambda::EventSourceMapping.SelfManagedKafkaEventSourceConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "ConsumerGroupId": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
         "AWS::Lambda::EventSourceMapping.SourceAccessConfiguration": {
             "additionalProperties": false,
             "properties": {
@@ -105529,6 +105593,9 @@
                 "Iops": {
                     "type": "number"
                 },
+                "Throughput": {
+                    "type": "number"
+                },
                 "VolumeSize": {
                     "type": "number"
                 },
@@ -113648,6 +113715,12 @@
                             "type": "string"
                         },
                         "Parameters": {
+                            "additionalProperties": true,
+                            "patternProperties": {
+                                "^[a-zA-Z0-9]+$": {
+                                    "type": "string"
+                                }
+                            },
                             "type": "object"
                         },
                         "Tags": {
@@ -115341,7 +115414,9 @@
                         }
                     },
                     "required": [
+                        "ClusterIdentifier",
                         "EndpointName",
+                        "SubnetGroupName",
                         "VpcSecurityGroupIds"
                     ],
                     "type": "object"
diff --git a/schema/sam.go b/schema/sam.go
index 1ad2e25de1..27ca91c622 100644
--- a/schema/sam.go
+++ b/schema/sam.go
@@ -31336,7 +31336,8 @@ var SamSchema = `{
                     "required": [
                         "Content",
                         "InstanceArn",
-                        "Name"
+                        "Name",
+                        "Type"
                     ],
                     "type": "object"
                 },
@@ -42899,6 +42900,9 @@ var SamSchema = `{
                                 "$ref": "#/definitions/AWS::EC2::LaunchTemplate.LaunchTemplateTagSpecification"
                             },
                             "type": "array"
+                        },
+                        "VersionDescription": {
+                            "type": "string"
                         }
                     },
                     "required": [
@@ -44394,6 +44398,18 @@ var SamSchema = `{
             ],
             "type": "object"
         },
+        "AWS::EC2::NetworkInsightsAnalysis.AdditionalDetail": {
+            "additionalProperties": false,
+            "properties": {
+                "AdditionalDetailType": {
+                    "type": "string"
+                },
+                "Component": {
+                    "$ref": "#/definitions/AWS::EC2::NetworkInsightsAnalysis.AnalysisComponent"
+                }
+            },
+            "type": "object"
+        },
         "AWS::EC2::NetworkInsightsAnalysis.AlternatePathHint": {
             "additionalProperties": false,
             "properties": {
@@ -44517,6 +44533,9 @@ var SamSchema = `{
                 "Origin": {
                     "type": "string"
                 },
+                "State": {
+                    "type": "string"
+                },
                 "TransitGatewayId": {
                     "type": "string"
                 },
@@ -44604,6 +44623,12 @@ var SamSchema = `{
                 "Component": {
                     "$ref": "#/definitions/AWS::EC2::NetworkInsightsAnalysis.AnalysisComponent"
                 },
+                "ComponentAccount": {
+                    "type": "string"
+                },
+                "ComponentRegion": {
+                    "type": "string"
+                },
                 "CustomerGateway": {
                     "$ref": "#/definitions/AWS::EC2::NetworkInsightsAnalysis.AnalysisComponent"
                 },
@@ -44745,12 +44770,27 @@ var SamSchema = `{
                 "AclRule": {
                     "$ref": "#/definitions/AWS::EC2::NetworkInsightsAnalysis.AnalysisAclRule"
                 },
+                "AdditionalDetails": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::EC2::NetworkInsightsAnalysis.AdditionalDetail"
+                    },
+                    "type": "array"
+                },
                 "Component": {
                     "$ref": "#/definitions/AWS::EC2::NetworkInsightsAnalysis.AnalysisComponent"
                 },
                 "DestinationVpc": {
                     "$ref": "#/definitions/AWS::EC2::NetworkInsightsAnalysis.AnalysisComponent"
                 },
+                "ElasticLoadBalancerListener": {
+                    "$ref": "#/definitions/AWS::EC2::NetworkInsightsAnalysis.AnalysisComponent"
+                },
+                "Explanations": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::EC2::NetworkInsightsAnalysis.Explanation"
+                    },
+                    "type": "array"
+                },
                 "InboundHeader": {
                     "$ref": "#/definitions/AWS::EC2::NetworkInsightsAnalysis.AnalysisPacketHeader"
                 },
@@ -88757,6 +88797,9 @@ var SamSchema = `{
                 "Properties": {
                     "additionalProperties": false,
                     "properties": {
+                        "AmazonManagedKafkaEventSourceConfig": {
+                            "$ref": "#/definitions/AWS::Lambda::EventSourceMapping.AmazonManagedKafkaEventSourceConfig"
+                        },
                         "BatchSize": {
                             "type": "number"
                         },
@@ -88805,6 +88848,9 @@ var SamSchema = `{
                         "SelfManagedEventSource": {
                             "$ref": "#/definitions/AWS::Lambda::EventSourceMapping.SelfManagedEventSource"
                         },
+                        "SelfManagedKafkaEventSourceConfig": {
+                            "$ref": "#/definitions/AWS::Lambda::EventSourceMapping.SelfManagedKafkaEventSourceConfig"
+                        },
                         "SourceAccessConfigurations": {
                             "items": {
                                 "$ref": "#/definitions/AWS::Lambda::EventSourceMapping.SourceAccessConfiguration"
@@ -88853,6 +88899,15 @@ var SamSchema = `{
             ],
             "type": "object"
         },
+        "AWS::Lambda::EventSourceMapping.AmazonManagedKafkaEventSourceConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "ConsumerGroupId": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
         "AWS::Lambda::EventSourceMapping.DestinationConfig": {
             "additionalProperties": false,
             "properties": {
@@ -88913,6 +88968,15 @@ var SamSchema = `{
             },
             "type": "object"
         },
+        "AWS::Lambda::EventSourceMapping.SelfManagedKafkaEventSourceConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "ConsumerGroupId": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
         "AWS::Lambda::EventSourceMapping.SourceAccessConfiguration": {
             "additionalProperties": false,
             "properties": {
@@ -105534,6 +105598,9 @@ var SamSchema = `{
                 "Iops": {
                     "type": "number"
                 },
+                "Throughput": {
+                    "type": "number"
+                },
                 "VolumeSize": {
                     "type": "number"
                 },
@@ -113653,6 +113720,12 @@ var SamSchema = `{
                             "type": "string"
                         },
                         "Parameters": {
+                            "additionalProperties": true,
+                            "patternProperties": {
+                                "^[a-zA-Z0-9]+$": {
+                                    "type": "string"
+                                }
+                            },
                             "type": "object"
                         },
                         "Tags": {
@@ -115346,7 +115419,9 @@ var SamSchema = `{
                         }
                     },
                     "required": [
+                        "ClusterIdentifier",
                         "EndpointName",
+                        "SubnetGroupName",
                         "VpcSecurityGroupIds"
                     ],
                     "type": "object"
diff --git a/schema/sam.schema.json b/schema/sam.schema.json
index bf1ceaf156..0d8f23b8de 100644
--- a/schema/sam.schema.json
+++ b/schema/sam.schema.json
@@ -31331,7 +31331,8 @@
                     "required": [
                         "Content",
                         "InstanceArn",
-                        "Name"
+                        "Name",
+                        "Type"
                     ],
                     "type": "object"
                 },
@@ -42894,6 +42895,9 @@
                                 "$ref": "#/definitions/AWS::EC2::LaunchTemplate.LaunchTemplateTagSpecification"
                             },
                             "type": "array"
+                        },
+                        "VersionDescription": {
+                            "type": "string"
                         }
                     },
                     "required": [
@@ -44389,6 +44393,18 @@
             ],
             "type": "object"
         },
+        "AWS::EC2::NetworkInsightsAnalysis.AdditionalDetail": {
+            "additionalProperties": false,
+            "properties": {
+                "AdditionalDetailType": {
+                    "type": "string"
+                },
+                "Component": {
+                    "$ref": "#/definitions/AWS::EC2::NetworkInsightsAnalysis.AnalysisComponent"
+                }
+            },
+            "type": "object"
+        },
         "AWS::EC2::NetworkInsightsAnalysis.AlternatePathHint": {
             "additionalProperties": false,
             "properties": {
@@ -44512,6 +44528,9 @@
                 "Origin": {
                     "type": "string"
                 },
+                "State": {
+                    "type": "string"
+                },
                 "TransitGatewayId": {
                     "type": "string"
                 },
@@ -44599,6 +44618,12 @@
                 "Component": {
                     "$ref": "#/definitions/AWS::EC2::NetworkInsightsAnalysis.AnalysisComponent"
                 },
+                "ComponentAccount": {
+                    "type": "string"
+                },
+                "ComponentRegion": {
+                    "type": "string"
+                },
                 "CustomerGateway": {
                     "$ref": "#/definitions/AWS::EC2::NetworkInsightsAnalysis.AnalysisComponent"
                 },
@@ -44740,12 +44765,27 @@
                 "AclRule": {
                     "$ref": "#/definitions/AWS::EC2::NetworkInsightsAnalysis.AnalysisAclRule"
                 },
+                "AdditionalDetails": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::EC2::NetworkInsightsAnalysis.AdditionalDetail"
+                    },
+                    "type": "array"
+                },
                 "Component": {
                     "$ref": "#/definitions/AWS::EC2::NetworkInsightsAnalysis.AnalysisComponent"
                 },
                 "DestinationVpc": {
                     "$ref": "#/definitions/AWS::EC2::NetworkInsightsAnalysis.AnalysisComponent"
                 },
+                "ElasticLoadBalancerListener": {
+                    "$ref": "#/definitions/AWS::EC2::NetworkInsightsAnalysis.AnalysisComponent"
+                },
+                "Explanations": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::EC2::NetworkInsightsAnalysis.Explanation"
+                    },
+                    "type": "array"
+                },
                 "InboundHeader": {
                     "$ref": "#/definitions/AWS::EC2::NetworkInsightsAnalysis.AnalysisPacketHeader"
                 },
@@ -88752,6 +88792,9 @@
                 "Properties": {
                     "additionalProperties": false,
                     "properties": {
+                        "AmazonManagedKafkaEventSourceConfig": {
+                            "$ref": "#/definitions/AWS::Lambda::EventSourceMapping.AmazonManagedKafkaEventSourceConfig"
+                        },
                         "BatchSize": {
                             "type": "number"
                         },
@@ -88800,6 +88843,9 @@
                         "SelfManagedEventSource": {
                             "$ref": "#/definitions/AWS::Lambda::EventSourceMapping.SelfManagedEventSource"
                         },
+                        "SelfManagedKafkaEventSourceConfig": {
+                            "$ref": "#/definitions/AWS::Lambda::EventSourceMapping.SelfManagedKafkaEventSourceConfig"
+                        },
                         "SourceAccessConfigurations": {
                             "items": {
                                 "$ref": "#/definitions/AWS::Lambda::EventSourceMapping.SourceAccessConfiguration"
@@ -88848,6 +88894,15 @@
             ],
             "type": "object"
         },
+        "AWS::Lambda::EventSourceMapping.AmazonManagedKafkaEventSourceConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "ConsumerGroupId": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
         "AWS::Lambda::EventSourceMapping.DestinationConfig": {
             "additionalProperties": false,
             "properties": {
@@ -88908,6 +88963,15 @@
             },
             "type": "object"
         },
+        "AWS::Lambda::EventSourceMapping.SelfManagedKafkaEventSourceConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "ConsumerGroupId": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
         "AWS::Lambda::EventSourceMapping.SourceAccessConfiguration": {
             "additionalProperties": false,
             "properties": {
@@ -105529,6 +105593,9 @@
                 "Iops": {
                     "type": "number"
                 },
+                "Throughput": {
+                    "type": "number"
+                },
                 "VolumeSize": {
                     "type": "number"
                 },
@@ -113648,6 +113715,12 @@
                             "type": "string"
                         },
                         "Parameters": {
+                            "additionalProperties": true,
+                            "patternProperties": {
+                                "^[a-zA-Z0-9]+$": {
+                                    "type": "string"
+                                }
+                            },
                             "type": "object"
                         },
                         "Tags": {
@@ -115341,7 +115414,9 @@
                         }
                     },
                     "required": [
+                        "ClusterIdentifier",
                         "EndpointName",
+                        "SubnetGroupName",
                         "VpcSecurityGroupIds"
                     ],
                     "type": "object"