diff --git a/cloudformation/cloudfront/aws-cloudfront-function.go b/cloudformation/cloudfront/aws-cloudfront-function.go
index f146285728..588e0d1d24 100644
--- a/cloudformation/cloudfront/aws-cloudfront-function.go
+++ b/cloudformation/cloudfront/aws-cloudfront-function.go
@@ -19,14 +19,14 @@ type Function struct {
 	AutoPublish *bool `json:"AutoPublish,omitempty"`
 
 	// FunctionCode AWS CloudFormation Property
-	// Required: false
+	// Required: true
 	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-cloudfront-function.html#cfn-cloudfront-function-functioncode
-	FunctionCode *string `json:"FunctionCode,omitempty"`
+	FunctionCode string `json:"FunctionCode"`
 
 	// FunctionConfig AWS CloudFormation Property
-	// Required: false
+	// Required: true
 	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-cloudfront-function.html#cfn-cloudfront-function-functionconfig
-	FunctionConfig *Function_FunctionConfig `json:"FunctionConfig,omitempty"`
+	FunctionConfig *Function_FunctionConfig `json:"FunctionConfig"`
 
 	// FunctionMetadata AWS CloudFormation Property
 	// Required: false
diff --git a/cloudformation/datasync/aws-datasync-locationefs.go b/cloudformation/datasync/aws-datasync-locationefs.go
index a5cecd4601..9f6862e013 100644
--- a/cloudformation/datasync/aws-datasync-locationefs.go
+++ b/cloudformation/datasync/aws-datasync-locationefs.go
@@ -25,9 +25,9 @@ type LocationEFS struct {
 	Ec2Config *LocationEFS_Ec2Config `json:"Ec2Config"`
 
 	// EfsFilesystemArn AWS CloudFormation Property
-	// Required: true
+	// Required: false
 	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-datasync-locationefs.html#cfn-datasync-locationefs-efsfilesystemarn
-	EfsFilesystemArn string `json:"EfsFilesystemArn"`
+	EfsFilesystemArn *string `json:"EfsFilesystemArn,omitempty"`
 
 	// FileSystemAccessRoleArn AWS CloudFormation Property
 	// Required: false
diff --git a/cloudformation/directoryservice/aws-directoryservice-simplead.go b/cloudformation/directoryservice/aws-directoryservice-simplead.go
index fe8a3c9094..d144d0e75c 100644
--- a/cloudformation/directoryservice/aws-directoryservice-simplead.go
+++ b/cloudformation/directoryservice/aws-directoryservice-simplead.go
@@ -34,9 +34,9 @@ type SimpleAD struct {
 	Name string `json:"Name"`
 
 	// Password AWS CloudFormation Property
-	// Required: true
+	// Required: false
 	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-directoryservice-simplead.html#cfn-directoryservice-simplead-password
-	Password string `json:"Password"`
+	Password *string `json:"Password,omitempty"`
 
 	// ShortName AWS CloudFormation Property
 	// Required: false
diff --git a/cloudformation/ec2/aws-ec2-volume.go b/cloudformation/ec2/aws-ec2-volume.go
index 3efea4a8ac..e76931ac5a 100644
--- a/cloudformation/ec2/aws-ec2-volume.go
+++ b/cloudformation/ec2/aws-ec2-volume.go
@@ -11,67 +11,67 @@ import (
 )
 
 // Volume AWS CloudFormation Resource (AWS::EC2::Volume)
-// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-ebs-volume.html
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-volume.html
 type Volume struct {
 
 	// AutoEnableIO AWS CloudFormation Property
 	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-ebs-volume.html#cfn-ec2-ebs-volume-autoenableio
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-volume.html#cfn-ec2-volume-autoenableio
 	AutoEnableIO *bool `json:"AutoEnableIO,omitempty"`
 
 	// AvailabilityZone AWS CloudFormation Property
 	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-ebs-volume.html#cfn-ec2-ebs-volume-availabilityzone
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-volume.html#cfn-ec2-volume-availabilityzone
 	AvailabilityZone string `json:"AvailabilityZone"`
 
 	// Encrypted AWS CloudFormation Property
 	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-ebs-volume.html#cfn-ec2-ebs-volume-encrypted
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-volume.html#cfn-ec2-volume-encrypted
 	Encrypted *bool `json:"Encrypted,omitempty"`
 
 	// Iops AWS CloudFormation Property
 	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-ebs-volume.html#cfn-ec2-ebs-volume-iops
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-volume.html#cfn-ec2-volume-iops
 	Iops *int `json:"Iops,omitempty"`
 
 	// KmsKeyId AWS CloudFormation Property
 	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-ebs-volume.html#cfn-ec2-ebs-volume-kmskeyid
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-volume.html#cfn-ec2-volume-kmskeyid
 	KmsKeyId *string `json:"KmsKeyId,omitempty"`
 
 	// MultiAttachEnabled AWS CloudFormation Property
 	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-ebs-volume.html#cfn-ec2-ebs-volume-multiattachenabled
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-volume.html#cfn-ec2-volume-multiattachenabled
 	MultiAttachEnabled *bool `json:"MultiAttachEnabled,omitempty"`
 
 	// OutpostArn AWS CloudFormation Property
 	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-ebs-volume.html#cfn-ec2-ebs-volume-outpostarn
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-volume.html#cfn-ec2-volume-outpostarn
 	OutpostArn *string `json:"OutpostArn,omitempty"`
 
 	// Size AWS CloudFormation Property
 	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-ebs-volume.html#cfn-ec2-ebs-volume-size
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-volume.html#cfn-ec2-volume-size
 	Size *int `json:"Size,omitempty"`
 
 	// SnapshotId AWS CloudFormation Property
 	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-ebs-volume.html#cfn-ec2-ebs-volume-snapshotid
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-volume.html#cfn-ec2-volume-snapshotid
 	SnapshotId *string `json:"SnapshotId,omitempty"`
 
 	// Tags AWS CloudFormation Property
 	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-ebs-volume.html#cfn-ec2-ebs-volume-tags
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-volume.html#cfn-ec2-volume-tags
 	Tags []tags.Tag `json:"Tags,omitempty"`
 
 	// Throughput AWS CloudFormation Property
 	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-ebs-volume.html#cfn-ec2-ebs-volume-throughput
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-volume.html#cfn-ec2-volume-throughput
 	Throughput *int `json:"Throughput,omitempty"`
 
 	// VolumeType AWS CloudFormation Property
 	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-ebs-volume.html#cfn-ec2-ebs-volume-volumetype
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-volume.html#cfn-ec2-volume-volumetype
 	VolumeType *string `json:"VolumeType,omitempty"`
 
 	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
diff --git a/cloudformation/eks/aws-eks-nodegroup.go b/cloudformation/eks/aws-eks-nodegroup.go
index 7ec5afd38b..b0e6068acd 100644
--- a/cloudformation/eks/aws-eks-nodegroup.go
+++ b/cloudformation/eks/aws-eks-nodegroup.go
@@ -46,7 +46,7 @@ type Nodegroup struct {
 	// Labels AWS CloudFormation Property
 	// Required: false
 	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-eks-nodegroup.html#cfn-eks-nodegroup-labels
-	Labels interface{} `json:"Labels,omitempty"`
+	Labels map[string]string `json:"Labels,omitempty"`
 
 	// LaunchTemplate AWS CloudFormation Property
 	// Required: false
@@ -86,7 +86,7 @@ type Nodegroup struct {
 	// Tags AWS CloudFormation Property
 	// Required: false
 	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-eks-nodegroup.html#cfn-eks-nodegroup-tags
-	Tags interface{} `json:"Tags,omitempty"`
+	Tags map[string]string `json:"Tags,omitempty"`
 
 	// Taints AWS CloudFormation Property
 	// Required: false
diff --git a/cloudformation/evidently/aws-evidently-experiment_metricgoalobject.go b/cloudformation/evidently/aws-evidently-experiment_metricgoalobject.go
index 5ba4709d04..036bb6cc22 100644
--- a/cloudformation/evidently/aws-evidently-experiment_metricgoalobject.go
+++ b/cloudformation/evidently/aws-evidently-experiment_metricgoalobject.go
@@ -21,9 +21,9 @@ type Experiment_MetricGoalObject struct {
 	EntityIdKey string `json:"EntityIdKey"`
 
 	// EventPattern AWS CloudFormation Property
-	// Required: true
+	// Required: false
 	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-evidently-experiment-metricgoalobject.html#cfn-evidently-experiment-metricgoalobject-eventpattern
-	EventPattern string `json:"EventPattern"`
+	EventPattern *string `json:"EventPattern,omitempty"`
 
 	// MetricName AWS CloudFormation Property
 	// Required: true
diff --git a/cloudformation/evidently/aws-evidently-launch_metricdefinitionobject.go b/cloudformation/evidently/aws-evidently-launch_metricdefinitionobject.go
index aec97e80a8..d20fa7b979 100644
--- a/cloudformation/evidently/aws-evidently-launch_metricdefinitionobject.go
+++ b/cloudformation/evidently/aws-evidently-launch_metricdefinitionobject.go
@@ -16,9 +16,9 @@ type Launch_MetricDefinitionObject struct {
 	EntityIdKey string `json:"EntityIdKey"`
 
 	// EventPattern AWS CloudFormation Property
-	// Required: true
+	// Required: false
 	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-evidently-launch-metricdefinitionobject.html#cfn-evidently-launch-metricdefinitionobject-eventpattern
-	EventPattern string `json:"EventPattern"`
+	EventPattern *string `json:"EventPattern,omitempty"`
 
 	// MetricName AWS CloudFormation Property
 	// Required: true
diff --git a/cloudformation/fsx/aws-fsx-volume_ontapconfiguration.go b/cloudformation/fsx/aws-fsx-volume_ontapconfiguration.go
index 17ed2bce27..aca9e22786 100644
--- a/cloudformation/fsx/aws-fsx-volume_ontapconfiguration.go
+++ b/cloudformation/fsx/aws-fsx-volume_ontapconfiguration.go
@@ -10,10 +10,20 @@ import (
 // See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-fsx-volume-ontapconfiguration.html
 type Volume_OntapConfiguration struct {
 
+	// CopyTagsToBackups AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-fsx-volume-ontapconfiguration.html#cfn-fsx-volume-ontapconfiguration-copytagstobackups
+	CopyTagsToBackups *string `json:"CopyTagsToBackups,omitempty"`
+
 	// JunctionPath AWS CloudFormation Property
-	// Required: true
+	// Required: false
 	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-fsx-volume-ontapconfiguration.html#cfn-fsx-volume-ontapconfiguration-junctionpath
-	JunctionPath string `json:"JunctionPath"`
+	JunctionPath *string `json:"JunctionPath,omitempty"`
+
+	// OntapVolumeType AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-fsx-volume-ontapconfiguration.html#cfn-fsx-volume-ontapconfiguration-ontapvolumetype
+	OntapVolumeType *string `json:"OntapVolumeType,omitempty"`
 
 	// SecurityStyle AWS CloudFormation Property
 	// Required: false
@@ -25,10 +35,15 @@ type Volume_OntapConfiguration struct {
 	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-fsx-volume-ontapconfiguration.html#cfn-fsx-volume-ontapconfiguration-sizeinmegabytes
 	SizeInMegabytes string `json:"SizeInMegabytes"`
 
+	// SnapshotPolicy AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-fsx-volume-ontapconfiguration.html#cfn-fsx-volume-ontapconfiguration-snapshotpolicy
+	SnapshotPolicy *string `json:"SnapshotPolicy,omitempty"`
+
 	// StorageEfficiencyEnabled AWS CloudFormation Property
-	// Required: true
+	// Required: false
 	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-fsx-volume-ontapconfiguration.html#cfn-fsx-volume-ontapconfiguration-storageefficiencyenabled
-	StorageEfficiencyEnabled string `json:"StorageEfficiencyEnabled"`
+	StorageEfficiencyEnabled *string `json:"StorageEfficiencyEnabled,omitempty"`
 
 	// StorageVirtualMachineId AWS CloudFormation Property
 	// Required: true
diff --git a/cloudformation/gamelift/aws-gamelift-build.go b/cloudformation/gamelift/aws-gamelift-build.go
index 254edce655..5569bba8cb 100644
--- a/cloudformation/gamelift/aws-gamelift-build.go
+++ b/cloudformation/gamelift/aws-gamelift-build.go
@@ -26,7 +26,7 @@ type Build struct {
 	// StorageLocation AWS CloudFormation Property
 	// Required: false
 	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-gamelift-build.html#cfn-gamelift-build-storagelocation
-	StorageLocation *Build_S3Location `json:"StorageLocation,omitempty"`
+	StorageLocation *Build_StorageLocation `json:"StorageLocation,omitempty"`
 
 	// Version AWS CloudFormation Property
 	// Required: false
diff --git a/cloudformation/gamelift/aws-gamelift-build_storagelocation.go b/cloudformation/gamelift/aws-gamelift-build_storagelocation.go
new file mode 100644
index 0000000000..2acfccbe5a
--- /dev/null
+++ b/cloudformation/gamelift/aws-gamelift-build_storagelocation.go
@@ -0,0 +1,52 @@
+// Code generated by "go generate". Please don't change this file directly.
+
+package gamelift
+
+import (
+	"github.com/awslabs/goformation/v7/cloudformation/policies"
+)
+
+// Build_StorageLocation AWS CloudFormation Resource (AWS::GameLift::Build.StorageLocation)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-gamelift-build-storagelocation.html
+type Build_StorageLocation struct {
+
+	// Bucket AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-gamelift-build-storagelocation.html#cfn-gamelift-build-storagelocation-bucket
+	Bucket string `json:"Bucket"`
+
+	// Key AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-gamelift-build-storagelocation.html#cfn-gamelift-build-storagelocation-key
+	Key string `json:"Key"`
+
+	// ObjectVersion AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-gamelift-build-storagelocation.html#cfn-gamelift-build-storagelocation-objectversion
+	ObjectVersion *string `json:"ObjectVersion,omitempty"`
+
+	// RoleArn AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-gamelift-build-storagelocation.html#cfn-gamelift-build-storagelocation-rolearn
+	RoleArn string `json:"RoleArn"`
+
+	// 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 *Build_StorageLocation) AWSCloudFormationType() string {
+	return "AWS::GameLift::Build.StorageLocation"
+}
diff --git a/cloudformation/grafana/aws-grafana-workspace.go b/cloudformation/grafana/aws-grafana-workspace.go
index 90adfed3c3..b62aadeeb5 100644
--- a/cloudformation/grafana/aws-grafana-workspace.go
+++ b/cloudformation/grafana/aws-grafana-workspace.go
@@ -78,6 +78,11 @@ type Workspace struct {
 	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-grafana-workspace.html#cfn-grafana-workspace-stacksetname
 	StackSetName *string `json:"StackSetName,omitempty"`
 
+	// VpcConfiguration AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-grafana-workspace.html#cfn-grafana-workspace-vpcconfiguration
+	VpcConfiguration *Workspace_VpcConfiguration `json:"VpcConfiguration,omitempty"`
+
 	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
 	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
 
diff --git a/cloudformation/grafana/aws-grafana-workspace_vpcconfiguration.go b/cloudformation/grafana/aws-grafana-workspace_vpcconfiguration.go
new file mode 100644
index 0000000000..47787bb851
--- /dev/null
+++ b/cloudformation/grafana/aws-grafana-workspace_vpcconfiguration.go
@@ -0,0 +1,42 @@
+// Code generated by "go generate". Please don't change this file directly.
+
+package grafana
+
+import (
+	"github.com/awslabs/goformation/v7/cloudformation/policies"
+)
+
+// Workspace_VpcConfiguration AWS CloudFormation Resource (AWS::Grafana::Workspace.VpcConfiguration)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-grafana-workspace-vpcconfiguration.html
+type Workspace_VpcConfiguration struct {
+
+	// SecurityGroupIds AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-grafana-workspace-vpcconfiguration.html#cfn-grafana-workspace-vpcconfiguration-securitygroupids
+	SecurityGroupIds []string `json:"SecurityGroupIds"`
+
+	// SubnetIds AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-grafana-workspace-vpcconfiguration.html#cfn-grafana-workspace-vpcconfiguration-subnetids
+	SubnetIds []string `json:"SubnetIds"`
+
+	// 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 *Workspace_VpcConfiguration) AWSCloudFormationType() string {
+	return "AWS::Grafana::Workspace.VpcConfiguration"
+}
diff --git a/cloudformation/logs/aws-logs-subscriptionfilter.go b/cloudformation/logs/aws-logs-subscriptionfilter.go
index e9b42240d4..13d40a9e09 100644
--- a/cloudformation/logs/aws-logs-subscriptionfilter.go
+++ b/cloudformation/logs/aws-logs-subscriptionfilter.go
@@ -18,6 +18,16 @@ type SubscriptionFilter struct {
 	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-logs-subscriptionfilter.html#cfn-logs-subscriptionfilter-destinationarn
 	DestinationArn string `json:"DestinationArn"`
 
+	// Distribution AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-logs-subscriptionfilter.html#cfn-logs-subscriptionfilter-distribution
+	Distribution *string `json:"Distribution,omitempty"`
+
+	// FilterName AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-logs-subscriptionfilter.html#cfn-logs-subscriptionfilter-filtername
+	FilterName *string `json:"FilterName,omitempty"`
+
 	// FilterPattern AWS CloudFormation Property
 	// Required: true
 	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-logs-subscriptionfilter.html#cfn-logs-subscriptionfilter-filterpattern
diff --git a/cloudformation/networkfirewall/aws-networkfirewall-firewallpolicy_statefulengineoptions.go b/cloudformation/networkfirewall/aws-networkfirewall-firewallpolicy_statefulengineoptions.go
index bbbe502929..98a8ea2332 100644
--- a/cloudformation/networkfirewall/aws-networkfirewall-firewallpolicy_statefulengineoptions.go
+++ b/cloudformation/networkfirewall/aws-networkfirewall-firewallpolicy_statefulengineoptions.go
@@ -15,6 +15,11 @@ type FirewallPolicy_StatefulEngineOptions struct {
 	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-networkfirewall-firewallpolicy-statefulengineoptions.html#cfn-networkfirewall-firewallpolicy-statefulengineoptions-ruleorder
 	RuleOrder *string `json:"RuleOrder,omitempty"`
 
+	// StreamExceptionPolicy AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-networkfirewall-firewallpolicy-statefulengineoptions.html#cfn-networkfirewall-firewallpolicy-statefulengineoptions-streamexceptionpolicy
+	StreamExceptionPolicy *string `json:"StreamExceptionPolicy,omitempty"`
+
 	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
 	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
 
diff --git a/cloudformation/networkfirewall/aws-networkfirewall-rulegroup_ipsetreference.go b/cloudformation/networkfirewall/aws-networkfirewall-rulegroup_ipsetreference.go
new file mode 100644
index 0000000000..ca5dfca8e4
--- /dev/null
+++ b/cloudformation/networkfirewall/aws-networkfirewall-rulegroup_ipsetreference.go
@@ -0,0 +1,37 @@
+// Code generated by "go generate". Please don't change this file directly.
+
+package networkfirewall
+
+import (
+	"github.com/awslabs/goformation/v7/cloudformation/policies"
+)
+
+// RuleGroup_IPSetReference AWS CloudFormation Resource (AWS::NetworkFirewall::RuleGroup.IPSetReference)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-networkfirewall-rulegroup-ipsetreference.html
+type RuleGroup_IPSetReference struct {
+
+	// ReferenceArn AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-networkfirewall-rulegroup-ipsetreference.html#cfn-networkfirewall-rulegroup-ipsetreference-referencearn
+	ReferenceArn *string `json:"ReferenceArn,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 *RuleGroup_IPSetReference) AWSCloudFormationType() string {
+	return "AWS::NetworkFirewall::RuleGroup.IPSetReference"
+}
diff --git a/cloudformation/networkfirewall/aws-networkfirewall-rulegroup_referencesets.go b/cloudformation/networkfirewall/aws-networkfirewall-rulegroup_referencesets.go
new file mode 100644
index 0000000000..bc36aef891
--- /dev/null
+++ b/cloudformation/networkfirewall/aws-networkfirewall-rulegroup_referencesets.go
@@ -0,0 +1,37 @@
+// Code generated by "go generate". Please don't change this file directly.
+
+package networkfirewall
+
+import (
+	"github.com/awslabs/goformation/v7/cloudformation/policies"
+)
+
+// RuleGroup_ReferenceSets AWS CloudFormation Resource (AWS::NetworkFirewall::RuleGroup.ReferenceSets)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-networkfirewall-rulegroup-referencesets.html
+type RuleGroup_ReferenceSets struct {
+
+	// IPSetReferences AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-networkfirewall-rulegroup-referencesets.html#cfn-networkfirewall-rulegroup-referencesets-ipsetreferences
+	IPSetReferences map[string]RuleGroup_IPSetReference `json:"IPSetReferences,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 *RuleGroup_ReferenceSets) AWSCloudFormationType() string {
+	return "AWS::NetworkFirewall::RuleGroup.ReferenceSets"
+}
diff --git a/cloudformation/networkfirewall/aws-networkfirewall-rulegroup_rulegroup.go b/cloudformation/networkfirewall/aws-networkfirewall-rulegroup_rulegroup.go
index c8af0374cb..d9242f122f 100644
--- a/cloudformation/networkfirewall/aws-networkfirewall-rulegroup_rulegroup.go
+++ b/cloudformation/networkfirewall/aws-networkfirewall-rulegroup_rulegroup.go
@@ -10,6 +10,11 @@ import (
 // See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-networkfirewall-rulegroup-rulegroup.html
 type RuleGroup_RuleGroup struct {
 
+	// ReferenceSets AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-networkfirewall-rulegroup-rulegroup.html#cfn-networkfirewall-rulegroup-rulegroup-referencesets
+	ReferenceSets *RuleGroup_ReferenceSets `json:"ReferenceSets,omitempty"`
+
 	// RuleVariables AWS CloudFormation Property
 	// Required: false
 	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-networkfirewall-rulegroup-rulegroup.html#cfn-networkfirewall-rulegroup-rulegroup-rulevariables
diff --git a/cloudformation/networkmanager/aws-networkmanager-vpcattachment_vpcoptions.go b/cloudformation/networkmanager/aws-networkmanager-vpcattachment_vpcoptions.go
index 6daba6f3d3..c0d7966dff 100644
--- a/cloudformation/networkmanager/aws-networkmanager-vpcattachment_vpcoptions.go
+++ b/cloudformation/networkmanager/aws-networkmanager-vpcattachment_vpcoptions.go
@@ -10,6 +10,11 @@ import (
 // See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-networkmanager-vpcattachment-vpcoptions.html
 type VpcAttachment_VpcOptions struct {
 
+	// ApplianceModeSupport AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-networkmanager-vpcattachment-vpcoptions.html#cfn-networkmanager-vpcattachment-vpcoptions-appliancemodesupport
+	ApplianceModeSupport *bool `json:"ApplianceModeSupport,omitempty"`
+
 	// Ipv6Support AWS CloudFormation Property
 	// Required: false
 	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-networkmanager-vpcattachment-vpcoptions.html#cfn-networkmanager-vpcattachment-vpcoptions-ipv6support
diff --git a/cloudformation/quicksight/aws-quicksight-datasource_databricksparameters.go b/cloudformation/quicksight/aws-quicksight-datasource_databricksparameters.go
new file mode 100644
index 0000000000..78490373a7
--- /dev/null
+++ b/cloudformation/quicksight/aws-quicksight-datasource_databricksparameters.go
@@ -0,0 +1,47 @@
+// Code generated by "go generate". Please don't change this file directly.
+
+package quicksight
+
+import (
+	"github.com/awslabs/goformation/v7/cloudformation/policies"
+)
+
+// DataSource_DatabricksParameters AWS CloudFormation Resource (AWS::QuickSight::DataSource.DatabricksParameters)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-quicksight-datasource-databricksparameters.html
+type DataSource_DatabricksParameters struct {
+
+	// Host AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-quicksight-datasource-databricksparameters.html#cfn-quicksight-datasource-databricksparameters-host
+	Host string `json:"Host"`
+
+	// Port AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-quicksight-datasource-databricksparameters.html#cfn-quicksight-datasource-databricksparameters-port
+	Port float64 `json:"Port"`
+
+	// SqlEndpointPath AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-quicksight-datasource-databricksparameters.html#cfn-quicksight-datasource-databricksparameters-sqlendpointpath
+	SqlEndpointPath string `json:"SqlEndpointPath"`
+
+	// 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 *DataSource_DatabricksParameters) AWSCloudFormationType() string {
+	return "AWS::QuickSight::DataSource.DatabricksParameters"
+}
diff --git a/cloudformation/quicksight/aws-quicksight-datasource_datasourceparameters.go b/cloudformation/quicksight/aws-quicksight-datasource_datasourceparameters.go
index 6962ee7331..828c2c59d5 100644
--- a/cloudformation/quicksight/aws-quicksight-datasource_datasourceparameters.go
+++ b/cloudformation/quicksight/aws-quicksight-datasource_datasourceparameters.go
@@ -35,6 +35,11 @@ type DataSource_DataSourceParameters struct {
 	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-quicksight-datasource-datasourceparameters.html#cfn-quicksight-datasource-datasourceparameters-aurorapostgresqlparameters
 	AuroraPostgreSqlParameters *DataSource_AuroraPostgreSqlParameters `json:"AuroraPostgreSqlParameters,omitempty"`
 
+	// DatabricksParameters AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-quicksight-datasource-datasourceparameters.html#cfn-quicksight-datasource-datasourceparameters-databricksparameters
+	DatabricksParameters *DataSource_DatabricksParameters `json:"DatabricksParameters,omitempty"`
+
 	// MariaDbParameters AWS CloudFormation Property
 	// Required: false
 	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-quicksight-datasource-datasourceparameters.html#cfn-quicksight-datasource-datasourceparameters-mariadbparameters
diff --git a/cloudformation/rds/aws-rds-dbproxy_authformat.go b/cloudformation/rds/aws-rds-dbproxy_authformat.go
index 8483b69a9a..68474489e4 100644
--- a/cloudformation/rds/aws-rds-dbproxy_authformat.go
+++ b/cloudformation/rds/aws-rds-dbproxy_authformat.go
@@ -15,6 +15,11 @@ type DBProxy_AuthFormat struct {
 	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-rds-dbproxy-authformat.html#cfn-rds-dbproxy-authformat-authscheme
 	AuthScheme *string `json:"AuthScheme,omitempty"`
 
+	// ClientPasswordAuthType AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-rds-dbproxy-authformat.html#cfn-rds-dbproxy-authformat-clientpasswordauthtype
+	ClientPasswordAuthType *string `json:"ClientPasswordAuthType,omitempty"`
+
 	// Description AWS CloudFormation Property
 	// Required: false
 	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-rds-dbproxy-authformat.html#cfn-rds-dbproxy-authformat-description
diff --git a/cloudformation/redshiftserverless/aws-redshiftserverless-namespace.go b/cloudformation/redshiftserverless/aws-redshiftserverless-namespace.go
index f4438b4bce..2906a42c8f 100644
--- a/cloudformation/redshiftserverless/aws-redshiftserverless-namespace.go
+++ b/cloudformation/redshiftserverless/aws-redshiftserverless-namespace.go
@@ -59,6 +59,11 @@ type Namespace struct {
 	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-redshiftserverless-namespace.html#cfn-redshiftserverless-namespace-logexports
 	LogExports []string `json:"LogExports,omitempty"`
 
+	// Namespace AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-redshiftserverless-namespace.html#cfn-redshiftserverless-namespace-namespace
+	Namespace *Namespace_Namespace `json:"Namespace,omitempty"`
+
 	// NamespaceName AWS CloudFormation Property
 	// Required: true
 	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-redshiftserverless-namespace.html#cfn-redshiftserverless-namespace-namespacename
diff --git a/cloudformation/redshiftserverless/aws-redshiftserverless-workgroup.go b/cloudformation/redshiftserverless/aws-redshiftserverless-workgroup.go
index a912010b0c..f39ea70c1c 100644
--- a/cloudformation/redshiftserverless/aws-redshiftserverless-workgroup.go
+++ b/cloudformation/redshiftserverless/aws-redshiftserverless-workgroup.go
@@ -54,6 +54,11 @@ type Workgroup struct {
 	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-redshiftserverless-workgroup.html#cfn-redshiftserverless-workgroup-tags
 	Tags []tags.Tag `json:"Tags,omitempty"`
 
+	// Workgroup AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-redshiftserverless-workgroup.html#cfn-redshiftserverless-workgroup-workgroup
+	Workgroup *Workgroup_Workgroup `json:"Workgroup,omitempty"`
+
 	// WorkgroupName AWS CloudFormation Property
 	// Required: true
 	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-redshiftserverless-workgroup.html#cfn-redshiftserverless-workgroup-workgroupname
diff --git a/cloudformation/route53recoverycontrol/aws-route53recoverycontrol-cluster.go b/cloudformation/route53recoverycontrol/aws-route53recoverycontrol-cluster.go
index 2b569c9f51..0a1cf46e09 100644
--- a/cloudformation/route53recoverycontrol/aws-route53recoverycontrol-cluster.go
+++ b/cloudformation/route53recoverycontrol/aws-route53recoverycontrol-cluster.go
@@ -14,6 +14,11 @@ import (
 // See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-route53recoverycontrol-cluster.html
 type Cluster struct {
 
+	// ClusterEndpoints AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-route53recoverycontrol-cluster.html#cfn-route53recoverycontrol-cluster-clusterendpoints
+	ClusterEndpoints []Cluster_ClusterEndpoint `json:"ClusterEndpoints,omitempty"`
+
 	// Name AWS CloudFormation Property
 	// Required: false
 	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-route53recoverycontrol-cluster.html#cfn-route53recoverycontrol-cluster-name
diff --git a/schema/cdk.go b/schema/cdk.go
index a3cc63a90c..c5de0ab006 100644
--- a/schema/cdk.go
+++ b/schema/cdk.go
@@ -24850,6 +24850,8 @@ var CdkSchema = `{
                         }
                     },
                     "required": [
+                        "FunctionCode",
+                        "FunctionConfig",
                         "Name"
                     ],
                     "type": "object"
@@ -39452,8 +39454,7 @@ var CdkSchema = `{
                         }
                     },
                     "required": [
-                        "Ec2Config",
-                        "EfsFilesystemArn"
+                        "Ec2Config"
                     ],
                     "type": "object"
                 },
@@ -41170,7 +41171,6 @@ var CdkSchema = `{
                     },
                     "required": [
                         "Name",
-                        "Password",
                         "Size",
                         "VpcSettings"
                     ],
@@ -55815,6 +55815,12 @@ var CdkSchema = `{
                             "type": "array"
                         },
                         "Labels": {
+                            "additionalProperties": true,
+                            "patternProperties": {
+                                "^[a-zA-Z0-9]+$": {
+                                    "type": "string"
+                                }
+                            },
                             "type": "object"
                         },
                         "LaunchTemplate": {
@@ -55842,6 +55848,12 @@ var CdkSchema = `{
                             "type": "array"
                         },
                         "Tags": {
+                            "additionalProperties": true,
+                            "patternProperties": {
+                                "^[a-zA-Z0-9]+$": {
+                                    "type": "string"
+                                }
+                            },
                             "type": "object"
                         },
                         "Taints": {
@@ -63108,7 +63120,6 @@ var CdkSchema = `{
             "required": [
                 "DesiredChange",
                 "EntityIdKey",
-                "EventPattern",
                 "MetricName",
                 "ValueKey"
             ],
@@ -63504,7 +63515,6 @@ var CdkSchema = `{
             },
             "required": [
                 "EntityIdKey",
-                "EventPattern",
                 "MetricName",
                 "ValueKey"
             ],
@@ -65173,15 +65183,24 @@ var CdkSchema = `{
         "AWS::FSx::Volume.OntapConfiguration": {
             "additionalProperties": false,
             "properties": {
+                "CopyTagsToBackups": {
+                    "type": "string"
+                },
                 "JunctionPath": {
                     "type": "string"
                 },
+                "OntapVolumeType": {
+                    "type": "string"
+                },
                 "SecurityStyle": {
                     "type": "string"
                 },
                 "SizeInMegabytes": {
                     "type": "string"
                 },
+                "SnapshotPolicy": {
+                    "type": "string"
+                },
                 "StorageEfficiencyEnabled": {
                     "type": "string"
                 },
@@ -65193,9 +65212,7 @@ var CdkSchema = `{
                 }
             },
             "required": [
-                "JunctionPath",
                 "SizeInMegabytes",
-                "StorageEfficiencyEnabled",
                 "StorageVirtualMachineId"
             ],
             "type": "object"
@@ -66617,7 +66634,7 @@ var CdkSchema = `{
                             "type": "string"
                         },
                         "StorageLocation": {
-                            "$ref": "#/definitions/AWS::GameLift::Build.S3Location"
+                            "$ref": "#/definitions/AWS::GameLift::Build.StorageLocation"
                         },
                         "Version": {
                             "type": "string"
@@ -66645,7 +66662,7 @@ var CdkSchema = `{
             ],
             "type": "object"
         },
-        "AWS::GameLift::Build.S3Location": {
+        "AWS::GameLift::Build.StorageLocation": {
             "additionalProperties": false,
             "properties": {
                 "Bucket": {
@@ -70530,6 +70547,9 @@ var CdkSchema = `{
                         },
                         "StackSetName": {
                             "type": "string"
+                        },
+                        "VpcConfiguration": {
+                            "$ref": "#/definitions/AWS::Grafana::Workspace.VpcConfiguration"
                         }
                     },
                     "type": "object"
@@ -70635,6 +70655,28 @@ var CdkSchema = `{
             ],
             "type": "object"
         },
+        "AWS::Grafana::Workspace.VpcConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "SecurityGroupIds": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "SubnetIds": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "SecurityGroupIds",
+                "SubnetIds"
+            ],
+            "type": "object"
+        },
         "AWS::Greengrass::ConnectorDefinition": {
             "additionalProperties": false,
             "properties": {
@@ -100084,6 +100126,12 @@ var CdkSchema = `{
                         "DestinationArn": {
                             "type": "string"
                         },
+                        "Distribution": {
+                            "type": "string"
+                        },
+                        "FilterName": {
+                            "type": "string"
+                        },
                         "FilterPattern": {
                             "type": "string"
                         },
@@ -109802,6 +109850,9 @@ var CdkSchema = `{
             "properties": {
                 "RuleOrder": {
                     "type": "string"
+                },
+                "StreamExceptionPolicy": {
+                    "type": "string"
                 }
             },
             "type": "object"
@@ -110140,6 +110191,15 @@ var CdkSchema = `{
             },
             "type": "object"
         },
+        "AWS::NetworkFirewall::RuleGroup.IPSetReference": {
+            "additionalProperties": false,
+            "properties": {
+                "ReferenceArn": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
         "AWS::NetworkFirewall::RuleGroup.MatchAttributes": {
             "additionalProperties": false,
             "properties": {
@@ -110225,6 +110285,21 @@ var CdkSchema = `{
             ],
             "type": "object"
         },
+        "AWS::NetworkFirewall::RuleGroup.ReferenceSets": {
+            "additionalProperties": false,
+            "properties": {
+                "IPSetReferences": {
+                    "additionalProperties": false,
+                    "patternProperties": {
+                        "^[a-zA-Z0-9]+$": {
+                            "$ref": "#/definitions/AWS::NetworkFirewall::RuleGroup.IPSetReference"
+                        }
+                    },
+                    "type": "object"
+                }
+            },
+            "type": "object"
+        },
         "AWS::NetworkFirewall::RuleGroup.RuleDefinition": {
             "additionalProperties": false,
             "properties": {
@@ -110247,6 +110322,9 @@ var CdkSchema = `{
         "AWS::NetworkFirewall::RuleGroup.RuleGroup": {
             "additionalProperties": false,
             "properties": {
+                "ReferenceSets": {
+                    "$ref": "#/definitions/AWS::NetworkFirewall::RuleGroup.ReferenceSets"
+                },
                 "RuleVariables": {
                     "$ref": "#/definitions/AWS::NetworkFirewall::RuleGroup.RuleVariables"
                 },
@@ -111581,6 +111659,9 @@ var CdkSchema = `{
         "AWS::NetworkManager::VpcAttachment.VpcOptions": {
             "additionalProperties": false,
             "properties": {
+                "ApplianceModeSupport": {
+                    "type": "boolean"
+                },
                 "Ipv6Support": {
                     "type": "boolean"
                 }
@@ -121198,6 +121279,9 @@ var CdkSchema = `{
                 "AuroraPostgreSqlParameters": {
                     "$ref": "#/definitions/AWS::QuickSight::DataSource.AuroraPostgreSqlParameters"
                 },
+                "DatabricksParameters": {
+                    "$ref": "#/definitions/AWS::QuickSight::DataSource.DatabricksParameters"
+                },
                 "MariaDbParameters": {
                     "$ref": "#/definitions/AWS::QuickSight::DataSource.MariaDbParameters"
                 },
@@ -121237,6 +121321,26 @@ var CdkSchema = `{
             },
             "type": "object"
         },
+        "AWS::QuickSight::DataSource.DatabricksParameters": {
+            "additionalProperties": false,
+            "properties": {
+                "Host": {
+                    "type": "string"
+                },
+                "Port": {
+                    "type": "number"
+                },
+                "SqlEndpointPath": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Host",
+                "Port",
+                "SqlEndpointPath"
+            ],
+            "type": "object"
+        },
         "AWS::QuickSight::DataSource.ManifestFileLocation": {
             "additionalProperties": false,
             "properties": {
@@ -123125,6 +123229,9 @@ var CdkSchema = `{
                 "AuthScheme": {
                     "type": "string"
                 },
+                "ClientPasswordAuthType": {
+                    "type": "string"
+                },
                 "Description": {
                     "type": "string"
                 },
@@ -125209,6 +125316,9 @@ var CdkSchema = `{
                             },
                             "type": "array"
                         },
+                        "Namespace": {
+                            "$ref": "#/definitions/AWS::RedshiftServerless::Namespace.Namespace"
+                        },
                         "NamespaceName": {
                             "type": "string"
                         },
@@ -125361,6 +125471,9 @@ var CdkSchema = `{
                             },
                             "type": "array"
                         },
+                        "Workgroup": {
+                            "$ref": "#/definitions/AWS::RedshiftServerless::Workgroup.Workgroup"
+                        },
                         "WorkgroupName": {
                             "type": "string"
                         }
@@ -128700,6 +128813,12 @@ var CdkSchema = `{
                 "Properties": {
                     "additionalProperties": false,
                     "properties": {
+                        "ClusterEndpoints": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::Route53RecoveryControl::Cluster.ClusterEndpoint"
+                            },
+                            "type": "array"
+                        },
                         "Name": {
                             "type": "string"
                         },
diff --git a/schema/cdk.schema.json b/schema/cdk.schema.json
index 9d0d71078c..3a0bf330c6 100644
--- a/schema/cdk.schema.json
+++ b/schema/cdk.schema.json
@@ -24845,6 +24845,8 @@
                         }
                     },
                     "required": [
+                        "FunctionCode",
+                        "FunctionConfig",
                         "Name"
                     ],
                     "type": "object"
@@ -39447,8 +39449,7 @@
                         }
                     },
                     "required": [
-                        "Ec2Config",
-                        "EfsFilesystemArn"
+                        "Ec2Config"
                     ],
                     "type": "object"
                 },
@@ -41165,7 +41166,6 @@
                     },
                     "required": [
                         "Name",
-                        "Password",
                         "Size",
                         "VpcSettings"
                     ],
@@ -55810,6 +55810,12 @@
                             "type": "array"
                         },
                         "Labels": {
+                            "additionalProperties": true,
+                            "patternProperties": {
+                                "^[a-zA-Z0-9]+$": {
+                                    "type": "string"
+                                }
+                            },
                             "type": "object"
                         },
                         "LaunchTemplate": {
@@ -55837,6 +55843,12 @@
                             "type": "array"
                         },
                         "Tags": {
+                            "additionalProperties": true,
+                            "patternProperties": {
+                                "^[a-zA-Z0-9]+$": {
+                                    "type": "string"
+                                }
+                            },
                             "type": "object"
                         },
                         "Taints": {
@@ -63103,7 +63115,6 @@
             "required": [
                 "DesiredChange",
                 "EntityIdKey",
-                "EventPattern",
                 "MetricName",
                 "ValueKey"
             ],
@@ -63499,7 +63510,6 @@
             },
             "required": [
                 "EntityIdKey",
-                "EventPattern",
                 "MetricName",
                 "ValueKey"
             ],
@@ -65168,15 +65178,24 @@
         "AWS::FSx::Volume.OntapConfiguration": {
             "additionalProperties": false,
             "properties": {
+                "CopyTagsToBackups": {
+                    "type": "string"
+                },
                 "JunctionPath": {
                     "type": "string"
                 },
+                "OntapVolumeType": {
+                    "type": "string"
+                },
                 "SecurityStyle": {
                     "type": "string"
                 },
                 "SizeInMegabytes": {
                     "type": "string"
                 },
+                "SnapshotPolicy": {
+                    "type": "string"
+                },
                 "StorageEfficiencyEnabled": {
                     "type": "string"
                 },
@@ -65188,9 +65207,7 @@
                 }
             },
             "required": [
-                "JunctionPath",
                 "SizeInMegabytes",
-                "StorageEfficiencyEnabled",
                 "StorageVirtualMachineId"
             ],
             "type": "object"
@@ -66612,7 +66629,7 @@
                             "type": "string"
                         },
                         "StorageLocation": {
-                            "$ref": "#/definitions/AWS::GameLift::Build.S3Location"
+                            "$ref": "#/definitions/AWS::GameLift::Build.StorageLocation"
                         },
                         "Version": {
                             "type": "string"
@@ -66640,7 +66657,7 @@
             ],
             "type": "object"
         },
-        "AWS::GameLift::Build.S3Location": {
+        "AWS::GameLift::Build.StorageLocation": {
             "additionalProperties": false,
             "properties": {
                 "Bucket": {
@@ -70525,6 +70542,9 @@
                         },
                         "StackSetName": {
                             "type": "string"
+                        },
+                        "VpcConfiguration": {
+                            "$ref": "#/definitions/AWS::Grafana::Workspace.VpcConfiguration"
                         }
                     },
                     "type": "object"
@@ -70630,6 +70650,28 @@
             ],
             "type": "object"
         },
+        "AWS::Grafana::Workspace.VpcConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "SecurityGroupIds": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "SubnetIds": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "SecurityGroupIds",
+                "SubnetIds"
+            ],
+            "type": "object"
+        },
         "AWS::Greengrass::ConnectorDefinition": {
             "additionalProperties": false,
             "properties": {
@@ -100079,6 +100121,12 @@
                         "DestinationArn": {
                             "type": "string"
                         },
+                        "Distribution": {
+                            "type": "string"
+                        },
+                        "FilterName": {
+                            "type": "string"
+                        },
                         "FilterPattern": {
                             "type": "string"
                         },
@@ -109797,6 +109845,9 @@
             "properties": {
                 "RuleOrder": {
                     "type": "string"
+                },
+                "StreamExceptionPolicy": {
+                    "type": "string"
                 }
             },
             "type": "object"
@@ -110135,6 +110186,15 @@
             },
             "type": "object"
         },
+        "AWS::NetworkFirewall::RuleGroup.IPSetReference": {
+            "additionalProperties": false,
+            "properties": {
+                "ReferenceArn": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
         "AWS::NetworkFirewall::RuleGroup.MatchAttributes": {
             "additionalProperties": false,
             "properties": {
@@ -110220,6 +110280,21 @@
             ],
             "type": "object"
         },
+        "AWS::NetworkFirewall::RuleGroup.ReferenceSets": {
+            "additionalProperties": false,
+            "properties": {
+                "IPSetReferences": {
+                    "additionalProperties": false,
+                    "patternProperties": {
+                        "^[a-zA-Z0-9]+$": {
+                            "$ref": "#/definitions/AWS::NetworkFirewall::RuleGroup.IPSetReference"
+                        }
+                    },
+                    "type": "object"
+                }
+            },
+            "type": "object"
+        },
         "AWS::NetworkFirewall::RuleGroup.RuleDefinition": {
             "additionalProperties": false,
             "properties": {
@@ -110242,6 +110317,9 @@
         "AWS::NetworkFirewall::RuleGroup.RuleGroup": {
             "additionalProperties": false,
             "properties": {
+                "ReferenceSets": {
+                    "$ref": "#/definitions/AWS::NetworkFirewall::RuleGroup.ReferenceSets"
+                },
                 "RuleVariables": {
                     "$ref": "#/definitions/AWS::NetworkFirewall::RuleGroup.RuleVariables"
                 },
@@ -111576,6 +111654,9 @@
         "AWS::NetworkManager::VpcAttachment.VpcOptions": {
             "additionalProperties": false,
             "properties": {
+                "ApplianceModeSupport": {
+                    "type": "boolean"
+                },
                 "Ipv6Support": {
                     "type": "boolean"
                 }
@@ -121193,6 +121274,9 @@
                 "AuroraPostgreSqlParameters": {
                     "$ref": "#/definitions/AWS::QuickSight::DataSource.AuroraPostgreSqlParameters"
                 },
+                "DatabricksParameters": {
+                    "$ref": "#/definitions/AWS::QuickSight::DataSource.DatabricksParameters"
+                },
                 "MariaDbParameters": {
                     "$ref": "#/definitions/AWS::QuickSight::DataSource.MariaDbParameters"
                 },
@@ -121232,6 +121316,26 @@
             },
             "type": "object"
         },
+        "AWS::QuickSight::DataSource.DatabricksParameters": {
+            "additionalProperties": false,
+            "properties": {
+                "Host": {
+                    "type": "string"
+                },
+                "Port": {
+                    "type": "number"
+                },
+                "SqlEndpointPath": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Host",
+                "Port",
+                "SqlEndpointPath"
+            ],
+            "type": "object"
+        },
         "AWS::QuickSight::DataSource.ManifestFileLocation": {
             "additionalProperties": false,
             "properties": {
@@ -123120,6 +123224,9 @@
                 "AuthScheme": {
                     "type": "string"
                 },
+                "ClientPasswordAuthType": {
+                    "type": "string"
+                },
                 "Description": {
                     "type": "string"
                 },
@@ -125204,6 +125311,9 @@
                             },
                             "type": "array"
                         },
+                        "Namespace": {
+                            "$ref": "#/definitions/AWS::RedshiftServerless::Namespace.Namespace"
+                        },
                         "NamespaceName": {
                             "type": "string"
                         },
@@ -125356,6 +125466,9 @@
                             },
                             "type": "array"
                         },
+                        "Workgroup": {
+                            "$ref": "#/definitions/AWS::RedshiftServerless::Workgroup.Workgroup"
+                        },
                         "WorkgroupName": {
                             "type": "string"
                         }
@@ -128695,6 +128808,12 @@
                 "Properties": {
                     "additionalProperties": false,
                     "properties": {
+                        "ClusterEndpoints": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::Route53RecoveryControl::Cluster.ClusterEndpoint"
+                            },
+                            "type": "array"
+                        },
                         "Name": {
                             "type": "string"
                         },
diff --git a/schema/cloudformation.go b/schema/cloudformation.go
index 040b6729f6..480259b603 100644
--- a/schema/cloudformation.go
+++ b/schema/cloudformation.go
@@ -24789,6 +24789,8 @@ var CloudformationSchema = `{
                         }
                     },
                     "required": [
+                        "FunctionCode",
+                        "FunctionConfig",
                         "Name"
                     ],
                     "type": "object"
@@ -39391,8 +39393,7 @@ var CloudformationSchema = `{
                         }
                     },
                     "required": [
-                        "Ec2Config",
-                        "EfsFilesystemArn"
+                        "Ec2Config"
                     ],
                     "type": "object"
                 },
@@ -41109,7 +41110,6 @@ var CloudformationSchema = `{
                     },
                     "required": [
                         "Name",
-                        "Password",
                         "Size",
                         "VpcSettings"
                     ],
@@ -55754,6 +55754,12 @@ var CloudformationSchema = `{
                             "type": "array"
                         },
                         "Labels": {
+                            "additionalProperties": true,
+                            "patternProperties": {
+                                "^[a-zA-Z0-9]+$": {
+                                    "type": "string"
+                                }
+                            },
                             "type": "object"
                         },
                         "LaunchTemplate": {
@@ -55781,6 +55787,12 @@ var CloudformationSchema = `{
                             "type": "array"
                         },
                         "Tags": {
+                            "additionalProperties": true,
+                            "patternProperties": {
+                                "^[a-zA-Z0-9]+$": {
+                                    "type": "string"
+                                }
+                            },
                             "type": "object"
                         },
                         "Taints": {
@@ -63047,7 +63059,6 @@ var CloudformationSchema = `{
             "required": [
                 "DesiredChange",
                 "EntityIdKey",
-                "EventPattern",
                 "MetricName",
                 "ValueKey"
             ],
@@ -63443,7 +63454,6 @@ var CloudformationSchema = `{
             },
             "required": [
                 "EntityIdKey",
-                "EventPattern",
                 "MetricName",
                 "ValueKey"
             ],
@@ -65112,15 +65122,24 @@ var CloudformationSchema = `{
         "AWS::FSx::Volume.OntapConfiguration": {
             "additionalProperties": false,
             "properties": {
+                "CopyTagsToBackups": {
+                    "type": "string"
+                },
                 "JunctionPath": {
                     "type": "string"
                 },
+                "OntapVolumeType": {
+                    "type": "string"
+                },
                 "SecurityStyle": {
                     "type": "string"
                 },
                 "SizeInMegabytes": {
                     "type": "string"
                 },
+                "SnapshotPolicy": {
+                    "type": "string"
+                },
                 "StorageEfficiencyEnabled": {
                     "type": "string"
                 },
@@ -65132,9 +65151,7 @@ var CloudformationSchema = `{
                 }
             },
             "required": [
-                "JunctionPath",
                 "SizeInMegabytes",
-                "StorageEfficiencyEnabled",
                 "StorageVirtualMachineId"
             ],
             "type": "object"
@@ -66556,7 +66573,7 @@ var CloudformationSchema = `{
                             "type": "string"
                         },
                         "StorageLocation": {
-                            "$ref": "#/definitions/AWS::GameLift::Build.S3Location"
+                            "$ref": "#/definitions/AWS::GameLift::Build.StorageLocation"
                         },
                         "Version": {
                             "type": "string"
@@ -66584,7 +66601,7 @@ var CloudformationSchema = `{
             ],
             "type": "object"
         },
-        "AWS::GameLift::Build.S3Location": {
+        "AWS::GameLift::Build.StorageLocation": {
             "additionalProperties": false,
             "properties": {
                 "Bucket": {
@@ -70469,6 +70486,9 @@ var CloudformationSchema = `{
                         },
                         "StackSetName": {
                             "type": "string"
+                        },
+                        "VpcConfiguration": {
+                            "$ref": "#/definitions/AWS::Grafana::Workspace.VpcConfiguration"
                         }
                     },
                     "type": "object"
@@ -70574,6 +70594,28 @@ var CloudformationSchema = `{
             ],
             "type": "object"
         },
+        "AWS::Grafana::Workspace.VpcConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "SecurityGroupIds": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "SubnetIds": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "SecurityGroupIds",
+                "SubnetIds"
+            ],
+            "type": "object"
+        },
         "AWS::Greengrass::ConnectorDefinition": {
             "additionalProperties": false,
             "properties": {
@@ -100023,6 +100065,12 @@ var CloudformationSchema = `{
                         "DestinationArn": {
                             "type": "string"
                         },
+                        "Distribution": {
+                            "type": "string"
+                        },
+                        "FilterName": {
+                            "type": "string"
+                        },
                         "FilterPattern": {
                             "type": "string"
                         },
@@ -109741,6 +109789,9 @@ var CloudformationSchema = `{
             "properties": {
                 "RuleOrder": {
                     "type": "string"
+                },
+                "StreamExceptionPolicy": {
+                    "type": "string"
                 }
             },
             "type": "object"
@@ -110079,6 +110130,15 @@ var CloudformationSchema = `{
             },
             "type": "object"
         },
+        "AWS::NetworkFirewall::RuleGroup.IPSetReference": {
+            "additionalProperties": false,
+            "properties": {
+                "ReferenceArn": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
         "AWS::NetworkFirewall::RuleGroup.MatchAttributes": {
             "additionalProperties": false,
             "properties": {
@@ -110164,6 +110224,21 @@ var CloudformationSchema = `{
             ],
             "type": "object"
         },
+        "AWS::NetworkFirewall::RuleGroup.ReferenceSets": {
+            "additionalProperties": false,
+            "properties": {
+                "IPSetReferences": {
+                    "additionalProperties": false,
+                    "patternProperties": {
+                        "^[a-zA-Z0-9]+$": {
+                            "$ref": "#/definitions/AWS::NetworkFirewall::RuleGroup.IPSetReference"
+                        }
+                    },
+                    "type": "object"
+                }
+            },
+            "type": "object"
+        },
         "AWS::NetworkFirewall::RuleGroup.RuleDefinition": {
             "additionalProperties": false,
             "properties": {
@@ -110186,6 +110261,9 @@ var CloudformationSchema = `{
         "AWS::NetworkFirewall::RuleGroup.RuleGroup": {
             "additionalProperties": false,
             "properties": {
+                "ReferenceSets": {
+                    "$ref": "#/definitions/AWS::NetworkFirewall::RuleGroup.ReferenceSets"
+                },
                 "RuleVariables": {
                     "$ref": "#/definitions/AWS::NetworkFirewall::RuleGroup.RuleVariables"
                 },
@@ -111520,6 +111598,9 @@ var CloudformationSchema = `{
         "AWS::NetworkManager::VpcAttachment.VpcOptions": {
             "additionalProperties": false,
             "properties": {
+                "ApplianceModeSupport": {
+                    "type": "boolean"
+                },
                 "Ipv6Support": {
                     "type": "boolean"
                 }
@@ -121137,6 +121218,9 @@ var CloudformationSchema = `{
                 "AuroraPostgreSqlParameters": {
                     "$ref": "#/definitions/AWS::QuickSight::DataSource.AuroraPostgreSqlParameters"
                 },
+                "DatabricksParameters": {
+                    "$ref": "#/definitions/AWS::QuickSight::DataSource.DatabricksParameters"
+                },
                 "MariaDbParameters": {
                     "$ref": "#/definitions/AWS::QuickSight::DataSource.MariaDbParameters"
                 },
@@ -121176,6 +121260,26 @@ var CloudformationSchema = `{
             },
             "type": "object"
         },
+        "AWS::QuickSight::DataSource.DatabricksParameters": {
+            "additionalProperties": false,
+            "properties": {
+                "Host": {
+                    "type": "string"
+                },
+                "Port": {
+                    "type": "number"
+                },
+                "SqlEndpointPath": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Host",
+                "Port",
+                "SqlEndpointPath"
+            ],
+            "type": "object"
+        },
         "AWS::QuickSight::DataSource.ManifestFileLocation": {
             "additionalProperties": false,
             "properties": {
@@ -123064,6 +123168,9 @@ var CloudformationSchema = `{
                 "AuthScheme": {
                     "type": "string"
                 },
+                "ClientPasswordAuthType": {
+                    "type": "string"
+                },
                 "Description": {
                     "type": "string"
                 },
@@ -125148,6 +125255,9 @@ var CloudformationSchema = `{
                             },
                             "type": "array"
                         },
+                        "Namespace": {
+                            "$ref": "#/definitions/AWS::RedshiftServerless::Namespace.Namespace"
+                        },
                         "NamespaceName": {
                             "type": "string"
                         },
@@ -125300,6 +125410,9 @@ var CloudformationSchema = `{
                             },
                             "type": "array"
                         },
+                        "Workgroup": {
+                            "$ref": "#/definitions/AWS::RedshiftServerless::Workgroup.Workgroup"
+                        },
                         "WorkgroupName": {
                             "type": "string"
                         }
@@ -128639,6 +128752,12 @@ var CloudformationSchema = `{
                 "Properties": {
                     "additionalProperties": false,
                     "properties": {
+                        "ClusterEndpoints": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::Route53RecoveryControl::Cluster.ClusterEndpoint"
+                            },
+                            "type": "array"
+                        },
                         "Name": {
                             "type": "string"
                         },
diff --git a/schema/cloudformation.schema.json b/schema/cloudformation.schema.json
index 991fc1e5eb..9cdf85e51d 100644
--- a/schema/cloudformation.schema.json
+++ b/schema/cloudformation.schema.json
@@ -24784,6 +24784,8 @@
                         }
                     },
                     "required": [
+                        "FunctionCode",
+                        "FunctionConfig",
                         "Name"
                     ],
                     "type": "object"
@@ -39386,8 +39388,7 @@
                         }
                     },
                     "required": [
-                        "Ec2Config",
-                        "EfsFilesystemArn"
+                        "Ec2Config"
                     ],
                     "type": "object"
                 },
@@ -41104,7 +41105,6 @@
                     },
                     "required": [
                         "Name",
-                        "Password",
                         "Size",
                         "VpcSettings"
                     ],
@@ -55749,6 +55749,12 @@
                             "type": "array"
                         },
                         "Labels": {
+                            "additionalProperties": true,
+                            "patternProperties": {
+                                "^[a-zA-Z0-9]+$": {
+                                    "type": "string"
+                                }
+                            },
                             "type": "object"
                         },
                         "LaunchTemplate": {
@@ -55776,6 +55782,12 @@
                             "type": "array"
                         },
                         "Tags": {
+                            "additionalProperties": true,
+                            "patternProperties": {
+                                "^[a-zA-Z0-9]+$": {
+                                    "type": "string"
+                                }
+                            },
                             "type": "object"
                         },
                         "Taints": {
@@ -63042,7 +63054,6 @@
             "required": [
                 "DesiredChange",
                 "EntityIdKey",
-                "EventPattern",
                 "MetricName",
                 "ValueKey"
             ],
@@ -63438,7 +63449,6 @@
             },
             "required": [
                 "EntityIdKey",
-                "EventPattern",
                 "MetricName",
                 "ValueKey"
             ],
@@ -65107,15 +65117,24 @@
         "AWS::FSx::Volume.OntapConfiguration": {
             "additionalProperties": false,
             "properties": {
+                "CopyTagsToBackups": {
+                    "type": "string"
+                },
                 "JunctionPath": {
                     "type": "string"
                 },
+                "OntapVolumeType": {
+                    "type": "string"
+                },
                 "SecurityStyle": {
                     "type": "string"
                 },
                 "SizeInMegabytes": {
                     "type": "string"
                 },
+                "SnapshotPolicy": {
+                    "type": "string"
+                },
                 "StorageEfficiencyEnabled": {
                     "type": "string"
                 },
@@ -65127,9 +65146,7 @@
                 }
             },
             "required": [
-                "JunctionPath",
                 "SizeInMegabytes",
-                "StorageEfficiencyEnabled",
                 "StorageVirtualMachineId"
             ],
             "type": "object"
@@ -66551,7 +66568,7 @@
                             "type": "string"
                         },
                         "StorageLocation": {
-                            "$ref": "#/definitions/AWS::GameLift::Build.S3Location"
+                            "$ref": "#/definitions/AWS::GameLift::Build.StorageLocation"
                         },
                         "Version": {
                             "type": "string"
@@ -66579,7 +66596,7 @@
             ],
             "type": "object"
         },
-        "AWS::GameLift::Build.S3Location": {
+        "AWS::GameLift::Build.StorageLocation": {
             "additionalProperties": false,
             "properties": {
                 "Bucket": {
@@ -70464,6 +70481,9 @@
                         },
                         "StackSetName": {
                             "type": "string"
+                        },
+                        "VpcConfiguration": {
+                            "$ref": "#/definitions/AWS::Grafana::Workspace.VpcConfiguration"
                         }
                     },
                     "type": "object"
@@ -70569,6 +70589,28 @@
             ],
             "type": "object"
         },
+        "AWS::Grafana::Workspace.VpcConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "SecurityGroupIds": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "SubnetIds": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "SecurityGroupIds",
+                "SubnetIds"
+            ],
+            "type": "object"
+        },
         "AWS::Greengrass::ConnectorDefinition": {
             "additionalProperties": false,
             "properties": {
@@ -100018,6 +100060,12 @@
                         "DestinationArn": {
                             "type": "string"
                         },
+                        "Distribution": {
+                            "type": "string"
+                        },
+                        "FilterName": {
+                            "type": "string"
+                        },
                         "FilterPattern": {
                             "type": "string"
                         },
@@ -109736,6 +109784,9 @@
             "properties": {
                 "RuleOrder": {
                     "type": "string"
+                },
+                "StreamExceptionPolicy": {
+                    "type": "string"
                 }
             },
             "type": "object"
@@ -110074,6 +110125,15 @@
             },
             "type": "object"
         },
+        "AWS::NetworkFirewall::RuleGroup.IPSetReference": {
+            "additionalProperties": false,
+            "properties": {
+                "ReferenceArn": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
         "AWS::NetworkFirewall::RuleGroup.MatchAttributes": {
             "additionalProperties": false,
             "properties": {
@@ -110159,6 +110219,21 @@
             ],
             "type": "object"
         },
+        "AWS::NetworkFirewall::RuleGroup.ReferenceSets": {
+            "additionalProperties": false,
+            "properties": {
+                "IPSetReferences": {
+                    "additionalProperties": false,
+                    "patternProperties": {
+                        "^[a-zA-Z0-9]+$": {
+                            "$ref": "#/definitions/AWS::NetworkFirewall::RuleGroup.IPSetReference"
+                        }
+                    },
+                    "type": "object"
+                }
+            },
+            "type": "object"
+        },
         "AWS::NetworkFirewall::RuleGroup.RuleDefinition": {
             "additionalProperties": false,
             "properties": {
@@ -110181,6 +110256,9 @@
         "AWS::NetworkFirewall::RuleGroup.RuleGroup": {
             "additionalProperties": false,
             "properties": {
+                "ReferenceSets": {
+                    "$ref": "#/definitions/AWS::NetworkFirewall::RuleGroup.ReferenceSets"
+                },
                 "RuleVariables": {
                     "$ref": "#/definitions/AWS::NetworkFirewall::RuleGroup.RuleVariables"
                 },
@@ -111515,6 +111593,9 @@
         "AWS::NetworkManager::VpcAttachment.VpcOptions": {
             "additionalProperties": false,
             "properties": {
+                "ApplianceModeSupport": {
+                    "type": "boolean"
+                },
                 "Ipv6Support": {
                     "type": "boolean"
                 }
@@ -121132,6 +121213,9 @@
                 "AuroraPostgreSqlParameters": {
                     "$ref": "#/definitions/AWS::QuickSight::DataSource.AuroraPostgreSqlParameters"
                 },
+                "DatabricksParameters": {
+                    "$ref": "#/definitions/AWS::QuickSight::DataSource.DatabricksParameters"
+                },
                 "MariaDbParameters": {
                     "$ref": "#/definitions/AWS::QuickSight::DataSource.MariaDbParameters"
                 },
@@ -121171,6 +121255,26 @@
             },
             "type": "object"
         },
+        "AWS::QuickSight::DataSource.DatabricksParameters": {
+            "additionalProperties": false,
+            "properties": {
+                "Host": {
+                    "type": "string"
+                },
+                "Port": {
+                    "type": "number"
+                },
+                "SqlEndpointPath": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Host",
+                "Port",
+                "SqlEndpointPath"
+            ],
+            "type": "object"
+        },
         "AWS::QuickSight::DataSource.ManifestFileLocation": {
             "additionalProperties": false,
             "properties": {
@@ -123059,6 +123163,9 @@
                 "AuthScheme": {
                     "type": "string"
                 },
+                "ClientPasswordAuthType": {
+                    "type": "string"
+                },
                 "Description": {
                     "type": "string"
                 },
@@ -125143,6 +125250,9 @@
                             },
                             "type": "array"
                         },
+                        "Namespace": {
+                            "$ref": "#/definitions/AWS::RedshiftServerless::Namespace.Namespace"
+                        },
                         "NamespaceName": {
                             "type": "string"
                         },
@@ -125295,6 +125405,9 @@
                             },
                             "type": "array"
                         },
+                        "Workgroup": {
+                            "$ref": "#/definitions/AWS::RedshiftServerless::Workgroup.Workgroup"
+                        },
                         "WorkgroupName": {
                             "type": "string"
                         }
@@ -128634,6 +128747,12 @@
                 "Properties": {
                     "additionalProperties": false,
                     "properties": {
+                        "ClusterEndpoints": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::Route53RecoveryControl::Cluster.ClusterEndpoint"
+                            },
+                            "type": "array"
+                        },
                         "Name": {
                             "type": "string"
                         },
diff --git a/schema/sam.go b/schema/sam.go
index cadc9693f4..f4fae02cc3 100644
--- a/schema/sam.go
+++ b/schema/sam.go
@@ -24789,6 +24789,8 @@ var SamSchema = `{
                         }
                     },
                     "required": [
+                        "FunctionCode",
+                        "FunctionConfig",
                         "Name"
                     ],
                     "type": "object"
@@ -39391,8 +39393,7 @@ var SamSchema = `{
                         }
                     },
                     "required": [
-                        "Ec2Config",
-                        "EfsFilesystemArn"
+                        "Ec2Config"
                     ],
                     "type": "object"
                 },
@@ -41109,7 +41110,6 @@ var SamSchema = `{
                     },
                     "required": [
                         "Name",
-                        "Password",
                         "Size",
                         "VpcSettings"
                     ],
@@ -55754,6 +55754,12 @@ var SamSchema = `{
                             "type": "array"
                         },
                         "Labels": {
+                            "additionalProperties": true,
+                            "patternProperties": {
+                                "^[a-zA-Z0-9]+$": {
+                                    "type": "string"
+                                }
+                            },
                             "type": "object"
                         },
                         "LaunchTemplate": {
@@ -55781,6 +55787,12 @@ var SamSchema = `{
                             "type": "array"
                         },
                         "Tags": {
+                            "additionalProperties": true,
+                            "patternProperties": {
+                                "^[a-zA-Z0-9]+$": {
+                                    "type": "string"
+                                }
+                            },
                             "type": "object"
                         },
                         "Taints": {
@@ -63047,7 +63059,6 @@ var SamSchema = `{
             "required": [
                 "DesiredChange",
                 "EntityIdKey",
-                "EventPattern",
                 "MetricName",
                 "ValueKey"
             ],
@@ -63443,7 +63454,6 @@ var SamSchema = `{
             },
             "required": [
                 "EntityIdKey",
-                "EventPattern",
                 "MetricName",
                 "ValueKey"
             ],
@@ -65112,15 +65122,24 @@ var SamSchema = `{
         "AWS::FSx::Volume.OntapConfiguration": {
             "additionalProperties": false,
             "properties": {
+                "CopyTagsToBackups": {
+                    "type": "string"
+                },
                 "JunctionPath": {
                     "type": "string"
                 },
+                "OntapVolumeType": {
+                    "type": "string"
+                },
                 "SecurityStyle": {
                     "type": "string"
                 },
                 "SizeInMegabytes": {
                     "type": "string"
                 },
+                "SnapshotPolicy": {
+                    "type": "string"
+                },
                 "StorageEfficiencyEnabled": {
                     "type": "string"
                 },
@@ -65132,9 +65151,7 @@ var SamSchema = `{
                 }
             },
             "required": [
-                "JunctionPath",
                 "SizeInMegabytes",
-                "StorageEfficiencyEnabled",
                 "StorageVirtualMachineId"
             ],
             "type": "object"
@@ -66556,7 +66573,7 @@ var SamSchema = `{
                             "type": "string"
                         },
                         "StorageLocation": {
-                            "$ref": "#/definitions/AWS::GameLift::Build.S3Location"
+                            "$ref": "#/definitions/AWS::GameLift::Build.StorageLocation"
                         },
                         "Version": {
                             "type": "string"
@@ -66584,7 +66601,7 @@ var SamSchema = `{
             ],
             "type": "object"
         },
-        "AWS::GameLift::Build.S3Location": {
+        "AWS::GameLift::Build.StorageLocation": {
             "additionalProperties": false,
             "properties": {
                 "Bucket": {
@@ -70469,6 +70486,9 @@ var SamSchema = `{
                         },
                         "StackSetName": {
                             "type": "string"
+                        },
+                        "VpcConfiguration": {
+                            "$ref": "#/definitions/AWS::Grafana::Workspace.VpcConfiguration"
                         }
                     },
                     "type": "object"
@@ -70574,6 +70594,28 @@ var SamSchema = `{
             ],
             "type": "object"
         },
+        "AWS::Grafana::Workspace.VpcConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "SecurityGroupIds": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "SubnetIds": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "SecurityGroupIds",
+                "SubnetIds"
+            ],
+            "type": "object"
+        },
         "AWS::Greengrass::ConnectorDefinition": {
             "additionalProperties": false,
             "properties": {
@@ -100023,6 +100065,12 @@ var SamSchema = `{
                         "DestinationArn": {
                             "type": "string"
                         },
+                        "Distribution": {
+                            "type": "string"
+                        },
+                        "FilterName": {
+                            "type": "string"
+                        },
                         "FilterPattern": {
                             "type": "string"
                         },
@@ -109741,6 +109789,9 @@ var SamSchema = `{
             "properties": {
                 "RuleOrder": {
                     "type": "string"
+                },
+                "StreamExceptionPolicy": {
+                    "type": "string"
                 }
             },
             "type": "object"
@@ -110079,6 +110130,15 @@ var SamSchema = `{
             },
             "type": "object"
         },
+        "AWS::NetworkFirewall::RuleGroup.IPSetReference": {
+            "additionalProperties": false,
+            "properties": {
+                "ReferenceArn": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
         "AWS::NetworkFirewall::RuleGroup.MatchAttributes": {
             "additionalProperties": false,
             "properties": {
@@ -110164,6 +110224,21 @@ var SamSchema = `{
             ],
             "type": "object"
         },
+        "AWS::NetworkFirewall::RuleGroup.ReferenceSets": {
+            "additionalProperties": false,
+            "properties": {
+                "IPSetReferences": {
+                    "additionalProperties": false,
+                    "patternProperties": {
+                        "^[a-zA-Z0-9]+$": {
+                            "$ref": "#/definitions/AWS::NetworkFirewall::RuleGroup.IPSetReference"
+                        }
+                    },
+                    "type": "object"
+                }
+            },
+            "type": "object"
+        },
         "AWS::NetworkFirewall::RuleGroup.RuleDefinition": {
             "additionalProperties": false,
             "properties": {
@@ -110186,6 +110261,9 @@ var SamSchema = `{
         "AWS::NetworkFirewall::RuleGroup.RuleGroup": {
             "additionalProperties": false,
             "properties": {
+                "ReferenceSets": {
+                    "$ref": "#/definitions/AWS::NetworkFirewall::RuleGroup.ReferenceSets"
+                },
                 "RuleVariables": {
                     "$ref": "#/definitions/AWS::NetworkFirewall::RuleGroup.RuleVariables"
                 },
@@ -111520,6 +111598,9 @@ var SamSchema = `{
         "AWS::NetworkManager::VpcAttachment.VpcOptions": {
             "additionalProperties": false,
             "properties": {
+                "ApplianceModeSupport": {
+                    "type": "boolean"
+                },
                 "Ipv6Support": {
                     "type": "boolean"
                 }
@@ -121137,6 +121218,9 @@ var SamSchema = `{
                 "AuroraPostgreSqlParameters": {
                     "$ref": "#/definitions/AWS::QuickSight::DataSource.AuroraPostgreSqlParameters"
                 },
+                "DatabricksParameters": {
+                    "$ref": "#/definitions/AWS::QuickSight::DataSource.DatabricksParameters"
+                },
                 "MariaDbParameters": {
                     "$ref": "#/definitions/AWS::QuickSight::DataSource.MariaDbParameters"
                 },
@@ -121176,6 +121260,26 @@ var SamSchema = `{
             },
             "type": "object"
         },
+        "AWS::QuickSight::DataSource.DatabricksParameters": {
+            "additionalProperties": false,
+            "properties": {
+                "Host": {
+                    "type": "string"
+                },
+                "Port": {
+                    "type": "number"
+                },
+                "SqlEndpointPath": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Host",
+                "Port",
+                "SqlEndpointPath"
+            ],
+            "type": "object"
+        },
         "AWS::QuickSight::DataSource.ManifestFileLocation": {
             "additionalProperties": false,
             "properties": {
@@ -123064,6 +123168,9 @@ var SamSchema = `{
                 "AuthScheme": {
                     "type": "string"
                 },
+                "ClientPasswordAuthType": {
+                    "type": "string"
+                },
                 "Description": {
                     "type": "string"
                 },
@@ -125148,6 +125255,9 @@ var SamSchema = `{
                             },
                             "type": "array"
                         },
+                        "Namespace": {
+                            "$ref": "#/definitions/AWS::RedshiftServerless::Namespace.Namespace"
+                        },
                         "NamespaceName": {
                             "type": "string"
                         },
@@ -125300,6 +125410,9 @@ var SamSchema = `{
                             },
                             "type": "array"
                         },
+                        "Workgroup": {
+                            "$ref": "#/definitions/AWS::RedshiftServerless::Workgroup.Workgroup"
+                        },
                         "WorkgroupName": {
                             "type": "string"
                         }
@@ -128639,6 +128752,12 @@ var SamSchema = `{
                 "Properties": {
                     "additionalProperties": false,
                     "properties": {
+                        "ClusterEndpoints": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::Route53RecoveryControl::Cluster.ClusterEndpoint"
+                            },
+                            "type": "array"
+                        },
                         "Name": {
                             "type": "string"
                         },
diff --git a/schema/sam.schema.json b/schema/sam.schema.json
index 420e45f3b8..2cbe770c66 100644
--- a/schema/sam.schema.json
+++ b/schema/sam.schema.json
@@ -24784,6 +24784,8 @@
                         }
                     },
                     "required": [
+                        "FunctionCode",
+                        "FunctionConfig",
                         "Name"
                     ],
                     "type": "object"
@@ -39386,8 +39388,7 @@
                         }
                     },
                     "required": [
-                        "Ec2Config",
-                        "EfsFilesystemArn"
+                        "Ec2Config"
                     ],
                     "type": "object"
                 },
@@ -41104,7 +41105,6 @@
                     },
                     "required": [
                         "Name",
-                        "Password",
                         "Size",
                         "VpcSettings"
                     ],
@@ -55749,6 +55749,12 @@
                             "type": "array"
                         },
                         "Labels": {
+                            "additionalProperties": true,
+                            "patternProperties": {
+                                "^[a-zA-Z0-9]+$": {
+                                    "type": "string"
+                                }
+                            },
                             "type": "object"
                         },
                         "LaunchTemplate": {
@@ -55776,6 +55782,12 @@
                             "type": "array"
                         },
                         "Tags": {
+                            "additionalProperties": true,
+                            "patternProperties": {
+                                "^[a-zA-Z0-9]+$": {
+                                    "type": "string"
+                                }
+                            },
                             "type": "object"
                         },
                         "Taints": {
@@ -63042,7 +63054,6 @@
             "required": [
                 "DesiredChange",
                 "EntityIdKey",
-                "EventPattern",
                 "MetricName",
                 "ValueKey"
             ],
@@ -63438,7 +63449,6 @@
             },
             "required": [
                 "EntityIdKey",
-                "EventPattern",
                 "MetricName",
                 "ValueKey"
             ],
@@ -65107,15 +65117,24 @@
         "AWS::FSx::Volume.OntapConfiguration": {
             "additionalProperties": false,
             "properties": {
+                "CopyTagsToBackups": {
+                    "type": "string"
+                },
                 "JunctionPath": {
                     "type": "string"
                 },
+                "OntapVolumeType": {
+                    "type": "string"
+                },
                 "SecurityStyle": {
                     "type": "string"
                 },
                 "SizeInMegabytes": {
                     "type": "string"
                 },
+                "SnapshotPolicy": {
+                    "type": "string"
+                },
                 "StorageEfficiencyEnabled": {
                     "type": "string"
                 },
@@ -65127,9 +65146,7 @@
                 }
             },
             "required": [
-                "JunctionPath",
                 "SizeInMegabytes",
-                "StorageEfficiencyEnabled",
                 "StorageVirtualMachineId"
             ],
             "type": "object"
@@ -66551,7 +66568,7 @@
                             "type": "string"
                         },
                         "StorageLocation": {
-                            "$ref": "#/definitions/AWS::GameLift::Build.S3Location"
+                            "$ref": "#/definitions/AWS::GameLift::Build.StorageLocation"
                         },
                         "Version": {
                             "type": "string"
@@ -66579,7 +66596,7 @@
             ],
             "type": "object"
         },
-        "AWS::GameLift::Build.S3Location": {
+        "AWS::GameLift::Build.StorageLocation": {
             "additionalProperties": false,
             "properties": {
                 "Bucket": {
@@ -70464,6 +70481,9 @@
                         },
                         "StackSetName": {
                             "type": "string"
+                        },
+                        "VpcConfiguration": {
+                            "$ref": "#/definitions/AWS::Grafana::Workspace.VpcConfiguration"
                         }
                     },
                     "type": "object"
@@ -70569,6 +70589,28 @@
             ],
             "type": "object"
         },
+        "AWS::Grafana::Workspace.VpcConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "SecurityGroupIds": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "SubnetIds": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "SecurityGroupIds",
+                "SubnetIds"
+            ],
+            "type": "object"
+        },
         "AWS::Greengrass::ConnectorDefinition": {
             "additionalProperties": false,
             "properties": {
@@ -100018,6 +100060,12 @@
                         "DestinationArn": {
                             "type": "string"
                         },
+                        "Distribution": {
+                            "type": "string"
+                        },
+                        "FilterName": {
+                            "type": "string"
+                        },
                         "FilterPattern": {
                             "type": "string"
                         },
@@ -109736,6 +109784,9 @@
             "properties": {
                 "RuleOrder": {
                     "type": "string"
+                },
+                "StreamExceptionPolicy": {
+                    "type": "string"
                 }
             },
             "type": "object"
@@ -110074,6 +110125,15 @@
             },
             "type": "object"
         },
+        "AWS::NetworkFirewall::RuleGroup.IPSetReference": {
+            "additionalProperties": false,
+            "properties": {
+                "ReferenceArn": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
         "AWS::NetworkFirewall::RuleGroup.MatchAttributes": {
             "additionalProperties": false,
             "properties": {
@@ -110159,6 +110219,21 @@
             ],
             "type": "object"
         },
+        "AWS::NetworkFirewall::RuleGroup.ReferenceSets": {
+            "additionalProperties": false,
+            "properties": {
+                "IPSetReferences": {
+                    "additionalProperties": false,
+                    "patternProperties": {
+                        "^[a-zA-Z0-9]+$": {
+                            "$ref": "#/definitions/AWS::NetworkFirewall::RuleGroup.IPSetReference"
+                        }
+                    },
+                    "type": "object"
+                }
+            },
+            "type": "object"
+        },
         "AWS::NetworkFirewall::RuleGroup.RuleDefinition": {
             "additionalProperties": false,
             "properties": {
@@ -110181,6 +110256,9 @@
         "AWS::NetworkFirewall::RuleGroup.RuleGroup": {
             "additionalProperties": false,
             "properties": {
+                "ReferenceSets": {
+                    "$ref": "#/definitions/AWS::NetworkFirewall::RuleGroup.ReferenceSets"
+                },
                 "RuleVariables": {
                     "$ref": "#/definitions/AWS::NetworkFirewall::RuleGroup.RuleVariables"
                 },
@@ -111515,6 +111593,9 @@
         "AWS::NetworkManager::VpcAttachment.VpcOptions": {
             "additionalProperties": false,
             "properties": {
+                "ApplianceModeSupport": {
+                    "type": "boolean"
+                },
                 "Ipv6Support": {
                     "type": "boolean"
                 }
@@ -121132,6 +121213,9 @@
                 "AuroraPostgreSqlParameters": {
                     "$ref": "#/definitions/AWS::QuickSight::DataSource.AuroraPostgreSqlParameters"
                 },
+                "DatabricksParameters": {
+                    "$ref": "#/definitions/AWS::QuickSight::DataSource.DatabricksParameters"
+                },
                 "MariaDbParameters": {
                     "$ref": "#/definitions/AWS::QuickSight::DataSource.MariaDbParameters"
                 },
@@ -121171,6 +121255,26 @@
             },
             "type": "object"
         },
+        "AWS::QuickSight::DataSource.DatabricksParameters": {
+            "additionalProperties": false,
+            "properties": {
+                "Host": {
+                    "type": "string"
+                },
+                "Port": {
+                    "type": "number"
+                },
+                "SqlEndpointPath": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Host",
+                "Port",
+                "SqlEndpointPath"
+            ],
+            "type": "object"
+        },
         "AWS::QuickSight::DataSource.ManifestFileLocation": {
             "additionalProperties": false,
             "properties": {
@@ -123059,6 +123163,9 @@
                 "AuthScheme": {
                     "type": "string"
                 },
+                "ClientPasswordAuthType": {
+                    "type": "string"
+                },
                 "Description": {
                     "type": "string"
                 },
@@ -125143,6 +125250,9 @@
                             },
                             "type": "array"
                         },
+                        "Namespace": {
+                            "$ref": "#/definitions/AWS::RedshiftServerless::Namespace.Namespace"
+                        },
                         "NamespaceName": {
                             "type": "string"
                         },
@@ -125295,6 +125405,9 @@
                             },
                             "type": "array"
                         },
+                        "Workgroup": {
+                            "$ref": "#/definitions/AWS::RedshiftServerless::Workgroup.Workgroup"
+                        },
                         "WorkgroupName": {
                             "type": "string"
                         }
@@ -128634,6 +128747,12 @@
                 "Properties": {
                     "additionalProperties": false,
                     "properties": {
+                        "ClusterEndpoints": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::Route53RecoveryControl::Cluster.ClusterEndpoint"
+                            },
+                            "type": "array"
+                        },
                         "Name": {
                             "type": "string"
                         },