From e9ade2117a6e76f5624728e6b731fcf745f78432 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=BAben=20Fonseca?= <fonseka@gmail.com>
Date: Fri, 30 Jun 2023 00:13:02 +0000
Subject: [PATCH] fix(schema): CloudFormation Updates

---
 cloudformation/all.go                         |  176 ++
 .../aws-apprunner-autoscalingconfiguration.go |  138 ++
 .../appstream/aws-appstream-appblock.go       |   14 +-
 .../aws-appstream-appblock_s3location.go      |    4 +-
 .../aws-appstream-appblockbuilder.go          |  168 ++
 ...ppstream-appblockbuilder_accessendpoint.go |   42 +
 ...aws-appstream-appblockbuilder_vpcconfig.go |   42 +
 .../aws-comprehend-documentclassifier.go      |  173 ++
 ...ntclassifier_augmentedmanifestslistitem.go |   47 +
 ...tclassifier_documentclassifierdocuments.go |   42 +
 ...ifier_documentclassifierinputdataconfig.go |   72 +
 ...fier_documentclassifieroutputdataconfig.go |   42 +
 ...documentclassifier_documentreaderconfig.go |   47 +
 ...comprehend-documentclassifier_vpcconfig.go |   42 +
 cloudformation/ec2/aws-ec2-keypair.go         |    5 +
 ...mplate_capacityreservationspecification.go |    6 +-
 .../ec2/aws-ec2-launchtemplate_cpuoptions.go  |    8 +-
 ...-ec2-launchtemplate_creditspecification.go |    4 +-
 .../ec2/aws-ec2-launchtemplate_ebs.go         |   18 +-
 .../aws-ec2-launchtemplate_enclaveoptions.go  |    4 +-
 ...s-ec2-launchtemplate_hibernationoptions.go |    4 +-
 ...s-ec2-launchtemplate_iaminstanceprofile.go |    6 +-
 ...c2-launchtemplate_instancemarketoptions.go |    6 +-
 ...ec2-launchtemplate_instancerequirements.go |   48 +-
 ...s-ec2-launchtemplate_maintenanceoptions.go |    4 +-
 .../aws-ec2-launchtemplate_metadataoptions.go |   12 +-
 .../ec2/aws-ec2-launchtemplate_monitoring.go  |    4 +-
 .../ec2/aws-ec2-launchtemplate_placement.go   |   20 +-
 ...c2-launchtemplate_privatednsnameoptions.go |    8 +-
 .../ec2/aws-ec2-launchtemplate_spotoptions.go |   12 +-
 ...rifiedaccessinstance_verifiedaccesslogs.go |   10 +
 .../iam/aws-iam-servicelinkedrole.go          |    4 +-
 ...tion-datalakesettings_datalakeprincipal.go |    4 +-
 ...n-datalakesettings_principalpermissions.go |    8 +-
 .../aws-networkmanager-connectpeer.go         |    4 +-
 .../aws-networkmanager-device.go              |    5 +
 .../aws-networkmanager-device_awslocation.go  |   42 +
 .../aws-panorama-applicationinstance.go       |   10 -
 ...t-analysis_aggregationsortconfiguration.go |    4 +-
 ...quicksight-analysis_columnconfiguration.go |    5 -
 ...ws-quicksight-analysis_datalabeloptions.go |    5 +
 ..._destinationparametervalueconfiguration.go |    5 +
 ...teroperationselectedfieldsconfiguration.go |    5 +
 ...ht-analysis_geospatialheatmapcolorscale.go |   37 +
 ...analysis_geospatialheatmapconfiguration.go |   37 +
 ...ght-analysis_geospatialheatmapdatacolor.go |   37 +
 ...ht-analysis_geospatialpointstyleoptions.go |    5 +
 ...sis_pivottablecellconditionalformatting.go |    5 +
 ...ysis_pivottablefieldcollapsestateoption.go |   42 +
 ...ysis_pivottablefieldcollapsestatetarget.go |   42 +
 ...cksight-analysis_pivottablefieldoptions.go |    5 +
 ...s-quicksight-analysis_pivottableoptions.go |    5 +
 ...ksight-analysis_radarchartconfiguration.go |    5 +
 ...s_referencelinedynamicdataconfiguration.go |    4 +-
 ...erplotcategoricallyaggregatedfieldwells.go |    5 +
 ...lysis_scatterplotunaggregatedfieldwells.go |   10 +
 ...-dashboard_aggregationsortconfiguration.go |    4 +-
 ...uicksight-dashboard_columnconfiguration.go |    5 -
 ...s-quicksight-dashboard_datalabeloptions.go |    5 +
 ..._destinationparametervalueconfiguration.go |    5 +
 ...teroperationselectedfieldsconfiguration.go |    5 +
 ...t-dashboard_geospatialheatmapcolorscale.go |   37 +
 ...ashboard_geospatialheatmapconfiguration.go |   37 +
 ...ht-dashboard_geospatialheatmapdatacolor.go |   37 +
 ...t-dashboard_geospatialpointstyleoptions.go |    5 +
 ...ard_pivottablecellconditionalformatting.go |    5 +
 ...oard_pivottablefieldcollapsestateoption.go |   42 +
 ...oard_pivottablefieldcollapsestatetarget.go |   42 +
 ...ksight-dashboard_pivottablefieldoptions.go |    5 +
 ...-quicksight-dashboard_pivottableoptions.go |    5 +
 ...sight-dashboard_radarchartconfiguration.go |    5 +
 ...d_referencelinedynamicdataconfiguration.go |    4 +-
 ...erplotcategoricallyaggregatedfieldwells.go |    5 +
 ...board_scatterplotunaggregatedfieldwells.go |   10 +
 ...t-template_aggregationsortconfiguration.go |    4 +-
 ...quicksight-template_columnconfiguration.go |    5 -
 ...ws-quicksight-template_datalabeloptions.go |    5 +
 ..._destinationparametervalueconfiguration.go |    5 +
 ...teroperationselectedfieldsconfiguration.go |    5 +
 ...ht-template_geospatialheatmapcolorscale.go |   37 +
 ...template_geospatialheatmapconfiguration.go |   37 +
 ...ght-template_geospatialheatmapdatacolor.go |   37 +
 ...ht-template_geospatialpointstyleoptions.go |    5 +
 ...ate_pivottablecellconditionalformatting.go |    5 +
 ...late_pivottablefieldcollapsestateoption.go |   42 +
 ...late_pivottablefieldcollapsestatetarget.go |   42 +
 ...cksight-template_pivottablefieldoptions.go |    5 +
 ...s-quicksight-template_pivottableoptions.go |    5 +
 ...ksight-template_radarchartconfiguration.go |    5 +
 ...e_referencelinedynamicdataconfiguration.go |    4 +-
 ...erplotcategoricallyaggregatedfieldwells.go |    5 +
 ...plate_scatterplotunaggregatedfieldwells.go |   10 +
 .../quicksight/aws-quicksight-theme.go        |   12 +-
 ...aws-quicksight-theme_resourcepermission.go |    5 +
 .../sagemaker/aws-sagemaker-modelpackage.go   |   25 -
 ...package_modelpackagecontainerdefinition.go |    5 -
 ...-modelpackage_modelpackagestatusdetails.go |    9 +-
 .../aws-verifiedpermissions-identitysource.go |  127 ++
 ...titysource_cognitouserpoolconfiguration.go |   42 +
 ...ntitysource_identitysourceconfiguration.go |   37 +
 ...ns-identitysource_identitysourcedetails.go |   52 +
 .../aws-verifiedpermissions-policy.go         |  122 ++
 ...fiedpermissions-policy_entityidentifier.go |   42 +
 ...fiedpermissions-policy_policydefinition.go |   42 +
 ...rmissions-policy_staticpolicydefinition.go |   42 +
 ...s-policy_templatelinkedpolicydefinition.go |   47 +
 .../aws-verifiedpermissions-policystore.go    |  122 ++
 ...ermissions-policystore_schemadefinition.go |   37 +
 ...missions-policystore_validationsettings.go |   37 +
 .../aws-verifiedpermissions-policytemplate.go |  127 ++
 cloudformation/wafv2/aws-wafv2-webacl.go      |    5 +
 .../aws-wafv2-webacl_associationconfig.go     |   37 +
 ...requestbodyassociatedresourcetypeconfig.go |   37 +
 schema/cdk.go                                 | 1915 +++++++++++++----
 schema/cdk.schema.json                        | 1915 +++++++++++++----
 schema/cloudformation.go                      | 1915 +++++++++++++----
 schema/cloudformation.schema.json             | 1915 +++++++++++++----
 schema/sam.go                                 | 1915 +++++++++++++----
 schema/sam.schema.json                        | 1915 +++++++++++++----
 119 files changed, 12049 insertions(+), 2546 deletions(-)
 create mode 100644 cloudformation/apprunner/aws-apprunner-autoscalingconfiguration.go
 create mode 100644 cloudformation/appstream/aws-appstream-appblockbuilder.go
 create mode 100644 cloudformation/appstream/aws-appstream-appblockbuilder_accessendpoint.go
 create mode 100644 cloudformation/appstream/aws-appstream-appblockbuilder_vpcconfig.go
 create mode 100644 cloudformation/comprehend/aws-comprehend-documentclassifier.go
 create mode 100644 cloudformation/comprehend/aws-comprehend-documentclassifier_augmentedmanifestslistitem.go
 create mode 100644 cloudformation/comprehend/aws-comprehend-documentclassifier_documentclassifierdocuments.go
 create mode 100644 cloudformation/comprehend/aws-comprehend-documentclassifier_documentclassifierinputdataconfig.go
 create mode 100644 cloudformation/comprehend/aws-comprehend-documentclassifier_documentclassifieroutputdataconfig.go
 create mode 100644 cloudformation/comprehend/aws-comprehend-documentclassifier_documentreaderconfig.go
 create mode 100644 cloudformation/comprehend/aws-comprehend-documentclassifier_vpcconfig.go
 create mode 100644 cloudformation/networkmanager/aws-networkmanager-device_awslocation.go
 create mode 100644 cloudformation/quicksight/aws-quicksight-analysis_geospatialheatmapcolorscale.go
 create mode 100644 cloudformation/quicksight/aws-quicksight-analysis_geospatialheatmapconfiguration.go
 create mode 100644 cloudformation/quicksight/aws-quicksight-analysis_geospatialheatmapdatacolor.go
 create mode 100644 cloudformation/quicksight/aws-quicksight-analysis_pivottablefieldcollapsestateoption.go
 create mode 100644 cloudformation/quicksight/aws-quicksight-analysis_pivottablefieldcollapsestatetarget.go
 create mode 100644 cloudformation/quicksight/aws-quicksight-dashboard_geospatialheatmapcolorscale.go
 create mode 100644 cloudformation/quicksight/aws-quicksight-dashboard_geospatialheatmapconfiguration.go
 create mode 100644 cloudformation/quicksight/aws-quicksight-dashboard_geospatialheatmapdatacolor.go
 create mode 100644 cloudformation/quicksight/aws-quicksight-dashboard_pivottablefieldcollapsestateoption.go
 create mode 100644 cloudformation/quicksight/aws-quicksight-dashboard_pivottablefieldcollapsestatetarget.go
 create mode 100644 cloudformation/quicksight/aws-quicksight-template_geospatialheatmapcolorscale.go
 create mode 100644 cloudformation/quicksight/aws-quicksight-template_geospatialheatmapconfiguration.go
 create mode 100644 cloudformation/quicksight/aws-quicksight-template_geospatialheatmapdatacolor.go
 create mode 100644 cloudformation/quicksight/aws-quicksight-template_pivottablefieldcollapsestateoption.go
 create mode 100644 cloudformation/quicksight/aws-quicksight-template_pivottablefieldcollapsestatetarget.go
 create mode 100644 cloudformation/verifiedpermissions/aws-verifiedpermissions-identitysource.go
 create mode 100644 cloudformation/verifiedpermissions/aws-verifiedpermissions-identitysource_cognitouserpoolconfiguration.go
 create mode 100644 cloudformation/verifiedpermissions/aws-verifiedpermissions-identitysource_identitysourceconfiguration.go
 create mode 100644 cloudformation/verifiedpermissions/aws-verifiedpermissions-identitysource_identitysourcedetails.go
 create mode 100644 cloudformation/verifiedpermissions/aws-verifiedpermissions-policy.go
 create mode 100644 cloudformation/verifiedpermissions/aws-verifiedpermissions-policy_entityidentifier.go
 create mode 100644 cloudformation/verifiedpermissions/aws-verifiedpermissions-policy_policydefinition.go
 create mode 100644 cloudformation/verifiedpermissions/aws-verifiedpermissions-policy_staticpolicydefinition.go
 create mode 100644 cloudformation/verifiedpermissions/aws-verifiedpermissions-policy_templatelinkedpolicydefinition.go
 create mode 100644 cloudformation/verifiedpermissions/aws-verifiedpermissions-policystore.go
 create mode 100644 cloudformation/verifiedpermissions/aws-verifiedpermissions-policystore_schemadefinition.go
 create mode 100644 cloudformation/verifiedpermissions/aws-verifiedpermissions-policystore_validationsettings.go
 create mode 100644 cloudformation/verifiedpermissions/aws-verifiedpermissions-policytemplate.go
 create mode 100644 cloudformation/wafv2/aws-wafv2-webacl_associationconfig.go
 create mode 100644 cloudformation/wafv2/aws-wafv2-webacl_requestbodyassociatedresourcetypeconfig.go

diff --git a/cloudformation/all.go b/cloudformation/all.go
index ff1166bb92..8985b56123 100644
--- a/cloudformation/all.go
+++ b/cloudformation/all.go
@@ -217,6 +217,7 @@ import (
 	"github.com/awslabs/goformation/v7/cloudformation/systemsmanagersap"
 	"github.com/awslabs/goformation/v7/cloudformation/timestream"
 	"github.com/awslabs/goformation/v7/cloudformation/transfer"
+	"github.com/awslabs/goformation/v7/cloudformation/verifiedpermissions"
 	"github.com/awslabs/goformation/v7/cloudformation/voiceid"
 	"github.com/awslabs/goformation/v7/cloudformation/vpclattice"
 	"github.com/awslabs/goformation/v7/cloudformation/waf"
@@ -300,11 +301,13 @@ func AllResources() map[string]Resource {
 		"AWS::AppMesh::VirtualNode":                                        &appmesh.VirtualNode{},
 		"AWS::AppMesh::VirtualRouter":                                      &appmesh.VirtualRouter{},
 		"AWS::AppMesh::VirtualService":                                     &appmesh.VirtualService{},
+		"AWS::AppRunner::AutoScalingConfiguration":                         &apprunner.AutoScalingConfiguration{},
 		"AWS::AppRunner::ObservabilityConfiguration":                       &apprunner.ObservabilityConfiguration{},
 		"AWS::AppRunner::Service":                                          &apprunner.Service{},
 		"AWS::AppRunner::VpcConnector":                                     &apprunner.VpcConnector{},
 		"AWS::AppRunner::VpcIngressConnection":                             &apprunner.VpcIngressConnection{},
 		"AWS::AppStream::AppBlock":                                         &appstream.AppBlock{},
+		"AWS::AppStream::AppBlockBuilder":                                  &appstream.AppBlockBuilder{},
 		"AWS::AppStream::Application":                                      &appstream.Application{},
 		"AWS::AppStream::ApplicationEntitlementAssociation":                &appstream.ApplicationEntitlementAssociation{},
 		"AWS::AppStream::ApplicationFleetAssociation":                      &appstream.ApplicationFleetAssociation{},
@@ -443,6 +446,7 @@ func AllResources() map[string]Resource {
 		"AWS::Cognito::UserPoolUICustomizationAttachment":                  &cognito.UserPoolUICustomizationAttachment{},
 		"AWS::Cognito::UserPoolUser":                                       &cognito.UserPoolUser{},
 		"AWS::Cognito::UserPoolUserToGroupAttachment":                      &cognito.UserPoolUserToGroupAttachment{},
+		"AWS::Comprehend::DocumentClassifier":                              &comprehend.DocumentClassifier{},
 		"AWS::Comprehend::Flywheel":                                        &comprehend.Flywheel{},
 		"AWS::Config::AggregationAuthorization":                            &config.AggregationAuthorization{},
 		"AWS::Config::ConfigRule":                                          &config.ConfigRule{},
@@ -1287,6 +1291,10 @@ func AllResources() map[string]Resource {
 		"AWS::Transfer::Server":                                            &transfer.Server{},
 		"AWS::Transfer::User":                                              &transfer.User{},
 		"AWS::Transfer::Workflow":                                          &transfer.Workflow{},
+		"AWS::VerifiedPermissions::IdentitySource":                         &verifiedpermissions.IdentitySource{},
+		"AWS::VerifiedPermissions::Policy":                                 &verifiedpermissions.Policy{},
+		"AWS::VerifiedPermissions::PolicyStore":                            &verifiedpermissions.PolicyStore{},
+		"AWS::VerifiedPermissions::PolicyTemplate":                         &verifiedpermissions.PolicyTemplate{},
 		"AWS::VoiceID::Domain":                                             &voiceid.Domain{},
 		"AWS::VpcLattice::AccessLogSubscription":                           &vpclattice.AccessLogSubscription{},
 		"AWS::VpcLattice::AuthPolicy":                                      &vpclattice.AuthPolicy{},
@@ -2970,6 +2978,30 @@ func (t *Template) GetAppMeshVirtualServiceWithName(name string) (*appmesh.Virtu
 	return nil, fmt.Errorf("resource %q of type appmesh.VirtualService not found", name)
 }
 
+// GetAllAppRunnerAutoScalingConfigurationResources retrieves all apprunner.AutoScalingConfiguration items from an AWS CloudFormation template
+func (t *Template) GetAllAppRunnerAutoScalingConfigurationResources() map[string]*apprunner.AutoScalingConfiguration {
+	results := map[string]*apprunner.AutoScalingConfiguration{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *apprunner.AutoScalingConfiguration:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetAppRunnerAutoScalingConfigurationWithName retrieves all apprunner.AutoScalingConfiguration items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetAppRunnerAutoScalingConfigurationWithName(name string) (*apprunner.AutoScalingConfiguration, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *apprunner.AutoScalingConfiguration:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type apprunner.AutoScalingConfiguration not found", name)
+}
+
 // GetAllAppRunnerObservabilityConfigurationResources retrieves all apprunner.ObservabilityConfiguration items from an AWS CloudFormation template
 func (t *Template) GetAllAppRunnerObservabilityConfigurationResources() map[string]*apprunner.ObservabilityConfiguration {
 	results := map[string]*apprunner.ObservabilityConfiguration{}
@@ -3090,6 +3122,30 @@ func (t *Template) GetAppStreamAppBlockWithName(name string) (*appstream.AppBloc
 	return nil, fmt.Errorf("resource %q of type appstream.AppBlock not found", name)
 }
 
+// GetAllAppStreamAppBlockBuilderResources retrieves all appstream.AppBlockBuilder items from an AWS CloudFormation template
+func (t *Template) GetAllAppStreamAppBlockBuilderResources() map[string]*appstream.AppBlockBuilder {
+	results := map[string]*appstream.AppBlockBuilder{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *appstream.AppBlockBuilder:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetAppStreamAppBlockBuilderWithName retrieves all appstream.AppBlockBuilder items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetAppStreamAppBlockBuilderWithName(name string) (*appstream.AppBlockBuilder, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *appstream.AppBlockBuilder:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type appstream.AppBlockBuilder not found", name)
+}
+
 // GetAllAppStreamApplicationResources retrieves all appstream.Application items from an AWS CloudFormation template
 func (t *Template) GetAllAppStreamApplicationResources() map[string]*appstream.Application {
 	results := map[string]*appstream.Application{}
@@ -6402,6 +6458,30 @@ func (t *Template) GetCognitoUserPoolUserToGroupAttachmentWithName(name string)
 	return nil, fmt.Errorf("resource %q of type cognito.UserPoolUserToGroupAttachment not found", name)
 }
 
+// GetAllComprehendDocumentClassifierResources retrieves all comprehend.DocumentClassifier items from an AWS CloudFormation template
+func (t *Template) GetAllComprehendDocumentClassifierResources() map[string]*comprehend.DocumentClassifier {
+	results := map[string]*comprehend.DocumentClassifier{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *comprehend.DocumentClassifier:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetComprehendDocumentClassifierWithName retrieves all comprehend.DocumentClassifier items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetComprehendDocumentClassifierWithName(name string) (*comprehend.DocumentClassifier, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *comprehend.DocumentClassifier:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type comprehend.DocumentClassifier not found", name)
+}
+
 // GetAllComprehendFlywheelResources retrieves all comprehend.Flywheel items from an AWS CloudFormation template
 func (t *Template) GetAllComprehendFlywheelResources() map[string]*comprehend.Flywheel {
 	results := map[string]*comprehend.Flywheel{}
@@ -26658,6 +26738,102 @@ func (t *Template) GetTransferWorkflowWithName(name string) (*transfer.Workflow,
 	return nil, fmt.Errorf("resource %q of type transfer.Workflow not found", name)
 }
 
+// GetAllVerifiedPermissionsIdentitySourceResources retrieves all verifiedpermissions.IdentitySource items from an AWS CloudFormation template
+func (t *Template) GetAllVerifiedPermissionsIdentitySourceResources() map[string]*verifiedpermissions.IdentitySource {
+	results := map[string]*verifiedpermissions.IdentitySource{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *verifiedpermissions.IdentitySource:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetVerifiedPermissionsIdentitySourceWithName retrieves all verifiedpermissions.IdentitySource items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetVerifiedPermissionsIdentitySourceWithName(name string) (*verifiedpermissions.IdentitySource, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *verifiedpermissions.IdentitySource:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type verifiedpermissions.IdentitySource not found", name)
+}
+
+// GetAllVerifiedPermissionsPolicyResources retrieves all verifiedpermissions.Policy items from an AWS CloudFormation template
+func (t *Template) GetAllVerifiedPermissionsPolicyResources() map[string]*verifiedpermissions.Policy {
+	results := map[string]*verifiedpermissions.Policy{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *verifiedpermissions.Policy:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetVerifiedPermissionsPolicyWithName retrieves all verifiedpermissions.Policy items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetVerifiedPermissionsPolicyWithName(name string) (*verifiedpermissions.Policy, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *verifiedpermissions.Policy:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type verifiedpermissions.Policy not found", name)
+}
+
+// GetAllVerifiedPermissionsPolicyStoreResources retrieves all verifiedpermissions.PolicyStore items from an AWS CloudFormation template
+func (t *Template) GetAllVerifiedPermissionsPolicyStoreResources() map[string]*verifiedpermissions.PolicyStore {
+	results := map[string]*verifiedpermissions.PolicyStore{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *verifiedpermissions.PolicyStore:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetVerifiedPermissionsPolicyStoreWithName retrieves all verifiedpermissions.PolicyStore items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetVerifiedPermissionsPolicyStoreWithName(name string) (*verifiedpermissions.PolicyStore, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *verifiedpermissions.PolicyStore:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type verifiedpermissions.PolicyStore not found", name)
+}
+
+// GetAllVerifiedPermissionsPolicyTemplateResources retrieves all verifiedpermissions.PolicyTemplate items from an AWS CloudFormation template
+func (t *Template) GetAllVerifiedPermissionsPolicyTemplateResources() map[string]*verifiedpermissions.PolicyTemplate {
+	results := map[string]*verifiedpermissions.PolicyTemplate{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *verifiedpermissions.PolicyTemplate:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetVerifiedPermissionsPolicyTemplateWithName retrieves all verifiedpermissions.PolicyTemplate items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetVerifiedPermissionsPolicyTemplateWithName(name string) (*verifiedpermissions.PolicyTemplate, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *verifiedpermissions.PolicyTemplate:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type verifiedpermissions.PolicyTemplate not found", name)
+}
+
 // GetAllVoiceIDDomainResources retrieves all voiceid.Domain items from an AWS CloudFormation template
 func (t *Template) GetAllVoiceIDDomainResources() map[string]*voiceid.Domain {
 	results := map[string]*voiceid.Domain{}
diff --git a/cloudformation/apprunner/aws-apprunner-autoscalingconfiguration.go b/cloudformation/apprunner/aws-apprunner-autoscalingconfiguration.go
new file mode 100644
index 0000000000..21c764e0b9
--- /dev/null
+++ b/cloudformation/apprunner/aws-apprunner-autoscalingconfiguration.go
@@ -0,0 +1,138 @@
+// Code generated by "go generate". Please don't change this file directly.
+
+package apprunner
+
+import (
+	"bytes"
+	"encoding/json"
+
+	"github.com/awslabs/goformation/v7/cloudformation/policies"
+	"github.com/awslabs/goformation/v7/cloudformation/tags"
+)
+
+// AutoScalingConfiguration AWS CloudFormation Resource (AWS::AppRunner::AutoScalingConfiguration)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-apprunner-autoscalingconfiguration.html
+type AutoScalingConfiguration struct {
+
+	// AutoScalingConfigurationName AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-apprunner-autoscalingconfiguration.html#cfn-apprunner-autoscalingconfiguration-autoscalingconfigurationname
+	AutoScalingConfigurationName *string `json:"AutoScalingConfigurationName,omitempty"`
+
+	// MaxConcurrency AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-apprunner-autoscalingconfiguration.html#cfn-apprunner-autoscalingconfiguration-maxconcurrency
+	MaxConcurrency *int `json:"MaxConcurrency,omitempty"`
+
+	// MaxSize AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-apprunner-autoscalingconfiguration.html#cfn-apprunner-autoscalingconfiguration-maxsize
+	MaxSize *int `json:"MaxSize,omitempty"`
+
+	// MinSize AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-apprunner-autoscalingconfiguration.html#cfn-apprunner-autoscalingconfiguration-minsize
+	MinSize *int `json:"MinSize,omitempty"`
+
+	// Tags AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-apprunner-autoscalingconfiguration.html#cfn-apprunner-autoscalingconfiguration-tags
+	Tags []tags.Tag `json:"Tags,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 *AutoScalingConfiguration) AWSCloudFormationType() string {
+	return "AWS::AppRunner::AutoScalingConfiguration"
+}
+
+// MarshalJSON is a custom JSON marshalling hook that embeds this object into
+// an AWS CloudFormation JSON resource's 'Properties' field and adds a 'Type'.
+func (r AutoScalingConfiguration) MarshalJSON() ([]byte, error) {
+	type Properties AutoScalingConfiguration
+	return json.Marshal(&struct {
+		Type                string
+		Properties          Properties
+		DependsOn           []string                     `json:"DependsOn,omitempty"`
+		Metadata            map[string]interface{}       `json:"Metadata,omitempty"`
+		DeletionPolicy      policies.DeletionPolicy      `json:"DeletionPolicy,omitempty"`
+		UpdateReplacePolicy policies.UpdateReplacePolicy `json:"UpdateReplacePolicy,omitempty"`
+		Condition           string                       `json:"Condition,omitempty"`
+	}{
+		Type:                r.AWSCloudFormationType(),
+		Properties:          (Properties)(r),
+		DependsOn:           r.AWSCloudFormationDependsOn,
+		Metadata:            r.AWSCloudFormationMetadata,
+		DeletionPolicy:      r.AWSCloudFormationDeletionPolicy,
+		UpdateReplacePolicy: r.AWSCloudFormationUpdateReplacePolicy,
+		Condition:           r.AWSCloudFormationCondition,
+	})
+}
+
+// UnmarshalJSON is a custom JSON unmarshalling hook that strips the outer
+// AWS CloudFormation resource object, and just keeps the 'Properties' field.
+func (r *AutoScalingConfiguration) UnmarshalJSON(b []byte) error {
+	type Properties AutoScalingConfiguration
+	res := &struct {
+		Type                string
+		Properties          *Properties
+		DependsOn           interface{}
+		Metadata            map[string]interface{}
+		DeletionPolicy      string
+		UpdateReplacePolicy string
+		Condition           string
+	}{}
+
+	dec := json.NewDecoder(bytes.NewReader(b))
+	dec.DisallowUnknownFields() // Force error if unknown field is found
+
+	if err := dec.Decode(&res); err != nil {
+		return err
+	}
+
+	// If the resource has no Properties set, it could be nil
+	if res.Properties != nil {
+		*r = AutoScalingConfiguration(*res.Properties)
+	}
+	if res.DependsOn != nil {
+		switch obj := res.DependsOn.(type) {
+		case string:
+			r.AWSCloudFormationDependsOn = []string{obj}
+		case []interface{}:
+			s := make([]string, 0, len(obj))
+			for _, v := range obj {
+				if value, ok := v.(string); ok {
+					s = append(s, value)
+				}
+			}
+			r.AWSCloudFormationDependsOn = s
+		}
+	}
+	if res.Metadata != nil {
+		r.AWSCloudFormationMetadata = res.Metadata
+	}
+	if res.DeletionPolicy != "" {
+		r.AWSCloudFormationDeletionPolicy = policies.DeletionPolicy(res.DeletionPolicy)
+	}
+	if res.UpdateReplacePolicy != "" {
+		r.AWSCloudFormationUpdateReplacePolicy = policies.UpdateReplacePolicy(res.UpdateReplacePolicy)
+	}
+	if res.Condition != "" {
+		r.AWSCloudFormationCondition = res.Condition
+	}
+	return nil
+}
diff --git a/cloudformation/appstream/aws-appstream-appblock.go b/cloudformation/appstream/aws-appstream-appblock.go
index 385f5dfc50..ff1006bc98 100644
--- a/cloudformation/appstream/aws-appstream-appblock.go
+++ b/cloudformation/appstream/aws-appstream-appblock.go
@@ -29,10 +29,20 @@ type AppBlock struct {
 	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-appstream-appblock.html#cfn-appstream-appblock-name
 	Name string `json:"Name"`
 
+	// PackagingType AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-appstream-appblock.html#cfn-appstream-appblock-packagingtype
+	PackagingType *string `json:"PackagingType,omitempty"`
+
+	// PostSetupScriptDetails AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-appstream-appblock.html#cfn-appstream-appblock-postsetupscriptdetails
+	PostSetupScriptDetails *AppBlock_ScriptDetails `json:"PostSetupScriptDetails,omitempty"`
+
 	// SetupScriptDetails AWS CloudFormation Property
-	// Required: true
+	// Required: false
 	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-appstream-appblock.html#cfn-appstream-appblock-setupscriptdetails
-	SetupScriptDetails *AppBlock_ScriptDetails `json:"SetupScriptDetails"`
+	SetupScriptDetails *AppBlock_ScriptDetails `json:"SetupScriptDetails,omitempty"`
 
 	// SourceS3Location AWS CloudFormation Property
 	// Required: true
diff --git a/cloudformation/appstream/aws-appstream-appblock_s3location.go b/cloudformation/appstream/aws-appstream-appblock_s3location.go
index e09b00f7d0..5895b973f1 100644
--- a/cloudformation/appstream/aws-appstream-appblock_s3location.go
+++ b/cloudformation/appstream/aws-appstream-appblock_s3location.go
@@ -16,9 +16,9 @@ type AppBlock_S3Location struct {
 	S3Bucket string `json:"S3Bucket"`
 
 	// S3Key AWS CloudFormation Property
-	// Required: true
+	// Required: false
 	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appstream-appblock-s3location.html#cfn-appstream-appblock-s3location-s3key
-	S3Key string `json:"S3Key"`
+	S3Key *string `json:"S3Key,omitempty"`
 
 	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
 	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
diff --git a/cloudformation/appstream/aws-appstream-appblockbuilder.go b/cloudformation/appstream/aws-appstream-appblockbuilder.go
new file mode 100644
index 0000000000..803bbfc485
--- /dev/null
+++ b/cloudformation/appstream/aws-appstream-appblockbuilder.go
@@ -0,0 +1,168 @@
+// Code generated by "go generate". Please don't change this file directly.
+
+package appstream
+
+import (
+	"bytes"
+	"encoding/json"
+
+	"github.com/awslabs/goformation/v7/cloudformation/policies"
+	"github.com/awslabs/goformation/v7/cloudformation/tags"
+)
+
+// AppBlockBuilder AWS CloudFormation Resource (AWS::AppStream::AppBlockBuilder)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-appstream-appblockbuilder.html
+type AppBlockBuilder struct {
+
+	// AccessEndpoints AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-appstream-appblockbuilder.html#cfn-appstream-appblockbuilder-accessendpoints
+	AccessEndpoints []AppBlockBuilder_AccessEndpoint `json:"AccessEndpoints,omitempty"`
+
+	// AppBlockArns AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-appstream-appblockbuilder.html#cfn-appstream-appblockbuilder-appblockarns
+	AppBlockArns []string `json:"AppBlockArns,omitempty"`
+
+	// Description AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-appstream-appblockbuilder.html#cfn-appstream-appblockbuilder-description
+	Description *string `json:"Description,omitempty"`
+
+	// DisplayName AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-appstream-appblockbuilder.html#cfn-appstream-appblockbuilder-displayname
+	DisplayName *string `json:"DisplayName,omitempty"`
+
+	// EnableDefaultInternetAccess AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-appstream-appblockbuilder.html#cfn-appstream-appblockbuilder-enabledefaultinternetaccess
+	EnableDefaultInternetAccess *bool `json:"EnableDefaultInternetAccess,omitempty"`
+
+	// IamRoleArn AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-appstream-appblockbuilder.html#cfn-appstream-appblockbuilder-iamrolearn
+	IamRoleArn *string `json:"IamRoleArn,omitempty"`
+
+	// InstanceType AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-appstream-appblockbuilder.html#cfn-appstream-appblockbuilder-instancetype
+	InstanceType string `json:"InstanceType"`
+
+	// Name AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-appstream-appblockbuilder.html#cfn-appstream-appblockbuilder-name
+	Name string `json:"Name"`
+
+	// Platform AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-appstream-appblockbuilder.html#cfn-appstream-appblockbuilder-platform
+	Platform string `json:"Platform"`
+
+	// Tags AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-appstream-appblockbuilder.html#cfn-appstream-appblockbuilder-tags
+	Tags []tags.Tag `json:"Tags,omitempty"`
+
+	// VpcConfig AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-appstream-appblockbuilder.html#cfn-appstream-appblockbuilder-vpcconfig
+	VpcConfig *AppBlockBuilder_VpcConfig `json:"VpcConfig"`
+
+	// 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 *AppBlockBuilder) AWSCloudFormationType() string {
+	return "AWS::AppStream::AppBlockBuilder"
+}
+
+// MarshalJSON is a custom JSON marshalling hook that embeds this object into
+// an AWS CloudFormation JSON resource's 'Properties' field and adds a 'Type'.
+func (r AppBlockBuilder) MarshalJSON() ([]byte, error) {
+	type Properties AppBlockBuilder
+	return json.Marshal(&struct {
+		Type                string
+		Properties          Properties
+		DependsOn           []string                     `json:"DependsOn,omitempty"`
+		Metadata            map[string]interface{}       `json:"Metadata,omitempty"`
+		DeletionPolicy      policies.DeletionPolicy      `json:"DeletionPolicy,omitempty"`
+		UpdateReplacePolicy policies.UpdateReplacePolicy `json:"UpdateReplacePolicy,omitempty"`
+		Condition           string                       `json:"Condition,omitempty"`
+	}{
+		Type:                r.AWSCloudFormationType(),
+		Properties:          (Properties)(r),
+		DependsOn:           r.AWSCloudFormationDependsOn,
+		Metadata:            r.AWSCloudFormationMetadata,
+		DeletionPolicy:      r.AWSCloudFormationDeletionPolicy,
+		UpdateReplacePolicy: r.AWSCloudFormationUpdateReplacePolicy,
+		Condition:           r.AWSCloudFormationCondition,
+	})
+}
+
+// UnmarshalJSON is a custom JSON unmarshalling hook that strips the outer
+// AWS CloudFormation resource object, and just keeps the 'Properties' field.
+func (r *AppBlockBuilder) UnmarshalJSON(b []byte) error {
+	type Properties AppBlockBuilder
+	res := &struct {
+		Type                string
+		Properties          *Properties
+		DependsOn           interface{}
+		Metadata            map[string]interface{}
+		DeletionPolicy      string
+		UpdateReplacePolicy string
+		Condition           string
+	}{}
+
+	dec := json.NewDecoder(bytes.NewReader(b))
+	dec.DisallowUnknownFields() // Force error if unknown field is found
+
+	if err := dec.Decode(&res); err != nil {
+		return err
+	}
+
+	// If the resource has no Properties set, it could be nil
+	if res.Properties != nil {
+		*r = AppBlockBuilder(*res.Properties)
+	}
+	if res.DependsOn != nil {
+		switch obj := res.DependsOn.(type) {
+		case string:
+			r.AWSCloudFormationDependsOn = []string{obj}
+		case []interface{}:
+			s := make([]string, 0, len(obj))
+			for _, v := range obj {
+				if value, ok := v.(string); ok {
+					s = append(s, value)
+				}
+			}
+			r.AWSCloudFormationDependsOn = s
+		}
+	}
+	if res.Metadata != nil {
+		r.AWSCloudFormationMetadata = res.Metadata
+	}
+	if res.DeletionPolicy != "" {
+		r.AWSCloudFormationDeletionPolicy = policies.DeletionPolicy(res.DeletionPolicy)
+	}
+	if res.UpdateReplacePolicy != "" {
+		r.AWSCloudFormationUpdateReplacePolicy = policies.UpdateReplacePolicy(res.UpdateReplacePolicy)
+	}
+	if res.Condition != "" {
+		r.AWSCloudFormationCondition = res.Condition
+	}
+	return nil
+}
diff --git a/cloudformation/appstream/aws-appstream-appblockbuilder_accessendpoint.go b/cloudformation/appstream/aws-appstream-appblockbuilder_accessendpoint.go
new file mode 100644
index 0000000000..7ba2415ae1
--- /dev/null
+++ b/cloudformation/appstream/aws-appstream-appblockbuilder_accessendpoint.go
@@ -0,0 +1,42 @@
+// Code generated by "go generate". Please don't change this file directly.
+
+package appstream
+
+import (
+	"github.com/awslabs/goformation/v7/cloudformation/policies"
+)
+
+// AppBlockBuilder_AccessEndpoint AWS CloudFormation Resource (AWS::AppStream::AppBlockBuilder.AccessEndpoint)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appstream-appblockbuilder-accessendpoint.html
+type AppBlockBuilder_AccessEndpoint struct {
+
+	// EndpointType AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appstream-appblockbuilder-accessendpoint.html#cfn-appstream-appblockbuilder-accessendpoint-endpointtype
+	EndpointType string `json:"EndpointType"`
+
+	// VpceId AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appstream-appblockbuilder-accessendpoint.html#cfn-appstream-appblockbuilder-accessendpoint-vpceid
+	VpceId string `json:"VpceId"`
+
+	// 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 *AppBlockBuilder_AccessEndpoint) AWSCloudFormationType() string {
+	return "AWS::AppStream::AppBlockBuilder.AccessEndpoint"
+}
diff --git a/cloudformation/appstream/aws-appstream-appblockbuilder_vpcconfig.go b/cloudformation/appstream/aws-appstream-appblockbuilder_vpcconfig.go
new file mode 100644
index 0000000000..be08a51a2e
--- /dev/null
+++ b/cloudformation/appstream/aws-appstream-appblockbuilder_vpcconfig.go
@@ -0,0 +1,42 @@
+// Code generated by "go generate". Please don't change this file directly.
+
+package appstream
+
+import (
+	"github.com/awslabs/goformation/v7/cloudformation/policies"
+)
+
+// AppBlockBuilder_VpcConfig AWS CloudFormation Resource (AWS::AppStream::AppBlockBuilder.VpcConfig)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appstream-appblockbuilder-vpcconfig.html
+type AppBlockBuilder_VpcConfig struct {
+
+	// SecurityGroupIds AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appstream-appblockbuilder-vpcconfig.html#cfn-appstream-appblockbuilder-vpcconfig-securitygroupids
+	SecurityGroupIds []string `json:"SecurityGroupIds,omitempty"`
+
+	// SubnetIds AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appstream-appblockbuilder-vpcconfig.html#cfn-appstream-appblockbuilder-vpcconfig-subnetids
+	SubnetIds []string `json:"SubnetIds,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 *AppBlockBuilder_VpcConfig) AWSCloudFormationType() string {
+	return "AWS::AppStream::AppBlockBuilder.VpcConfig"
+}
diff --git a/cloudformation/comprehend/aws-comprehend-documentclassifier.go b/cloudformation/comprehend/aws-comprehend-documentclassifier.go
new file mode 100644
index 0000000000..9d1e678b59
--- /dev/null
+++ b/cloudformation/comprehend/aws-comprehend-documentclassifier.go
@@ -0,0 +1,173 @@
+// Code generated by "go generate". Please don't change this file directly.
+
+package comprehend
+
+import (
+	"bytes"
+	"encoding/json"
+
+	"github.com/awslabs/goformation/v7/cloudformation/policies"
+	"github.com/awslabs/goformation/v7/cloudformation/tags"
+)
+
+// DocumentClassifier AWS CloudFormation Resource (AWS::Comprehend::DocumentClassifier)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-comprehend-documentclassifier.html
+type DocumentClassifier struct {
+
+	// DataAccessRoleArn AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-comprehend-documentclassifier.html#cfn-comprehend-documentclassifier-dataaccessrolearn
+	DataAccessRoleArn string `json:"DataAccessRoleArn"`
+
+	// DocumentClassifierName AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-comprehend-documentclassifier.html#cfn-comprehend-documentclassifier-documentclassifiername
+	DocumentClassifierName string `json:"DocumentClassifierName"`
+
+	// InputDataConfig AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-comprehend-documentclassifier.html#cfn-comprehend-documentclassifier-inputdataconfig
+	InputDataConfig *DocumentClassifier_DocumentClassifierInputDataConfig `json:"InputDataConfig"`
+
+	// LanguageCode AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-comprehend-documentclassifier.html#cfn-comprehend-documentclassifier-languagecode
+	LanguageCode string `json:"LanguageCode"`
+
+	// Mode AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-comprehend-documentclassifier.html#cfn-comprehend-documentclassifier-mode
+	Mode *string `json:"Mode,omitempty"`
+
+	// ModelKmsKeyId AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-comprehend-documentclassifier.html#cfn-comprehend-documentclassifier-modelkmskeyid
+	ModelKmsKeyId *string `json:"ModelKmsKeyId,omitempty"`
+
+	// ModelPolicy AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-comprehend-documentclassifier.html#cfn-comprehend-documentclassifier-modelpolicy
+	ModelPolicy *string `json:"ModelPolicy,omitempty"`
+
+	// OutputDataConfig AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-comprehend-documentclassifier.html#cfn-comprehend-documentclassifier-outputdataconfig
+	OutputDataConfig *DocumentClassifier_DocumentClassifierOutputDataConfig `json:"OutputDataConfig,omitempty"`
+
+	// Tags AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-comprehend-documentclassifier.html#cfn-comprehend-documentclassifier-tags
+	Tags []tags.Tag `json:"Tags,omitempty"`
+
+	// VersionName AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-comprehend-documentclassifier.html#cfn-comprehend-documentclassifier-versionname
+	VersionName *string `json:"VersionName,omitempty"`
+
+	// VolumeKmsKeyId AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-comprehend-documentclassifier.html#cfn-comprehend-documentclassifier-volumekmskeyid
+	VolumeKmsKeyId *string `json:"VolumeKmsKeyId,omitempty"`
+
+	// VpcConfig AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-comprehend-documentclassifier.html#cfn-comprehend-documentclassifier-vpcconfig
+	VpcConfig *DocumentClassifier_VpcConfig `json:"VpcConfig,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 *DocumentClassifier) AWSCloudFormationType() string {
+	return "AWS::Comprehend::DocumentClassifier"
+}
+
+// MarshalJSON is a custom JSON marshalling hook that embeds this object into
+// an AWS CloudFormation JSON resource's 'Properties' field and adds a 'Type'.
+func (r DocumentClassifier) MarshalJSON() ([]byte, error) {
+	type Properties DocumentClassifier
+	return json.Marshal(&struct {
+		Type                string
+		Properties          Properties
+		DependsOn           []string                     `json:"DependsOn,omitempty"`
+		Metadata            map[string]interface{}       `json:"Metadata,omitempty"`
+		DeletionPolicy      policies.DeletionPolicy      `json:"DeletionPolicy,omitempty"`
+		UpdateReplacePolicy policies.UpdateReplacePolicy `json:"UpdateReplacePolicy,omitempty"`
+		Condition           string                       `json:"Condition,omitempty"`
+	}{
+		Type:                r.AWSCloudFormationType(),
+		Properties:          (Properties)(r),
+		DependsOn:           r.AWSCloudFormationDependsOn,
+		Metadata:            r.AWSCloudFormationMetadata,
+		DeletionPolicy:      r.AWSCloudFormationDeletionPolicy,
+		UpdateReplacePolicy: r.AWSCloudFormationUpdateReplacePolicy,
+		Condition:           r.AWSCloudFormationCondition,
+	})
+}
+
+// UnmarshalJSON is a custom JSON unmarshalling hook that strips the outer
+// AWS CloudFormation resource object, and just keeps the 'Properties' field.
+func (r *DocumentClassifier) UnmarshalJSON(b []byte) error {
+	type Properties DocumentClassifier
+	res := &struct {
+		Type                string
+		Properties          *Properties
+		DependsOn           interface{}
+		Metadata            map[string]interface{}
+		DeletionPolicy      string
+		UpdateReplacePolicy string
+		Condition           string
+	}{}
+
+	dec := json.NewDecoder(bytes.NewReader(b))
+	dec.DisallowUnknownFields() // Force error if unknown field is found
+
+	if err := dec.Decode(&res); err != nil {
+		return err
+	}
+
+	// If the resource has no Properties set, it could be nil
+	if res.Properties != nil {
+		*r = DocumentClassifier(*res.Properties)
+	}
+	if res.DependsOn != nil {
+		switch obj := res.DependsOn.(type) {
+		case string:
+			r.AWSCloudFormationDependsOn = []string{obj}
+		case []interface{}:
+			s := make([]string, 0, len(obj))
+			for _, v := range obj {
+				if value, ok := v.(string); ok {
+					s = append(s, value)
+				}
+			}
+			r.AWSCloudFormationDependsOn = s
+		}
+	}
+	if res.Metadata != nil {
+		r.AWSCloudFormationMetadata = res.Metadata
+	}
+	if res.DeletionPolicy != "" {
+		r.AWSCloudFormationDeletionPolicy = policies.DeletionPolicy(res.DeletionPolicy)
+	}
+	if res.UpdateReplacePolicy != "" {
+		r.AWSCloudFormationUpdateReplacePolicy = policies.UpdateReplacePolicy(res.UpdateReplacePolicy)
+	}
+	if res.Condition != "" {
+		r.AWSCloudFormationCondition = res.Condition
+	}
+	return nil
+}
diff --git a/cloudformation/comprehend/aws-comprehend-documentclassifier_augmentedmanifestslistitem.go b/cloudformation/comprehend/aws-comprehend-documentclassifier_augmentedmanifestslistitem.go
new file mode 100644
index 0000000000..2f2cc2b17f
--- /dev/null
+++ b/cloudformation/comprehend/aws-comprehend-documentclassifier_augmentedmanifestslistitem.go
@@ -0,0 +1,47 @@
+// Code generated by "go generate". Please don't change this file directly.
+
+package comprehend
+
+import (
+	"github.com/awslabs/goformation/v7/cloudformation/policies"
+)
+
+// DocumentClassifier_AugmentedManifestsListItem AWS CloudFormation Resource (AWS::Comprehend::DocumentClassifier.AugmentedManifestsListItem)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-comprehend-documentclassifier-augmentedmanifestslistitem.html
+type DocumentClassifier_AugmentedManifestsListItem struct {
+
+	// AttributeNames AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-comprehend-documentclassifier-augmentedmanifestslistitem.html#cfn-comprehend-documentclassifier-augmentedmanifestslistitem-attributenames
+	AttributeNames []string `json:"AttributeNames"`
+
+	// S3Uri AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-comprehend-documentclassifier-augmentedmanifestslistitem.html#cfn-comprehend-documentclassifier-augmentedmanifestslistitem-s3uri
+	S3Uri string `json:"S3Uri"`
+
+	// Split AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-comprehend-documentclassifier-augmentedmanifestslistitem.html#cfn-comprehend-documentclassifier-augmentedmanifestslistitem-split
+	Split *string `json:"Split,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 *DocumentClassifier_AugmentedManifestsListItem) AWSCloudFormationType() string {
+	return "AWS::Comprehend::DocumentClassifier.AugmentedManifestsListItem"
+}
diff --git a/cloudformation/comprehend/aws-comprehend-documentclassifier_documentclassifierdocuments.go b/cloudformation/comprehend/aws-comprehend-documentclassifier_documentclassifierdocuments.go
new file mode 100644
index 0000000000..dbbbbb3458
--- /dev/null
+++ b/cloudformation/comprehend/aws-comprehend-documentclassifier_documentclassifierdocuments.go
@@ -0,0 +1,42 @@
+// Code generated by "go generate". Please don't change this file directly.
+
+package comprehend
+
+import (
+	"github.com/awslabs/goformation/v7/cloudformation/policies"
+)
+
+// DocumentClassifier_DocumentClassifierDocuments AWS CloudFormation Resource (AWS::Comprehend::DocumentClassifier.DocumentClassifierDocuments)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-comprehend-documentclassifier-documentclassifierdocuments.html
+type DocumentClassifier_DocumentClassifierDocuments struct {
+
+	// S3Uri AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-comprehend-documentclassifier-documentclassifierdocuments.html#cfn-comprehend-documentclassifier-documentclassifierdocuments-s3uri
+	S3Uri string `json:"S3Uri"`
+
+	// TestS3Uri AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-comprehend-documentclassifier-documentclassifierdocuments.html#cfn-comprehend-documentclassifier-documentclassifierdocuments-tests3uri
+	TestS3Uri *string `json:"TestS3Uri,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 *DocumentClassifier_DocumentClassifierDocuments) AWSCloudFormationType() string {
+	return "AWS::Comprehend::DocumentClassifier.DocumentClassifierDocuments"
+}
diff --git a/cloudformation/comprehend/aws-comprehend-documentclassifier_documentclassifierinputdataconfig.go b/cloudformation/comprehend/aws-comprehend-documentclassifier_documentclassifierinputdataconfig.go
new file mode 100644
index 0000000000..935a550ff1
--- /dev/null
+++ b/cloudformation/comprehend/aws-comprehend-documentclassifier_documentclassifierinputdataconfig.go
@@ -0,0 +1,72 @@
+// Code generated by "go generate". Please don't change this file directly.
+
+package comprehend
+
+import (
+	"github.com/awslabs/goformation/v7/cloudformation/policies"
+)
+
+// DocumentClassifier_DocumentClassifierInputDataConfig AWS CloudFormation Resource (AWS::Comprehend::DocumentClassifier.DocumentClassifierInputDataConfig)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-comprehend-documentclassifier-documentclassifierinputdataconfig.html
+type DocumentClassifier_DocumentClassifierInputDataConfig struct {
+
+	// AugmentedManifests AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-comprehend-documentclassifier-documentclassifierinputdataconfig.html#cfn-comprehend-documentclassifier-documentclassifierinputdataconfig-augmentedmanifests
+	AugmentedManifests []DocumentClassifier_AugmentedManifestsListItem `json:"AugmentedManifests,omitempty"`
+
+	// DataFormat AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-comprehend-documentclassifier-documentclassifierinputdataconfig.html#cfn-comprehend-documentclassifier-documentclassifierinputdataconfig-dataformat
+	DataFormat *string `json:"DataFormat,omitempty"`
+
+	// DocumentReaderConfig AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-comprehend-documentclassifier-documentclassifierinputdataconfig.html#cfn-comprehend-documentclassifier-documentclassifierinputdataconfig-documentreaderconfig
+	DocumentReaderConfig *DocumentClassifier_DocumentReaderConfig `json:"DocumentReaderConfig,omitempty"`
+
+	// DocumentType AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-comprehend-documentclassifier-documentclassifierinputdataconfig.html#cfn-comprehend-documentclassifier-documentclassifierinputdataconfig-documenttype
+	DocumentType *string `json:"DocumentType,omitempty"`
+
+	// Documents AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-comprehend-documentclassifier-documentclassifierinputdataconfig.html#cfn-comprehend-documentclassifier-documentclassifierinputdataconfig-documents
+	Documents *DocumentClassifier_DocumentClassifierDocuments `json:"Documents,omitempty"`
+
+	// LabelDelimiter AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-comprehend-documentclassifier-documentclassifierinputdataconfig.html#cfn-comprehend-documentclassifier-documentclassifierinputdataconfig-labeldelimiter
+	LabelDelimiter *string `json:"LabelDelimiter,omitempty"`
+
+	// S3Uri AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-comprehend-documentclassifier-documentclassifierinputdataconfig.html#cfn-comprehend-documentclassifier-documentclassifierinputdataconfig-s3uri
+	S3Uri *string `json:"S3Uri,omitempty"`
+
+	// TestS3Uri AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-comprehend-documentclassifier-documentclassifierinputdataconfig.html#cfn-comprehend-documentclassifier-documentclassifierinputdataconfig-tests3uri
+	TestS3Uri *string `json:"TestS3Uri,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 *DocumentClassifier_DocumentClassifierInputDataConfig) AWSCloudFormationType() string {
+	return "AWS::Comprehend::DocumentClassifier.DocumentClassifierInputDataConfig"
+}
diff --git a/cloudformation/comprehend/aws-comprehend-documentclassifier_documentclassifieroutputdataconfig.go b/cloudformation/comprehend/aws-comprehend-documentclassifier_documentclassifieroutputdataconfig.go
new file mode 100644
index 0000000000..30b0c7259b
--- /dev/null
+++ b/cloudformation/comprehend/aws-comprehend-documentclassifier_documentclassifieroutputdataconfig.go
@@ -0,0 +1,42 @@
+// Code generated by "go generate". Please don't change this file directly.
+
+package comprehend
+
+import (
+	"github.com/awslabs/goformation/v7/cloudformation/policies"
+)
+
+// DocumentClassifier_DocumentClassifierOutputDataConfig AWS CloudFormation Resource (AWS::Comprehend::DocumentClassifier.DocumentClassifierOutputDataConfig)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-comprehend-documentclassifier-documentclassifieroutputdataconfig.html
+type DocumentClassifier_DocumentClassifierOutputDataConfig struct {
+
+	// KmsKeyId AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-comprehend-documentclassifier-documentclassifieroutputdataconfig.html#cfn-comprehend-documentclassifier-documentclassifieroutputdataconfig-kmskeyid
+	KmsKeyId *string `json:"KmsKeyId,omitempty"`
+
+	// S3Uri AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-comprehend-documentclassifier-documentclassifieroutputdataconfig.html#cfn-comprehend-documentclassifier-documentclassifieroutputdataconfig-s3uri
+	S3Uri *string `json:"S3Uri,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 *DocumentClassifier_DocumentClassifierOutputDataConfig) AWSCloudFormationType() string {
+	return "AWS::Comprehend::DocumentClassifier.DocumentClassifierOutputDataConfig"
+}
diff --git a/cloudformation/comprehend/aws-comprehend-documentclassifier_documentreaderconfig.go b/cloudformation/comprehend/aws-comprehend-documentclassifier_documentreaderconfig.go
new file mode 100644
index 0000000000..9cc7fcd0ad
--- /dev/null
+++ b/cloudformation/comprehend/aws-comprehend-documentclassifier_documentreaderconfig.go
@@ -0,0 +1,47 @@
+// Code generated by "go generate". Please don't change this file directly.
+
+package comprehend
+
+import (
+	"github.com/awslabs/goformation/v7/cloudformation/policies"
+)
+
+// DocumentClassifier_DocumentReaderConfig AWS CloudFormation Resource (AWS::Comprehend::DocumentClassifier.DocumentReaderConfig)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-comprehend-documentclassifier-documentreaderconfig.html
+type DocumentClassifier_DocumentReaderConfig struct {
+
+	// DocumentReadAction AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-comprehend-documentclassifier-documentreaderconfig.html#cfn-comprehend-documentclassifier-documentreaderconfig-documentreadaction
+	DocumentReadAction string `json:"DocumentReadAction"`
+
+	// DocumentReadMode AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-comprehend-documentclassifier-documentreaderconfig.html#cfn-comprehend-documentclassifier-documentreaderconfig-documentreadmode
+	DocumentReadMode *string `json:"DocumentReadMode,omitempty"`
+
+	// FeatureTypes AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-comprehend-documentclassifier-documentreaderconfig.html#cfn-comprehend-documentclassifier-documentreaderconfig-featuretypes
+	FeatureTypes []string `json:"FeatureTypes,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 *DocumentClassifier_DocumentReaderConfig) AWSCloudFormationType() string {
+	return "AWS::Comprehend::DocumentClassifier.DocumentReaderConfig"
+}
diff --git a/cloudformation/comprehend/aws-comprehend-documentclassifier_vpcconfig.go b/cloudformation/comprehend/aws-comprehend-documentclassifier_vpcconfig.go
new file mode 100644
index 0000000000..0913e2c2d1
--- /dev/null
+++ b/cloudformation/comprehend/aws-comprehend-documentclassifier_vpcconfig.go
@@ -0,0 +1,42 @@
+// Code generated by "go generate". Please don't change this file directly.
+
+package comprehend
+
+import (
+	"github.com/awslabs/goformation/v7/cloudformation/policies"
+)
+
+// DocumentClassifier_VpcConfig AWS CloudFormation Resource (AWS::Comprehend::DocumentClassifier.VpcConfig)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-comprehend-documentclassifier-vpcconfig.html
+type DocumentClassifier_VpcConfig struct {
+
+	// SecurityGroupIds AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-comprehend-documentclassifier-vpcconfig.html#cfn-comprehend-documentclassifier-vpcconfig-securitygroupids
+	SecurityGroupIds []string `json:"SecurityGroupIds"`
+
+	// Subnets AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-comprehend-documentclassifier-vpcconfig.html#cfn-comprehend-documentclassifier-vpcconfig-subnets
+	Subnets []string `json:"Subnets"`
+
+	// 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 *DocumentClassifier_VpcConfig) AWSCloudFormationType() string {
+	return "AWS::Comprehend::DocumentClassifier.VpcConfig"
+}
diff --git a/cloudformation/ec2/aws-ec2-keypair.go b/cloudformation/ec2/aws-ec2-keypair.go
index 57bbdab2bf..8971bd48c2 100644
--- a/cloudformation/ec2/aws-ec2-keypair.go
+++ b/cloudformation/ec2/aws-ec2-keypair.go
@@ -14,6 +14,11 @@ import (
 // See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-keypair.html
 type KeyPair struct {
 
+	// KeyFormat AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-keypair.html#cfn-ec2-keypair-keyformat
+	KeyFormat *string `json:"KeyFormat,omitempty"`
+
 	// KeyName AWS CloudFormation Property
 	// Required: true
 	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-keypair.html#cfn-ec2-keypair-keyname
diff --git a/cloudformation/ec2/aws-ec2-launchtemplate_capacityreservationspecification.go b/cloudformation/ec2/aws-ec2-launchtemplate_capacityreservationspecification.go
index de9f854205..eb4a2c5020 100644
--- a/cloudformation/ec2/aws-ec2-launchtemplate_capacityreservationspecification.go
+++ b/cloudformation/ec2/aws-ec2-launchtemplate_capacityreservationspecification.go
@@ -7,17 +7,17 @@ import (
 )
 
 // LaunchTemplate_CapacityReservationSpecification AWS CloudFormation Resource (AWS::EC2::LaunchTemplate.CapacityReservationSpecification)
-// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-launchtemplate-launchtemplatedata-capacityreservationspecification.html
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-launchtemplate-capacityreservationspecification.html
 type LaunchTemplate_CapacityReservationSpecification struct {
 
 	// CapacityReservationPreference AWS CloudFormation Property
 	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-launchtemplate-launchtemplatedata-capacityreservationspecification.html#cfn-ec2-launchtemplate-launchtemplatedata-capacityreservationspecification-capacityreservationpreference
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-launchtemplate-capacityreservationspecification.html#cfn-ec2-launchtemplate-capacityreservationspecification-capacityreservationpreference
 	CapacityReservationPreference *string `json:"CapacityReservationPreference,omitempty"`
 
 	// CapacityReservationTarget AWS CloudFormation Property
 	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-launchtemplate-launchtemplatedata-capacityreservationspecification.html#cfn-ec2-launchtemplate-launchtemplatedata-capacityreservationspecification-capacityreservationtarget
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-launchtemplate-capacityreservationspecification.html#cfn-ec2-launchtemplate-capacityreservationspecification-capacityreservationtarget
 	CapacityReservationTarget *LaunchTemplate_CapacityReservationTarget `json:"CapacityReservationTarget,omitempty"`
 
 	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
diff --git a/cloudformation/ec2/aws-ec2-launchtemplate_cpuoptions.go b/cloudformation/ec2/aws-ec2-launchtemplate_cpuoptions.go
index f9300c48ba..56df0259ee 100644
--- a/cloudformation/ec2/aws-ec2-launchtemplate_cpuoptions.go
+++ b/cloudformation/ec2/aws-ec2-launchtemplate_cpuoptions.go
@@ -7,22 +7,22 @@ import (
 )
 
 // LaunchTemplate_CpuOptions AWS CloudFormation Resource (AWS::EC2::LaunchTemplate.CpuOptions)
-// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-launchtemplate-launchtemplatedata-cpuoptions.html
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-launchtemplate-cpuoptions.html
 type LaunchTemplate_CpuOptions struct {
 
 	// AmdSevSnp AWS CloudFormation Property
 	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-launchtemplate-launchtemplatedata-cpuoptions.html#cfn-ec2-launchtemplate-launchtemplatedata-cpuoptions-amdsevsnp
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-launchtemplate-cpuoptions.html#cfn-ec2-launchtemplate-cpuoptions-amdsevsnp
 	AmdSevSnp *string `json:"AmdSevSnp,omitempty"`
 
 	// CoreCount AWS CloudFormation Property
 	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-launchtemplate-launchtemplatedata-cpuoptions.html#cfn-ec2-launchtemplate-launchtemplatedata-cpuoptions-corecount
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-launchtemplate-cpuoptions.html#cfn-ec2-launchtemplate-cpuoptions-corecount
 	CoreCount *int `json:"CoreCount,omitempty"`
 
 	// ThreadsPerCore AWS CloudFormation Property
 	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-launchtemplate-launchtemplatedata-cpuoptions.html#cfn-ec2-launchtemplate-launchtemplatedata-cpuoptions-threadspercore
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-launchtemplate-cpuoptions.html#cfn-ec2-launchtemplate-cpuoptions-threadspercore
 	ThreadsPerCore *int `json:"ThreadsPerCore,omitempty"`
 
 	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
diff --git a/cloudformation/ec2/aws-ec2-launchtemplate_creditspecification.go b/cloudformation/ec2/aws-ec2-launchtemplate_creditspecification.go
index e416c5b93d..595c79ca74 100644
--- a/cloudformation/ec2/aws-ec2-launchtemplate_creditspecification.go
+++ b/cloudformation/ec2/aws-ec2-launchtemplate_creditspecification.go
@@ -7,12 +7,12 @@ import (
 )
 
 // LaunchTemplate_CreditSpecification AWS CloudFormation Resource (AWS::EC2::LaunchTemplate.CreditSpecification)
-// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-launchtemplate-launchtemplatedata-creditspecification.html
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-launchtemplate-creditspecification.html
 type LaunchTemplate_CreditSpecification struct {
 
 	// CpuCredits AWS CloudFormation Property
 	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-launchtemplate-launchtemplatedata-creditspecification.html#cfn-ec2-launchtemplate-launchtemplatedata-creditspecification-cpucredits
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-launchtemplate-creditspecification.html#cfn-ec2-launchtemplate-creditspecification-cpucredits
 	CpuCredits *string `json:"CpuCredits,omitempty"`
 
 	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
diff --git a/cloudformation/ec2/aws-ec2-launchtemplate_ebs.go b/cloudformation/ec2/aws-ec2-launchtemplate_ebs.go
index d8c302c612..a3fed7483c 100644
--- a/cloudformation/ec2/aws-ec2-launchtemplate_ebs.go
+++ b/cloudformation/ec2/aws-ec2-launchtemplate_ebs.go
@@ -7,47 +7,47 @@ import (
 )
 
 // LaunchTemplate_Ebs AWS CloudFormation Resource (AWS::EC2::LaunchTemplate.Ebs)
-// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-launchtemplate-blockdevicemapping-ebs.html
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-launchtemplate-ebs.html
 type LaunchTemplate_Ebs struct {
 
 	// DeleteOnTermination AWS CloudFormation Property
 	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-launchtemplate-blockdevicemapping-ebs.html#cfn-ec2-launchtemplate-blockdevicemapping-ebs-deleteontermination
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-launchtemplate-ebs.html#cfn-ec2-launchtemplate-ebs-deleteontermination
 	DeleteOnTermination *bool `json:"DeleteOnTermination,omitempty"`
 
 	// Encrypted AWS CloudFormation Property
 	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-launchtemplate-blockdevicemapping-ebs.html#cfn-ec2-launchtemplate-blockdevicemapping-ebs-encrypted
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-launchtemplate-ebs.html#cfn-ec2-launchtemplate-ebs-encrypted
 	Encrypted *bool `json:"Encrypted,omitempty"`
 
 	// Iops AWS CloudFormation Property
 	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-launchtemplate-blockdevicemapping-ebs.html#cfn-ec2-launchtemplate-blockdevicemapping-ebs-iops
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-launchtemplate-ebs.html#cfn-ec2-launchtemplate-ebs-iops
 	Iops *int `json:"Iops,omitempty"`
 
 	// KmsKeyId AWS CloudFormation Property
 	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-launchtemplate-blockdevicemapping-ebs.html#cfn-ec2-launchtemplate-blockdevicemapping-ebs-kmskeyid
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-launchtemplate-ebs.html#cfn-ec2-launchtemplate-ebs-kmskeyid
 	KmsKeyId *string `json:"KmsKeyId,omitempty"`
 
 	// SnapshotId AWS CloudFormation Property
 	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-launchtemplate-blockdevicemapping-ebs.html#cfn-ec2-launchtemplate-blockdevicemapping-ebs-snapshotid
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-launchtemplate-ebs.html#cfn-ec2-launchtemplate-ebs-snapshotid
 	SnapshotId *string `json:"SnapshotId,omitempty"`
 
 	// Throughput AWS CloudFormation Property
 	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-launchtemplate-blockdevicemapping-ebs.html#cfn-ec2-launchtemplate-blockdevicemapping-ebs-throughput
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-launchtemplate-ebs.html#cfn-ec2-launchtemplate-ebs-throughput
 	Throughput *int `json:"Throughput,omitempty"`
 
 	// VolumeSize AWS CloudFormation Property
 	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-launchtemplate-blockdevicemapping-ebs.html#cfn-ec2-launchtemplate-blockdevicemapping-ebs-volumesize
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-launchtemplate-ebs.html#cfn-ec2-launchtemplate-ebs-volumesize
 	VolumeSize *int `json:"VolumeSize,omitempty"`
 
 	// VolumeType AWS CloudFormation Property
 	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-launchtemplate-blockdevicemapping-ebs.html#cfn-ec2-launchtemplate-blockdevicemapping-ebs-volumetype
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-launchtemplate-ebs.html#cfn-ec2-launchtemplate-ebs-volumetype
 	VolumeType *string `json:"VolumeType,omitempty"`
 
 	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
diff --git a/cloudformation/ec2/aws-ec2-launchtemplate_enclaveoptions.go b/cloudformation/ec2/aws-ec2-launchtemplate_enclaveoptions.go
index 59a32ab861..48317b174f 100644
--- a/cloudformation/ec2/aws-ec2-launchtemplate_enclaveoptions.go
+++ b/cloudformation/ec2/aws-ec2-launchtemplate_enclaveoptions.go
@@ -7,12 +7,12 @@ import (
 )
 
 // LaunchTemplate_EnclaveOptions AWS CloudFormation Resource (AWS::EC2::LaunchTemplate.EnclaveOptions)
-// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-launchtemplate-launchtemplatedata-enclaveoptions.html
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-launchtemplate-enclaveoptions.html
 type LaunchTemplate_EnclaveOptions struct {
 
 	// Enabled AWS CloudFormation Property
 	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-launchtemplate-launchtemplatedata-enclaveoptions.html#cfn-ec2-launchtemplate-launchtemplatedata-enclaveoptions-enabled
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-launchtemplate-enclaveoptions.html#cfn-ec2-launchtemplate-enclaveoptions-enabled
 	Enabled *bool `json:"Enabled,omitempty"`
 
 	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
diff --git a/cloudformation/ec2/aws-ec2-launchtemplate_hibernationoptions.go b/cloudformation/ec2/aws-ec2-launchtemplate_hibernationoptions.go
index 9b81fece88..0dc6bedbed 100644
--- a/cloudformation/ec2/aws-ec2-launchtemplate_hibernationoptions.go
+++ b/cloudformation/ec2/aws-ec2-launchtemplate_hibernationoptions.go
@@ -7,12 +7,12 @@ import (
 )
 
 // LaunchTemplate_HibernationOptions AWS CloudFormation Resource (AWS::EC2::LaunchTemplate.HibernationOptions)
-// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-launchtemplate-launchtemplatedata-hibernationoptions.html
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-launchtemplate-hibernationoptions.html
 type LaunchTemplate_HibernationOptions struct {
 
 	// Configured AWS CloudFormation Property
 	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-launchtemplate-launchtemplatedata-hibernationoptions.html#cfn-ec2-launchtemplate-launchtemplatedata-hibernationoptions-configured
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-launchtemplate-hibernationoptions.html#cfn-ec2-launchtemplate-hibernationoptions-configured
 	Configured *bool `json:"Configured,omitempty"`
 
 	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
diff --git a/cloudformation/ec2/aws-ec2-launchtemplate_iaminstanceprofile.go b/cloudformation/ec2/aws-ec2-launchtemplate_iaminstanceprofile.go
index 9282e3fc62..c7cf10135f 100644
--- a/cloudformation/ec2/aws-ec2-launchtemplate_iaminstanceprofile.go
+++ b/cloudformation/ec2/aws-ec2-launchtemplate_iaminstanceprofile.go
@@ -7,17 +7,17 @@ import (
 )
 
 // LaunchTemplate_IamInstanceProfile AWS CloudFormation Resource (AWS::EC2::LaunchTemplate.IamInstanceProfile)
-// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-launchtemplate-launchtemplatedata-iaminstanceprofile.html
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-launchtemplate-iaminstanceprofile.html
 type LaunchTemplate_IamInstanceProfile struct {
 
 	// Arn AWS CloudFormation Property
 	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-launchtemplate-launchtemplatedata-iaminstanceprofile.html#cfn-ec2-launchtemplate-launchtemplatedata-iaminstanceprofile-arn
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-launchtemplate-iaminstanceprofile.html#cfn-ec2-launchtemplate-iaminstanceprofile-arn
 	Arn *string `json:"Arn,omitempty"`
 
 	// Name AWS CloudFormation Property
 	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-launchtemplate-launchtemplatedata-iaminstanceprofile.html#cfn-ec2-launchtemplate-launchtemplatedata-iaminstanceprofile-name
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-launchtemplate-iaminstanceprofile.html#cfn-ec2-launchtemplate-iaminstanceprofile-name
 	Name *string `json:"Name,omitempty"`
 
 	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
diff --git a/cloudformation/ec2/aws-ec2-launchtemplate_instancemarketoptions.go b/cloudformation/ec2/aws-ec2-launchtemplate_instancemarketoptions.go
index 44cb341f05..728f4daea7 100644
--- a/cloudformation/ec2/aws-ec2-launchtemplate_instancemarketoptions.go
+++ b/cloudformation/ec2/aws-ec2-launchtemplate_instancemarketoptions.go
@@ -7,17 +7,17 @@ import (
 )
 
 // LaunchTemplate_InstanceMarketOptions AWS CloudFormation Resource (AWS::EC2::LaunchTemplate.InstanceMarketOptions)
-// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-launchtemplate-launchtemplatedata-instancemarketoptions.html
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-launchtemplate-instancemarketoptions.html
 type LaunchTemplate_InstanceMarketOptions struct {
 
 	// MarketType AWS CloudFormation Property
 	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-launchtemplate-launchtemplatedata-instancemarketoptions.html#cfn-ec2-launchtemplate-launchtemplatedata-instancemarketoptions-markettype
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-launchtemplate-instancemarketoptions.html#cfn-ec2-launchtemplate-instancemarketoptions-markettype
 	MarketType *string `json:"MarketType,omitempty"`
 
 	// SpotOptions AWS CloudFormation Property
 	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-launchtemplate-launchtemplatedata-instancemarketoptions.html#cfn-ec2-launchtemplate-launchtemplatedata-instancemarketoptions-spotoptions
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-launchtemplate-instancemarketoptions.html#cfn-ec2-launchtemplate-instancemarketoptions-spotoptions
 	SpotOptions *LaunchTemplate_SpotOptions `json:"SpotOptions,omitempty"`
 
 	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
diff --git a/cloudformation/ec2/aws-ec2-launchtemplate_instancerequirements.go b/cloudformation/ec2/aws-ec2-launchtemplate_instancerequirements.go
index 215a886b53..c1bdacaf3b 100644
--- a/cloudformation/ec2/aws-ec2-launchtemplate_instancerequirements.go
+++ b/cloudformation/ec2/aws-ec2-launchtemplate_instancerequirements.go
@@ -7,122 +7,122 @@ import (
 )
 
 // LaunchTemplate_InstanceRequirements AWS CloudFormation Resource (AWS::EC2::LaunchTemplate.InstanceRequirements)
-// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-launchtemplate-launchtemplatedata-instancerequirements.html
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-launchtemplate-instancerequirements.html
 type LaunchTemplate_InstanceRequirements struct {
 
 	// AcceleratorCount AWS CloudFormation Property
 	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-launchtemplate-launchtemplatedata-instancerequirements.html#cfn-ec2-launchtemplate-launchtemplatedata-instancerequirements-acceleratorcount
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-launchtemplate-instancerequirements.html#cfn-ec2-launchtemplate-instancerequirements-acceleratorcount
 	AcceleratorCount *LaunchTemplate_AcceleratorCount `json:"AcceleratorCount,omitempty"`
 
 	// AcceleratorManufacturers AWS CloudFormation Property
 	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-launchtemplate-launchtemplatedata-instancerequirements.html#cfn-ec2-launchtemplate-launchtemplatedata-instancerequirements-acceleratormanufacturers
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-launchtemplate-instancerequirements.html#cfn-ec2-launchtemplate-instancerequirements-acceleratormanufacturers
 	AcceleratorManufacturers []string `json:"AcceleratorManufacturers,omitempty"`
 
 	// AcceleratorNames AWS CloudFormation Property
 	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-launchtemplate-launchtemplatedata-instancerequirements.html#cfn-ec2-launchtemplate-launchtemplatedata-instancerequirements-acceleratornames
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-launchtemplate-instancerequirements.html#cfn-ec2-launchtemplate-instancerequirements-acceleratornames
 	AcceleratorNames []string `json:"AcceleratorNames,omitempty"`
 
 	// AcceleratorTotalMemoryMiB AWS CloudFormation Property
 	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-launchtemplate-launchtemplatedata-instancerequirements.html#cfn-ec2-launchtemplate-launchtemplatedata-instancerequirements-acceleratortotalmemorymib
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-launchtemplate-instancerequirements.html#cfn-ec2-launchtemplate-instancerequirements-acceleratortotalmemorymib
 	AcceleratorTotalMemoryMiB *LaunchTemplate_AcceleratorTotalMemoryMiB `json:"AcceleratorTotalMemoryMiB,omitempty"`
 
 	// AcceleratorTypes AWS CloudFormation Property
 	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-launchtemplate-launchtemplatedata-instancerequirements.html#cfn-ec2-launchtemplate-launchtemplatedata-instancerequirements-acceleratortypes
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-launchtemplate-instancerequirements.html#cfn-ec2-launchtemplate-instancerequirements-acceleratortypes
 	AcceleratorTypes []string `json:"AcceleratorTypes,omitempty"`
 
 	// AllowedInstanceTypes AWS CloudFormation Property
 	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-launchtemplate-launchtemplatedata-instancerequirements.html#cfn-ec2-launchtemplate-launchtemplatedata-instancerequirements-allowedinstancetypes
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-launchtemplate-instancerequirements.html#cfn-ec2-launchtemplate-instancerequirements-allowedinstancetypes
 	AllowedInstanceTypes []string `json:"AllowedInstanceTypes,omitempty"`
 
 	// BareMetal AWS CloudFormation Property
 	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-launchtemplate-launchtemplatedata-instancerequirements.html#cfn-ec2-launchtemplate-launchtemplatedata-instancerequirements-baremetal
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-launchtemplate-instancerequirements.html#cfn-ec2-launchtemplate-instancerequirements-baremetal
 	BareMetal *string `json:"BareMetal,omitempty"`
 
 	// BaselineEbsBandwidthMbps AWS CloudFormation Property
 	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-launchtemplate-launchtemplatedata-instancerequirements.html#cfn-ec2-launchtemplate-launchtemplatedata-instancerequirements-baselineebsbandwidthmbps
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-launchtemplate-instancerequirements.html#cfn-ec2-launchtemplate-instancerequirements-baselineebsbandwidthmbps
 	BaselineEbsBandwidthMbps *LaunchTemplate_BaselineEbsBandwidthMbps `json:"BaselineEbsBandwidthMbps,omitempty"`
 
 	// BurstablePerformance AWS CloudFormation Property
 	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-launchtemplate-launchtemplatedata-instancerequirements.html#cfn-ec2-launchtemplate-launchtemplatedata-instancerequirements-burstableperformance
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-launchtemplate-instancerequirements.html#cfn-ec2-launchtemplate-instancerequirements-burstableperformance
 	BurstablePerformance *string `json:"BurstablePerformance,omitempty"`
 
 	// CpuManufacturers AWS CloudFormation Property
 	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-launchtemplate-launchtemplatedata-instancerequirements.html#cfn-ec2-launchtemplate-launchtemplatedata-instancerequirements-cpumanufacturers
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-launchtemplate-instancerequirements.html#cfn-ec2-launchtemplate-instancerequirements-cpumanufacturers
 	CpuManufacturers []string `json:"CpuManufacturers,omitempty"`
 
 	// ExcludedInstanceTypes AWS CloudFormation Property
 	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-launchtemplate-launchtemplatedata-instancerequirements.html#cfn-ec2-launchtemplate-launchtemplatedata-instancerequirements-excludedinstancetypes
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-launchtemplate-instancerequirements.html#cfn-ec2-launchtemplate-instancerequirements-excludedinstancetypes
 	ExcludedInstanceTypes []string `json:"ExcludedInstanceTypes,omitempty"`
 
 	// InstanceGenerations AWS CloudFormation Property
 	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-launchtemplate-launchtemplatedata-instancerequirements.html#cfn-ec2-launchtemplate-launchtemplatedata-instancerequirements-instancegenerations
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-launchtemplate-instancerequirements.html#cfn-ec2-launchtemplate-instancerequirements-instancegenerations
 	InstanceGenerations []string `json:"InstanceGenerations,omitempty"`
 
 	// LocalStorage AWS CloudFormation Property
 	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-launchtemplate-launchtemplatedata-instancerequirements.html#cfn-ec2-launchtemplate-launchtemplatedata-instancerequirements-localstorage
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-launchtemplate-instancerequirements.html#cfn-ec2-launchtemplate-instancerequirements-localstorage
 	LocalStorage *string `json:"LocalStorage,omitempty"`
 
 	// LocalStorageTypes AWS CloudFormation Property
 	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-launchtemplate-launchtemplatedata-instancerequirements.html#cfn-ec2-launchtemplate-launchtemplatedata-instancerequirements-localstoragetypes
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-launchtemplate-instancerequirements.html#cfn-ec2-launchtemplate-instancerequirements-localstoragetypes
 	LocalStorageTypes []string `json:"LocalStorageTypes,omitempty"`
 
 	// MemoryGiBPerVCpu AWS CloudFormation Property
 	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-launchtemplate-launchtemplatedata-instancerequirements.html#cfn-ec2-launchtemplate-launchtemplatedata-instancerequirements-memorygibpervcpu
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-launchtemplate-instancerequirements.html#cfn-ec2-launchtemplate-instancerequirements-memorygibpervcpu
 	MemoryGiBPerVCpu *LaunchTemplate_MemoryGiBPerVCpu `json:"MemoryGiBPerVCpu,omitempty"`
 
 	// MemoryMiB AWS CloudFormation Property
 	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-launchtemplate-launchtemplatedata-instancerequirements.html#cfn-ec2-launchtemplate-launchtemplatedata-instancerequirements-memorymib
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-launchtemplate-instancerequirements.html#cfn-ec2-launchtemplate-instancerequirements-memorymib
 	MemoryMiB *LaunchTemplate_MemoryMiB `json:"MemoryMiB,omitempty"`
 
 	// NetworkBandwidthGbps AWS CloudFormation Property
 	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-launchtemplate-launchtemplatedata-instancerequirements.html#cfn-ec2-launchtemplate-launchtemplatedata-instancerequirements-networkbandwidthgbps
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-launchtemplate-instancerequirements.html#cfn-ec2-launchtemplate-instancerequirements-networkbandwidthgbps
 	NetworkBandwidthGbps *LaunchTemplate_NetworkBandwidthGbps `json:"NetworkBandwidthGbps,omitempty"`
 
 	// NetworkInterfaceCount AWS CloudFormation Property
 	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-launchtemplate-launchtemplatedata-instancerequirements.html#cfn-ec2-launchtemplate-launchtemplatedata-instancerequirements-networkinterfacecount
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-launchtemplate-instancerequirements.html#cfn-ec2-launchtemplate-instancerequirements-networkinterfacecount
 	NetworkInterfaceCount *LaunchTemplate_NetworkInterfaceCount `json:"NetworkInterfaceCount,omitempty"`
 
 	// OnDemandMaxPricePercentageOverLowestPrice AWS CloudFormation Property
 	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-launchtemplate-launchtemplatedata-instancerequirements.html#cfn-ec2-launchtemplate-launchtemplatedata-instancerequirements-ondemandmaxpricepercentageoverlowestprice
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-launchtemplate-instancerequirements.html#cfn-ec2-launchtemplate-instancerequirements-ondemandmaxpricepercentageoverlowestprice
 	OnDemandMaxPricePercentageOverLowestPrice *int `json:"OnDemandMaxPricePercentageOverLowestPrice,omitempty"`
 
 	// RequireHibernateSupport AWS CloudFormation Property
 	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-launchtemplate-launchtemplatedata-instancerequirements.html#cfn-ec2-launchtemplate-launchtemplatedata-instancerequirements-requirehibernatesupport
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-launchtemplate-instancerequirements.html#cfn-ec2-launchtemplate-instancerequirements-requirehibernatesupport
 	RequireHibernateSupport *bool `json:"RequireHibernateSupport,omitempty"`
 
 	// SpotMaxPricePercentageOverLowestPrice AWS CloudFormation Property
 	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-launchtemplate-launchtemplatedata-instancerequirements.html#cfn-ec2-launchtemplate-launchtemplatedata-instancerequirements-spotmaxpricepercentageoverlowestprice
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-launchtemplate-instancerequirements.html#cfn-ec2-launchtemplate-instancerequirements-spotmaxpricepercentageoverlowestprice
 	SpotMaxPricePercentageOverLowestPrice *int `json:"SpotMaxPricePercentageOverLowestPrice,omitempty"`
 
 	// TotalLocalStorageGB AWS CloudFormation Property
 	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-launchtemplate-launchtemplatedata-instancerequirements.html#cfn-ec2-launchtemplate-launchtemplatedata-instancerequirements-totallocalstoragegb
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-launchtemplate-instancerequirements.html#cfn-ec2-launchtemplate-instancerequirements-totallocalstoragegb
 	TotalLocalStorageGB *LaunchTemplate_TotalLocalStorageGB `json:"TotalLocalStorageGB,omitempty"`
 
 	// VCpuCount AWS CloudFormation Property
 	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-launchtemplate-launchtemplatedata-instancerequirements.html#cfn-ec2-launchtemplate-launchtemplatedata-instancerequirements-vcpucount
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-launchtemplate-instancerequirements.html#cfn-ec2-launchtemplate-instancerequirements-vcpucount
 	VCpuCount *LaunchTemplate_VCpuCount `json:"VCpuCount,omitempty"`
 
 	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
diff --git a/cloudformation/ec2/aws-ec2-launchtemplate_maintenanceoptions.go b/cloudformation/ec2/aws-ec2-launchtemplate_maintenanceoptions.go
index 202c79a228..80c76a6d89 100644
--- a/cloudformation/ec2/aws-ec2-launchtemplate_maintenanceoptions.go
+++ b/cloudformation/ec2/aws-ec2-launchtemplate_maintenanceoptions.go
@@ -7,12 +7,12 @@ import (
 )
 
 // LaunchTemplate_MaintenanceOptions AWS CloudFormation Resource (AWS::EC2::LaunchTemplate.MaintenanceOptions)
-// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-launchtemplate-launchtemplatedata-maintenanceoptions.html
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-launchtemplate-maintenanceoptions.html
 type LaunchTemplate_MaintenanceOptions struct {
 
 	// AutoRecovery AWS CloudFormation Property
 	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-launchtemplate-launchtemplatedata-maintenanceoptions.html#cfn-ec2-launchtemplate-launchtemplatedata-maintenanceoptions-autorecovery
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-launchtemplate-maintenanceoptions.html#cfn-ec2-launchtemplate-maintenanceoptions-autorecovery
 	AutoRecovery *string `json:"AutoRecovery,omitempty"`
 
 	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
diff --git a/cloudformation/ec2/aws-ec2-launchtemplate_metadataoptions.go b/cloudformation/ec2/aws-ec2-launchtemplate_metadataoptions.go
index bf221d5074..be3a7459b2 100644
--- a/cloudformation/ec2/aws-ec2-launchtemplate_metadataoptions.go
+++ b/cloudformation/ec2/aws-ec2-launchtemplate_metadataoptions.go
@@ -7,32 +7,32 @@ import (
 )
 
 // LaunchTemplate_MetadataOptions AWS CloudFormation Resource (AWS::EC2::LaunchTemplate.MetadataOptions)
-// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-launchtemplate-launchtemplatedata-metadataoptions.html
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-launchtemplate-metadataoptions.html
 type LaunchTemplate_MetadataOptions struct {
 
 	// HttpEndpoint AWS CloudFormation Property
 	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-launchtemplate-launchtemplatedata-metadataoptions.html#cfn-ec2-launchtemplate-launchtemplatedata-metadataoptions-httpendpoint
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-launchtemplate-metadataoptions.html#cfn-ec2-launchtemplate-metadataoptions-httpendpoint
 	HttpEndpoint *string `json:"HttpEndpoint,omitempty"`
 
 	// HttpProtocolIpv6 AWS CloudFormation Property
 	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-launchtemplate-launchtemplatedata-metadataoptions.html#cfn-ec2-launchtemplate-launchtemplatedata-metadataoptions-httpprotocolipv6
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-launchtemplate-metadataoptions.html#cfn-ec2-launchtemplate-metadataoptions-httpprotocolipv6
 	HttpProtocolIpv6 *string `json:"HttpProtocolIpv6,omitempty"`
 
 	// HttpPutResponseHopLimit AWS CloudFormation Property
 	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-launchtemplate-launchtemplatedata-metadataoptions.html#cfn-ec2-launchtemplate-launchtemplatedata-metadataoptions-httpputresponsehoplimit
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-launchtemplate-metadataoptions.html#cfn-ec2-launchtemplate-metadataoptions-httpputresponsehoplimit
 	HttpPutResponseHopLimit *int `json:"HttpPutResponseHopLimit,omitempty"`
 
 	// HttpTokens AWS CloudFormation Property
 	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-launchtemplate-launchtemplatedata-metadataoptions.html#cfn-ec2-launchtemplate-launchtemplatedata-metadataoptions-httptokens
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-launchtemplate-metadataoptions.html#cfn-ec2-launchtemplate-metadataoptions-httptokens
 	HttpTokens *string `json:"HttpTokens,omitempty"`
 
 	// InstanceMetadataTags AWS CloudFormation Property
 	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-launchtemplate-launchtemplatedata-metadataoptions.html#cfn-ec2-launchtemplate-launchtemplatedata-metadataoptions-instancemetadatatags
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-launchtemplate-metadataoptions.html#cfn-ec2-launchtemplate-metadataoptions-instancemetadatatags
 	InstanceMetadataTags *string `json:"InstanceMetadataTags,omitempty"`
 
 	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
diff --git a/cloudformation/ec2/aws-ec2-launchtemplate_monitoring.go b/cloudformation/ec2/aws-ec2-launchtemplate_monitoring.go
index 8e1bc814ba..e87785dc8b 100644
--- a/cloudformation/ec2/aws-ec2-launchtemplate_monitoring.go
+++ b/cloudformation/ec2/aws-ec2-launchtemplate_monitoring.go
@@ -7,12 +7,12 @@ import (
 )
 
 // LaunchTemplate_Monitoring AWS CloudFormation Resource (AWS::EC2::LaunchTemplate.Monitoring)
-// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-launchtemplate-launchtemplatedata-monitoring.html
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-launchtemplate-monitoring.html
 type LaunchTemplate_Monitoring struct {
 
 	// Enabled AWS CloudFormation Property
 	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-launchtemplate-launchtemplatedata-monitoring.html#cfn-ec2-launchtemplate-launchtemplatedata-monitoring-enabled
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-launchtemplate-monitoring.html#cfn-ec2-launchtemplate-monitoring-enabled
 	Enabled *bool `json:"Enabled,omitempty"`
 
 	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
diff --git a/cloudformation/ec2/aws-ec2-launchtemplate_placement.go b/cloudformation/ec2/aws-ec2-launchtemplate_placement.go
index cb637abc29..451beeff02 100644
--- a/cloudformation/ec2/aws-ec2-launchtemplate_placement.go
+++ b/cloudformation/ec2/aws-ec2-launchtemplate_placement.go
@@ -7,52 +7,52 @@ import (
 )
 
 // LaunchTemplate_Placement AWS CloudFormation Resource (AWS::EC2::LaunchTemplate.Placement)
-// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-launchtemplate-launchtemplatedata-placement.html
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-launchtemplate-placement.html
 type LaunchTemplate_Placement struct {
 
 	// Affinity AWS CloudFormation Property
 	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-launchtemplate-launchtemplatedata-placement.html#cfn-ec2-launchtemplate-launchtemplatedata-placement-affinity
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-launchtemplate-placement.html#cfn-ec2-launchtemplate-placement-affinity
 	Affinity *string `json:"Affinity,omitempty"`
 
 	// AvailabilityZone AWS CloudFormation Property
 	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-launchtemplate-launchtemplatedata-placement.html#cfn-ec2-launchtemplate-launchtemplatedata-placement-availabilityzone
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-launchtemplate-placement.html#cfn-ec2-launchtemplate-placement-availabilityzone
 	AvailabilityZone *string `json:"AvailabilityZone,omitempty"`
 
 	// GroupId AWS CloudFormation Property
 	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-launchtemplate-launchtemplatedata-placement.html#cfn-ec2-launchtemplate-launchtemplatedata-placement-groupid
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-launchtemplate-placement.html#cfn-ec2-launchtemplate-placement-groupid
 	GroupId *string `json:"GroupId,omitempty"`
 
 	// GroupName AWS CloudFormation Property
 	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-launchtemplate-launchtemplatedata-placement.html#cfn-ec2-launchtemplate-launchtemplatedata-placement-groupname
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-launchtemplate-placement.html#cfn-ec2-launchtemplate-placement-groupname
 	GroupName *string `json:"GroupName,omitempty"`
 
 	// HostId AWS CloudFormation Property
 	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-launchtemplate-launchtemplatedata-placement.html#cfn-ec2-launchtemplate-launchtemplatedata-placement-hostid
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-launchtemplate-placement.html#cfn-ec2-launchtemplate-placement-hostid
 	HostId *string `json:"HostId,omitempty"`
 
 	// HostResourceGroupArn AWS CloudFormation Property
 	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-launchtemplate-launchtemplatedata-placement.html#cfn-ec2-launchtemplate-launchtemplatedata-placement-hostresourcegrouparn
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-launchtemplate-placement.html#cfn-ec2-launchtemplate-placement-hostresourcegrouparn
 	HostResourceGroupArn *string `json:"HostResourceGroupArn,omitempty"`
 
 	// PartitionNumber AWS CloudFormation Property
 	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-launchtemplate-launchtemplatedata-placement.html#cfn-ec2-launchtemplate-launchtemplatedata-placement-partitionnumber
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-launchtemplate-placement.html#cfn-ec2-launchtemplate-placement-partitionnumber
 	PartitionNumber *int `json:"PartitionNumber,omitempty"`
 
 	// SpreadDomain AWS CloudFormation Property
 	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-launchtemplate-launchtemplatedata-placement.html#cfn-ec2-launchtemplate-launchtemplatedata-placement-spreaddomain
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-launchtemplate-placement.html#cfn-ec2-launchtemplate-placement-spreaddomain
 	SpreadDomain *string `json:"SpreadDomain,omitempty"`
 
 	// Tenancy AWS CloudFormation Property
 	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-launchtemplate-launchtemplatedata-placement.html#cfn-ec2-launchtemplate-launchtemplatedata-placement-tenancy
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-launchtemplate-placement.html#cfn-ec2-launchtemplate-placement-tenancy
 	Tenancy *string `json:"Tenancy,omitempty"`
 
 	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
diff --git a/cloudformation/ec2/aws-ec2-launchtemplate_privatednsnameoptions.go b/cloudformation/ec2/aws-ec2-launchtemplate_privatednsnameoptions.go
index b05bfb27ad..0c76d7357c 100644
--- a/cloudformation/ec2/aws-ec2-launchtemplate_privatednsnameoptions.go
+++ b/cloudformation/ec2/aws-ec2-launchtemplate_privatednsnameoptions.go
@@ -7,22 +7,22 @@ import (
 )
 
 // LaunchTemplate_PrivateDnsNameOptions AWS CloudFormation Resource (AWS::EC2::LaunchTemplate.PrivateDnsNameOptions)
-// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-launchtemplate-launchtemplatedata-privatednsnameoptions.html
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-launchtemplate-privatednsnameoptions.html
 type LaunchTemplate_PrivateDnsNameOptions struct {
 
 	// EnableResourceNameDnsAAAARecord AWS CloudFormation Property
 	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-launchtemplate-launchtemplatedata-privatednsnameoptions.html#cfn-ec2-launchtemplate-launchtemplatedata-privatednsnameoptions-enableresourcenamednsaaaarecord
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-launchtemplate-privatednsnameoptions.html#cfn-ec2-launchtemplate-privatednsnameoptions-enableresourcenamednsaaaarecord
 	EnableResourceNameDnsAAAARecord *bool `json:"EnableResourceNameDnsAAAARecord,omitempty"`
 
 	// EnableResourceNameDnsARecord AWS CloudFormation Property
 	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-launchtemplate-launchtemplatedata-privatednsnameoptions.html#cfn-ec2-launchtemplate-launchtemplatedata-privatednsnameoptions-enableresourcenamednsarecord
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-launchtemplate-privatednsnameoptions.html#cfn-ec2-launchtemplate-privatednsnameoptions-enableresourcenamednsarecord
 	EnableResourceNameDnsARecord *bool `json:"EnableResourceNameDnsARecord,omitempty"`
 
 	// HostnameType AWS CloudFormation Property
 	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-launchtemplate-launchtemplatedata-privatednsnameoptions.html#cfn-ec2-launchtemplate-launchtemplatedata-privatednsnameoptions-hostnametype
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-launchtemplate-privatednsnameoptions.html#cfn-ec2-launchtemplate-privatednsnameoptions-hostnametype
 	HostnameType *string `json:"HostnameType,omitempty"`
 
 	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
diff --git a/cloudformation/ec2/aws-ec2-launchtemplate_spotoptions.go b/cloudformation/ec2/aws-ec2-launchtemplate_spotoptions.go
index b448609b22..b8f1581f61 100644
--- a/cloudformation/ec2/aws-ec2-launchtemplate_spotoptions.go
+++ b/cloudformation/ec2/aws-ec2-launchtemplate_spotoptions.go
@@ -7,32 +7,32 @@ import (
 )
 
 // LaunchTemplate_SpotOptions AWS CloudFormation Resource (AWS::EC2::LaunchTemplate.SpotOptions)
-// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-launchtemplate-launchtemplatedata-instancemarketoptions-spotoptions.html
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-launchtemplate-spotoptions.html
 type LaunchTemplate_SpotOptions struct {
 
 	// BlockDurationMinutes AWS CloudFormation Property
 	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-launchtemplate-launchtemplatedata-instancemarketoptions-spotoptions.html#cfn-ec2-launchtemplate-launchtemplatedata-instancemarketoptions-spotoptions-blockdurationminutes
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-launchtemplate-spotoptions.html#cfn-ec2-launchtemplate-spotoptions-blockdurationminutes
 	BlockDurationMinutes *int `json:"BlockDurationMinutes,omitempty"`
 
 	// InstanceInterruptionBehavior AWS CloudFormation Property
 	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-launchtemplate-launchtemplatedata-instancemarketoptions-spotoptions.html#cfn-ec2-launchtemplate-launchtemplatedata-instancemarketoptions-spotoptions-instanceinterruptionbehavior
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-launchtemplate-spotoptions.html#cfn-ec2-launchtemplate-spotoptions-instanceinterruptionbehavior
 	InstanceInterruptionBehavior *string `json:"InstanceInterruptionBehavior,omitempty"`
 
 	// MaxPrice AWS CloudFormation Property
 	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-launchtemplate-launchtemplatedata-instancemarketoptions-spotoptions.html#cfn-ec2-launchtemplate-launchtemplatedata-instancemarketoptions-spotoptions-maxprice
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-launchtemplate-spotoptions.html#cfn-ec2-launchtemplate-spotoptions-maxprice
 	MaxPrice *string `json:"MaxPrice,omitempty"`
 
 	// SpotInstanceType AWS CloudFormation Property
 	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-launchtemplate-launchtemplatedata-instancemarketoptions-spotoptions.html#cfn-ec2-launchtemplate-launchtemplatedata-instancemarketoptions-spotoptions-spotinstancetype
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-launchtemplate-spotoptions.html#cfn-ec2-launchtemplate-spotoptions-spotinstancetype
 	SpotInstanceType *string `json:"SpotInstanceType,omitempty"`
 
 	// ValidUntil AWS CloudFormation Property
 	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-launchtemplate-launchtemplatedata-instancemarketoptions-spotoptions.html#cfn-ec2-launchtemplate-launchtemplatedata-instancemarketoptions-spotoptions-validuntil
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-launchtemplate-spotoptions.html#cfn-ec2-launchtemplate-spotoptions-validuntil
 	ValidUntil *string `json:"ValidUntil,omitempty"`
 
 	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
diff --git a/cloudformation/ec2/aws-ec2-verifiedaccessinstance_verifiedaccesslogs.go b/cloudformation/ec2/aws-ec2-verifiedaccessinstance_verifiedaccesslogs.go
index 604aa46a4f..eeac26a551 100644
--- a/cloudformation/ec2/aws-ec2-verifiedaccessinstance_verifiedaccesslogs.go
+++ b/cloudformation/ec2/aws-ec2-verifiedaccessinstance_verifiedaccesslogs.go
@@ -15,11 +15,21 @@ type VerifiedAccessInstance_VerifiedAccessLogs struct {
 	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-verifiedaccessinstance-verifiedaccesslogs.html#cfn-ec2-verifiedaccessinstance-verifiedaccesslogs-cloudwatchlogs
 	CloudWatchLogs *VerifiedAccessInstance_CloudWatchLogs `json:"CloudWatchLogs,omitempty"`
 
+	// IncludeTrustContext AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-verifiedaccessinstance-verifiedaccesslogs.html#cfn-ec2-verifiedaccessinstance-verifiedaccesslogs-includetrustcontext
+	IncludeTrustContext *bool `json:"IncludeTrustContext,omitempty"`
+
 	// KinesisDataFirehose AWS CloudFormation Property
 	// Required: false
 	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-verifiedaccessinstance-verifiedaccesslogs.html#cfn-ec2-verifiedaccessinstance-verifiedaccesslogs-kinesisdatafirehose
 	KinesisDataFirehose *VerifiedAccessInstance_KinesisDataFirehose `json:"KinesisDataFirehose,omitempty"`
 
+	// LogVersion AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-verifiedaccessinstance-verifiedaccesslogs.html#cfn-ec2-verifiedaccessinstance-verifiedaccesslogs-logversion
+	LogVersion *string `json:"LogVersion,omitempty"`
+
 	// S3 AWS CloudFormation Property
 	// Required: false
 	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-verifiedaccessinstance-verifiedaccesslogs.html#cfn-ec2-verifiedaccessinstance-verifiedaccesslogs-s3
diff --git a/cloudformation/iam/aws-iam-servicelinkedrole.go b/cloudformation/iam/aws-iam-servicelinkedrole.go
index cf10fa6712..8b1ade005d 100644
--- a/cloudformation/iam/aws-iam-servicelinkedrole.go
+++ b/cloudformation/iam/aws-iam-servicelinkedrole.go
@@ -14,9 +14,9 @@ import (
 type ServiceLinkedRole struct {
 
 	// AWSServiceName AWS CloudFormation Property
-	// Required: true
+	// Required: false
 	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-iam-servicelinkedrole.html#cfn-iam-servicelinkedrole-awsservicename
-	AWSServiceName string `json:"AWSServiceName"`
+	AWSServiceName *string `json:"AWSServiceName,omitempty"`
 
 	// CustomSuffix AWS CloudFormation Property
 	// Required: false
diff --git a/cloudformation/lakeformation/aws-lakeformation-datalakesettings_datalakeprincipal.go b/cloudformation/lakeformation/aws-lakeformation-datalakesettings_datalakeprincipal.go
index 837207ae79..55a9b968db 100644
--- a/cloudformation/lakeformation/aws-lakeformation-datalakesettings_datalakeprincipal.go
+++ b/cloudformation/lakeformation/aws-lakeformation-datalakesettings_datalakeprincipal.go
@@ -11,9 +11,9 @@ import (
 type DataLakeSettings_DataLakePrincipal struct {
 
 	// DataLakePrincipalIdentifier AWS CloudFormation Property
-	// Required: false
+	// Required: true
 	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-lakeformation-datalakesettings-datalakeprincipal.html#cfn-lakeformation-datalakesettings-datalakeprincipal-datalakeprincipalidentifier
-	DataLakePrincipalIdentifier *string `json:"DataLakePrincipalIdentifier,omitempty"`
+	DataLakePrincipalIdentifier string `json:"DataLakePrincipalIdentifier"`
 
 	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
 	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
diff --git a/cloudformation/lakeformation/aws-lakeformation-datalakesettings_principalpermissions.go b/cloudformation/lakeformation/aws-lakeformation-datalakesettings_principalpermissions.go
index d3ffc11879..2a64a43c34 100644
--- a/cloudformation/lakeformation/aws-lakeformation-datalakesettings_principalpermissions.go
+++ b/cloudformation/lakeformation/aws-lakeformation-datalakesettings_principalpermissions.go
@@ -11,14 +11,14 @@ import (
 type DataLakeSettings_PrincipalPermissions struct {
 
 	// Permissions AWS CloudFormation Property
-	// Required: false
+	// Required: true
 	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-lakeformation-datalakesettings-principalpermissions.html#cfn-lakeformation-datalakesettings-principalpermissions-permissions
-	Permissions *DataLakeSettings_Permissions `json:"Permissions,omitempty"`
+	Permissions []string `json:"Permissions"`
 
 	// Principal AWS CloudFormation Property
-	// Required: false
+	// Required: true
 	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-lakeformation-datalakesettings-principalpermissions.html#cfn-lakeformation-datalakesettings-principalpermissions-principal
-	Principal *DataLakeSettings_DataLakePrincipal `json:"Principal,omitempty"`
+	Principal *DataLakeSettings_DataLakePrincipal `json:"Principal"`
 
 	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
 	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
diff --git a/cloudformation/networkmanager/aws-networkmanager-connectpeer.go b/cloudformation/networkmanager/aws-networkmanager-connectpeer.go
index 51cb70b86e..2a308eb92c 100644
--- a/cloudformation/networkmanager/aws-networkmanager-connectpeer.go
+++ b/cloudformation/networkmanager/aws-networkmanager-connectpeer.go
@@ -30,9 +30,9 @@ type ConnectPeer struct {
 	CoreNetworkAddress *string `json:"CoreNetworkAddress,omitempty"`
 
 	// InsideCidrBlocks AWS CloudFormation Property
-	// Required: true
+	// Required: false
 	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-networkmanager-connectpeer.html#cfn-networkmanager-connectpeer-insidecidrblocks
-	InsideCidrBlocks []string `json:"InsideCidrBlocks"`
+	InsideCidrBlocks []string `json:"InsideCidrBlocks,omitempty"`
 
 	// PeerAddress AWS CloudFormation Property
 	// Required: true
diff --git a/cloudformation/networkmanager/aws-networkmanager-device.go b/cloudformation/networkmanager/aws-networkmanager-device.go
index 5d87f355b5..5780b3d828 100644
--- a/cloudformation/networkmanager/aws-networkmanager-device.go
+++ b/cloudformation/networkmanager/aws-networkmanager-device.go
@@ -14,6 +14,11 @@ import (
 // See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-networkmanager-device.html
 type Device struct {
 
+	// AWSLocation AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-networkmanager-device.html#cfn-networkmanager-device-awslocation
+	AWSLocation *Device_AWSLocation `json:"AWSLocation,omitempty"`
+
 	// Description AWS CloudFormation Property
 	// Required: false
 	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-networkmanager-device.html#cfn-networkmanager-device-description
diff --git a/cloudformation/networkmanager/aws-networkmanager-device_awslocation.go b/cloudformation/networkmanager/aws-networkmanager-device_awslocation.go
new file mode 100644
index 0000000000..7a21d06f65
--- /dev/null
+++ b/cloudformation/networkmanager/aws-networkmanager-device_awslocation.go
@@ -0,0 +1,42 @@
+// Code generated by "go generate". Please don't change this file directly.
+
+package networkmanager
+
+import (
+	"github.com/awslabs/goformation/v7/cloudformation/policies"
+)
+
+// Device_AWSLocation AWS CloudFormation Resource (AWS::NetworkManager::Device.AWSLocation)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-networkmanager-device-awslocation.html
+type Device_AWSLocation struct {
+
+	// SubnetArn AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-networkmanager-device-awslocation.html#cfn-networkmanager-device-awslocation-subnetarn
+	SubnetArn *string `json:"SubnetArn,omitempty"`
+
+	// Zone AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-networkmanager-device-awslocation.html#cfn-networkmanager-device-awslocation-zone
+	Zone *string `json:"Zone,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 *Device_AWSLocation) AWSCloudFormationType() string {
+	return "AWS::NetworkManager::Device.AWSLocation"
+}
diff --git a/cloudformation/panorama/aws-panorama-applicationinstance.go b/cloudformation/panorama/aws-panorama-applicationinstance.go
index 038710e57c..0d4948dfaf 100644
--- a/cloudformation/panorama/aws-panorama-applicationinstance.go
+++ b/cloudformation/panorama/aws-panorama-applicationinstance.go
@@ -29,11 +29,6 @@ type ApplicationInstance struct {
 	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-panorama-applicationinstance.html#cfn-panorama-applicationinstance-description
 	Description *string `json:"Description,omitempty"`
 
-	// DeviceId AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-panorama-applicationinstance.html#cfn-panorama-applicationinstance-deviceid
-	DeviceId *string `json:"DeviceId,omitempty"`
-
 	// ManifestOverridesPayload AWS CloudFormation Property
 	// Required: false
 	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-panorama-applicationinstance.html#cfn-panorama-applicationinstance-manifestoverridespayload
@@ -54,11 +49,6 @@ type ApplicationInstance struct {
 	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-panorama-applicationinstance.html#cfn-panorama-applicationinstance-runtimerolearn
 	RuntimeRoleArn *string `json:"RuntimeRoleArn,omitempty"`
 
-	// StatusFilter AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-panorama-applicationinstance.html#cfn-panorama-applicationinstance-statusfilter
-	StatusFilter *string `json:"StatusFilter,omitempty"`
-
 	// Tags AWS CloudFormation Property
 	// Required: false
 	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-panorama-applicationinstance.html#cfn-panorama-applicationinstance-tags
diff --git a/cloudformation/quicksight/aws-quicksight-analysis_aggregationsortconfiguration.go b/cloudformation/quicksight/aws-quicksight-analysis_aggregationsortconfiguration.go
index 2ce75c5938..8926c2c9f5 100644
--- a/cloudformation/quicksight/aws-quicksight-analysis_aggregationsortconfiguration.go
+++ b/cloudformation/quicksight/aws-quicksight-analysis_aggregationsortconfiguration.go
@@ -11,9 +11,9 @@ import (
 type Analysis_AggregationSortConfiguration struct {
 
 	// AggregationFunction AWS CloudFormation Property
-	// Required: true
+	// Required: false
 	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-quicksight-analysis-aggregationsortconfiguration.html#cfn-quicksight-analysis-aggregationsortconfiguration-aggregationfunction
-	AggregationFunction *Analysis_AggregationFunction `json:"AggregationFunction"`
+	AggregationFunction *Analysis_AggregationFunction `json:"AggregationFunction,omitempty"`
 
 	// Column AWS CloudFormation Property
 	// Required: true
diff --git a/cloudformation/quicksight/aws-quicksight-analysis_columnconfiguration.go b/cloudformation/quicksight/aws-quicksight-analysis_columnconfiguration.go
index 6ebee7dbb9..541a20a5d7 100644
--- a/cloudformation/quicksight/aws-quicksight-analysis_columnconfiguration.go
+++ b/cloudformation/quicksight/aws-quicksight-analysis_columnconfiguration.go
@@ -10,11 +10,6 @@ import (
 // See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-quicksight-analysis-columnconfiguration.html
 type Analysis_ColumnConfiguration struct {
 
-	// ColorsConfiguration AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-quicksight-analysis-columnconfiguration.html#cfn-quicksight-analysis-columnconfiguration-colorsconfiguration
-	ColorsConfiguration *Analysis_ColorsConfiguration `json:"ColorsConfiguration,omitempty"`
-
 	// Column AWS CloudFormation Property
 	// Required: true
 	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-quicksight-analysis-columnconfiguration.html#cfn-quicksight-analysis-columnconfiguration-column
diff --git a/cloudformation/quicksight/aws-quicksight-analysis_datalabeloptions.go b/cloudformation/quicksight/aws-quicksight-analysis_datalabeloptions.go
index 9870326d5e..bc6dfadfda 100644
--- a/cloudformation/quicksight/aws-quicksight-analysis_datalabeloptions.go
+++ b/cloudformation/quicksight/aws-quicksight-analysis_datalabeloptions.go
@@ -50,6 +50,11 @@ type Analysis_DataLabelOptions struct {
 	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-quicksight-analysis-datalabeloptions.html#cfn-quicksight-analysis-datalabeloptions-position
 	Position *string `json:"Position,omitempty"`
 
+	// TotalsVisibility AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-quicksight-analysis-datalabeloptions.html#cfn-quicksight-analysis-datalabeloptions-totalsvisibility
+	TotalsVisibility *string `json:"TotalsVisibility,omitempty"`
+
 	// Visibility AWS CloudFormation Property
 	// Required: false
 	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-quicksight-analysis-datalabeloptions.html#cfn-quicksight-analysis-datalabeloptions-visibility
diff --git a/cloudformation/quicksight/aws-quicksight-analysis_destinationparametervalueconfiguration.go b/cloudformation/quicksight/aws-quicksight-analysis_destinationparametervalueconfiguration.go
index e605fb1b58..1624e2b6b0 100644
--- a/cloudformation/quicksight/aws-quicksight-analysis_destinationparametervalueconfiguration.go
+++ b/cloudformation/quicksight/aws-quicksight-analysis_destinationparametervalueconfiguration.go
@@ -20,6 +20,11 @@ type Analysis_DestinationParameterValueConfiguration struct {
 	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-quicksight-analysis-destinationparametervalueconfiguration.html#cfn-quicksight-analysis-destinationparametervalueconfiguration-selectallvalueoptions
 	SelectAllValueOptions *string `json:"SelectAllValueOptions,omitempty"`
 
+	// SourceColumn AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-quicksight-analysis-destinationparametervalueconfiguration.html#cfn-quicksight-analysis-destinationparametervalueconfiguration-sourcecolumn
+	SourceColumn *Analysis_ColumnIdentifier `json:"SourceColumn,omitempty"`
+
 	// SourceField AWS CloudFormation Property
 	// Required: false
 	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-quicksight-analysis-destinationparametervalueconfiguration.html#cfn-quicksight-analysis-destinationparametervalueconfiguration-sourcefield
diff --git a/cloudformation/quicksight/aws-quicksight-analysis_filteroperationselectedfieldsconfiguration.go b/cloudformation/quicksight/aws-quicksight-analysis_filteroperationselectedfieldsconfiguration.go
index 2e3f440eef..e629504db5 100644
--- a/cloudformation/quicksight/aws-quicksight-analysis_filteroperationselectedfieldsconfiguration.go
+++ b/cloudformation/quicksight/aws-quicksight-analysis_filteroperationselectedfieldsconfiguration.go
@@ -10,6 +10,11 @@ import (
 // See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-quicksight-analysis-filteroperationselectedfieldsconfiguration.html
 type Analysis_FilterOperationSelectedFieldsConfiguration struct {
 
+	// SelectedColumns AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-quicksight-analysis-filteroperationselectedfieldsconfiguration.html#cfn-quicksight-analysis-filteroperationselectedfieldsconfiguration-selectedcolumns
+	SelectedColumns []Analysis_ColumnIdentifier `json:"SelectedColumns,omitempty"`
+
 	// SelectedFieldOptions AWS CloudFormation Property
 	// Required: false
 	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-quicksight-analysis-filteroperationselectedfieldsconfiguration.html#cfn-quicksight-analysis-filteroperationselectedfieldsconfiguration-selectedfieldoptions
diff --git a/cloudformation/quicksight/aws-quicksight-analysis_geospatialheatmapcolorscale.go b/cloudformation/quicksight/aws-quicksight-analysis_geospatialheatmapcolorscale.go
new file mode 100644
index 0000000000..0964f7cb30
--- /dev/null
+++ b/cloudformation/quicksight/aws-quicksight-analysis_geospatialheatmapcolorscale.go
@@ -0,0 +1,37 @@
+// Code generated by "go generate". Please don't change this file directly.
+
+package quicksight
+
+import (
+	"github.com/awslabs/goformation/v7/cloudformation/policies"
+)
+
+// Analysis_GeospatialHeatmapColorScale AWS CloudFormation Resource (AWS::QuickSight::Analysis.GeospatialHeatmapColorScale)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-quicksight-analysis-geospatialheatmapcolorscale.html
+type Analysis_GeospatialHeatmapColorScale struct {
+
+	// Colors AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-quicksight-analysis-geospatialheatmapcolorscale.html#cfn-quicksight-analysis-geospatialheatmapcolorscale-colors
+	Colors []Analysis_GeospatialHeatmapDataColor `json:"Colors,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 *Analysis_GeospatialHeatmapColorScale) AWSCloudFormationType() string {
+	return "AWS::QuickSight::Analysis.GeospatialHeatmapColorScale"
+}
diff --git a/cloudformation/quicksight/aws-quicksight-analysis_geospatialheatmapconfiguration.go b/cloudformation/quicksight/aws-quicksight-analysis_geospatialheatmapconfiguration.go
new file mode 100644
index 0000000000..07ef2369b8
--- /dev/null
+++ b/cloudformation/quicksight/aws-quicksight-analysis_geospatialheatmapconfiguration.go
@@ -0,0 +1,37 @@
+// Code generated by "go generate". Please don't change this file directly.
+
+package quicksight
+
+import (
+	"github.com/awslabs/goformation/v7/cloudformation/policies"
+)
+
+// Analysis_GeospatialHeatmapConfiguration AWS CloudFormation Resource (AWS::QuickSight::Analysis.GeospatialHeatmapConfiguration)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-quicksight-analysis-geospatialheatmapconfiguration.html
+type Analysis_GeospatialHeatmapConfiguration struct {
+
+	// HeatmapColor AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-quicksight-analysis-geospatialheatmapconfiguration.html#cfn-quicksight-analysis-geospatialheatmapconfiguration-heatmapcolor
+	HeatmapColor *Analysis_GeospatialHeatmapColorScale `json:"HeatmapColor,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 *Analysis_GeospatialHeatmapConfiguration) AWSCloudFormationType() string {
+	return "AWS::QuickSight::Analysis.GeospatialHeatmapConfiguration"
+}
diff --git a/cloudformation/quicksight/aws-quicksight-analysis_geospatialheatmapdatacolor.go b/cloudformation/quicksight/aws-quicksight-analysis_geospatialheatmapdatacolor.go
new file mode 100644
index 0000000000..4bd8e3efe4
--- /dev/null
+++ b/cloudformation/quicksight/aws-quicksight-analysis_geospatialheatmapdatacolor.go
@@ -0,0 +1,37 @@
+// Code generated by "go generate". Please don't change this file directly.
+
+package quicksight
+
+import (
+	"github.com/awslabs/goformation/v7/cloudformation/policies"
+)
+
+// Analysis_GeospatialHeatmapDataColor AWS CloudFormation Resource (AWS::QuickSight::Analysis.GeospatialHeatmapDataColor)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-quicksight-analysis-geospatialheatmapdatacolor.html
+type Analysis_GeospatialHeatmapDataColor struct {
+
+	// Color AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-quicksight-analysis-geospatialheatmapdatacolor.html#cfn-quicksight-analysis-geospatialheatmapdatacolor-color
+	Color string `json:"Color"`
+
+	// 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 *Analysis_GeospatialHeatmapDataColor) AWSCloudFormationType() string {
+	return "AWS::QuickSight::Analysis.GeospatialHeatmapDataColor"
+}
diff --git a/cloudformation/quicksight/aws-quicksight-analysis_geospatialpointstyleoptions.go b/cloudformation/quicksight/aws-quicksight-analysis_geospatialpointstyleoptions.go
index 6d4a0d7313..50a931fcf9 100644
--- a/cloudformation/quicksight/aws-quicksight-analysis_geospatialpointstyleoptions.go
+++ b/cloudformation/quicksight/aws-quicksight-analysis_geospatialpointstyleoptions.go
@@ -15,6 +15,11 @@ type Analysis_GeospatialPointStyleOptions struct {
 	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-quicksight-analysis-geospatialpointstyleoptions.html#cfn-quicksight-analysis-geospatialpointstyleoptions-clustermarkerconfiguration
 	ClusterMarkerConfiguration *Analysis_ClusterMarkerConfiguration `json:"ClusterMarkerConfiguration,omitempty"`
 
+	// HeatmapConfiguration AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-quicksight-analysis-geospatialpointstyleoptions.html#cfn-quicksight-analysis-geospatialpointstyleoptions-heatmapconfiguration
+	HeatmapConfiguration *Analysis_GeospatialHeatmapConfiguration `json:"HeatmapConfiguration,omitempty"`
+
 	// SelectedPointStyle AWS CloudFormation Property
 	// Required: false
 	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-quicksight-analysis-geospatialpointstyleoptions.html#cfn-quicksight-analysis-geospatialpointstyleoptions-selectedpointstyle
diff --git a/cloudformation/quicksight/aws-quicksight-analysis_pivottablecellconditionalformatting.go b/cloudformation/quicksight/aws-quicksight-analysis_pivottablecellconditionalformatting.go
index 10b403bee6..2c005ed37e 100644
--- a/cloudformation/quicksight/aws-quicksight-analysis_pivottablecellconditionalformatting.go
+++ b/cloudformation/quicksight/aws-quicksight-analysis_pivottablecellconditionalformatting.go
@@ -20,6 +20,11 @@ type Analysis_PivotTableCellConditionalFormatting struct {
 	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-quicksight-analysis-pivottablecellconditionalformatting.html#cfn-quicksight-analysis-pivottablecellconditionalformatting-scope
 	Scope *Analysis_PivotTableConditionalFormattingScope `json:"Scope,omitempty"`
 
+	// Scopes AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-quicksight-analysis-pivottablecellconditionalformatting.html#cfn-quicksight-analysis-pivottablecellconditionalformatting-scopes
+	Scopes []Analysis_PivotTableConditionalFormattingScope `json:"Scopes,omitempty"`
+
 	// TextFormat AWS CloudFormation Property
 	// Required: false
 	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-quicksight-analysis-pivottablecellconditionalformatting.html#cfn-quicksight-analysis-pivottablecellconditionalformatting-textformat
diff --git a/cloudformation/quicksight/aws-quicksight-analysis_pivottablefieldcollapsestateoption.go b/cloudformation/quicksight/aws-quicksight-analysis_pivottablefieldcollapsestateoption.go
new file mode 100644
index 0000000000..b43f69234a
--- /dev/null
+++ b/cloudformation/quicksight/aws-quicksight-analysis_pivottablefieldcollapsestateoption.go
@@ -0,0 +1,42 @@
+// Code generated by "go generate". Please don't change this file directly.
+
+package quicksight
+
+import (
+	"github.com/awslabs/goformation/v7/cloudformation/policies"
+)
+
+// Analysis_PivotTableFieldCollapseStateOption AWS CloudFormation Resource (AWS::QuickSight::Analysis.PivotTableFieldCollapseStateOption)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-quicksight-analysis-pivottablefieldcollapsestateoption.html
+type Analysis_PivotTableFieldCollapseStateOption struct {
+
+	// State AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-quicksight-analysis-pivottablefieldcollapsestateoption.html#cfn-quicksight-analysis-pivottablefieldcollapsestateoption-state
+	State *string `json:"State,omitempty"`
+
+	// Target AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-quicksight-analysis-pivottablefieldcollapsestateoption.html#cfn-quicksight-analysis-pivottablefieldcollapsestateoption-target
+	Target *Analysis_PivotTableFieldCollapseStateTarget `json:"Target"`
+
+	// 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 *Analysis_PivotTableFieldCollapseStateOption) AWSCloudFormationType() string {
+	return "AWS::QuickSight::Analysis.PivotTableFieldCollapseStateOption"
+}
diff --git a/cloudformation/quicksight/aws-quicksight-analysis_pivottablefieldcollapsestatetarget.go b/cloudformation/quicksight/aws-quicksight-analysis_pivottablefieldcollapsestatetarget.go
new file mode 100644
index 0000000000..e9da00259e
--- /dev/null
+++ b/cloudformation/quicksight/aws-quicksight-analysis_pivottablefieldcollapsestatetarget.go
@@ -0,0 +1,42 @@
+// Code generated by "go generate". Please don't change this file directly.
+
+package quicksight
+
+import (
+	"github.com/awslabs/goformation/v7/cloudformation/policies"
+)
+
+// Analysis_PivotTableFieldCollapseStateTarget AWS CloudFormation Resource (AWS::QuickSight::Analysis.PivotTableFieldCollapseStateTarget)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-quicksight-analysis-pivottablefieldcollapsestatetarget.html
+type Analysis_PivotTableFieldCollapseStateTarget struct {
+
+	// FieldDataPathValues AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-quicksight-analysis-pivottablefieldcollapsestatetarget.html#cfn-quicksight-analysis-pivottablefieldcollapsestatetarget-fielddatapathvalues
+	FieldDataPathValues []Analysis_DataPathValue `json:"FieldDataPathValues,omitempty"`
+
+	// FieldId AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-quicksight-analysis-pivottablefieldcollapsestatetarget.html#cfn-quicksight-analysis-pivottablefieldcollapsestatetarget-fieldid
+	FieldId *string `json:"FieldId,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 *Analysis_PivotTableFieldCollapseStateTarget) AWSCloudFormationType() string {
+	return "AWS::QuickSight::Analysis.PivotTableFieldCollapseStateTarget"
+}
diff --git a/cloudformation/quicksight/aws-quicksight-analysis_pivottablefieldoptions.go b/cloudformation/quicksight/aws-quicksight-analysis_pivottablefieldoptions.go
index b4ced6c91b..655c83fbb0 100644
--- a/cloudformation/quicksight/aws-quicksight-analysis_pivottablefieldoptions.go
+++ b/cloudformation/quicksight/aws-quicksight-analysis_pivottablefieldoptions.go
@@ -10,6 +10,11 @@ import (
 // See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-quicksight-analysis-pivottablefieldoptions.html
 type Analysis_PivotTableFieldOptions struct {
 
+	// CollapseStateOptions AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-quicksight-analysis-pivottablefieldoptions.html#cfn-quicksight-analysis-pivottablefieldoptions-collapsestateoptions
+	CollapseStateOptions []Analysis_PivotTableFieldCollapseStateOption `json:"CollapseStateOptions,omitempty"`
+
 	// DataPathOptions AWS CloudFormation Property
 	// Required: false
 	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-quicksight-analysis-pivottablefieldoptions.html#cfn-quicksight-analysis-pivottablefieldoptions-datapathoptions
diff --git a/cloudformation/quicksight/aws-quicksight-analysis_pivottableoptions.go b/cloudformation/quicksight/aws-quicksight-analysis_pivottableoptions.go
index 4187b0fea7..1576f5357d 100644
--- a/cloudformation/quicksight/aws-quicksight-analysis_pivottableoptions.go
+++ b/cloudformation/quicksight/aws-quicksight-analysis_pivottableoptions.go
@@ -15,6 +15,11 @@ type Analysis_PivotTableOptions struct {
 	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-quicksight-analysis-pivottableoptions.html#cfn-quicksight-analysis-pivottableoptions-cellstyle
 	CellStyle *Analysis_TableCellStyle `json:"CellStyle,omitempty"`
 
+	// CollapsedRowDimensionsVisibility AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-quicksight-analysis-pivottableoptions.html#cfn-quicksight-analysis-pivottableoptions-collapsedrowdimensionsvisibility
+	CollapsedRowDimensionsVisibility *string `json:"CollapsedRowDimensionsVisibility,omitempty"`
+
 	// ColumnHeaderStyle AWS CloudFormation Property
 	// Required: false
 	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-quicksight-analysis-pivottableoptions.html#cfn-quicksight-analysis-pivottableoptions-columnheaderstyle
diff --git a/cloudformation/quicksight/aws-quicksight-analysis_radarchartconfiguration.go b/cloudformation/quicksight/aws-quicksight-analysis_radarchartconfiguration.go
index b89e705118..6359ac5f69 100644
--- a/cloudformation/quicksight/aws-quicksight-analysis_radarchartconfiguration.go
+++ b/cloudformation/quicksight/aws-quicksight-analysis_radarchartconfiguration.go
@@ -25,6 +25,11 @@ type Analysis_RadarChartConfiguration struct {
 	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-quicksight-analysis-radarchartconfiguration.html#cfn-quicksight-analysis-radarchartconfiguration-alternatebandoddcolor
 	AlternateBandOddColor *string `json:"AlternateBandOddColor,omitempty"`
 
+	// AxesRangeScale AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-quicksight-analysis-radarchartconfiguration.html#cfn-quicksight-analysis-radarchartconfiguration-axesrangescale
+	AxesRangeScale *string `json:"AxesRangeScale,omitempty"`
+
 	// BaseSeriesSettings AWS CloudFormation Property
 	// Required: false
 	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-quicksight-analysis-radarchartconfiguration.html#cfn-quicksight-analysis-radarchartconfiguration-baseseriessettings
diff --git a/cloudformation/quicksight/aws-quicksight-analysis_referencelinedynamicdataconfiguration.go b/cloudformation/quicksight/aws-quicksight-analysis_referencelinedynamicdataconfiguration.go
index f744201fc2..7dfdb46af3 100644
--- a/cloudformation/quicksight/aws-quicksight-analysis_referencelinedynamicdataconfiguration.go
+++ b/cloudformation/quicksight/aws-quicksight-analysis_referencelinedynamicdataconfiguration.go
@@ -21,9 +21,9 @@ type Analysis_ReferenceLineDynamicDataConfiguration struct {
 	Column *Analysis_ColumnIdentifier `json:"Column"`
 
 	// MeasureAggregationFunction AWS CloudFormation Property
-	// Required: true
+	// Required: false
 	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-quicksight-analysis-referencelinedynamicdataconfiguration.html#cfn-quicksight-analysis-referencelinedynamicdataconfiguration-measureaggregationfunction
-	MeasureAggregationFunction *Analysis_AggregationFunction `json:"MeasureAggregationFunction"`
+	MeasureAggregationFunction *Analysis_AggregationFunction `json:"MeasureAggregationFunction,omitempty"`
 
 	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
 	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
diff --git a/cloudformation/quicksight/aws-quicksight-analysis_scatterplotcategoricallyaggregatedfieldwells.go b/cloudformation/quicksight/aws-quicksight-analysis_scatterplotcategoricallyaggregatedfieldwells.go
index afa6a2e323..b837a15ccf 100644
--- a/cloudformation/quicksight/aws-quicksight-analysis_scatterplotcategoricallyaggregatedfieldwells.go
+++ b/cloudformation/quicksight/aws-quicksight-analysis_scatterplotcategoricallyaggregatedfieldwells.go
@@ -15,6 +15,11 @@ type Analysis_ScatterPlotCategoricallyAggregatedFieldWells struct {
 	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-quicksight-analysis-scatterplotcategoricallyaggregatedfieldwells.html#cfn-quicksight-analysis-scatterplotcategoricallyaggregatedfieldwells-category
 	Category []Analysis_DimensionField `json:"Category,omitempty"`
 
+	// Label AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-quicksight-analysis-scatterplotcategoricallyaggregatedfieldwells.html#cfn-quicksight-analysis-scatterplotcategoricallyaggregatedfieldwells-label
+	Label []Analysis_DimensionField `json:"Label,omitempty"`
+
 	// Size AWS CloudFormation Property
 	// Required: false
 	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-quicksight-analysis-scatterplotcategoricallyaggregatedfieldwells.html#cfn-quicksight-analysis-scatterplotcategoricallyaggregatedfieldwells-size
diff --git a/cloudformation/quicksight/aws-quicksight-analysis_scatterplotunaggregatedfieldwells.go b/cloudformation/quicksight/aws-quicksight-analysis_scatterplotunaggregatedfieldwells.go
index d41c666b38..2631243ba4 100644
--- a/cloudformation/quicksight/aws-quicksight-analysis_scatterplotunaggregatedfieldwells.go
+++ b/cloudformation/quicksight/aws-quicksight-analysis_scatterplotunaggregatedfieldwells.go
@@ -10,6 +10,16 @@ import (
 // See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-quicksight-analysis-scatterplotunaggregatedfieldwells.html
 type Analysis_ScatterPlotUnaggregatedFieldWells struct {
 
+	// Category AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-quicksight-analysis-scatterplotunaggregatedfieldwells.html#cfn-quicksight-analysis-scatterplotunaggregatedfieldwells-category
+	Category []Analysis_DimensionField `json:"Category,omitempty"`
+
+	// Label AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-quicksight-analysis-scatterplotunaggregatedfieldwells.html#cfn-quicksight-analysis-scatterplotunaggregatedfieldwells-label
+	Label []Analysis_DimensionField `json:"Label,omitempty"`
+
 	// Size AWS CloudFormation Property
 	// Required: false
 	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-quicksight-analysis-scatterplotunaggregatedfieldwells.html#cfn-quicksight-analysis-scatterplotunaggregatedfieldwells-size
diff --git a/cloudformation/quicksight/aws-quicksight-dashboard_aggregationsortconfiguration.go b/cloudformation/quicksight/aws-quicksight-dashboard_aggregationsortconfiguration.go
index 60b0fde2d4..fb06e77187 100644
--- a/cloudformation/quicksight/aws-quicksight-dashboard_aggregationsortconfiguration.go
+++ b/cloudformation/quicksight/aws-quicksight-dashboard_aggregationsortconfiguration.go
@@ -11,9 +11,9 @@ import (
 type Dashboard_AggregationSortConfiguration struct {
 
 	// AggregationFunction AWS CloudFormation Property
-	// Required: true
+	// Required: false
 	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-quicksight-dashboard-aggregationsortconfiguration.html#cfn-quicksight-dashboard-aggregationsortconfiguration-aggregationfunction
-	AggregationFunction *Dashboard_AggregationFunction `json:"AggregationFunction"`
+	AggregationFunction *Dashboard_AggregationFunction `json:"AggregationFunction,omitempty"`
 
 	// Column AWS CloudFormation Property
 	// Required: true
diff --git a/cloudformation/quicksight/aws-quicksight-dashboard_columnconfiguration.go b/cloudformation/quicksight/aws-quicksight-dashboard_columnconfiguration.go
index 6e0c1c0ff3..5cf0d2b66f 100644
--- a/cloudformation/quicksight/aws-quicksight-dashboard_columnconfiguration.go
+++ b/cloudformation/quicksight/aws-quicksight-dashboard_columnconfiguration.go
@@ -10,11 +10,6 @@ import (
 // See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-quicksight-dashboard-columnconfiguration.html
 type Dashboard_ColumnConfiguration struct {
 
-	// ColorsConfiguration AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-quicksight-dashboard-columnconfiguration.html#cfn-quicksight-dashboard-columnconfiguration-colorsconfiguration
-	ColorsConfiguration *Dashboard_ColorsConfiguration `json:"ColorsConfiguration,omitempty"`
-
 	// Column AWS CloudFormation Property
 	// Required: true
 	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-quicksight-dashboard-columnconfiguration.html#cfn-quicksight-dashboard-columnconfiguration-column
diff --git a/cloudformation/quicksight/aws-quicksight-dashboard_datalabeloptions.go b/cloudformation/quicksight/aws-quicksight-dashboard_datalabeloptions.go
index 57d9fbd0af..689372e5cb 100644
--- a/cloudformation/quicksight/aws-quicksight-dashboard_datalabeloptions.go
+++ b/cloudformation/quicksight/aws-quicksight-dashboard_datalabeloptions.go
@@ -50,6 +50,11 @@ type Dashboard_DataLabelOptions struct {
 	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-quicksight-dashboard-datalabeloptions.html#cfn-quicksight-dashboard-datalabeloptions-position
 	Position *string `json:"Position,omitempty"`
 
+	// TotalsVisibility AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-quicksight-dashboard-datalabeloptions.html#cfn-quicksight-dashboard-datalabeloptions-totalsvisibility
+	TotalsVisibility *string `json:"TotalsVisibility,omitempty"`
+
 	// Visibility AWS CloudFormation Property
 	// Required: false
 	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-quicksight-dashboard-datalabeloptions.html#cfn-quicksight-dashboard-datalabeloptions-visibility
diff --git a/cloudformation/quicksight/aws-quicksight-dashboard_destinationparametervalueconfiguration.go b/cloudformation/quicksight/aws-quicksight-dashboard_destinationparametervalueconfiguration.go
index 7050885c8f..6c20e461cb 100644
--- a/cloudformation/quicksight/aws-quicksight-dashboard_destinationparametervalueconfiguration.go
+++ b/cloudformation/quicksight/aws-quicksight-dashboard_destinationparametervalueconfiguration.go
@@ -20,6 +20,11 @@ type Dashboard_DestinationParameterValueConfiguration struct {
 	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-quicksight-dashboard-destinationparametervalueconfiguration.html#cfn-quicksight-dashboard-destinationparametervalueconfiguration-selectallvalueoptions
 	SelectAllValueOptions *string `json:"SelectAllValueOptions,omitempty"`
 
+	// SourceColumn AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-quicksight-dashboard-destinationparametervalueconfiguration.html#cfn-quicksight-dashboard-destinationparametervalueconfiguration-sourcecolumn
+	SourceColumn *Dashboard_ColumnIdentifier `json:"SourceColumn,omitempty"`
+
 	// SourceField AWS CloudFormation Property
 	// Required: false
 	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-quicksight-dashboard-destinationparametervalueconfiguration.html#cfn-quicksight-dashboard-destinationparametervalueconfiguration-sourcefield
diff --git a/cloudformation/quicksight/aws-quicksight-dashboard_filteroperationselectedfieldsconfiguration.go b/cloudformation/quicksight/aws-quicksight-dashboard_filteroperationselectedfieldsconfiguration.go
index 4d6dc1f18e..75ea63e1f6 100644
--- a/cloudformation/quicksight/aws-quicksight-dashboard_filteroperationselectedfieldsconfiguration.go
+++ b/cloudformation/quicksight/aws-quicksight-dashboard_filteroperationselectedfieldsconfiguration.go
@@ -10,6 +10,11 @@ import (
 // See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-quicksight-dashboard-filteroperationselectedfieldsconfiguration.html
 type Dashboard_FilterOperationSelectedFieldsConfiguration struct {
 
+	// SelectedColumns AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-quicksight-dashboard-filteroperationselectedfieldsconfiguration.html#cfn-quicksight-dashboard-filteroperationselectedfieldsconfiguration-selectedcolumns
+	SelectedColumns []Dashboard_ColumnIdentifier `json:"SelectedColumns,omitempty"`
+
 	// SelectedFieldOptions AWS CloudFormation Property
 	// Required: false
 	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-quicksight-dashboard-filteroperationselectedfieldsconfiguration.html#cfn-quicksight-dashboard-filteroperationselectedfieldsconfiguration-selectedfieldoptions
diff --git a/cloudformation/quicksight/aws-quicksight-dashboard_geospatialheatmapcolorscale.go b/cloudformation/quicksight/aws-quicksight-dashboard_geospatialheatmapcolorscale.go
new file mode 100644
index 0000000000..f8d96a3c1a
--- /dev/null
+++ b/cloudformation/quicksight/aws-quicksight-dashboard_geospatialheatmapcolorscale.go
@@ -0,0 +1,37 @@
+// Code generated by "go generate". Please don't change this file directly.
+
+package quicksight
+
+import (
+	"github.com/awslabs/goformation/v7/cloudformation/policies"
+)
+
+// Dashboard_GeospatialHeatmapColorScale AWS CloudFormation Resource (AWS::QuickSight::Dashboard.GeospatialHeatmapColorScale)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-quicksight-dashboard-geospatialheatmapcolorscale.html
+type Dashboard_GeospatialHeatmapColorScale struct {
+
+	// Colors AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-quicksight-dashboard-geospatialheatmapcolorscale.html#cfn-quicksight-dashboard-geospatialheatmapcolorscale-colors
+	Colors []Dashboard_GeospatialHeatmapDataColor `json:"Colors,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 *Dashboard_GeospatialHeatmapColorScale) AWSCloudFormationType() string {
+	return "AWS::QuickSight::Dashboard.GeospatialHeatmapColorScale"
+}
diff --git a/cloudformation/quicksight/aws-quicksight-dashboard_geospatialheatmapconfiguration.go b/cloudformation/quicksight/aws-quicksight-dashboard_geospatialheatmapconfiguration.go
new file mode 100644
index 0000000000..55bfd3fc51
--- /dev/null
+++ b/cloudformation/quicksight/aws-quicksight-dashboard_geospatialheatmapconfiguration.go
@@ -0,0 +1,37 @@
+// Code generated by "go generate". Please don't change this file directly.
+
+package quicksight
+
+import (
+	"github.com/awslabs/goformation/v7/cloudformation/policies"
+)
+
+// Dashboard_GeospatialHeatmapConfiguration AWS CloudFormation Resource (AWS::QuickSight::Dashboard.GeospatialHeatmapConfiguration)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-quicksight-dashboard-geospatialheatmapconfiguration.html
+type Dashboard_GeospatialHeatmapConfiguration struct {
+
+	// HeatmapColor AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-quicksight-dashboard-geospatialheatmapconfiguration.html#cfn-quicksight-dashboard-geospatialheatmapconfiguration-heatmapcolor
+	HeatmapColor *Dashboard_GeospatialHeatmapColorScale `json:"HeatmapColor,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 *Dashboard_GeospatialHeatmapConfiguration) AWSCloudFormationType() string {
+	return "AWS::QuickSight::Dashboard.GeospatialHeatmapConfiguration"
+}
diff --git a/cloudformation/quicksight/aws-quicksight-dashboard_geospatialheatmapdatacolor.go b/cloudformation/quicksight/aws-quicksight-dashboard_geospatialheatmapdatacolor.go
new file mode 100644
index 0000000000..919f21434e
--- /dev/null
+++ b/cloudformation/quicksight/aws-quicksight-dashboard_geospatialheatmapdatacolor.go
@@ -0,0 +1,37 @@
+// Code generated by "go generate". Please don't change this file directly.
+
+package quicksight
+
+import (
+	"github.com/awslabs/goformation/v7/cloudformation/policies"
+)
+
+// Dashboard_GeospatialHeatmapDataColor AWS CloudFormation Resource (AWS::QuickSight::Dashboard.GeospatialHeatmapDataColor)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-quicksight-dashboard-geospatialheatmapdatacolor.html
+type Dashboard_GeospatialHeatmapDataColor struct {
+
+	// Color AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-quicksight-dashboard-geospatialheatmapdatacolor.html#cfn-quicksight-dashboard-geospatialheatmapdatacolor-color
+	Color string `json:"Color"`
+
+	// 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 *Dashboard_GeospatialHeatmapDataColor) AWSCloudFormationType() string {
+	return "AWS::QuickSight::Dashboard.GeospatialHeatmapDataColor"
+}
diff --git a/cloudformation/quicksight/aws-quicksight-dashboard_geospatialpointstyleoptions.go b/cloudformation/quicksight/aws-quicksight-dashboard_geospatialpointstyleoptions.go
index 5c94a9eaa7..92499f5cc5 100644
--- a/cloudformation/quicksight/aws-quicksight-dashboard_geospatialpointstyleoptions.go
+++ b/cloudformation/quicksight/aws-quicksight-dashboard_geospatialpointstyleoptions.go
@@ -15,6 +15,11 @@ type Dashboard_GeospatialPointStyleOptions struct {
 	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-quicksight-dashboard-geospatialpointstyleoptions.html#cfn-quicksight-dashboard-geospatialpointstyleoptions-clustermarkerconfiguration
 	ClusterMarkerConfiguration *Dashboard_ClusterMarkerConfiguration `json:"ClusterMarkerConfiguration,omitempty"`
 
+	// HeatmapConfiguration AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-quicksight-dashboard-geospatialpointstyleoptions.html#cfn-quicksight-dashboard-geospatialpointstyleoptions-heatmapconfiguration
+	HeatmapConfiguration *Dashboard_GeospatialHeatmapConfiguration `json:"HeatmapConfiguration,omitempty"`
+
 	// SelectedPointStyle AWS CloudFormation Property
 	// Required: false
 	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-quicksight-dashboard-geospatialpointstyleoptions.html#cfn-quicksight-dashboard-geospatialpointstyleoptions-selectedpointstyle
diff --git a/cloudformation/quicksight/aws-quicksight-dashboard_pivottablecellconditionalformatting.go b/cloudformation/quicksight/aws-quicksight-dashboard_pivottablecellconditionalformatting.go
index 92ea11078f..00abd9917e 100644
--- a/cloudformation/quicksight/aws-quicksight-dashboard_pivottablecellconditionalformatting.go
+++ b/cloudformation/quicksight/aws-quicksight-dashboard_pivottablecellconditionalformatting.go
@@ -20,6 +20,11 @@ type Dashboard_PivotTableCellConditionalFormatting struct {
 	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-quicksight-dashboard-pivottablecellconditionalformatting.html#cfn-quicksight-dashboard-pivottablecellconditionalformatting-scope
 	Scope *Dashboard_PivotTableConditionalFormattingScope `json:"Scope,omitempty"`
 
+	// Scopes AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-quicksight-dashboard-pivottablecellconditionalformatting.html#cfn-quicksight-dashboard-pivottablecellconditionalformatting-scopes
+	Scopes []Dashboard_PivotTableConditionalFormattingScope `json:"Scopes,omitempty"`
+
 	// TextFormat AWS CloudFormation Property
 	// Required: false
 	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-quicksight-dashboard-pivottablecellconditionalformatting.html#cfn-quicksight-dashboard-pivottablecellconditionalformatting-textformat
diff --git a/cloudformation/quicksight/aws-quicksight-dashboard_pivottablefieldcollapsestateoption.go b/cloudformation/quicksight/aws-quicksight-dashboard_pivottablefieldcollapsestateoption.go
new file mode 100644
index 0000000000..4718133a8b
--- /dev/null
+++ b/cloudformation/quicksight/aws-quicksight-dashboard_pivottablefieldcollapsestateoption.go
@@ -0,0 +1,42 @@
+// Code generated by "go generate". Please don't change this file directly.
+
+package quicksight
+
+import (
+	"github.com/awslabs/goformation/v7/cloudformation/policies"
+)
+
+// Dashboard_PivotTableFieldCollapseStateOption AWS CloudFormation Resource (AWS::QuickSight::Dashboard.PivotTableFieldCollapseStateOption)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-quicksight-dashboard-pivottablefieldcollapsestateoption.html
+type Dashboard_PivotTableFieldCollapseStateOption struct {
+
+	// State AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-quicksight-dashboard-pivottablefieldcollapsestateoption.html#cfn-quicksight-dashboard-pivottablefieldcollapsestateoption-state
+	State *string `json:"State,omitempty"`
+
+	// Target AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-quicksight-dashboard-pivottablefieldcollapsestateoption.html#cfn-quicksight-dashboard-pivottablefieldcollapsestateoption-target
+	Target *Dashboard_PivotTableFieldCollapseStateTarget `json:"Target"`
+
+	// 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 *Dashboard_PivotTableFieldCollapseStateOption) AWSCloudFormationType() string {
+	return "AWS::QuickSight::Dashboard.PivotTableFieldCollapseStateOption"
+}
diff --git a/cloudformation/quicksight/aws-quicksight-dashboard_pivottablefieldcollapsestatetarget.go b/cloudformation/quicksight/aws-quicksight-dashboard_pivottablefieldcollapsestatetarget.go
new file mode 100644
index 0000000000..5af5155a60
--- /dev/null
+++ b/cloudformation/quicksight/aws-quicksight-dashboard_pivottablefieldcollapsestatetarget.go
@@ -0,0 +1,42 @@
+// Code generated by "go generate". Please don't change this file directly.
+
+package quicksight
+
+import (
+	"github.com/awslabs/goformation/v7/cloudformation/policies"
+)
+
+// Dashboard_PivotTableFieldCollapseStateTarget AWS CloudFormation Resource (AWS::QuickSight::Dashboard.PivotTableFieldCollapseStateTarget)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-quicksight-dashboard-pivottablefieldcollapsestatetarget.html
+type Dashboard_PivotTableFieldCollapseStateTarget struct {
+
+	// FieldDataPathValues AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-quicksight-dashboard-pivottablefieldcollapsestatetarget.html#cfn-quicksight-dashboard-pivottablefieldcollapsestatetarget-fielddatapathvalues
+	FieldDataPathValues []Dashboard_DataPathValue `json:"FieldDataPathValues,omitempty"`
+
+	// FieldId AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-quicksight-dashboard-pivottablefieldcollapsestatetarget.html#cfn-quicksight-dashboard-pivottablefieldcollapsestatetarget-fieldid
+	FieldId *string `json:"FieldId,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 *Dashboard_PivotTableFieldCollapseStateTarget) AWSCloudFormationType() string {
+	return "AWS::QuickSight::Dashboard.PivotTableFieldCollapseStateTarget"
+}
diff --git a/cloudformation/quicksight/aws-quicksight-dashboard_pivottablefieldoptions.go b/cloudformation/quicksight/aws-quicksight-dashboard_pivottablefieldoptions.go
index 2326cb6ff8..8eee74e2a7 100644
--- a/cloudformation/quicksight/aws-quicksight-dashboard_pivottablefieldoptions.go
+++ b/cloudformation/quicksight/aws-quicksight-dashboard_pivottablefieldoptions.go
@@ -10,6 +10,11 @@ import (
 // See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-quicksight-dashboard-pivottablefieldoptions.html
 type Dashboard_PivotTableFieldOptions struct {
 
+	// CollapseStateOptions AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-quicksight-dashboard-pivottablefieldoptions.html#cfn-quicksight-dashboard-pivottablefieldoptions-collapsestateoptions
+	CollapseStateOptions []Dashboard_PivotTableFieldCollapseStateOption `json:"CollapseStateOptions,omitempty"`
+
 	// DataPathOptions AWS CloudFormation Property
 	// Required: false
 	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-quicksight-dashboard-pivottablefieldoptions.html#cfn-quicksight-dashboard-pivottablefieldoptions-datapathoptions
diff --git a/cloudformation/quicksight/aws-quicksight-dashboard_pivottableoptions.go b/cloudformation/quicksight/aws-quicksight-dashboard_pivottableoptions.go
index 1d9a99ef7c..2c62aeab82 100644
--- a/cloudformation/quicksight/aws-quicksight-dashboard_pivottableoptions.go
+++ b/cloudformation/quicksight/aws-quicksight-dashboard_pivottableoptions.go
@@ -15,6 +15,11 @@ type Dashboard_PivotTableOptions struct {
 	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-quicksight-dashboard-pivottableoptions.html#cfn-quicksight-dashboard-pivottableoptions-cellstyle
 	CellStyle *Dashboard_TableCellStyle `json:"CellStyle,omitempty"`
 
+	// CollapsedRowDimensionsVisibility AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-quicksight-dashboard-pivottableoptions.html#cfn-quicksight-dashboard-pivottableoptions-collapsedrowdimensionsvisibility
+	CollapsedRowDimensionsVisibility *string `json:"CollapsedRowDimensionsVisibility,omitempty"`
+
 	// ColumnHeaderStyle AWS CloudFormation Property
 	// Required: false
 	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-quicksight-dashboard-pivottableoptions.html#cfn-quicksight-dashboard-pivottableoptions-columnheaderstyle
diff --git a/cloudformation/quicksight/aws-quicksight-dashboard_radarchartconfiguration.go b/cloudformation/quicksight/aws-quicksight-dashboard_radarchartconfiguration.go
index 66e3d8c824..64a3e445f6 100644
--- a/cloudformation/quicksight/aws-quicksight-dashboard_radarchartconfiguration.go
+++ b/cloudformation/quicksight/aws-quicksight-dashboard_radarchartconfiguration.go
@@ -25,6 +25,11 @@ type Dashboard_RadarChartConfiguration struct {
 	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-quicksight-dashboard-radarchartconfiguration.html#cfn-quicksight-dashboard-radarchartconfiguration-alternatebandoddcolor
 	AlternateBandOddColor *string `json:"AlternateBandOddColor,omitempty"`
 
+	// AxesRangeScale AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-quicksight-dashboard-radarchartconfiguration.html#cfn-quicksight-dashboard-radarchartconfiguration-axesrangescale
+	AxesRangeScale *string `json:"AxesRangeScale,omitempty"`
+
 	// BaseSeriesSettings AWS CloudFormation Property
 	// Required: false
 	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-quicksight-dashboard-radarchartconfiguration.html#cfn-quicksight-dashboard-radarchartconfiguration-baseseriessettings
diff --git a/cloudformation/quicksight/aws-quicksight-dashboard_referencelinedynamicdataconfiguration.go b/cloudformation/quicksight/aws-quicksight-dashboard_referencelinedynamicdataconfiguration.go
index d97025d122..5fccfa8947 100644
--- a/cloudformation/quicksight/aws-quicksight-dashboard_referencelinedynamicdataconfiguration.go
+++ b/cloudformation/quicksight/aws-quicksight-dashboard_referencelinedynamicdataconfiguration.go
@@ -21,9 +21,9 @@ type Dashboard_ReferenceLineDynamicDataConfiguration struct {
 	Column *Dashboard_ColumnIdentifier `json:"Column"`
 
 	// MeasureAggregationFunction AWS CloudFormation Property
-	// Required: true
+	// Required: false
 	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-quicksight-dashboard-referencelinedynamicdataconfiguration.html#cfn-quicksight-dashboard-referencelinedynamicdataconfiguration-measureaggregationfunction
-	MeasureAggregationFunction *Dashboard_AggregationFunction `json:"MeasureAggregationFunction"`
+	MeasureAggregationFunction *Dashboard_AggregationFunction `json:"MeasureAggregationFunction,omitempty"`
 
 	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
 	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
diff --git a/cloudformation/quicksight/aws-quicksight-dashboard_scatterplotcategoricallyaggregatedfieldwells.go b/cloudformation/quicksight/aws-quicksight-dashboard_scatterplotcategoricallyaggregatedfieldwells.go
index dbacf83dfb..e44c3a51ad 100644
--- a/cloudformation/quicksight/aws-quicksight-dashboard_scatterplotcategoricallyaggregatedfieldwells.go
+++ b/cloudformation/quicksight/aws-quicksight-dashboard_scatterplotcategoricallyaggregatedfieldwells.go
@@ -15,6 +15,11 @@ type Dashboard_ScatterPlotCategoricallyAggregatedFieldWells struct {
 	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-quicksight-dashboard-scatterplotcategoricallyaggregatedfieldwells.html#cfn-quicksight-dashboard-scatterplotcategoricallyaggregatedfieldwells-category
 	Category []Dashboard_DimensionField `json:"Category,omitempty"`
 
+	// Label AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-quicksight-dashboard-scatterplotcategoricallyaggregatedfieldwells.html#cfn-quicksight-dashboard-scatterplotcategoricallyaggregatedfieldwells-label
+	Label []Dashboard_DimensionField `json:"Label,omitempty"`
+
 	// Size AWS CloudFormation Property
 	// Required: false
 	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-quicksight-dashboard-scatterplotcategoricallyaggregatedfieldwells.html#cfn-quicksight-dashboard-scatterplotcategoricallyaggregatedfieldwells-size
diff --git a/cloudformation/quicksight/aws-quicksight-dashboard_scatterplotunaggregatedfieldwells.go b/cloudformation/quicksight/aws-quicksight-dashboard_scatterplotunaggregatedfieldwells.go
index a831647862..bdb0fc52d6 100644
--- a/cloudformation/quicksight/aws-quicksight-dashboard_scatterplotunaggregatedfieldwells.go
+++ b/cloudformation/quicksight/aws-quicksight-dashboard_scatterplotunaggregatedfieldwells.go
@@ -10,6 +10,16 @@ import (
 // See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-quicksight-dashboard-scatterplotunaggregatedfieldwells.html
 type Dashboard_ScatterPlotUnaggregatedFieldWells struct {
 
+	// Category AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-quicksight-dashboard-scatterplotunaggregatedfieldwells.html#cfn-quicksight-dashboard-scatterplotunaggregatedfieldwells-category
+	Category []Dashboard_DimensionField `json:"Category,omitempty"`
+
+	// Label AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-quicksight-dashboard-scatterplotunaggregatedfieldwells.html#cfn-quicksight-dashboard-scatterplotunaggregatedfieldwells-label
+	Label []Dashboard_DimensionField `json:"Label,omitempty"`
+
 	// Size AWS CloudFormation Property
 	// Required: false
 	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-quicksight-dashboard-scatterplotunaggregatedfieldwells.html#cfn-quicksight-dashboard-scatterplotunaggregatedfieldwells-size
diff --git a/cloudformation/quicksight/aws-quicksight-template_aggregationsortconfiguration.go b/cloudformation/quicksight/aws-quicksight-template_aggregationsortconfiguration.go
index e8c6c76707..dced98acb3 100644
--- a/cloudformation/quicksight/aws-quicksight-template_aggregationsortconfiguration.go
+++ b/cloudformation/quicksight/aws-quicksight-template_aggregationsortconfiguration.go
@@ -11,9 +11,9 @@ import (
 type Template_AggregationSortConfiguration struct {
 
 	// AggregationFunction AWS CloudFormation Property
-	// Required: true
+	// Required: false
 	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-quicksight-template-aggregationsortconfiguration.html#cfn-quicksight-template-aggregationsortconfiguration-aggregationfunction
-	AggregationFunction *Template_AggregationFunction `json:"AggregationFunction"`
+	AggregationFunction *Template_AggregationFunction `json:"AggregationFunction,omitempty"`
 
 	// Column AWS CloudFormation Property
 	// Required: true
diff --git a/cloudformation/quicksight/aws-quicksight-template_columnconfiguration.go b/cloudformation/quicksight/aws-quicksight-template_columnconfiguration.go
index ed06b15a09..7e6398d322 100644
--- a/cloudformation/quicksight/aws-quicksight-template_columnconfiguration.go
+++ b/cloudformation/quicksight/aws-quicksight-template_columnconfiguration.go
@@ -10,11 +10,6 @@ import (
 // See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-quicksight-template-columnconfiguration.html
 type Template_ColumnConfiguration struct {
 
-	// ColorsConfiguration AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-quicksight-template-columnconfiguration.html#cfn-quicksight-template-columnconfiguration-colorsconfiguration
-	ColorsConfiguration *Template_ColorsConfiguration `json:"ColorsConfiguration,omitempty"`
-
 	// Column AWS CloudFormation Property
 	// Required: true
 	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-quicksight-template-columnconfiguration.html#cfn-quicksight-template-columnconfiguration-column
diff --git a/cloudformation/quicksight/aws-quicksight-template_datalabeloptions.go b/cloudformation/quicksight/aws-quicksight-template_datalabeloptions.go
index 4fdf5716a1..e175742d6c 100644
--- a/cloudformation/quicksight/aws-quicksight-template_datalabeloptions.go
+++ b/cloudformation/quicksight/aws-quicksight-template_datalabeloptions.go
@@ -50,6 +50,11 @@ type Template_DataLabelOptions struct {
 	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-quicksight-template-datalabeloptions.html#cfn-quicksight-template-datalabeloptions-position
 	Position *string `json:"Position,omitempty"`
 
+	// TotalsVisibility AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-quicksight-template-datalabeloptions.html#cfn-quicksight-template-datalabeloptions-totalsvisibility
+	TotalsVisibility *string `json:"TotalsVisibility,omitempty"`
+
 	// Visibility AWS CloudFormation Property
 	// Required: false
 	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-quicksight-template-datalabeloptions.html#cfn-quicksight-template-datalabeloptions-visibility
diff --git a/cloudformation/quicksight/aws-quicksight-template_destinationparametervalueconfiguration.go b/cloudformation/quicksight/aws-quicksight-template_destinationparametervalueconfiguration.go
index 05250a3378..97ecad43b8 100644
--- a/cloudformation/quicksight/aws-quicksight-template_destinationparametervalueconfiguration.go
+++ b/cloudformation/quicksight/aws-quicksight-template_destinationparametervalueconfiguration.go
@@ -20,6 +20,11 @@ type Template_DestinationParameterValueConfiguration struct {
 	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-quicksight-template-destinationparametervalueconfiguration.html#cfn-quicksight-template-destinationparametervalueconfiguration-selectallvalueoptions
 	SelectAllValueOptions *string `json:"SelectAllValueOptions,omitempty"`
 
+	// SourceColumn AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-quicksight-template-destinationparametervalueconfiguration.html#cfn-quicksight-template-destinationparametervalueconfiguration-sourcecolumn
+	SourceColumn *Template_ColumnIdentifier `json:"SourceColumn,omitempty"`
+
 	// SourceField AWS CloudFormation Property
 	// Required: false
 	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-quicksight-template-destinationparametervalueconfiguration.html#cfn-quicksight-template-destinationparametervalueconfiguration-sourcefield
diff --git a/cloudformation/quicksight/aws-quicksight-template_filteroperationselectedfieldsconfiguration.go b/cloudformation/quicksight/aws-quicksight-template_filteroperationselectedfieldsconfiguration.go
index 663863cf66..317ad0ff08 100644
--- a/cloudformation/quicksight/aws-quicksight-template_filteroperationselectedfieldsconfiguration.go
+++ b/cloudformation/quicksight/aws-quicksight-template_filteroperationselectedfieldsconfiguration.go
@@ -10,6 +10,11 @@ import (
 // See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-quicksight-template-filteroperationselectedfieldsconfiguration.html
 type Template_FilterOperationSelectedFieldsConfiguration struct {
 
+	// SelectedColumns AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-quicksight-template-filteroperationselectedfieldsconfiguration.html#cfn-quicksight-template-filteroperationselectedfieldsconfiguration-selectedcolumns
+	SelectedColumns []Template_ColumnIdentifier `json:"SelectedColumns,omitempty"`
+
 	// SelectedFieldOptions AWS CloudFormation Property
 	// Required: false
 	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-quicksight-template-filteroperationselectedfieldsconfiguration.html#cfn-quicksight-template-filteroperationselectedfieldsconfiguration-selectedfieldoptions
diff --git a/cloudformation/quicksight/aws-quicksight-template_geospatialheatmapcolorscale.go b/cloudformation/quicksight/aws-quicksight-template_geospatialheatmapcolorscale.go
new file mode 100644
index 0000000000..0739b03ff7
--- /dev/null
+++ b/cloudformation/quicksight/aws-quicksight-template_geospatialheatmapcolorscale.go
@@ -0,0 +1,37 @@
+// Code generated by "go generate". Please don't change this file directly.
+
+package quicksight
+
+import (
+	"github.com/awslabs/goformation/v7/cloudformation/policies"
+)
+
+// Template_GeospatialHeatmapColorScale AWS CloudFormation Resource (AWS::QuickSight::Template.GeospatialHeatmapColorScale)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-quicksight-template-geospatialheatmapcolorscale.html
+type Template_GeospatialHeatmapColorScale struct {
+
+	// Colors AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-quicksight-template-geospatialheatmapcolorscale.html#cfn-quicksight-template-geospatialheatmapcolorscale-colors
+	Colors []Template_GeospatialHeatmapDataColor `json:"Colors,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 *Template_GeospatialHeatmapColorScale) AWSCloudFormationType() string {
+	return "AWS::QuickSight::Template.GeospatialHeatmapColorScale"
+}
diff --git a/cloudformation/quicksight/aws-quicksight-template_geospatialheatmapconfiguration.go b/cloudformation/quicksight/aws-quicksight-template_geospatialheatmapconfiguration.go
new file mode 100644
index 0000000000..35b26930d4
--- /dev/null
+++ b/cloudformation/quicksight/aws-quicksight-template_geospatialheatmapconfiguration.go
@@ -0,0 +1,37 @@
+// Code generated by "go generate". Please don't change this file directly.
+
+package quicksight
+
+import (
+	"github.com/awslabs/goformation/v7/cloudformation/policies"
+)
+
+// Template_GeospatialHeatmapConfiguration AWS CloudFormation Resource (AWS::QuickSight::Template.GeospatialHeatmapConfiguration)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-quicksight-template-geospatialheatmapconfiguration.html
+type Template_GeospatialHeatmapConfiguration struct {
+
+	// HeatmapColor AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-quicksight-template-geospatialheatmapconfiguration.html#cfn-quicksight-template-geospatialheatmapconfiguration-heatmapcolor
+	HeatmapColor *Template_GeospatialHeatmapColorScale `json:"HeatmapColor,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 *Template_GeospatialHeatmapConfiguration) AWSCloudFormationType() string {
+	return "AWS::QuickSight::Template.GeospatialHeatmapConfiguration"
+}
diff --git a/cloudformation/quicksight/aws-quicksight-template_geospatialheatmapdatacolor.go b/cloudformation/quicksight/aws-quicksight-template_geospatialheatmapdatacolor.go
new file mode 100644
index 0000000000..21a469c6e9
--- /dev/null
+++ b/cloudformation/quicksight/aws-quicksight-template_geospatialheatmapdatacolor.go
@@ -0,0 +1,37 @@
+// Code generated by "go generate". Please don't change this file directly.
+
+package quicksight
+
+import (
+	"github.com/awslabs/goformation/v7/cloudformation/policies"
+)
+
+// Template_GeospatialHeatmapDataColor AWS CloudFormation Resource (AWS::QuickSight::Template.GeospatialHeatmapDataColor)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-quicksight-template-geospatialheatmapdatacolor.html
+type Template_GeospatialHeatmapDataColor struct {
+
+	// Color AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-quicksight-template-geospatialheatmapdatacolor.html#cfn-quicksight-template-geospatialheatmapdatacolor-color
+	Color string `json:"Color"`
+
+	// 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 *Template_GeospatialHeatmapDataColor) AWSCloudFormationType() string {
+	return "AWS::QuickSight::Template.GeospatialHeatmapDataColor"
+}
diff --git a/cloudformation/quicksight/aws-quicksight-template_geospatialpointstyleoptions.go b/cloudformation/quicksight/aws-quicksight-template_geospatialpointstyleoptions.go
index ab5cf6cac1..2c4e49092f 100644
--- a/cloudformation/quicksight/aws-quicksight-template_geospatialpointstyleoptions.go
+++ b/cloudformation/quicksight/aws-quicksight-template_geospatialpointstyleoptions.go
@@ -15,6 +15,11 @@ type Template_GeospatialPointStyleOptions struct {
 	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-quicksight-template-geospatialpointstyleoptions.html#cfn-quicksight-template-geospatialpointstyleoptions-clustermarkerconfiguration
 	ClusterMarkerConfiguration *Template_ClusterMarkerConfiguration `json:"ClusterMarkerConfiguration,omitempty"`
 
+	// HeatmapConfiguration AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-quicksight-template-geospatialpointstyleoptions.html#cfn-quicksight-template-geospatialpointstyleoptions-heatmapconfiguration
+	HeatmapConfiguration *Template_GeospatialHeatmapConfiguration `json:"HeatmapConfiguration,omitempty"`
+
 	// SelectedPointStyle AWS CloudFormation Property
 	// Required: false
 	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-quicksight-template-geospatialpointstyleoptions.html#cfn-quicksight-template-geospatialpointstyleoptions-selectedpointstyle
diff --git a/cloudformation/quicksight/aws-quicksight-template_pivottablecellconditionalformatting.go b/cloudformation/quicksight/aws-quicksight-template_pivottablecellconditionalformatting.go
index 5bc568cff7..2a7448d94e 100644
--- a/cloudformation/quicksight/aws-quicksight-template_pivottablecellconditionalformatting.go
+++ b/cloudformation/quicksight/aws-quicksight-template_pivottablecellconditionalformatting.go
@@ -20,6 +20,11 @@ type Template_PivotTableCellConditionalFormatting struct {
 	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-quicksight-template-pivottablecellconditionalformatting.html#cfn-quicksight-template-pivottablecellconditionalformatting-scope
 	Scope *Template_PivotTableConditionalFormattingScope `json:"Scope,omitempty"`
 
+	// Scopes AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-quicksight-template-pivottablecellconditionalformatting.html#cfn-quicksight-template-pivottablecellconditionalformatting-scopes
+	Scopes []Template_PivotTableConditionalFormattingScope `json:"Scopes,omitempty"`
+
 	// TextFormat AWS CloudFormation Property
 	// Required: false
 	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-quicksight-template-pivottablecellconditionalformatting.html#cfn-quicksight-template-pivottablecellconditionalformatting-textformat
diff --git a/cloudformation/quicksight/aws-quicksight-template_pivottablefieldcollapsestateoption.go b/cloudformation/quicksight/aws-quicksight-template_pivottablefieldcollapsestateoption.go
new file mode 100644
index 0000000000..bf5f77969b
--- /dev/null
+++ b/cloudformation/quicksight/aws-quicksight-template_pivottablefieldcollapsestateoption.go
@@ -0,0 +1,42 @@
+// Code generated by "go generate". Please don't change this file directly.
+
+package quicksight
+
+import (
+	"github.com/awslabs/goformation/v7/cloudformation/policies"
+)
+
+// Template_PivotTableFieldCollapseStateOption AWS CloudFormation Resource (AWS::QuickSight::Template.PivotTableFieldCollapseStateOption)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-quicksight-template-pivottablefieldcollapsestateoption.html
+type Template_PivotTableFieldCollapseStateOption struct {
+
+	// State AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-quicksight-template-pivottablefieldcollapsestateoption.html#cfn-quicksight-template-pivottablefieldcollapsestateoption-state
+	State *string `json:"State,omitempty"`
+
+	// Target AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-quicksight-template-pivottablefieldcollapsestateoption.html#cfn-quicksight-template-pivottablefieldcollapsestateoption-target
+	Target *Template_PivotTableFieldCollapseStateTarget `json:"Target"`
+
+	// 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 *Template_PivotTableFieldCollapseStateOption) AWSCloudFormationType() string {
+	return "AWS::QuickSight::Template.PivotTableFieldCollapseStateOption"
+}
diff --git a/cloudformation/quicksight/aws-quicksight-template_pivottablefieldcollapsestatetarget.go b/cloudformation/quicksight/aws-quicksight-template_pivottablefieldcollapsestatetarget.go
new file mode 100644
index 0000000000..362ace74f9
--- /dev/null
+++ b/cloudformation/quicksight/aws-quicksight-template_pivottablefieldcollapsestatetarget.go
@@ -0,0 +1,42 @@
+// Code generated by "go generate". Please don't change this file directly.
+
+package quicksight
+
+import (
+	"github.com/awslabs/goformation/v7/cloudformation/policies"
+)
+
+// Template_PivotTableFieldCollapseStateTarget AWS CloudFormation Resource (AWS::QuickSight::Template.PivotTableFieldCollapseStateTarget)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-quicksight-template-pivottablefieldcollapsestatetarget.html
+type Template_PivotTableFieldCollapseStateTarget struct {
+
+	// FieldDataPathValues AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-quicksight-template-pivottablefieldcollapsestatetarget.html#cfn-quicksight-template-pivottablefieldcollapsestatetarget-fielddatapathvalues
+	FieldDataPathValues []Template_DataPathValue `json:"FieldDataPathValues,omitempty"`
+
+	// FieldId AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-quicksight-template-pivottablefieldcollapsestatetarget.html#cfn-quicksight-template-pivottablefieldcollapsestatetarget-fieldid
+	FieldId *string `json:"FieldId,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 *Template_PivotTableFieldCollapseStateTarget) AWSCloudFormationType() string {
+	return "AWS::QuickSight::Template.PivotTableFieldCollapseStateTarget"
+}
diff --git a/cloudformation/quicksight/aws-quicksight-template_pivottablefieldoptions.go b/cloudformation/quicksight/aws-quicksight-template_pivottablefieldoptions.go
index 4798fa1778..30d781a0e6 100644
--- a/cloudformation/quicksight/aws-quicksight-template_pivottablefieldoptions.go
+++ b/cloudformation/quicksight/aws-quicksight-template_pivottablefieldoptions.go
@@ -10,6 +10,11 @@ import (
 // See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-quicksight-template-pivottablefieldoptions.html
 type Template_PivotTableFieldOptions struct {
 
+	// CollapseStateOptions AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-quicksight-template-pivottablefieldoptions.html#cfn-quicksight-template-pivottablefieldoptions-collapsestateoptions
+	CollapseStateOptions []Template_PivotTableFieldCollapseStateOption `json:"CollapseStateOptions,omitempty"`
+
 	// DataPathOptions AWS CloudFormation Property
 	// Required: false
 	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-quicksight-template-pivottablefieldoptions.html#cfn-quicksight-template-pivottablefieldoptions-datapathoptions
diff --git a/cloudformation/quicksight/aws-quicksight-template_pivottableoptions.go b/cloudformation/quicksight/aws-quicksight-template_pivottableoptions.go
index b8ac007561..e6a7f9f864 100644
--- a/cloudformation/quicksight/aws-quicksight-template_pivottableoptions.go
+++ b/cloudformation/quicksight/aws-quicksight-template_pivottableoptions.go
@@ -15,6 +15,11 @@ type Template_PivotTableOptions struct {
 	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-quicksight-template-pivottableoptions.html#cfn-quicksight-template-pivottableoptions-cellstyle
 	CellStyle *Template_TableCellStyle `json:"CellStyle,omitempty"`
 
+	// CollapsedRowDimensionsVisibility AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-quicksight-template-pivottableoptions.html#cfn-quicksight-template-pivottableoptions-collapsedrowdimensionsvisibility
+	CollapsedRowDimensionsVisibility *string `json:"CollapsedRowDimensionsVisibility,omitempty"`
+
 	// ColumnHeaderStyle AWS CloudFormation Property
 	// Required: false
 	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-quicksight-template-pivottableoptions.html#cfn-quicksight-template-pivottableoptions-columnheaderstyle
diff --git a/cloudformation/quicksight/aws-quicksight-template_radarchartconfiguration.go b/cloudformation/quicksight/aws-quicksight-template_radarchartconfiguration.go
index d5559d818c..02cd815476 100644
--- a/cloudformation/quicksight/aws-quicksight-template_radarchartconfiguration.go
+++ b/cloudformation/quicksight/aws-quicksight-template_radarchartconfiguration.go
@@ -25,6 +25,11 @@ type Template_RadarChartConfiguration struct {
 	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-quicksight-template-radarchartconfiguration.html#cfn-quicksight-template-radarchartconfiguration-alternatebandoddcolor
 	AlternateBandOddColor *string `json:"AlternateBandOddColor,omitempty"`
 
+	// AxesRangeScale AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-quicksight-template-radarchartconfiguration.html#cfn-quicksight-template-radarchartconfiguration-axesrangescale
+	AxesRangeScale *string `json:"AxesRangeScale,omitempty"`
+
 	// BaseSeriesSettings AWS CloudFormation Property
 	// Required: false
 	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-quicksight-template-radarchartconfiguration.html#cfn-quicksight-template-radarchartconfiguration-baseseriessettings
diff --git a/cloudformation/quicksight/aws-quicksight-template_referencelinedynamicdataconfiguration.go b/cloudformation/quicksight/aws-quicksight-template_referencelinedynamicdataconfiguration.go
index fd6111d9af..625f5203c1 100644
--- a/cloudformation/quicksight/aws-quicksight-template_referencelinedynamicdataconfiguration.go
+++ b/cloudformation/quicksight/aws-quicksight-template_referencelinedynamicdataconfiguration.go
@@ -21,9 +21,9 @@ type Template_ReferenceLineDynamicDataConfiguration struct {
 	Column *Template_ColumnIdentifier `json:"Column"`
 
 	// MeasureAggregationFunction AWS CloudFormation Property
-	// Required: true
+	// Required: false
 	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-quicksight-template-referencelinedynamicdataconfiguration.html#cfn-quicksight-template-referencelinedynamicdataconfiguration-measureaggregationfunction
-	MeasureAggregationFunction *Template_AggregationFunction `json:"MeasureAggregationFunction"`
+	MeasureAggregationFunction *Template_AggregationFunction `json:"MeasureAggregationFunction,omitempty"`
 
 	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
 	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
diff --git a/cloudformation/quicksight/aws-quicksight-template_scatterplotcategoricallyaggregatedfieldwells.go b/cloudformation/quicksight/aws-quicksight-template_scatterplotcategoricallyaggregatedfieldwells.go
index 6ce09d996f..8bedb8dfab 100644
--- a/cloudformation/quicksight/aws-quicksight-template_scatterplotcategoricallyaggregatedfieldwells.go
+++ b/cloudformation/quicksight/aws-quicksight-template_scatterplotcategoricallyaggregatedfieldwells.go
@@ -15,6 +15,11 @@ type Template_ScatterPlotCategoricallyAggregatedFieldWells struct {
 	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-quicksight-template-scatterplotcategoricallyaggregatedfieldwells.html#cfn-quicksight-template-scatterplotcategoricallyaggregatedfieldwells-category
 	Category []Template_DimensionField `json:"Category,omitempty"`
 
+	// Label AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-quicksight-template-scatterplotcategoricallyaggregatedfieldwells.html#cfn-quicksight-template-scatterplotcategoricallyaggregatedfieldwells-label
+	Label []Template_DimensionField `json:"Label,omitempty"`
+
 	// Size AWS CloudFormation Property
 	// Required: false
 	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-quicksight-template-scatterplotcategoricallyaggregatedfieldwells.html#cfn-quicksight-template-scatterplotcategoricallyaggregatedfieldwells-size
diff --git a/cloudformation/quicksight/aws-quicksight-template_scatterplotunaggregatedfieldwells.go b/cloudformation/quicksight/aws-quicksight-template_scatterplotunaggregatedfieldwells.go
index 18df6c789c..f3dcb802d3 100644
--- a/cloudformation/quicksight/aws-quicksight-template_scatterplotunaggregatedfieldwells.go
+++ b/cloudformation/quicksight/aws-quicksight-template_scatterplotunaggregatedfieldwells.go
@@ -10,6 +10,16 @@ import (
 // See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-quicksight-template-scatterplotunaggregatedfieldwells.html
 type Template_ScatterPlotUnaggregatedFieldWells struct {
 
+	// Category AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-quicksight-template-scatterplotunaggregatedfieldwells.html#cfn-quicksight-template-scatterplotunaggregatedfieldwells-category
+	Category []Template_DimensionField `json:"Category,omitempty"`
+
+	// Label AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-quicksight-template-scatterplotunaggregatedfieldwells.html#cfn-quicksight-template-scatterplotunaggregatedfieldwells-label
+	Label []Template_DimensionField `json:"Label,omitempty"`
+
 	// Size AWS CloudFormation Property
 	// Required: false
 	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-quicksight-template-scatterplotunaggregatedfieldwells.html#cfn-quicksight-template-scatterplotunaggregatedfieldwells-size
diff --git a/cloudformation/quicksight/aws-quicksight-theme.go b/cloudformation/quicksight/aws-quicksight-theme.go
index 1b121fff41..163ac95210 100644
--- a/cloudformation/quicksight/aws-quicksight-theme.go
+++ b/cloudformation/quicksight/aws-quicksight-theme.go
@@ -20,19 +20,19 @@ type Theme struct {
 	AwsAccountId string `json:"AwsAccountId"`
 
 	// BaseThemeId AWS CloudFormation Property
-	// Required: false
+	// Required: true
 	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-quicksight-theme.html#cfn-quicksight-theme-basethemeid
-	BaseThemeId *string `json:"BaseThemeId,omitempty"`
+	BaseThemeId string `json:"BaseThemeId"`
 
 	// Configuration AWS CloudFormation Property
-	// Required: false
+	// Required: true
 	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-quicksight-theme.html#cfn-quicksight-theme-configuration
-	Configuration *Theme_ThemeConfiguration `json:"Configuration,omitempty"`
+	Configuration *Theme_ThemeConfiguration `json:"Configuration"`
 
 	// Name AWS CloudFormation Property
-	// Required: false
+	// Required: true
 	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-quicksight-theme.html#cfn-quicksight-theme-name
-	Name *string `json:"Name,omitempty"`
+	Name string `json:"Name"`
 
 	// Permissions AWS CloudFormation Property
 	// Required: false
diff --git a/cloudformation/quicksight/aws-quicksight-theme_resourcepermission.go b/cloudformation/quicksight/aws-quicksight-theme_resourcepermission.go
index dd43c12a72..e91b486924 100644
--- a/cloudformation/quicksight/aws-quicksight-theme_resourcepermission.go
+++ b/cloudformation/quicksight/aws-quicksight-theme_resourcepermission.go
@@ -20,6 +20,11 @@ type Theme_ResourcePermission struct {
 	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-quicksight-theme-resourcepermission.html#cfn-quicksight-theme-resourcepermission-principal
 	Principal string `json:"Principal"`
 
+	// Resource AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-quicksight-theme-resourcepermission.html#cfn-quicksight-theme-resourcepermission-resource
+	Resource *string `json:"Resource,omitempty"`
+
 	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
 	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
 
diff --git a/cloudformation/sagemaker/aws-sagemaker-modelpackage.go b/cloudformation/sagemaker/aws-sagemaker-modelpackage.go
index 9e0df5b050..e198c03841 100644
--- a/cloudformation/sagemaker/aws-sagemaker-modelpackage.go
+++ b/cloudformation/sagemaker/aws-sagemaker-modelpackage.go
@@ -14,11 +14,6 @@ import (
 // See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-sagemaker-modelpackage.html
 type ModelPackage struct {
 
-	// AdditionalInferenceSpecificationDefinition AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-sagemaker-modelpackage.html#cfn-sagemaker-modelpackage-additionalinferencespecificationdefinition
-	AdditionalInferenceSpecificationDefinition *ModelPackage_AdditionalInferenceSpecificationDefinition `json:"AdditionalInferenceSpecificationDefinition,omitempty"`
-
 	// AdditionalInferenceSpecifications AWS CloudFormation Property
 	// Required: false
 	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-sagemaker-modelpackage.html#cfn-sagemaker-modelpackage-additionalinferencespecifications
@@ -44,11 +39,6 @@ type ModelPackage struct {
 	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-sagemaker-modelpackage.html#cfn-sagemaker-modelpackage-clienttoken
 	ClientToken *string `json:"ClientToken,omitempty"`
 
-	// CreatedBy AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-sagemaker-modelpackage.html#cfn-sagemaker-modelpackage-createdby
-	CreatedBy *ModelPackage_UserContext `json:"CreatedBy,omitempty"`
-
 	// CustomerMetadataProperties AWS CloudFormation Property
 	// Required: false
 	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-sagemaker-modelpackage.html#cfn-sagemaker-modelpackage-customermetadataproperties
@@ -64,21 +54,11 @@ type ModelPackage struct {
 	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-sagemaker-modelpackage.html#cfn-sagemaker-modelpackage-driftcheckbaselines
 	DriftCheckBaselines *ModelPackage_DriftCheckBaselines `json:"DriftCheckBaselines,omitempty"`
 
-	// Environment AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-sagemaker-modelpackage.html#cfn-sagemaker-modelpackage-environment
-	Environment map[string]string `json:"Environment,omitempty"`
-
 	// InferenceSpecification AWS CloudFormation Property
 	// Required: false
 	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-sagemaker-modelpackage.html#cfn-sagemaker-modelpackage-inferencespecification
 	InferenceSpecification *ModelPackage_InferenceSpecification `json:"InferenceSpecification,omitempty"`
 
-	// LastModifiedBy AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-sagemaker-modelpackage.html#cfn-sagemaker-modelpackage-lastmodifiedby
-	LastModifiedBy *ModelPackage_UserContext `json:"LastModifiedBy,omitempty"`
-
 	// LastModifiedTime AWS CloudFormation Property
 	// Required: false
 	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-sagemaker-modelpackage.html#cfn-sagemaker-modelpackage-lastmodifiedtime
@@ -119,11 +99,6 @@ type ModelPackage struct {
 	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-sagemaker-modelpackage.html#cfn-sagemaker-modelpackage-modelpackagestatusdetails
 	ModelPackageStatusDetails *ModelPackage_ModelPackageStatusDetails `json:"ModelPackageStatusDetails,omitempty"`
 
-	// ModelPackageStatusItem AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-sagemaker-modelpackage.html#cfn-sagemaker-modelpackage-modelpackagestatusitem
-	ModelPackageStatusItem *ModelPackage_ModelPackageStatusItem `json:"ModelPackageStatusItem,omitempty"`
-
 	// ModelPackageVersion AWS CloudFormation Property
 	// Required: false
 	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-sagemaker-modelpackage.html#cfn-sagemaker-modelpackage-modelpackageversion
diff --git a/cloudformation/sagemaker/aws-sagemaker-modelpackage_modelpackagecontainerdefinition.go b/cloudformation/sagemaker/aws-sagemaker-modelpackage_modelpackagecontainerdefinition.go
index c2a6aa1f4c..9362582cdf 100644
--- a/cloudformation/sagemaker/aws-sagemaker-modelpackage_modelpackagecontainerdefinition.go
+++ b/cloudformation/sagemaker/aws-sagemaker-modelpackage_modelpackagecontainerdefinition.go
@@ -55,11 +55,6 @@ type ModelPackage_ModelPackageContainerDefinition struct {
 	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-sagemaker-modelpackage-modelpackagecontainerdefinition.html#cfn-sagemaker-modelpackage-modelpackagecontainerdefinition-nearestmodelname
 	NearestModelName *string `json:"NearestModelName,omitempty"`
 
-	// ProductId AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-sagemaker-modelpackage-modelpackagecontainerdefinition.html#cfn-sagemaker-modelpackage-modelpackagecontainerdefinition-productid
-	ProductId *string `json:"ProductId,omitempty"`
-
 	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
 	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
 
diff --git a/cloudformation/sagemaker/aws-sagemaker-modelpackage_modelpackagestatusdetails.go b/cloudformation/sagemaker/aws-sagemaker-modelpackage_modelpackagestatusdetails.go
index e93a84c7f0..7072e755c3 100644
--- a/cloudformation/sagemaker/aws-sagemaker-modelpackage_modelpackagestatusdetails.go
+++ b/cloudformation/sagemaker/aws-sagemaker-modelpackage_modelpackagestatusdetails.go
@@ -10,15 +10,10 @@ import (
 // See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-sagemaker-modelpackage-modelpackagestatusdetails.html
 type ModelPackage_ModelPackageStatusDetails struct {
 
-	// ImageScanStatuses AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-sagemaker-modelpackage-modelpackagestatusdetails.html#cfn-sagemaker-modelpackage-modelpackagestatusdetails-imagescanstatuses
-	ImageScanStatuses []ModelPackage_ModelPackageStatusItem `json:"ImageScanStatuses,omitempty"`
-
 	// ValidationStatuses AWS CloudFormation Property
-	// Required: true
+	// Required: false
 	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-sagemaker-modelpackage-modelpackagestatusdetails.html#cfn-sagemaker-modelpackage-modelpackagestatusdetails-validationstatuses
-	ValidationStatuses []ModelPackage_ModelPackageStatusItem `json:"ValidationStatuses"`
+	ValidationStatuses []ModelPackage_ModelPackageStatusItem `json:"ValidationStatuses,omitempty"`
 
 	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
 	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
diff --git a/cloudformation/verifiedpermissions/aws-verifiedpermissions-identitysource.go b/cloudformation/verifiedpermissions/aws-verifiedpermissions-identitysource.go
new file mode 100644
index 0000000000..f7b40720bf
--- /dev/null
+++ b/cloudformation/verifiedpermissions/aws-verifiedpermissions-identitysource.go
@@ -0,0 +1,127 @@
+// Code generated by "go generate". Please don't change this file directly.
+
+package verifiedpermissions
+
+import (
+	"bytes"
+	"encoding/json"
+
+	"github.com/awslabs/goformation/v7/cloudformation/policies"
+)
+
+// IdentitySource AWS CloudFormation Resource (AWS::VerifiedPermissions::IdentitySource)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-verifiedpermissions-identitysource.html
+type IdentitySource struct {
+
+	// Configuration AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-verifiedpermissions-identitysource.html#cfn-verifiedpermissions-identitysource-configuration
+	Configuration *IdentitySource_IdentitySourceConfiguration `json:"Configuration"`
+
+	// PolicyStoreId AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-verifiedpermissions-identitysource.html#cfn-verifiedpermissions-identitysource-policystoreid
+	PolicyStoreId *string `json:"PolicyStoreId,omitempty"`
+
+	// PrincipalEntityType AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-verifiedpermissions-identitysource.html#cfn-verifiedpermissions-identitysource-principalentitytype
+	PrincipalEntityType *string `json:"PrincipalEntityType,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 *IdentitySource) AWSCloudFormationType() string {
+	return "AWS::VerifiedPermissions::IdentitySource"
+}
+
+// MarshalJSON is a custom JSON marshalling hook that embeds this object into
+// an AWS CloudFormation JSON resource's 'Properties' field and adds a 'Type'.
+func (r IdentitySource) MarshalJSON() ([]byte, error) {
+	type Properties IdentitySource
+	return json.Marshal(&struct {
+		Type                string
+		Properties          Properties
+		DependsOn           []string                     `json:"DependsOn,omitempty"`
+		Metadata            map[string]interface{}       `json:"Metadata,omitempty"`
+		DeletionPolicy      policies.DeletionPolicy      `json:"DeletionPolicy,omitempty"`
+		UpdateReplacePolicy policies.UpdateReplacePolicy `json:"UpdateReplacePolicy,omitempty"`
+		Condition           string                       `json:"Condition,omitempty"`
+	}{
+		Type:                r.AWSCloudFormationType(),
+		Properties:          (Properties)(r),
+		DependsOn:           r.AWSCloudFormationDependsOn,
+		Metadata:            r.AWSCloudFormationMetadata,
+		DeletionPolicy:      r.AWSCloudFormationDeletionPolicy,
+		UpdateReplacePolicy: r.AWSCloudFormationUpdateReplacePolicy,
+		Condition:           r.AWSCloudFormationCondition,
+	})
+}
+
+// UnmarshalJSON is a custom JSON unmarshalling hook that strips the outer
+// AWS CloudFormation resource object, and just keeps the 'Properties' field.
+func (r *IdentitySource) UnmarshalJSON(b []byte) error {
+	type Properties IdentitySource
+	res := &struct {
+		Type                string
+		Properties          *Properties
+		DependsOn           interface{}
+		Metadata            map[string]interface{}
+		DeletionPolicy      string
+		UpdateReplacePolicy string
+		Condition           string
+	}{}
+
+	dec := json.NewDecoder(bytes.NewReader(b))
+	dec.DisallowUnknownFields() // Force error if unknown field is found
+
+	if err := dec.Decode(&res); err != nil {
+		return err
+	}
+
+	// If the resource has no Properties set, it could be nil
+	if res.Properties != nil {
+		*r = IdentitySource(*res.Properties)
+	}
+	if res.DependsOn != nil {
+		switch obj := res.DependsOn.(type) {
+		case string:
+			r.AWSCloudFormationDependsOn = []string{obj}
+		case []interface{}:
+			s := make([]string, 0, len(obj))
+			for _, v := range obj {
+				if value, ok := v.(string); ok {
+					s = append(s, value)
+				}
+			}
+			r.AWSCloudFormationDependsOn = s
+		}
+	}
+	if res.Metadata != nil {
+		r.AWSCloudFormationMetadata = res.Metadata
+	}
+	if res.DeletionPolicy != "" {
+		r.AWSCloudFormationDeletionPolicy = policies.DeletionPolicy(res.DeletionPolicy)
+	}
+	if res.UpdateReplacePolicy != "" {
+		r.AWSCloudFormationUpdateReplacePolicy = policies.UpdateReplacePolicy(res.UpdateReplacePolicy)
+	}
+	if res.Condition != "" {
+		r.AWSCloudFormationCondition = res.Condition
+	}
+	return nil
+}
diff --git a/cloudformation/verifiedpermissions/aws-verifiedpermissions-identitysource_cognitouserpoolconfiguration.go b/cloudformation/verifiedpermissions/aws-verifiedpermissions-identitysource_cognitouserpoolconfiguration.go
new file mode 100644
index 0000000000..8490c9c03a
--- /dev/null
+++ b/cloudformation/verifiedpermissions/aws-verifiedpermissions-identitysource_cognitouserpoolconfiguration.go
@@ -0,0 +1,42 @@
+// Code generated by "go generate". Please don't change this file directly.
+
+package verifiedpermissions
+
+import (
+	"github.com/awslabs/goformation/v7/cloudformation/policies"
+)
+
+// IdentitySource_CognitoUserPoolConfiguration AWS CloudFormation Resource (AWS::VerifiedPermissions::IdentitySource.CognitoUserPoolConfiguration)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-verifiedpermissions-identitysource-cognitouserpoolconfiguration.html
+type IdentitySource_CognitoUserPoolConfiguration struct {
+
+	// ClientIds AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-verifiedpermissions-identitysource-cognitouserpoolconfiguration.html#cfn-verifiedpermissions-identitysource-cognitouserpoolconfiguration-clientids
+	ClientIds []string `json:"ClientIds,omitempty"`
+
+	// UserPoolArn AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-verifiedpermissions-identitysource-cognitouserpoolconfiguration.html#cfn-verifiedpermissions-identitysource-cognitouserpoolconfiguration-userpoolarn
+	UserPoolArn string `json:"UserPoolArn"`
+
+	// 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 *IdentitySource_CognitoUserPoolConfiguration) AWSCloudFormationType() string {
+	return "AWS::VerifiedPermissions::IdentitySource.CognitoUserPoolConfiguration"
+}
diff --git a/cloudformation/verifiedpermissions/aws-verifiedpermissions-identitysource_identitysourceconfiguration.go b/cloudformation/verifiedpermissions/aws-verifiedpermissions-identitysource_identitysourceconfiguration.go
new file mode 100644
index 0000000000..0f56502c01
--- /dev/null
+++ b/cloudformation/verifiedpermissions/aws-verifiedpermissions-identitysource_identitysourceconfiguration.go
@@ -0,0 +1,37 @@
+// Code generated by "go generate". Please don't change this file directly.
+
+package verifiedpermissions
+
+import (
+	"github.com/awslabs/goformation/v7/cloudformation/policies"
+)
+
+// IdentitySource_IdentitySourceConfiguration AWS CloudFormation Resource (AWS::VerifiedPermissions::IdentitySource.IdentitySourceConfiguration)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-verifiedpermissions-identitysource-identitysourceconfiguration.html
+type IdentitySource_IdentitySourceConfiguration struct {
+
+	// CognitoUserPoolConfiguration AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-verifiedpermissions-identitysource-identitysourceconfiguration.html#cfn-verifiedpermissions-identitysource-identitysourceconfiguration-cognitouserpoolconfiguration
+	CognitoUserPoolConfiguration *IdentitySource_CognitoUserPoolConfiguration `json:"CognitoUserPoolConfiguration"`
+
+	// 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 *IdentitySource_IdentitySourceConfiguration) AWSCloudFormationType() string {
+	return "AWS::VerifiedPermissions::IdentitySource.IdentitySourceConfiguration"
+}
diff --git a/cloudformation/verifiedpermissions/aws-verifiedpermissions-identitysource_identitysourcedetails.go b/cloudformation/verifiedpermissions/aws-verifiedpermissions-identitysource_identitysourcedetails.go
new file mode 100644
index 0000000000..cd332499b9
--- /dev/null
+++ b/cloudformation/verifiedpermissions/aws-verifiedpermissions-identitysource_identitysourcedetails.go
@@ -0,0 +1,52 @@
+// Code generated by "go generate". Please don't change this file directly.
+
+package verifiedpermissions
+
+import (
+	"github.com/awslabs/goformation/v7/cloudformation/policies"
+)
+
+// IdentitySource_IdentitySourceDetails AWS CloudFormation Resource (AWS::VerifiedPermissions::IdentitySource.IdentitySourceDetails)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-verifiedpermissions-identitysource-identitysourcedetails.html
+type IdentitySource_IdentitySourceDetails struct {
+
+	// ClientIds AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-verifiedpermissions-identitysource-identitysourcedetails.html#cfn-verifiedpermissions-identitysource-identitysourcedetails-clientids
+	ClientIds []string `json:"ClientIds,omitempty"`
+
+	// DiscoveryUrl AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-verifiedpermissions-identitysource-identitysourcedetails.html#cfn-verifiedpermissions-identitysource-identitysourcedetails-discoveryurl
+	DiscoveryUrl *string `json:"DiscoveryUrl,omitempty"`
+
+	// OpenIdIssuer AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-verifiedpermissions-identitysource-identitysourcedetails.html#cfn-verifiedpermissions-identitysource-identitysourcedetails-openidissuer
+	OpenIdIssuer *string `json:"OpenIdIssuer,omitempty"`
+
+	// UserPoolArn AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-verifiedpermissions-identitysource-identitysourcedetails.html#cfn-verifiedpermissions-identitysource-identitysourcedetails-userpoolarn
+	UserPoolArn *string `json:"UserPoolArn,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 *IdentitySource_IdentitySourceDetails) AWSCloudFormationType() string {
+	return "AWS::VerifiedPermissions::IdentitySource.IdentitySourceDetails"
+}
diff --git a/cloudformation/verifiedpermissions/aws-verifiedpermissions-policy.go b/cloudformation/verifiedpermissions/aws-verifiedpermissions-policy.go
new file mode 100644
index 0000000000..89350d350e
--- /dev/null
+++ b/cloudformation/verifiedpermissions/aws-verifiedpermissions-policy.go
@@ -0,0 +1,122 @@
+// Code generated by "go generate". Please don't change this file directly.
+
+package verifiedpermissions
+
+import (
+	"bytes"
+	"encoding/json"
+
+	"github.com/awslabs/goformation/v7/cloudformation/policies"
+)
+
+// Policy AWS CloudFormation Resource (AWS::VerifiedPermissions::Policy)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-verifiedpermissions-policy.html
+type Policy struct {
+
+	// Definition AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-verifiedpermissions-policy.html#cfn-verifiedpermissions-policy-definition
+	Definition *Policy_PolicyDefinition `json:"Definition"`
+
+	// PolicyStoreId AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-verifiedpermissions-policy.html#cfn-verifiedpermissions-policy-policystoreid
+	PolicyStoreId *string `json:"PolicyStoreId,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 *Policy) AWSCloudFormationType() string {
+	return "AWS::VerifiedPermissions::Policy"
+}
+
+// MarshalJSON is a custom JSON marshalling hook that embeds this object into
+// an AWS CloudFormation JSON resource's 'Properties' field and adds a 'Type'.
+func (r Policy) MarshalJSON() ([]byte, error) {
+	type Properties Policy
+	return json.Marshal(&struct {
+		Type                string
+		Properties          Properties
+		DependsOn           []string                     `json:"DependsOn,omitempty"`
+		Metadata            map[string]interface{}       `json:"Metadata,omitempty"`
+		DeletionPolicy      policies.DeletionPolicy      `json:"DeletionPolicy,omitempty"`
+		UpdateReplacePolicy policies.UpdateReplacePolicy `json:"UpdateReplacePolicy,omitempty"`
+		Condition           string                       `json:"Condition,omitempty"`
+	}{
+		Type:                r.AWSCloudFormationType(),
+		Properties:          (Properties)(r),
+		DependsOn:           r.AWSCloudFormationDependsOn,
+		Metadata:            r.AWSCloudFormationMetadata,
+		DeletionPolicy:      r.AWSCloudFormationDeletionPolicy,
+		UpdateReplacePolicy: r.AWSCloudFormationUpdateReplacePolicy,
+		Condition:           r.AWSCloudFormationCondition,
+	})
+}
+
+// UnmarshalJSON is a custom JSON unmarshalling hook that strips the outer
+// AWS CloudFormation resource object, and just keeps the 'Properties' field.
+func (r *Policy) UnmarshalJSON(b []byte) error {
+	type Properties Policy
+	res := &struct {
+		Type                string
+		Properties          *Properties
+		DependsOn           interface{}
+		Metadata            map[string]interface{}
+		DeletionPolicy      string
+		UpdateReplacePolicy string
+		Condition           string
+	}{}
+
+	dec := json.NewDecoder(bytes.NewReader(b))
+	dec.DisallowUnknownFields() // Force error if unknown field is found
+
+	if err := dec.Decode(&res); err != nil {
+		return err
+	}
+
+	// If the resource has no Properties set, it could be nil
+	if res.Properties != nil {
+		*r = Policy(*res.Properties)
+	}
+	if res.DependsOn != nil {
+		switch obj := res.DependsOn.(type) {
+		case string:
+			r.AWSCloudFormationDependsOn = []string{obj}
+		case []interface{}:
+			s := make([]string, 0, len(obj))
+			for _, v := range obj {
+				if value, ok := v.(string); ok {
+					s = append(s, value)
+				}
+			}
+			r.AWSCloudFormationDependsOn = s
+		}
+	}
+	if res.Metadata != nil {
+		r.AWSCloudFormationMetadata = res.Metadata
+	}
+	if res.DeletionPolicy != "" {
+		r.AWSCloudFormationDeletionPolicy = policies.DeletionPolicy(res.DeletionPolicy)
+	}
+	if res.UpdateReplacePolicy != "" {
+		r.AWSCloudFormationUpdateReplacePolicy = policies.UpdateReplacePolicy(res.UpdateReplacePolicy)
+	}
+	if res.Condition != "" {
+		r.AWSCloudFormationCondition = res.Condition
+	}
+	return nil
+}
diff --git a/cloudformation/verifiedpermissions/aws-verifiedpermissions-policy_entityidentifier.go b/cloudformation/verifiedpermissions/aws-verifiedpermissions-policy_entityidentifier.go
new file mode 100644
index 0000000000..afe760ac23
--- /dev/null
+++ b/cloudformation/verifiedpermissions/aws-verifiedpermissions-policy_entityidentifier.go
@@ -0,0 +1,42 @@
+// Code generated by "go generate". Please don't change this file directly.
+
+package verifiedpermissions
+
+import (
+	"github.com/awslabs/goformation/v7/cloudformation/policies"
+)
+
+// Policy_EntityIdentifier AWS CloudFormation Resource (AWS::VerifiedPermissions::Policy.EntityIdentifier)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-verifiedpermissions-policy-entityidentifier.html
+type Policy_EntityIdentifier struct {
+
+	// EntityId AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-verifiedpermissions-policy-entityidentifier.html#cfn-verifiedpermissions-policy-entityidentifier-entityid
+	EntityId string `json:"EntityId"`
+
+	// EntityType AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-verifiedpermissions-policy-entityidentifier.html#cfn-verifiedpermissions-policy-entityidentifier-entitytype
+	EntityType string `json:"EntityType"`
+
+	// 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 *Policy_EntityIdentifier) AWSCloudFormationType() string {
+	return "AWS::VerifiedPermissions::Policy.EntityIdentifier"
+}
diff --git a/cloudformation/verifiedpermissions/aws-verifiedpermissions-policy_policydefinition.go b/cloudformation/verifiedpermissions/aws-verifiedpermissions-policy_policydefinition.go
new file mode 100644
index 0000000000..f97c093b40
--- /dev/null
+++ b/cloudformation/verifiedpermissions/aws-verifiedpermissions-policy_policydefinition.go
@@ -0,0 +1,42 @@
+// Code generated by "go generate". Please don't change this file directly.
+
+package verifiedpermissions
+
+import (
+	"github.com/awslabs/goformation/v7/cloudformation/policies"
+)
+
+// Policy_PolicyDefinition AWS CloudFormation Resource (AWS::VerifiedPermissions::Policy.PolicyDefinition)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-verifiedpermissions-policy-policydefinition.html
+type Policy_PolicyDefinition struct {
+
+	// Static AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-verifiedpermissions-policy-policydefinition.html#cfn-verifiedpermissions-policy-policydefinition-static
+	Static *Policy_StaticPolicyDefinition `json:"Static,omitempty"`
+
+	// TemplateLinked AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-verifiedpermissions-policy-policydefinition.html#cfn-verifiedpermissions-policy-policydefinition-templatelinked
+	TemplateLinked *Policy_TemplateLinkedPolicyDefinition `json:"TemplateLinked,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 *Policy_PolicyDefinition) AWSCloudFormationType() string {
+	return "AWS::VerifiedPermissions::Policy.PolicyDefinition"
+}
diff --git a/cloudformation/verifiedpermissions/aws-verifiedpermissions-policy_staticpolicydefinition.go b/cloudformation/verifiedpermissions/aws-verifiedpermissions-policy_staticpolicydefinition.go
new file mode 100644
index 0000000000..b95c326cc2
--- /dev/null
+++ b/cloudformation/verifiedpermissions/aws-verifiedpermissions-policy_staticpolicydefinition.go
@@ -0,0 +1,42 @@
+// Code generated by "go generate". Please don't change this file directly.
+
+package verifiedpermissions
+
+import (
+	"github.com/awslabs/goformation/v7/cloudformation/policies"
+)
+
+// Policy_StaticPolicyDefinition AWS CloudFormation Resource (AWS::VerifiedPermissions::Policy.StaticPolicyDefinition)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-verifiedpermissions-policy-staticpolicydefinition.html
+type Policy_StaticPolicyDefinition struct {
+
+	// Description AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-verifiedpermissions-policy-staticpolicydefinition.html#cfn-verifiedpermissions-policy-staticpolicydefinition-description
+	Description *string `json:"Description,omitempty"`
+
+	// Statement AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-verifiedpermissions-policy-staticpolicydefinition.html#cfn-verifiedpermissions-policy-staticpolicydefinition-statement
+	Statement string `json:"Statement"`
+
+	// 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 *Policy_StaticPolicyDefinition) AWSCloudFormationType() string {
+	return "AWS::VerifiedPermissions::Policy.StaticPolicyDefinition"
+}
diff --git a/cloudformation/verifiedpermissions/aws-verifiedpermissions-policy_templatelinkedpolicydefinition.go b/cloudformation/verifiedpermissions/aws-verifiedpermissions-policy_templatelinkedpolicydefinition.go
new file mode 100644
index 0000000000..f68c7c04ed
--- /dev/null
+++ b/cloudformation/verifiedpermissions/aws-verifiedpermissions-policy_templatelinkedpolicydefinition.go
@@ -0,0 +1,47 @@
+// Code generated by "go generate". Please don't change this file directly.
+
+package verifiedpermissions
+
+import (
+	"github.com/awslabs/goformation/v7/cloudformation/policies"
+)
+
+// Policy_TemplateLinkedPolicyDefinition AWS CloudFormation Resource (AWS::VerifiedPermissions::Policy.TemplateLinkedPolicyDefinition)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-verifiedpermissions-policy-templatelinkedpolicydefinition.html
+type Policy_TemplateLinkedPolicyDefinition struct {
+
+	// PolicyTemplateId AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-verifiedpermissions-policy-templatelinkedpolicydefinition.html#cfn-verifiedpermissions-policy-templatelinkedpolicydefinition-policytemplateid
+	PolicyTemplateId string `json:"PolicyTemplateId"`
+
+	// Principal AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-verifiedpermissions-policy-templatelinkedpolicydefinition.html#cfn-verifiedpermissions-policy-templatelinkedpolicydefinition-principal
+	Principal *Policy_EntityIdentifier `json:"Principal,omitempty"`
+
+	// Resource AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-verifiedpermissions-policy-templatelinkedpolicydefinition.html#cfn-verifiedpermissions-policy-templatelinkedpolicydefinition-resource
+	Resource *Policy_EntityIdentifier `json:"Resource,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 *Policy_TemplateLinkedPolicyDefinition) AWSCloudFormationType() string {
+	return "AWS::VerifiedPermissions::Policy.TemplateLinkedPolicyDefinition"
+}
diff --git a/cloudformation/verifiedpermissions/aws-verifiedpermissions-policystore.go b/cloudformation/verifiedpermissions/aws-verifiedpermissions-policystore.go
new file mode 100644
index 0000000000..121f957605
--- /dev/null
+++ b/cloudformation/verifiedpermissions/aws-verifiedpermissions-policystore.go
@@ -0,0 +1,122 @@
+// Code generated by "go generate". Please don't change this file directly.
+
+package verifiedpermissions
+
+import (
+	"bytes"
+	"encoding/json"
+
+	"github.com/awslabs/goformation/v7/cloudformation/policies"
+)
+
+// PolicyStore AWS CloudFormation Resource (AWS::VerifiedPermissions::PolicyStore)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-verifiedpermissions-policystore.html
+type PolicyStore struct {
+
+	// Schema AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-verifiedpermissions-policystore.html#cfn-verifiedpermissions-policystore-schema
+	Schema *PolicyStore_SchemaDefinition `json:"Schema,omitempty"`
+
+	// ValidationSettings AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-verifiedpermissions-policystore.html#cfn-verifiedpermissions-policystore-validationsettings
+	ValidationSettings *PolicyStore_ValidationSettings `json:"ValidationSettings"`
+
+	// 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 *PolicyStore) AWSCloudFormationType() string {
+	return "AWS::VerifiedPermissions::PolicyStore"
+}
+
+// MarshalJSON is a custom JSON marshalling hook that embeds this object into
+// an AWS CloudFormation JSON resource's 'Properties' field and adds a 'Type'.
+func (r PolicyStore) MarshalJSON() ([]byte, error) {
+	type Properties PolicyStore
+	return json.Marshal(&struct {
+		Type                string
+		Properties          Properties
+		DependsOn           []string                     `json:"DependsOn,omitempty"`
+		Metadata            map[string]interface{}       `json:"Metadata,omitempty"`
+		DeletionPolicy      policies.DeletionPolicy      `json:"DeletionPolicy,omitempty"`
+		UpdateReplacePolicy policies.UpdateReplacePolicy `json:"UpdateReplacePolicy,omitempty"`
+		Condition           string                       `json:"Condition,omitempty"`
+	}{
+		Type:                r.AWSCloudFormationType(),
+		Properties:          (Properties)(r),
+		DependsOn:           r.AWSCloudFormationDependsOn,
+		Metadata:            r.AWSCloudFormationMetadata,
+		DeletionPolicy:      r.AWSCloudFormationDeletionPolicy,
+		UpdateReplacePolicy: r.AWSCloudFormationUpdateReplacePolicy,
+		Condition:           r.AWSCloudFormationCondition,
+	})
+}
+
+// UnmarshalJSON is a custom JSON unmarshalling hook that strips the outer
+// AWS CloudFormation resource object, and just keeps the 'Properties' field.
+func (r *PolicyStore) UnmarshalJSON(b []byte) error {
+	type Properties PolicyStore
+	res := &struct {
+		Type                string
+		Properties          *Properties
+		DependsOn           interface{}
+		Metadata            map[string]interface{}
+		DeletionPolicy      string
+		UpdateReplacePolicy string
+		Condition           string
+	}{}
+
+	dec := json.NewDecoder(bytes.NewReader(b))
+	dec.DisallowUnknownFields() // Force error if unknown field is found
+
+	if err := dec.Decode(&res); err != nil {
+		return err
+	}
+
+	// If the resource has no Properties set, it could be nil
+	if res.Properties != nil {
+		*r = PolicyStore(*res.Properties)
+	}
+	if res.DependsOn != nil {
+		switch obj := res.DependsOn.(type) {
+		case string:
+			r.AWSCloudFormationDependsOn = []string{obj}
+		case []interface{}:
+			s := make([]string, 0, len(obj))
+			for _, v := range obj {
+				if value, ok := v.(string); ok {
+					s = append(s, value)
+				}
+			}
+			r.AWSCloudFormationDependsOn = s
+		}
+	}
+	if res.Metadata != nil {
+		r.AWSCloudFormationMetadata = res.Metadata
+	}
+	if res.DeletionPolicy != "" {
+		r.AWSCloudFormationDeletionPolicy = policies.DeletionPolicy(res.DeletionPolicy)
+	}
+	if res.UpdateReplacePolicy != "" {
+		r.AWSCloudFormationUpdateReplacePolicy = policies.UpdateReplacePolicy(res.UpdateReplacePolicy)
+	}
+	if res.Condition != "" {
+		r.AWSCloudFormationCondition = res.Condition
+	}
+	return nil
+}
diff --git a/cloudformation/verifiedpermissions/aws-verifiedpermissions-policystore_schemadefinition.go b/cloudformation/verifiedpermissions/aws-verifiedpermissions-policystore_schemadefinition.go
new file mode 100644
index 0000000000..b7361bdabc
--- /dev/null
+++ b/cloudformation/verifiedpermissions/aws-verifiedpermissions-policystore_schemadefinition.go
@@ -0,0 +1,37 @@
+// Code generated by "go generate". Please don't change this file directly.
+
+package verifiedpermissions
+
+import (
+	"github.com/awslabs/goformation/v7/cloudformation/policies"
+)
+
+// PolicyStore_SchemaDefinition AWS CloudFormation Resource (AWS::VerifiedPermissions::PolicyStore.SchemaDefinition)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-verifiedpermissions-policystore-schemadefinition.html
+type PolicyStore_SchemaDefinition struct {
+
+	// CedarJson AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-verifiedpermissions-policystore-schemadefinition.html#cfn-verifiedpermissions-policystore-schemadefinition-cedarjson
+	CedarJson *string `json:"CedarJson,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 *PolicyStore_SchemaDefinition) AWSCloudFormationType() string {
+	return "AWS::VerifiedPermissions::PolicyStore.SchemaDefinition"
+}
diff --git a/cloudformation/verifiedpermissions/aws-verifiedpermissions-policystore_validationsettings.go b/cloudformation/verifiedpermissions/aws-verifiedpermissions-policystore_validationsettings.go
new file mode 100644
index 0000000000..4cba01b748
--- /dev/null
+++ b/cloudformation/verifiedpermissions/aws-verifiedpermissions-policystore_validationsettings.go
@@ -0,0 +1,37 @@
+// Code generated by "go generate". Please don't change this file directly.
+
+package verifiedpermissions
+
+import (
+	"github.com/awslabs/goformation/v7/cloudformation/policies"
+)
+
+// PolicyStore_ValidationSettings AWS CloudFormation Resource (AWS::VerifiedPermissions::PolicyStore.ValidationSettings)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-verifiedpermissions-policystore-validationsettings.html
+type PolicyStore_ValidationSettings struct {
+
+	// Mode AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-verifiedpermissions-policystore-validationsettings.html#cfn-verifiedpermissions-policystore-validationsettings-mode
+	Mode string `json:"Mode"`
+
+	// 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 *PolicyStore_ValidationSettings) AWSCloudFormationType() string {
+	return "AWS::VerifiedPermissions::PolicyStore.ValidationSettings"
+}
diff --git a/cloudformation/verifiedpermissions/aws-verifiedpermissions-policytemplate.go b/cloudformation/verifiedpermissions/aws-verifiedpermissions-policytemplate.go
new file mode 100644
index 0000000000..a55e9c4114
--- /dev/null
+++ b/cloudformation/verifiedpermissions/aws-verifiedpermissions-policytemplate.go
@@ -0,0 +1,127 @@
+// Code generated by "go generate". Please don't change this file directly.
+
+package verifiedpermissions
+
+import (
+	"bytes"
+	"encoding/json"
+
+	"github.com/awslabs/goformation/v7/cloudformation/policies"
+)
+
+// PolicyTemplate AWS CloudFormation Resource (AWS::VerifiedPermissions::PolicyTemplate)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-verifiedpermissions-policytemplate.html
+type PolicyTemplate struct {
+
+	// Description AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-verifiedpermissions-policytemplate.html#cfn-verifiedpermissions-policytemplate-description
+	Description *string `json:"Description,omitempty"`
+
+	// PolicyStoreId AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-verifiedpermissions-policytemplate.html#cfn-verifiedpermissions-policytemplate-policystoreid
+	PolicyStoreId *string `json:"PolicyStoreId,omitempty"`
+
+	// Statement AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-verifiedpermissions-policytemplate.html#cfn-verifiedpermissions-policytemplate-statement
+	Statement string `json:"Statement"`
+
+	// 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 *PolicyTemplate) AWSCloudFormationType() string {
+	return "AWS::VerifiedPermissions::PolicyTemplate"
+}
+
+// MarshalJSON is a custom JSON marshalling hook that embeds this object into
+// an AWS CloudFormation JSON resource's 'Properties' field and adds a 'Type'.
+func (r PolicyTemplate) MarshalJSON() ([]byte, error) {
+	type Properties PolicyTemplate
+	return json.Marshal(&struct {
+		Type                string
+		Properties          Properties
+		DependsOn           []string                     `json:"DependsOn,omitempty"`
+		Metadata            map[string]interface{}       `json:"Metadata,omitempty"`
+		DeletionPolicy      policies.DeletionPolicy      `json:"DeletionPolicy,omitempty"`
+		UpdateReplacePolicy policies.UpdateReplacePolicy `json:"UpdateReplacePolicy,omitempty"`
+		Condition           string                       `json:"Condition,omitempty"`
+	}{
+		Type:                r.AWSCloudFormationType(),
+		Properties:          (Properties)(r),
+		DependsOn:           r.AWSCloudFormationDependsOn,
+		Metadata:            r.AWSCloudFormationMetadata,
+		DeletionPolicy:      r.AWSCloudFormationDeletionPolicy,
+		UpdateReplacePolicy: r.AWSCloudFormationUpdateReplacePolicy,
+		Condition:           r.AWSCloudFormationCondition,
+	})
+}
+
+// UnmarshalJSON is a custom JSON unmarshalling hook that strips the outer
+// AWS CloudFormation resource object, and just keeps the 'Properties' field.
+func (r *PolicyTemplate) UnmarshalJSON(b []byte) error {
+	type Properties PolicyTemplate
+	res := &struct {
+		Type                string
+		Properties          *Properties
+		DependsOn           interface{}
+		Metadata            map[string]interface{}
+		DeletionPolicy      string
+		UpdateReplacePolicy string
+		Condition           string
+	}{}
+
+	dec := json.NewDecoder(bytes.NewReader(b))
+	dec.DisallowUnknownFields() // Force error if unknown field is found
+
+	if err := dec.Decode(&res); err != nil {
+		return err
+	}
+
+	// If the resource has no Properties set, it could be nil
+	if res.Properties != nil {
+		*r = PolicyTemplate(*res.Properties)
+	}
+	if res.DependsOn != nil {
+		switch obj := res.DependsOn.(type) {
+		case string:
+			r.AWSCloudFormationDependsOn = []string{obj}
+		case []interface{}:
+			s := make([]string, 0, len(obj))
+			for _, v := range obj {
+				if value, ok := v.(string); ok {
+					s = append(s, value)
+				}
+			}
+			r.AWSCloudFormationDependsOn = s
+		}
+	}
+	if res.Metadata != nil {
+		r.AWSCloudFormationMetadata = res.Metadata
+	}
+	if res.DeletionPolicy != "" {
+		r.AWSCloudFormationDeletionPolicy = policies.DeletionPolicy(res.DeletionPolicy)
+	}
+	if res.UpdateReplacePolicy != "" {
+		r.AWSCloudFormationUpdateReplacePolicy = policies.UpdateReplacePolicy(res.UpdateReplacePolicy)
+	}
+	if res.Condition != "" {
+		r.AWSCloudFormationCondition = res.Condition
+	}
+	return nil
+}
diff --git a/cloudformation/wafv2/aws-wafv2-webacl.go b/cloudformation/wafv2/aws-wafv2-webacl.go
index 97d4245567..fe0d92e4aa 100644
--- a/cloudformation/wafv2/aws-wafv2-webacl.go
+++ b/cloudformation/wafv2/aws-wafv2-webacl.go
@@ -14,6 +14,11 @@ import (
 // See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-wafv2-webacl.html
 type WebACL struct {
 
+	// AssociationConfig AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-wafv2-webacl.html#cfn-wafv2-webacl-associationconfig
+	AssociationConfig *WebACL_AssociationConfig `json:"AssociationConfig,omitempty"`
+
 	// CaptchaConfig AWS CloudFormation Property
 	// Required: false
 	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-wafv2-webacl.html#cfn-wafv2-webacl-captchaconfig
diff --git a/cloudformation/wafv2/aws-wafv2-webacl_associationconfig.go b/cloudformation/wafv2/aws-wafv2-webacl_associationconfig.go
new file mode 100644
index 0000000000..9045d5eefa
--- /dev/null
+++ b/cloudformation/wafv2/aws-wafv2-webacl_associationconfig.go
@@ -0,0 +1,37 @@
+// Code generated by "go generate". Please don't change this file directly.
+
+package wafv2
+
+import (
+	"github.com/awslabs/goformation/v7/cloudformation/policies"
+)
+
+// WebACL_AssociationConfig AWS CloudFormation Resource (AWS::WAFv2::WebACL.AssociationConfig)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-wafv2-webacl-associationconfig.html
+type WebACL_AssociationConfig struct {
+
+	// RequestBody AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-wafv2-webacl-associationconfig.html#cfn-wafv2-webacl-associationconfig-requestbody
+	RequestBody map[string]WebACL_RequestBodyAssociatedResourceTypeConfig `json:"RequestBody,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 *WebACL_AssociationConfig) AWSCloudFormationType() string {
+	return "AWS::WAFv2::WebACL.AssociationConfig"
+}
diff --git a/cloudformation/wafv2/aws-wafv2-webacl_requestbodyassociatedresourcetypeconfig.go b/cloudformation/wafv2/aws-wafv2-webacl_requestbodyassociatedresourcetypeconfig.go
new file mode 100644
index 0000000000..bcfb681147
--- /dev/null
+++ b/cloudformation/wafv2/aws-wafv2-webacl_requestbodyassociatedresourcetypeconfig.go
@@ -0,0 +1,37 @@
+// Code generated by "go generate". Please don't change this file directly.
+
+package wafv2
+
+import (
+	"github.com/awslabs/goformation/v7/cloudformation/policies"
+)
+
+// WebACL_RequestBodyAssociatedResourceTypeConfig AWS CloudFormation Resource (AWS::WAFv2::WebACL.RequestBodyAssociatedResourceTypeConfig)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-wafv2-webacl-requestbodyassociatedresourcetypeconfig.html
+type WebACL_RequestBodyAssociatedResourceTypeConfig struct {
+
+	// DefaultSizeInspectionLimit AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-wafv2-webacl-requestbodyassociatedresourcetypeconfig.html#cfn-wafv2-webacl-requestbodyassociatedresourcetypeconfig-defaultsizeinspectionlimit
+	DefaultSizeInspectionLimit string `json:"DefaultSizeInspectionLimit"`
+
+	// 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 *WebACL_RequestBodyAssociatedResourceTypeConfig) AWSCloudFormationType() string {
+	return "AWS::WAFv2::WebACL.RequestBodyAssociatedResourceTypeConfig"
+}
diff --git a/schema/cdk.go b/schema/cdk.go
index caaee16363..50c86b1e68 100644
--- a/schema/cdk.go
+++ b/schema/cdk.go
@@ -12398,6 +12398,82 @@ var CdkSchema = `{
             },
             "type": "object"
         },
+        "AWS::AppRunner::AutoScalingConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "Condition": {
+                    "type": "string"
+                },
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "AutoScalingConfigurationName": {
+                            "type": "string"
+                        },
+                        "MaxConcurrency": {
+                            "type": "number"
+                        },
+                        "MaxSize": {
+                            "type": "number"
+                        },
+                        "MinSize": {
+                            "type": "number"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::AppRunner::AutoScalingConfiguration"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type"
+            ],
+            "type": "object"
+        },
         "AWS::AppRunner::ObservabilityConfiguration": {
             "additionalProperties": false,
             "properties": {
@@ -13066,6 +13142,12 @@ var CdkSchema = `{
                         "Name": {
                             "type": "string"
                         },
+                        "PackagingType": {
+                            "type": "string"
+                        },
+                        "PostSetupScriptDetails": {
+                            "$ref": "#/definitions/AWS::AppStream::AppBlock.ScriptDetails"
+                        },
                         "SetupScriptDetails": {
                             "$ref": "#/definitions/AWS::AppStream::AppBlock.ScriptDetails"
                         },
@@ -13081,7 +13163,6 @@ var CdkSchema = `{
                     },
                     "required": [
                         "Name",
-                        "SetupScriptDetails",
                         "SourceS3Location"
                     ],
                     "type": "object"
@@ -13118,8 +13199,7 @@ var CdkSchema = `{
                 }
             },
             "required": [
-                "S3Bucket",
-                "S3Key"
+                "S3Bucket"
             ],
             "type": "object"
         },
@@ -13146,7 +13226,7 @@ var CdkSchema = `{
             ],
             "type": "object"
         },
-        "AWS::AppStream::Application": {
+        "AWS::AppStream::AppBlockBuilder": {
             "additionalProperties": false,
             "properties": {
                 "Condition": {
@@ -13181,10 +13261,13 @@ var CdkSchema = `{
                 "Properties": {
                     "additionalProperties": false,
                     "properties": {
-                        "AppBlockArn": {
-                            "type": "string"
+                        "AccessEndpoints": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::AppStream::AppBlockBuilder.AccessEndpoint"
+                            },
+                            "type": "array"
                         },
-                        "AttributesToDelete": {
+                        "AppBlockArns": {
                             "items": {
                                 "type": "string"
                             },
@@ -13196,29 +13279,20 @@ var CdkSchema = `{
                         "DisplayName": {
                             "type": "string"
                         },
-                        "IconS3Location": {
-                            "$ref": "#/definitions/AWS::AppStream::Application.S3Location"
-                        },
-                        "InstanceFamilies": {
-                            "items": {
-                                "type": "string"
-                            },
-                            "type": "array"
+                        "EnableDefaultInternetAccess": {
+                            "type": "boolean"
                         },
-                        "LaunchParameters": {
+                        "IamRoleArn": {
                             "type": "string"
                         },
-                        "LaunchPath": {
+                        "InstanceType": {
                             "type": "string"
                         },
                         "Name": {
                             "type": "string"
                         },
-                        "Platforms": {
-                            "items": {
-                                "type": "string"
-                            },
-                            "type": "array"
+                        "Platform": {
+                            "type": "string"
                         },
                         "Tags": {
                             "items": {
@@ -13226,23 +13300,21 @@ var CdkSchema = `{
                             },
                             "type": "array"
                         },
-                        "WorkingDirectory": {
-                            "type": "string"
+                        "VpcConfig": {
+                            "$ref": "#/definitions/AWS::AppStream::AppBlockBuilder.VpcConfig"
                         }
                     },
                     "required": [
-                        "AppBlockArn",
-                        "IconS3Location",
-                        "InstanceFamilies",
-                        "LaunchPath",
+                        "InstanceType",
                         "Name",
-                        "Platforms"
+                        "Platform",
+                        "VpcConfig"
                     ],
                     "type": "object"
                 },
                 "Type": {
                     "enum": [
-                        "AWS::AppStream::Application"
+                        "AWS::AppStream::AppBlockBuilder"
                     ],
                     "type": "string"
                 },
@@ -13261,23 +13333,41 @@ var CdkSchema = `{
             ],
             "type": "object"
         },
-        "AWS::AppStream::Application.S3Location": {
+        "AWS::AppStream::AppBlockBuilder.AccessEndpoint": {
             "additionalProperties": false,
             "properties": {
-                "S3Bucket": {
+                "EndpointType": {
                     "type": "string"
                 },
-                "S3Key": {
+                "VpceId": {
                     "type": "string"
                 }
             },
             "required": [
-                "S3Bucket",
-                "S3Key"
+                "EndpointType",
+                "VpceId"
             ],
             "type": "object"
         },
-        "AWS::AppStream::ApplicationEntitlementAssociation": {
+        "AWS::AppStream::AppBlockBuilder.VpcConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "SecurityGroupIds": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "SubnetIds": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::AppStream::Application": {
             "additionalProperties": false,
             "properties": {
                 "Condition": {
@@ -13312,26 +13402,68 @@ var CdkSchema = `{
                 "Properties": {
                     "additionalProperties": false,
                     "properties": {
-                        "ApplicationIdentifier": {
+                        "AppBlockArn": {
                             "type": "string"
                         },
-                        "EntitlementName": {
+                        "AttributesToDelete": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "Description": {
                             "type": "string"
                         },
-                        "StackName": {
+                        "DisplayName": {
+                            "type": "string"
+                        },
+                        "IconS3Location": {
+                            "$ref": "#/definitions/AWS::AppStream::Application.S3Location"
+                        },
+                        "InstanceFamilies": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "LaunchParameters": {
+                            "type": "string"
+                        },
+                        "LaunchPath": {
+                            "type": "string"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "Platforms": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        },
+                        "WorkingDirectory": {
                             "type": "string"
                         }
                     },
                     "required": [
-                        "ApplicationIdentifier",
-                        "EntitlementName",
-                        "StackName"
+                        "AppBlockArn",
+                        "IconS3Location",
+                        "InstanceFamilies",
+                        "LaunchPath",
+                        "Name",
+                        "Platforms"
                     ],
                     "type": "object"
                 },
                 "Type": {
                     "enum": [
-                        "AWS::AppStream::ApplicationEntitlementAssociation"
+                        "AWS::AppStream::Application"
                     ],
                     "type": "string"
                 },
@@ -13350,76 +13482,165 @@ var CdkSchema = `{
             ],
             "type": "object"
         },
-        "AWS::AppStream::ApplicationFleetAssociation": {
+        "AWS::AppStream::Application.S3Location": {
             "additionalProperties": false,
             "properties": {
-                "Condition": {
-                    "type": "string"
-                },
-                "DeletionPolicy": {
-                    "enum": [
-                        "Delete",
-                        "Retain",
-                        "Snapshot"
-                    ],
-                    "type": "string"
-                },
-                "DependsOn": {
-                    "anyOf": [
-                        {
-                            "pattern": "^[a-zA-Z0-9]+$",
-                            "type": "string"
-                        },
-                        {
-                            "items": {
-                                "pattern": "^[a-zA-Z0-9]+$",
-                                "type": "string"
-                            },
-                            "type": "array"
-                        }
-                    ]
-                },
-                "Metadata": {
-                    "type": "object"
-                },
-                "Properties": {
-                    "additionalProperties": false,
-                    "properties": {
-                        "ApplicationArn": {
-                            "type": "string"
-                        },
-                        "FleetName": {
-                            "type": "string"
-                        }
-                    },
-                    "required": [
-                        "ApplicationArn",
-                        "FleetName"
-                    ],
-                    "type": "object"
-                },
-                "Type": {
-                    "enum": [
-                        "AWS::AppStream::ApplicationFleetAssociation"
-                    ],
+                "S3Bucket": {
                     "type": "string"
                 },
-                "UpdateReplacePolicy": {
-                    "enum": [
-                        "Delete",
-                        "Retain",
-                        "Snapshot"
-                    ],
+                "S3Key": {
                     "type": "string"
                 }
             },
             "required": [
-                "Type",
-                "Properties"
+                "S3Bucket",
+                "S3Key"
             ],
             "type": "object"
         },
-        "AWS::AppStream::DirectoryConfig": {
+        "AWS::AppStream::ApplicationEntitlementAssociation": {
+            "additionalProperties": false,
+            "properties": {
+                "Condition": {
+                    "type": "string"
+                },
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "ApplicationIdentifier": {
+                            "type": "string"
+                        },
+                        "EntitlementName": {
+                            "type": "string"
+                        },
+                        "StackName": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "ApplicationIdentifier",
+                        "EntitlementName",
+                        "StackName"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::AppStream::ApplicationEntitlementAssociation"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::AppStream::ApplicationFleetAssociation": {
+            "additionalProperties": false,
+            "properties": {
+                "Condition": {
+                    "type": "string"
+                },
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "ApplicationArn": {
+                            "type": "string"
+                        },
+                        "FleetName": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "ApplicationArn",
+                        "FleetName"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::AppStream::ApplicationFleetAssociation"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::AppStream::DirectoryConfig": {
             "additionalProperties": false,
             "properties": {
                 "Condition": {
@@ -33588,6 +33809,235 @@ var CdkSchema = `{
             ],
             "type": "object"
         },
+        "AWS::Comprehend::DocumentClassifier": {
+            "additionalProperties": false,
+            "properties": {
+                "Condition": {
+                    "type": "string"
+                },
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "DataAccessRoleArn": {
+                            "type": "string"
+                        },
+                        "DocumentClassifierName": {
+                            "type": "string"
+                        },
+                        "InputDataConfig": {
+                            "$ref": "#/definitions/AWS::Comprehend::DocumentClassifier.DocumentClassifierInputDataConfig"
+                        },
+                        "LanguageCode": {
+                            "type": "string"
+                        },
+                        "Mode": {
+                            "type": "string"
+                        },
+                        "ModelKmsKeyId": {
+                            "type": "string"
+                        },
+                        "ModelPolicy": {
+                            "type": "string"
+                        },
+                        "OutputDataConfig": {
+                            "$ref": "#/definitions/AWS::Comprehend::DocumentClassifier.DocumentClassifierOutputDataConfig"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        },
+                        "VersionName": {
+                            "type": "string"
+                        },
+                        "VolumeKmsKeyId": {
+                            "type": "string"
+                        },
+                        "VpcConfig": {
+                            "$ref": "#/definitions/AWS::Comprehend::DocumentClassifier.VpcConfig"
+                        }
+                    },
+                    "required": [
+                        "DataAccessRoleArn",
+                        "DocumentClassifierName",
+                        "InputDataConfig",
+                        "LanguageCode"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Comprehend::DocumentClassifier"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::Comprehend::DocumentClassifier.AugmentedManifestsListItem": {
+            "additionalProperties": false,
+            "properties": {
+                "AttributeNames": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "S3Uri": {
+                    "type": "string"
+                },
+                "Split": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "AttributeNames",
+                "S3Uri"
+            ],
+            "type": "object"
+        },
+        "AWS::Comprehend::DocumentClassifier.DocumentClassifierDocuments": {
+            "additionalProperties": false,
+            "properties": {
+                "S3Uri": {
+                    "type": "string"
+                },
+                "TestS3Uri": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "S3Uri"
+            ],
+            "type": "object"
+        },
+        "AWS::Comprehend::DocumentClassifier.DocumentClassifierInputDataConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "AugmentedManifests": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::Comprehend::DocumentClassifier.AugmentedManifestsListItem"
+                    },
+                    "type": "array"
+                },
+                "DataFormat": {
+                    "type": "string"
+                },
+                "DocumentReaderConfig": {
+                    "$ref": "#/definitions/AWS::Comprehend::DocumentClassifier.DocumentReaderConfig"
+                },
+                "DocumentType": {
+                    "type": "string"
+                },
+                "Documents": {
+                    "$ref": "#/definitions/AWS::Comprehend::DocumentClassifier.DocumentClassifierDocuments"
+                },
+                "LabelDelimiter": {
+                    "type": "string"
+                },
+                "S3Uri": {
+                    "type": "string"
+                },
+                "TestS3Uri": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Comprehend::DocumentClassifier.DocumentClassifierOutputDataConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "KmsKeyId": {
+                    "type": "string"
+                },
+                "S3Uri": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Comprehend::DocumentClassifier.DocumentReaderConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "DocumentReadAction": {
+                    "type": "string"
+                },
+                "DocumentReadMode": {
+                    "type": "string"
+                },
+                "FeatureTypes": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "DocumentReadAction"
+            ],
+            "type": "object"
+        },
+        "AWS::Comprehend::DocumentClassifier.VpcConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "SecurityGroupIds": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "Subnets": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "SecurityGroupIds",
+                "Subnets"
+            ],
+            "type": "object"
+        },
         "AWS::Comprehend::Flywheel": {
             "additionalProperties": false,
             "properties": {
@@ -48916,6 +49366,9 @@ var CdkSchema = `{
                 "Properties": {
                     "additionalProperties": false,
                     "properties": {
+                        "KeyFormat": {
+                            "type": "string"
+                        },
                         "KeyName": {
                             "type": "string"
                         },
@@ -56277,9 +56730,15 @@ var CdkSchema = `{
                 "CloudWatchLogs": {
                     "$ref": "#/definitions/AWS::EC2::VerifiedAccessInstance.CloudWatchLogs"
                 },
+                "IncludeTrustContext": {
+                    "type": "boolean"
+                },
                 "KinesisDataFirehose": {
                     "$ref": "#/definitions/AWS::EC2::VerifiedAccessInstance.KinesisDataFirehose"
                 },
+                "LogVersion": {
+                    "type": "string"
+                },
                 "S3": {
                     "$ref": "#/definitions/AWS::EC2::VerifiedAccessInstance.S3"
                 }
@@ -80083,9 +80542,6 @@ var CdkSchema = `{
                             "type": "string"
                         }
                     },
-                    "required": [
-                        "AWSServiceName"
-                    ],
                     "type": "object"
                 },
                 "Type": {
@@ -80104,8 +80560,7 @@ var CdkSchema = `{
                 }
             },
             "required": [
-                "Type",
-                "Properties"
+                "Type"
             ],
             "type": "object"
         },
@@ -99150,6 +99605,9 @@ var CdkSchema = `{
                     "type": "string"
                 }
             },
+            "required": [
+                "DataLakePrincipalIdentifier"
+            ],
             "type": "object"
         },
         "AWS::LakeFormation::DataLakeSettings.ExternalDataFilteringAllowList": {
@@ -99157,21 +99615,23 @@ var CdkSchema = `{
             "properties": {},
             "type": "object"
         },
-        "AWS::LakeFormation::DataLakeSettings.Permissions": {
-            "additionalProperties": false,
-            "properties": {},
-            "type": "object"
-        },
         "AWS::LakeFormation::DataLakeSettings.PrincipalPermissions": {
             "additionalProperties": false,
             "properties": {
                 "Permissions": {
-                    "$ref": "#/definitions/AWS::LakeFormation::DataLakeSettings.Permissions"
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
                 },
                 "Principal": {
                     "$ref": "#/definitions/AWS::LakeFormation::DataLakeSettings.DataLakePrincipal"
                 }
             },
+            "required": [
+                "Permissions",
+                "Principal"
+            ],
             "type": "object"
         },
         "AWS::LakeFormation::Permissions": {
@@ -117886,7 +118346,6 @@ var CdkSchema = `{
                     },
                     "required": [
                         "ConnectAttachmentId",
-                        "InsideCidrBlocks",
                         "PeerAddress"
                     ],
                     "type": "object"
@@ -118193,6 +118652,9 @@ var CdkSchema = `{
                 "Properties": {
                     "additionalProperties": false,
                     "properties": {
+                        "AWSLocation": {
+                            "$ref": "#/definitions/AWS::NetworkManager::Device.AWSLocation"
+                        },
                         "Description": {
                             "type": "string"
                         },
@@ -118250,6 +118712,18 @@ var CdkSchema = `{
             ],
             "type": "object"
         },
+        "AWS::NetworkManager::Device.AWSLocation": {
+            "additionalProperties": false,
+            "properties": {
+                "SubnetArn": {
+                    "type": "string"
+                },
+                "Zone": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
         "AWS::NetworkManager::Device.Location": {
             "additionalProperties": false,
             "properties": {
@@ -123219,9 +123693,6 @@ var CdkSchema = `{
                         "Description": {
                             "type": "string"
                         },
-                        "DeviceId": {
-                            "type": "string"
-                        },
                         "ManifestOverridesPayload": {
                             "$ref": "#/definitions/AWS::Panorama::ApplicationInstance.ManifestOverridesPayload"
                         },
@@ -123234,9 +123705,6 @@ var CdkSchema = `{
                         "RuntimeRoleArn": {
                             "type": "string"
                         },
-                        "StatusFilter": {
-                            "type": "string"
-                        },
                         "Tags": {
                             "items": {
                                 "$ref": "#/definitions/Tag"
@@ -128539,7 +129007,6 @@ var CdkSchema = `{
                 }
             },
             "required": [
-                "AggregationFunction",
                 "Column",
                 "SortDirection"
             ],
@@ -129418,24 +129885,9 @@ var CdkSchema = `{
             ],
             "type": "object"
         },
-        "AWS::QuickSight::Analysis.ColorsConfiguration": {
-            "additionalProperties": false,
-            "properties": {
-                "CustomColors": {
-                    "items": {
-                        "$ref": "#/definitions/AWS::QuickSight::Analysis.CustomColor"
-                    },
-                    "type": "array"
-                }
-            },
-            "type": "object"
-        },
         "AWS::QuickSight::Analysis.ColumnConfiguration": {
             "additionalProperties": false,
             "properties": {
-                "ColorsConfiguration": {
-                    "$ref": "#/definitions/AWS::QuickSight::Analysis.ColorsConfiguration"
-                },
                 "Column": {
                     "$ref": "#/definitions/AWS::QuickSight::Analysis.ColumnIdentifier"
                 },
@@ -129953,24 +130405,6 @@ var CdkSchema = `{
             ],
             "type": "object"
         },
-        "AWS::QuickSight::Analysis.CustomColor": {
-            "additionalProperties": false,
-            "properties": {
-                "Color": {
-                    "type": "string"
-                },
-                "FieldValue": {
-                    "type": "string"
-                },
-                "SpecialValue": {
-                    "type": "string"
-                }
-            },
-            "required": [
-                "Color"
-            ],
-            "type": "object"
-        },
         "AWS::QuickSight::Analysis.CustomContentConfiguration": {
             "additionalProperties": false,
             "properties": {
@@ -130206,6 +130640,9 @@ var CdkSchema = `{
                 "Position": {
                     "type": "string"
                 },
+                "TotalsVisibility": {
+                    "type": "string"
+                },
                 "Visibility": {
                     "type": "string"
                 }
@@ -130678,6 +131115,9 @@ var CdkSchema = `{
                 "SelectAllValueOptions": {
                     "type": "string"
                 },
+                "SourceColumn": {
+                    "$ref": "#/definitions/AWS::QuickSight::Analysis.ColumnIdentifier"
+                },
                 "SourceField": {
                     "type": "string"
                 },
@@ -131277,6 +131717,12 @@ var CdkSchema = `{
         "AWS::QuickSight::Analysis.FilterOperationSelectedFieldsConfiguration": {
             "additionalProperties": false,
             "properties": {
+                "SelectedColumns": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::QuickSight::Analysis.ColumnIdentifier"
+                    },
+                    "type": "array"
+                },
                 "SelectedFieldOptions": {
                     "type": "string"
                 },
@@ -131969,6 +132415,39 @@ var CdkSchema = `{
             ],
             "type": "object"
         },
+        "AWS::QuickSight::Analysis.GeospatialHeatmapColorScale": {
+            "additionalProperties": false,
+            "properties": {
+                "Colors": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::QuickSight::Analysis.GeospatialHeatmapDataColor"
+                    },
+                    "type": "array"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::QuickSight::Analysis.GeospatialHeatmapConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "HeatmapColor": {
+                    "$ref": "#/definitions/AWS::QuickSight::Analysis.GeospatialHeatmapColorScale"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::QuickSight::Analysis.GeospatialHeatmapDataColor": {
+            "additionalProperties": false,
+            "properties": {
+                "Color": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Color"
+            ],
+            "type": "object"
+        },
         "AWS::QuickSight::Analysis.GeospatialMapAggregatedFieldWells": {
             "additionalProperties": false,
             "properties": {
@@ -132077,6 +132556,9 @@ var CdkSchema = `{
                 "ClusterMarkerConfiguration": {
                     "$ref": "#/definitions/AWS::QuickSight::Analysis.ClusterMarkerConfiguration"
                 },
+                "HeatmapConfiguration": {
+                    "$ref": "#/definitions/AWS::QuickSight::Analysis.GeospatialHeatmapConfiguration"
+                },
                 "SelectedPointStyle": {
                     "type": "string"
                 }
@@ -134107,6 +134589,12 @@ var CdkSchema = `{
                 "Scope": {
                     "$ref": "#/definitions/AWS::QuickSight::Analysis.PivotTableConditionalFormattingScope"
                 },
+                "Scopes": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::QuickSight::Analysis.PivotTableConditionalFormattingScope"
+                    },
+                    "type": "array"
+                },
                 "TextFormat": {
                     "$ref": "#/definitions/AWS::QuickSight::Analysis.TextConditionalFormat"
                 }
@@ -134188,6 +134676,36 @@ var CdkSchema = `{
             ],
             "type": "object"
         },
+        "AWS::QuickSight::Analysis.PivotTableFieldCollapseStateOption": {
+            "additionalProperties": false,
+            "properties": {
+                "State": {
+                    "type": "string"
+                },
+                "Target": {
+                    "$ref": "#/definitions/AWS::QuickSight::Analysis.PivotTableFieldCollapseStateTarget"
+                }
+            },
+            "required": [
+                "Target"
+            ],
+            "type": "object"
+        },
+        "AWS::QuickSight::Analysis.PivotTableFieldCollapseStateTarget": {
+            "additionalProperties": false,
+            "properties": {
+                "FieldDataPathValues": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::QuickSight::Analysis.DataPathValue"
+                    },
+                    "type": "array"
+                },
+                "FieldId": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
         "AWS::QuickSight::Analysis.PivotTableFieldOption": {
             "additionalProperties": false,
             "properties": {
@@ -134209,6 +134727,12 @@ var CdkSchema = `{
         "AWS::QuickSight::Analysis.PivotTableFieldOptions": {
             "additionalProperties": false,
             "properties": {
+                "CollapseStateOptions": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::QuickSight::Analysis.PivotTableFieldCollapseStateOption"
+                    },
+                    "type": "array"
+                },
                 "DataPathOptions": {
                     "items": {
                         "$ref": "#/definitions/AWS::QuickSight::Analysis.PivotTableDataPathOption"
@@ -134248,6 +134772,9 @@ var CdkSchema = `{
                 "CellStyle": {
                     "$ref": "#/definitions/AWS::QuickSight::Analysis.TableCellStyle"
                 },
+                "CollapsedRowDimensionsVisibility": {
+                    "type": "string"
+                },
                 "ColumnHeaderStyle": {
                     "$ref": "#/definitions/AWS::QuickSight::Analysis.TableCellStyle"
                 },
@@ -134468,6 +134995,9 @@ var CdkSchema = `{
                 "AlternateBandOddColor": {
                     "type": "string"
                 },
+                "AxesRangeScale": {
+                    "type": "string"
+                },
                 "BaseSeriesSettings": {
                     "$ref": "#/definitions/AWS::QuickSight::Analysis.RadarChartSeriesSettings"
                 },
@@ -134651,8 +135181,7 @@ var CdkSchema = `{
             },
             "required": [
                 "Calculation",
-                "Column",
-                "MeasureAggregationFunction"
+                "Column"
             ],
             "type": "object"
         },
@@ -134941,6 +135470,12 @@ var CdkSchema = `{
                     },
                     "type": "array"
                 },
+                "Label": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::QuickSight::Analysis.DimensionField"
+                    },
+                    "type": "array"
+                },
                 "Size": {
                     "items": {
                         "$ref": "#/definitions/AWS::QuickSight::Analysis.MeasureField"
@@ -135010,6 +135545,18 @@ var CdkSchema = `{
         "AWS::QuickSight::Analysis.ScatterPlotUnaggregatedFieldWells": {
             "additionalProperties": false,
             "properties": {
+                "Category": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::QuickSight::Analysis.DimensionField"
+                    },
+                    "type": "array"
+                },
+                "Label": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::QuickSight::Analysis.DimensionField"
+                    },
+                    "type": "array"
+                },
                 "Size": {
                     "items": {
                         "$ref": "#/definitions/AWS::QuickSight::Analysis.MeasureField"
@@ -137072,7 +137619,6 @@ var CdkSchema = `{
                 }
             },
             "required": [
-                "AggregationFunction",
                 "Column",
                 "SortDirection"
             ],
@@ -137857,24 +138403,9 @@ var CdkSchema = `{
             ],
             "type": "object"
         },
-        "AWS::QuickSight::Dashboard.ColorsConfiguration": {
-            "additionalProperties": false,
-            "properties": {
-                "CustomColors": {
-                    "items": {
-                        "$ref": "#/definitions/AWS::QuickSight::Dashboard.CustomColor"
-                    },
-                    "type": "array"
-                }
-            },
-            "type": "object"
-        },
         "AWS::QuickSight::Dashboard.ColumnConfiguration": {
             "additionalProperties": false,
             "properties": {
-                "ColorsConfiguration": {
-                    "$ref": "#/definitions/AWS::QuickSight::Dashboard.ColorsConfiguration"
-                },
                 "Column": {
                     "$ref": "#/definitions/AWS::QuickSight::Dashboard.ColumnIdentifier"
                 },
@@ -138392,24 +138923,6 @@ var CdkSchema = `{
             ],
             "type": "object"
         },
-        "AWS::QuickSight::Dashboard.CustomColor": {
-            "additionalProperties": false,
-            "properties": {
-                "Color": {
-                    "type": "string"
-                },
-                "FieldValue": {
-                    "type": "string"
-                },
-                "SpecialValue": {
-                    "type": "string"
-                }
-            },
-            "required": [
-                "Color"
-            ],
-            "type": "object"
-        },
         "AWS::QuickSight::Dashboard.CustomContentConfiguration": {
             "additionalProperties": false,
             "properties": {
@@ -138832,6 +139345,9 @@ var CdkSchema = `{
                 "Position": {
                     "type": "string"
                 },
+                "TotalsVisibility": {
+                    "type": "string"
+                },
                 "Visibility": {
                     "type": "string"
                 }
@@ -139331,6 +139847,9 @@ var CdkSchema = `{
                 "SelectAllValueOptions": {
                     "type": "string"
                 },
+                "SourceColumn": {
+                    "$ref": "#/definitions/AWS::QuickSight::Dashboard.ColumnIdentifier"
+                },
                 "SourceField": {
                     "type": "string"
                 },
@@ -139957,6 +140476,12 @@ var CdkSchema = `{
         "AWS::QuickSight::Dashboard.FilterOperationSelectedFieldsConfiguration": {
             "additionalProperties": false,
             "properties": {
+                "SelectedColumns": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::QuickSight::Dashboard.ColumnIdentifier"
+                    },
+                    "type": "array"
+                },
                 "SelectedFieldOptions": {
                     "type": "string"
                 },
@@ -140649,6 +141174,39 @@ var CdkSchema = `{
             ],
             "type": "object"
         },
+        "AWS::QuickSight::Dashboard.GeospatialHeatmapColorScale": {
+            "additionalProperties": false,
+            "properties": {
+                "Colors": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::QuickSight::Dashboard.GeospatialHeatmapDataColor"
+                    },
+                    "type": "array"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::QuickSight::Dashboard.GeospatialHeatmapConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "HeatmapColor": {
+                    "$ref": "#/definitions/AWS::QuickSight::Dashboard.GeospatialHeatmapColorScale"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::QuickSight::Dashboard.GeospatialHeatmapDataColor": {
+            "additionalProperties": false,
+            "properties": {
+                "Color": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Color"
+            ],
+            "type": "object"
+        },
         "AWS::QuickSight::Dashboard.GeospatialMapAggregatedFieldWells": {
             "additionalProperties": false,
             "properties": {
@@ -140757,6 +141315,9 @@ var CdkSchema = `{
                 "ClusterMarkerConfiguration": {
                     "$ref": "#/definitions/AWS::QuickSight::Dashboard.ClusterMarkerConfiguration"
                 },
+                "HeatmapConfiguration": {
+                    "$ref": "#/definitions/AWS::QuickSight::Dashboard.GeospatialHeatmapConfiguration"
+                },
                 "SelectedPointStyle": {
                     "type": "string"
                 }
@@ -142787,6 +143348,12 @@ var CdkSchema = `{
                 "Scope": {
                     "$ref": "#/definitions/AWS::QuickSight::Dashboard.PivotTableConditionalFormattingScope"
                 },
+                "Scopes": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::QuickSight::Dashboard.PivotTableConditionalFormattingScope"
+                    },
+                    "type": "array"
+                },
                 "TextFormat": {
                     "$ref": "#/definitions/AWS::QuickSight::Dashboard.TextConditionalFormat"
                 }
@@ -142868,6 +143435,36 @@ var CdkSchema = `{
             ],
             "type": "object"
         },
+        "AWS::QuickSight::Dashboard.PivotTableFieldCollapseStateOption": {
+            "additionalProperties": false,
+            "properties": {
+                "State": {
+                    "type": "string"
+                },
+                "Target": {
+                    "$ref": "#/definitions/AWS::QuickSight::Dashboard.PivotTableFieldCollapseStateTarget"
+                }
+            },
+            "required": [
+                "Target"
+            ],
+            "type": "object"
+        },
+        "AWS::QuickSight::Dashboard.PivotTableFieldCollapseStateTarget": {
+            "additionalProperties": false,
+            "properties": {
+                "FieldDataPathValues": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::QuickSight::Dashboard.DataPathValue"
+                    },
+                    "type": "array"
+                },
+                "FieldId": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
         "AWS::QuickSight::Dashboard.PivotTableFieldOption": {
             "additionalProperties": false,
             "properties": {
@@ -142889,6 +143486,12 @@ var CdkSchema = `{
         "AWS::QuickSight::Dashboard.PivotTableFieldOptions": {
             "additionalProperties": false,
             "properties": {
+                "CollapseStateOptions": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::QuickSight::Dashboard.PivotTableFieldCollapseStateOption"
+                    },
+                    "type": "array"
+                },
                 "DataPathOptions": {
                     "items": {
                         "$ref": "#/definitions/AWS::QuickSight::Dashboard.PivotTableDataPathOption"
@@ -142928,6 +143531,9 @@ var CdkSchema = `{
                 "CellStyle": {
                     "$ref": "#/definitions/AWS::QuickSight::Dashboard.TableCellStyle"
                 },
+                "CollapsedRowDimensionsVisibility": {
+                    "type": "string"
+                },
                 "ColumnHeaderStyle": {
                     "$ref": "#/definitions/AWS::QuickSight::Dashboard.TableCellStyle"
                 },
@@ -143148,6 +143754,9 @@ var CdkSchema = `{
                 "AlternateBandOddColor": {
                     "type": "string"
                 },
+                "AxesRangeScale": {
+                    "type": "string"
+                },
                 "BaseSeriesSettings": {
                     "$ref": "#/definitions/AWS::QuickSight::Dashboard.RadarChartSeriesSettings"
                 },
@@ -143331,8 +143940,7 @@ var CdkSchema = `{
             },
             "required": [
                 "Calculation",
-                "Column",
-                "MeasureAggregationFunction"
+                "Column"
             ],
             "type": "object"
         },
@@ -143621,6 +144229,12 @@ var CdkSchema = `{
                     },
                     "type": "array"
                 },
+                "Label": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::QuickSight::Dashboard.DimensionField"
+                    },
+                    "type": "array"
+                },
                 "Size": {
                     "items": {
                         "$ref": "#/definitions/AWS::QuickSight::Dashboard.MeasureField"
@@ -143690,6 +144304,18 @@ var CdkSchema = `{
         "AWS::QuickSight::Dashboard.ScatterPlotUnaggregatedFieldWells": {
             "additionalProperties": false,
             "properties": {
+                "Category": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::QuickSight::Dashboard.DimensionField"
+                    },
+                    "type": "array"
+                },
+                "Label": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::QuickSight::Dashboard.DimensionField"
+                    },
+                    "type": "array"
+                },
                 "Size": {
                     "items": {
                         "$ref": "#/definitions/AWS::QuickSight::Dashboard.MeasureField"
@@ -147429,7 +148055,6 @@ var CdkSchema = `{
                 }
             },
             "required": [
-                "AggregationFunction",
                 "Column",
                 "SortDirection"
             ],
@@ -148214,24 +148839,9 @@ var CdkSchema = `{
             ],
             "type": "object"
         },
-        "AWS::QuickSight::Template.ColorsConfiguration": {
-            "additionalProperties": false,
-            "properties": {
-                "CustomColors": {
-                    "items": {
-                        "$ref": "#/definitions/AWS::QuickSight::Template.CustomColor"
-                    },
-                    "type": "array"
-                }
-            },
-            "type": "object"
-        },
         "AWS::QuickSight::Template.ColumnConfiguration": {
             "additionalProperties": false,
             "properties": {
-                "ColorsConfiguration": {
-                    "$ref": "#/definitions/AWS::QuickSight::Template.ColorsConfiguration"
-                },
                 "Column": {
                     "$ref": "#/definitions/AWS::QuickSight::Template.ColumnIdentifier"
                 },
@@ -148788,24 +149398,6 @@ var CdkSchema = `{
             ],
             "type": "object"
         },
-        "AWS::QuickSight::Template.CustomColor": {
-            "additionalProperties": false,
-            "properties": {
-                "Color": {
-                    "type": "string"
-                },
-                "FieldValue": {
-                    "type": "string"
-                },
-                "SpecialValue": {
-                    "type": "string"
-                }
-            },
-            "required": [
-                "Color"
-            ],
-            "type": "object"
-        },
         "AWS::QuickSight::Template.CustomContentConfiguration": {
             "additionalProperties": false,
             "properties": {
@@ -149041,6 +149633,9 @@ var CdkSchema = `{
                 "Position": {
                     "type": "string"
                 },
+                "TotalsVisibility": {
+                    "type": "string"
+                },
                 "Visibility": {
                     "type": "string"
                 }
@@ -149489,6 +150084,9 @@ var CdkSchema = `{
                 "SelectAllValueOptions": {
                     "type": "string"
                 },
+                "SourceColumn": {
+                    "$ref": "#/definitions/AWS::QuickSight::Template.ColumnIdentifier"
+                },
                 "SourceField": {
                     "type": "string"
                 },
@@ -150088,6 +150686,12 @@ var CdkSchema = `{
         "AWS::QuickSight::Template.FilterOperationSelectedFieldsConfiguration": {
             "additionalProperties": false,
             "properties": {
+                "SelectedColumns": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::QuickSight::Template.ColumnIdentifier"
+                    },
+                    "type": "array"
+                },
                 "SelectedFieldOptions": {
                     "type": "string"
                 },
@@ -150780,6 +151384,39 @@ var CdkSchema = `{
             ],
             "type": "object"
         },
+        "AWS::QuickSight::Template.GeospatialHeatmapColorScale": {
+            "additionalProperties": false,
+            "properties": {
+                "Colors": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::QuickSight::Template.GeospatialHeatmapDataColor"
+                    },
+                    "type": "array"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::QuickSight::Template.GeospatialHeatmapConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "HeatmapColor": {
+                    "$ref": "#/definitions/AWS::QuickSight::Template.GeospatialHeatmapColorScale"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::QuickSight::Template.GeospatialHeatmapDataColor": {
+            "additionalProperties": false,
+            "properties": {
+                "Color": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Color"
+            ],
+            "type": "object"
+        },
         "AWS::QuickSight::Template.GeospatialMapAggregatedFieldWells": {
             "additionalProperties": false,
             "properties": {
@@ -150888,6 +151525,9 @@ var CdkSchema = `{
                 "ClusterMarkerConfiguration": {
                     "$ref": "#/definitions/AWS::QuickSight::Template.ClusterMarkerConfiguration"
                 },
+                "HeatmapConfiguration": {
+                    "$ref": "#/definitions/AWS::QuickSight::Template.GeospatialHeatmapConfiguration"
+                },
                 "SelectedPointStyle": {
                     "type": "string"
                 }
@@ -152869,6 +153509,12 @@ var CdkSchema = `{
                 "Scope": {
                     "$ref": "#/definitions/AWS::QuickSight::Template.PivotTableConditionalFormattingScope"
                 },
+                "Scopes": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::QuickSight::Template.PivotTableConditionalFormattingScope"
+                    },
+                    "type": "array"
+                },
                 "TextFormat": {
                     "$ref": "#/definitions/AWS::QuickSight::Template.TextConditionalFormat"
                 }
@@ -152950,6 +153596,36 @@ var CdkSchema = `{
             ],
             "type": "object"
         },
+        "AWS::QuickSight::Template.PivotTableFieldCollapseStateOption": {
+            "additionalProperties": false,
+            "properties": {
+                "State": {
+                    "type": "string"
+                },
+                "Target": {
+                    "$ref": "#/definitions/AWS::QuickSight::Template.PivotTableFieldCollapseStateTarget"
+                }
+            },
+            "required": [
+                "Target"
+            ],
+            "type": "object"
+        },
+        "AWS::QuickSight::Template.PivotTableFieldCollapseStateTarget": {
+            "additionalProperties": false,
+            "properties": {
+                "FieldDataPathValues": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::QuickSight::Template.DataPathValue"
+                    },
+                    "type": "array"
+                },
+                "FieldId": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
         "AWS::QuickSight::Template.PivotTableFieldOption": {
             "additionalProperties": false,
             "properties": {
@@ -152971,6 +153647,12 @@ var CdkSchema = `{
         "AWS::QuickSight::Template.PivotTableFieldOptions": {
             "additionalProperties": false,
             "properties": {
+                "CollapseStateOptions": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::QuickSight::Template.PivotTableFieldCollapseStateOption"
+                    },
+                    "type": "array"
+                },
                 "DataPathOptions": {
                     "items": {
                         "$ref": "#/definitions/AWS::QuickSight::Template.PivotTableDataPathOption"
@@ -153010,6 +153692,9 @@ var CdkSchema = `{
                 "CellStyle": {
                     "$ref": "#/definitions/AWS::QuickSight::Template.TableCellStyle"
                 },
+                "CollapsedRowDimensionsVisibility": {
+                    "type": "string"
+                },
                 "ColumnHeaderStyle": {
                     "$ref": "#/definitions/AWS::QuickSight::Template.TableCellStyle"
                 },
@@ -153230,6 +153915,9 @@ var CdkSchema = `{
                 "AlternateBandOddColor": {
                     "type": "string"
                 },
+                "AxesRangeScale": {
+                    "type": "string"
+                },
                 "BaseSeriesSettings": {
                     "$ref": "#/definitions/AWS::QuickSight::Template.RadarChartSeriesSettings"
                 },
@@ -153413,8 +154101,7 @@ var CdkSchema = `{
             },
             "required": [
                 "Calculation",
-                "Column",
-                "MeasureAggregationFunction"
+                "Column"
             ],
             "type": "object"
         },
@@ -153703,6 +154390,12 @@ var CdkSchema = `{
                     },
                     "type": "array"
                 },
+                "Label": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::QuickSight::Template.DimensionField"
+                    },
+                    "type": "array"
+                },
                 "Size": {
                     "items": {
                         "$ref": "#/definitions/AWS::QuickSight::Template.MeasureField"
@@ -153772,6 +154465,18 @@ var CdkSchema = `{
         "AWS::QuickSight::Template.ScatterPlotUnaggregatedFieldWells": {
             "additionalProperties": false,
             "properties": {
+                "Category": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::QuickSight::Template.DimensionField"
+                    },
+                    "type": "array"
+                },
+                "Label": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::QuickSight::Template.DimensionField"
+                    },
+                    "type": "array"
+                },
                 "Size": {
                     "items": {
                         "$ref": "#/definitions/AWS::QuickSight::Template.MeasureField"
@@ -155893,6 +156598,9 @@ var CdkSchema = `{
                     },
                     "required": [
                         "AwsAccountId",
+                        "BaseThemeId",
+                        "Configuration",
+                        "Name",
                         "ThemeId"
                     ],
                     "type": "object"
@@ -155986,6 +156694,9 @@ var CdkSchema = `{
                 },
                 "Principal": {
                     "type": "string"
+                },
+                "Resource": {
+                    "type": "string"
                 }
             },
             "required": [
@@ -176134,9 +176845,6 @@ var CdkSchema = `{
                 "Properties": {
                     "additionalProperties": false,
                     "properties": {
-                        "AdditionalInferenceSpecificationDefinition": {
-                            "$ref": "#/definitions/AWS::SageMaker::ModelPackage.AdditionalInferenceSpecificationDefinition"
-                        },
                         "AdditionalInferenceSpecifications": {
                             "items": {
                                 "$ref": "#/definitions/AWS::SageMaker::ModelPackage.AdditionalInferenceSpecificationDefinition"
@@ -176158,9 +176866,6 @@ var CdkSchema = `{
                         "ClientToken": {
                             "type": "string"
                         },
-                        "CreatedBy": {
-                            "$ref": "#/definitions/AWS::SageMaker::ModelPackage.UserContext"
-                        },
                         "CustomerMetadataProperties": {
                             "additionalProperties": true,
                             "patternProperties": {
@@ -176176,21 +176881,9 @@ var CdkSchema = `{
                         "DriftCheckBaselines": {
                             "$ref": "#/definitions/AWS::SageMaker::ModelPackage.DriftCheckBaselines"
                         },
-                        "Environment": {
-                            "additionalProperties": true,
-                            "patternProperties": {
-                                "^[a-zA-Z0-9]+$": {
-                                    "type": "string"
-                                }
-                            },
-                            "type": "object"
-                        },
                         "InferenceSpecification": {
                             "$ref": "#/definitions/AWS::SageMaker::ModelPackage.InferenceSpecification"
                         },
-                        "LastModifiedBy": {
-                            "$ref": "#/definitions/AWS::SageMaker::ModelPackage.UserContext"
-                        },
                         "LastModifiedTime": {
                             "type": "string"
                         },
@@ -176215,9 +176908,6 @@ var CdkSchema = `{
                         "ModelPackageStatusDetails": {
                             "$ref": "#/definitions/AWS::SageMaker::ModelPackage.ModelPackageStatusDetails"
                         },
-                        "ModelPackageStatusItem": {
-                            "$ref": "#/definitions/AWS::SageMaker::ModelPackage.ModelPackageStatusItem"
-                        },
                         "ModelPackageVersion": {
                             "type": "number"
                         },
@@ -176586,9 +177276,6 @@ var CdkSchema = `{
                 },
                 "NearestModelName": {
                     "type": "string"
-                },
-                "ProductId": {
-                    "type": "string"
                 }
             },
             "required": [
@@ -176599,12 +177286,6 @@ var CdkSchema = `{
         "AWS::SageMaker::ModelPackage.ModelPackageStatusDetails": {
             "additionalProperties": false,
             "properties": {
-                "ImageScanStatuses": {
-                    "items": {
-                        "$ref": "#/definitions/AWS::SageMaker::ModelPackage.ModelPackageStatusItem"
-                    },
-                    "type": "array"
-                },
                 "ValidationStatuses": {
                     "items": {
                         "$ref": "#/definitions/AWS::SageMaker::ModelPackage.ModelPackageStatusItem"
@@ -176612,9 +177293,6 @@ var CdkSchema = `{
                     "type": "array"
                 }
             },
-            "required": [
-                "ValidationStatuses"
-            ],
             "type": "object"
         },
         "AWS::SageMaker::ModelPackage.ModelPackageStatusItem": {
@@ -176793,21 +177471,6 @@ var CdkSchema = `{
             ],
             "type": "object"
         },
-        "AWS::SageMaker::ModelPackage.UserContext": {
-            "additionalProperties": false,
-            "properties": {
-                "DomainId": {
-                    "type": "string"
-                },
-                "UserProfileArn": {
-                    "type": "string"
-                },
-                "UserProfileName": {
-                    "type": "string"
-                }
-            },
-            "type": "object"
-        },
         "AWS::SageMaker::ModelPackage.ValidationProfile": {
             "additionalProperties": false,
             "properties": {
@@ -185626,36 +186289,398 @@ var CdkSchema = `{
                 "Properties": {
                     "additionalProperties": false,
                     "properties": {
-                        "Description": {
-                            "type": "string"
-                        },
-                        "OnExceptionSteps": {
-                            "items": {
-                                "$ref": "#/definitions/AWS::Transfer::Workflow.WorkflowStep"
-                            },
-                            "type": "array"
-                        },
-                        "Steps": {
-                            "items": {
-                                "$ref": "#/definitions/AWS::Transfer::Workflow.WorkflowStep"
-                            },
-                            "type": "array"
+                        "Description": {
+                            "type": "string"
+                        },
+                        "OnExceptionSteps": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::Transfer::Workflow.WorkflowStep"
+                            },
+                            "type": "array"
+                        },
+                        "Steps": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::Transfer::Workflow.WorkflowStep"
+                            },
+                            "type": "array"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "Steps"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Transfer::Workflow"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::Transfer::Workflow.CopyStepDetails": {
+            "additionalProperties": false,
+            "properties": {
+                "DestinationFileLocation": {
+                    "$ref": "#/definitions/AWS::Transfer::Workflow.S3FileLocation"
+                },
+                "Name": {
+                    "type": "string"
+                },
+                "OverwriteExisting": {
+                    "type": "string"
+                },
+                "SourceFileLocation": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Transfer::Workflow.CustomStepDetails": {
+            "additionalProperties": false,
+            "properties": {
+                "Name": {
+                    "type": "string"
+                },
+                "SourceFileLocation": {
+                    "type": "string"
+                },
+                "Target": {
+                    "type": "string"
+                },
+                "TimeoutSeconds": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Transfer::Workflow.DecryptStepDetails": {
+            "additionalProperties": false,
+            "properties": {
+                "DestinationFileLocation": {
+                    "$ref": "#/definitions/AWS::Transfer::Workflow.InputFileLocation"
+                },
+                "Name": {
+                    "type": "string"
+                },
+                "OverwriteExisting": {
+                    "type": "string"
+                },
+                "SourceFileLocation": {
+                    "type": "string"
+                },
+                "Type": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Transfer::Workflow.DeleteStepDetails": {
+            "additionalProperties": false,
+            "properties": {
+                "Name": {
+                    "type": "string"
+                },
+                "SourceFileLocation": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Transfer::Workflow.EfsInputFileLocation": {
+            "additionalProperties": false,
+            "properties": {
+                "FileSystemId": {
+                    "type": "string"
+                },
+                "Path": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Transfer::Workflow.InputFileLocation": {
+            "additionalProperties": false,
+            "properties": {
+                "EfsFileLocation": {
+                    "$ref": "#/definitions/AWS::Transfer::Workflow.EfsInputFileLocation"
+                },
+                "S3FileLocation": {
+                    "$ref": "#/definitions/AWS::Transfer::Workflow.S3InputFileLocation"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Transfer::Workflow.S3FileLocation": {
+            "additionalProperties": false,
+            "properties": {
+                "S3FileLocation": {
+                    "$ref": "#/definitions/AWS::Transfer::Workflow.S3InputFileLocation"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Transfer::Workflow.S3InputFileLocation": {
+            "additionalProperties": false,
+            "properties": {
+                "Bucket": {
+                    "type": "string"
+                },
+                "Key": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Transfer::Workflow.S3Tag": {
+            "additionalProperties": false,
+            "properties": {
+                "Key": {
+                    "type": "string"
+                },
+                "Value": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Key",
+                "Value"
+            ],
+            "type": "object"
+        },
+        "AWS::Transfer::Workflow.TagStepDetails": {
+            "additionalProperties": false,
+            "properties": {
+                "Name": {
+                    "type": "string"
+                },
+                "SourceFileLocation": {
+                    "type": "string"
+                },
+                "Tags": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::Transfer::Workflow.S3Tag"
+                    },
+                    "type": "array"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Transfer::Workflow.WorkflowStep": {
+            "additionalProperties": false,
+            "properties": {
+                "CopyStepDetails": {
+                    "$ref": "#/definitions/AWS::Transfer::Workflow.CopyStepDetails"
+                },
+                "CustomStepDetails": {
+                    "$ref": "#/definitions/AWS::Transfer::Workflow.CustomStepDetails"
+                },
+                "DecryptStepDetails": {
+                    "$ref": "#/definitions/AWS::Transfer::Workflow.DecryptStepDetails"
+                },
+                "DeleteStepDetails": {
+                    "$ref": "#/definitions/AWS::Transfer::Workflow.DeleteStepDetails"
+                },
+                "TagStepDetails": {
+                    "$ref": "#/definitions/AWS::Transfer::Workflow.TagStepDetails"
+                },
+                "Type": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::VerifiedPermissions::IdentitySource": {
+            "additionalProperties": false,
+            "properties": {
+                "Condition": {
+                    "type": "string"
+                },
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "Configuration": {
+                            "$ref": "#/definitions/AWS::VerifiedPermissions::IdentitySource.IdentitySourceConfiguration"
+                        },
+                        "PolicyStoreId": {
+                            "type": "string"
+                        },
+                        "PrincipalEntityType": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "Configuration"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::VerifiedPermissions::IdentitySource"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::VerifiedPermissions::IdentitySource.CognitoUserPoolConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "ClientIds": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "UserPoolArn": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "UserPoolArn"
+            ],
+            "type": "object"
+        },
+        "AWS::VerifiedPermissions::IdentitySource.IdentitySourceConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "CognitoUserPoolConfiguration": {
+                    "$ref": "#/definitions/AWS::VerifiedPermissions::IdentitySource.CognitoUserPoolConfiguration"
+                }
+            },
+            "required": [
+                "CognitoUserPoolConfiguration"
+            ],
+            "type": "object"
+        },
+        "AWS::VerifiedPermissions::IdentitySource.IdentitySourceDetails": {
+            "additionalProperties": false,
+            "properties": {
+                "ClientIds": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "DiscoveryUrl": {
+                    "type": "string"
+                },
+                "OpenIdIssuer": {
+                    "type": "string"
+                },
+                "UserPoolArn": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::VerifiedPermissions::Policy": {
+            "additionalProperties": false,
+            "properties": {
+                "Condition": {
+                    "type": "string"
+                },
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "Definition": {
+                            "$ref": "#/definitions/AWS::VerifiedPermissions::Policy.PolicyDefinition"
                         },
-                        "Tags": {
-                            "items": {
-                                "$ref": "#/definitions/Tag"
-                            },
-                            "type": "array"
+                        "PolicyStoreId": {
+                            "type": "string"
                         }
                     },
                     "required": [
-                        "Steps"
+                        "Definition"
                     ],
                     "type": "object"
                 },
                 "Type": {
                     "enum": [
-                        "AWS::Transfer::Workflow"
+                        "AWS::VerifiedPermissions::Policy"
                     ],
                     "type": "string"
                 },
@@ -185674,176 +186699,225 @@ var CdkSchema = `{
             ],
             "type": "object"
         },
-        "AWS::Transfer::Workflow.CopyStepDetails": {
+        "AWS::VerifiedPermissions::Policy.EntityIdentifier": {
             "additionalProperties": false,
             "properties": {
-                "DestinationFileLocation": {
-                    "$ref": "#/definitions/AWS::Transfer::Workflow.S3FileLocation"
-                },
-                "Name": {
-                    "type": "string"
-                },
-                "OverwriteExisting": {
+                "EntityId": {
                     "type": "string"
                 },
-                "SourceFileLocation": {
+                "EntityType": {
                     "type": "string"
                 }
             },
+            "required": [
+                "EntityId",
+                "EntityType"
+            ],
             "type": "object"
         },
-        "AWS::Transfer::Workflow.CustomStepDetails": {
+        "AWS::VerifiedPermissions::Policy.PolicyDefinition": {
             "additionalProperties": false,
             "properties": {
-                "Name": {
-                    "type": "string"
-                },
-                "SourceFileLocation": {
-                    "type": "string"
-                },
-                "Target": {
-                    "type": "string"
+                "Static": {
+                    "$ref": "#/definitions/AWS::VerifiedPermissions::Policy.StaticPolicyDefinition"
                 },
-                "TimeoutSeconds": {
-                    "type": "number"
+                "TemplateLinked": {
+                    "$ref": "#/definitions/AWS::VerifiedPermissions::Policy.TemplateLinkedPolicyDefinition"
                 }
             },
             "type": "object"
         },
-        "AWS::Transfer::Workflow.DecryptStepDetails": {
+        "AWS::VerifiedPermissions::Policy.StaticPolicyDefinition": {
             "additionalProperties": false,
             "properties": {
-                "DestinationFileLocation": {
-                    "$ref": "#/definitions/AWS::Transfer::Workflow.InputFileLocation"
-                },
-                "Name": {
-                    "type": "string"
-                },
-                "OverwriteExisting": {
-                    "type": "string"
-                },
-                "SourceFileLocation": {
+                "Description": {
                     "type": "string"
                 },
-                "Type": {
+                "Statement": {
                     "type": "string"
                 }
             },
+            "required": [
+                "Statement"
+            ],
             "type": "object"
         },
-        "AWS::Transfer::Workflow.DeleteStepDetails": {
+        "AWS::VerifiedPermissions::Policy.TemplateLinkedPolicyDefinition": {
             "additionalProperties": false,
             "properties": {
-                "Name": {
+                "PolicyTemplateId": {
                     "type": "string"
                 },
-                "SourceFileLocation": {
-                    "type": "string"
+                "Principal": {
+                    "$ref": "#/definitions/AWS::VerifiedPermissions::Policy.EntityIdentifier"
+                },
+                "Resource": {
+                    "$ref": "#/definitions/AWS::VerifiedPermissions::Policy.EntityIdentifier"
                 }
             },
+            "required": [
+                "PolicyTemplateId"
+            ],
             "type": "object"
         },
-        "AWS::Transfer::Workflow.EfsInputFileLocation": {
+        "AWS::VerifiedPermissions::PolicyStore": {
             "additionalProperties": false,
             "properties": {
-                "FileSystemId": {
+                "Condition": {
                     "type": "string"
                 },
-                "Path": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
                     "type": "string"
-                }
-            },
-            "type": "object"
-        },
-        "AWS::Transfer::Workflow.InputFileLocation": {
-            "additionalProperties": false,
-            "properties": {
-                "EfsFileLocation": {
-                    "$ref": "#/definitions/AWS::Transfer::Workflow.EfsInputFileLocation"
                 },
-                "S3FileLocation": {
-                    "$ref": "#/definitions/AWS::Transfer::Workflow.S3InputFileLocation"
-                }
-            },
-            "type": "object"
-        },
-        "AWS::Transfer::Workflow.S3FileLocation": {
-            "additionalProperties": false,
-            "properties": {
-                "S3FileLocation": {
-                    "$ref": "#/definitions/AWS::Transfer::Workflow.S3InputFileLocation"
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "Schema": {
+                            "$ref": "#/definitions/AWS::VerifiedPermissions::PolicyStore.SchemaDefinition"
+                        },
+                        "ValidationSettings": {
+                            "$ref": "#/definitions/AWS::VerifiedPermissions::PolicyStore.ValidationSettings"
+                        }
+                    },
+                    "required": [
+                        "ValidationSettings"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::VerifiedPermissions::PolicyStore"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
                 }
             },
+            "required": [
+                "Type",
+                "Properties"
+            ],
             "type": "object"
         },
-        "AWS::Transfer::Workflow.S3InputFileLocation": {
+        "AWS::VerifiedPermissions::PolicyStore.SchemaDefinition": {
             "additionalProperties": false,
             "properties": {
-                "Bucket": {
-                    "type": "string"
-                },
-                "Key": {
+                "CedarJson": {
                     "type": "string"
                 }
             },
             "type": "object"
         },
-        "AWS::Transfer::Workflow.S3Tag": {
+        "AWS::VerifiedPermissions::PolicyStore.ValidationSettings": {
             "additionalProperties": false,
             "properties": {
-                "Key": {
-                    "type": "string"
-                },
-                "Value": {
+                "Mode": {
                     "type": "string"
                 }
             },
             "required": [
-                "Key",
-                "Value"
+                "Mode"
             ],
             "type": "object"
         },
-        "AWS::Transfer::Workflow.TagStepDetails": {
+        "AWS::VerifiedPermissions::PolicyTemplate": {
             "additionalProperties": false,
             "properties": {
-                "Name": {
+                "Condition": {
                     "type": "string"
                 },
-                "SourceFileLocation": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
                     "type": "string"
                 },
-                "Tags": {
-                    "items": {
-                        "$ref": "#/definitions/AWS::Transfer::Workflow.S3Tag"
-                    },
-                    "type": "array"
-                }
-            },
-            "type": "object"
-        },
-        "AWS::Transfer::Workflow.WorkflowStep": {
-            "additionalProperties": false,
-            "properties": {
-                "CopyStepDetails": {
-                    "$ref": "#/definitions/AWS::Transfer::Workflow.CopyStepDetails"
-                },
-                "CustomStepDetails": {
-                    "$ref": "#/definitions/AWS::Transfer::Workflow.CustomStepDetails"
-                },
-                "DecryptStepDetails": {
-                    "$ref": "#/definitions/AWS::Transfer::Workflow.DecryptStepDetails"
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
                 },
-                "DeleteStepDetails": {
-                    "$ref": "#/definitions/AWS::Transfer::Workflow.DeleteStepDetails"
+                "Metadata": {
+                    "type": "object"
                 },
-                "TagStepDetails": {
-                    "$ref": "#/definitions/AWS::Transfer::Workflow.TagStepDetails"
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "Description": {
+                            "type": "string"
+                        },
+                        "PolicyStoreId": {
+                            "type": "string"
+                        },
+                        "Statement": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "Statement"
+                    ],
+                    "type": "object"
                 },
                 "Type": {
+                    "enum": [
+                        "AWS::VerifiedPermissions::PolicyTemplate"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
                     "type": "string"
                 }
             },
+            "required": [
+                "Type",
+                "Properties"
+            ],
             "type": "object"
         },
         "AWS::VoiceID::Domain": {
@@ -190113,6 +191187,9 @@ var CdkSchema = `{
                 "Properties": {
                     "additionalProperties": false,
                     "properties": {
+                        "AssociationConfig": {
+                            "$ref": "#/definitions/AWS::WAFv2::WebACL.AssociationConfig"
+                        },
                         "CaptchaConfig": {
                             "$ref": "#/definitions/AWS::WAFv2::WebACL.CaptchaConfig"
                         },
@@ -190244,6 +191321,21 @@ var CdkSchema = `{
             ],
             "type": "object"
         },
+        "AWS::WAFv2::WebACL.AssociationConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "RequestBody": {
+                    "additionalProperties": false,
+                    "patternProperties": {
+                        "^[a-zA-Z0-9]+$": {
+                            "$ref": "#/definitions/AWS::WAFv2::WebACL.RequestBodyAssociatedResourceTypeConfig"
+                        }
+                    },
+                    "type": "object"
+                }
+            },
+            "type": "object"
+        },
         "AWS::WAFv2::WebACL.BlockAction": {
             "additionalProperties": false,
             "properties": {
@@ -190872,6 +191964,18 @@ var CdkSchema = `{
             ],
             "type": "object"
         },
+        "AWS::WAFv2::WebACL.RequestBodyAssociatedResourceTypeConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "DefaultSizeInspectionLimit": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "DefaultSizeInspectionLimit"
+            ],
+            "type": "object"
+        },
         "AWS::WAFv2::WebACL.RequestInspection": {
             "additionalProperties": false,
             "properties": {
@@ -192690,6 +193794,9 @@ var CdkSchema = `{
                         {
                             "$ref": "#/definitions/AWS::AppMesh::VirtualService"
                         },
+                        {
+                            "$ref": "#/definitions/AWS::AppRunner::AutoScalingConfiguration"
+                        },
                         {
                             "$ref": "#/definitions/AWS::AppRunner::ObservabilityConfiguration"
                         },
@@ -192705,6 +193812,9 @@ var CdkSchema = `{
                         {
                             "$ref": "#/definitions/AWS::AppStream::AppBlock"
                         },
+                        {
+                            "$ref": "#/definitions/AWS::AppStream::AppBlockBuilder"
+                        },
                         {
                             "$ref": "#/definitions/AWS::AppStream::Application"
                         },
@@ -193119,6 +194229,9 @@ var CdkSchema = `{
                         {
                             "$ref": "#/definitions/AWS::Cognito::UserPoolUserToGroupAttachment"
                         },
+                        {
+                            "$ref": "#/definitions/AWS::Comprehend::DocumentClassifier"
+                        },
                         {
                             "$ref": "#/definitions/AWS::Comprehend::Flywheel"
                         },
@@ -195630,6 +196743,18 @@ var CdkSchema = `{
                         {
                             "$ref": "#/definitions/AWS::Transfer::Workflow"
                         },
+                        {
+                            "$ref": "#/definitions/AWS::VerifiedPermissions::IdentitySource"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::VerifiedPermissions::Policy"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::VerifiedPermissions::PolicyStore"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::VerifiedPermissions::PolicyTemplate"
+                        },
                         {
                             "$ref": "#/definitions/AWS::VoiceID::Domain"
                         },
diff --git a/schema/cdk.schema.json b/schema/cdk.schema.json
index 77ba6f3da6..6a81f35030 100644
--- a/schema/cdk.schema.json
+++ b/schema/cdk.schema.json
@@ -12393,6 +12393,82 @@
             },
             "type": "object"
         },
+        "AWS::AppRunner::AutoScalingConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "Condition": {
+                    "type": "string"
+                },
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "AutoScalingConfigurationName": {
+                            "type": "string"
+                        },
+                        "MaxConcurrency": {
+                            "type": "number"
+                        },
+                        "MaxSize": {
+                            "type": "number"
+                        },
+                        "MinSize": {
+                            "type": "number"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::AppRunner::AutoScalingConfiguration"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type"
+            ],
+            "type": "object"
+        },
         "AWS::AppRunner::ObservabilityConfiguration": {
             "additionalProperties": false,
             "properties": {
@@ -13061,6 +13137,12 @@
                         "Name": {
                             "type": "string"
                         },
+                        "PackagingType": {
+                            "type": "string"
+                        },
+                        "PostSetupScriptDetails": {
+                            "$ref": "#/definitions/AWS::AppStream::AppBlock.ScriptDetails"
+                        },
                         "SetupScriptDetails": {
                             "$ref": "#/definitions/AWS::AppStream::AppBlock.ScriptDetails"
                         },
@@ -13076,7 +13158,6 @@
                     },
                     "required": [
                         "Name",
-                        "SetupScriptDetails",
                         "SourceS3Location"
                     ],
                     "type": "object"
@@ -13113,8 +13194,7 @@
                 }
             },
             "required": [
-                "S3Bucket",
-                "S3Key"
+                "S3Bucket"
             ],
             "type": "object"
         },
@@ -13141,7 +13221,7 @@
             ],
             "type": "object"
         },
-        "AWS::AppStream::Application": {
+        "AWS::AppStream::AppBlockBuilder": {
             "additionalProperties": false,
             "properties": {
                 "Condition": {
@@ -13176,10 +13256,13 @@
                 "Properties": {
                     "additionalProperties": false,
                     "properties": {
-                        "AppBlockArn": {
-                            "type": "string"
+                        "AccessEndpoints": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::AppStream::AppBlockBuilder.AccessEndpoint"
+                            },
+                            "type": "array"
                         },
-                        "AttributesToDelete": {
+                        "AppBlockArns": {
                             "items": {
                                 "type": "string"
                             },
@@ -13191,29 +13274,20 @@
                         "DisplayName": {
                             "type": "string"
                         },
-                        "IconS3Location": {
-                            "$ref": "#/definitions/AWS::AppStream::Application.S3Location"
-                        },
-                        "InstanceFamilies": {
-                            "items": {
-                                "type": "string"
-                            },
-                            "type": "array"
+                        "EnableDefaultInternetAccess": {
+                            "type": "boolean"
                         },
-                        "LaunchParameters": {
+                        "IamRoleArn": {
                             "type": "string"
                         },
-                        "LaunchPath": {
+                        "InstanceType": {
                             "type": "string"
                         },
                         "Name": {
                             "type": "string"
                         },
-                        "Platforms": {
-                            "items": {
-                                "type": "string"
-                            },
-                            "type": "array"
+                        "Platform": {
+                            "type": "string"
                         },
                         "Tags": {
                             "items": {
@@ -13221,23 +13295,21 @@
                             },
                             "type": "array"
                         },
-                        "WorkingDirectory": {
-                            "type": "string"
+                        "VpcConfig": {
+                            "$ref": "#/definitions/AWS::AppStream::AppBlockBuilder.VpcConfig"
                         }
                     },
                     "required": [
-                        "AppBlockArn",
-                        "IconS3Location",
-                        "InstanceFamilies",
-                        "LaunchPath",
+                        "InstanceType",
                         "Name",
-                        "Platforms"
+                        "Platform",
+                        "VpcConfig"
                     ],
                     "type": "object"
                 },
                 "Type": {
                     "enum": [
-                        "AWS::AppStream::Application"
+                        "AWS::AppStream::AppBlockBuilder"
                     ],
                     "type": "string"
                 },
@@ -13256,23 +13328,41 @@
             ],
             "type": "object"
         },
-        "AWS::AppStream::Application.S3Location": {
+        "AWS::AppStream::AppBlockBuilder.AccessEndpoint": {
             "additionalProperties": false,
             "properties": {
-                "S3Bucket": {
+                "EndpointType": {
                     "type": "string"
                 },
-                "S3Key": {
+                "VpceId": {
                     "type": "string"
                 }
             },
             "required": [
-                "S3Bucket",
-                "S3Key"
+                "EndpointType",
+                "VpceId"
             ],
             "type": "object"
         },
-        "AWS::AppStream::ApplicationEntitlementAssociation": {
+        "AWS::AppStream::AppBlockBuilder.VpcConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "SecurityGroupIds": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "SubnetIds": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::AppStream::Application": {
             "additionalProperties": false,
             "properties": {
                 "Condition": {
@@ -13307,26 +13397,68 @@
                 "Properties": {
                     "additionalProperties": false,
                     "properties": {
-                        "ApplicationIdentifier": {
+                        "AppBlockArn": {
                             "type": "string"
                         },
-                        "EntitlementName": {
+                        "AttributesToDelete": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "Description": {
                             "type": "string"
                         },
-                        "StackName": {
+                        "DisplayName": {
+                            "type": "string"
+                        },
+                        "IconS3Location": {
+                            "$ref": "#/definitions/AWS::AppStream::Application.S3Location"
+                        },
+                        "InstanceFamilies": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "LaunchParameters": {
+                            "type": "string"
+                        },
+                        "LaunchPath": {
+                            "type": "string"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "Platforms": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        },
+                        "WorkingDirectory": {
                             "type": "string"
                         }
                     },
                     "required": [
-                        "ApplicationIdentifier",
-                        "EntitlementName",
-                        "StackName"
+                        "AppBlockArn",
+                        "IconS3Location",
+                        "InstanceFamilies",
+                        "LaunchPath",
+                        "Name",
+                        "Platforms"
                     ],
                     "type": "object"
                 },
                 "Type": {
                     "enum": [
-                        "AWS::AppStream::ApplicationEntitlementAssociation"
+                        "AWS::AppStream::Application"
                     ],
                     "type": "string"
                 },
@@ -13345,76 +13477,165 @@
             ],
             "type": "object"
         },
-        "AWS::AppStream::ApplicationFleetAssociation": {
+        "AWS::AppStream::Application.S3Location": {
             "additionalProperties": false,
             "properties": {
-                "Condition": {
-                    "type": "string"
-                },
-                "DeletionPolicy": {
-                    "enum": [
-                        "Delete",
-                        "Retain",
-                        "Snapshot"
-                    ],
-                    "type": "string"
-                },
-                "DependsOn": {
-                    "anyOf": [
-                        {
-                            "pattern": "^[a-zA-Z0-9]+$",
-                            "type": "string"
-                        },
-                        {
-                            "items": {
-                                "pattern": "^[a-zA-Z0-9]+$",
-                                "type": "string"
-                            },
-                            "type": "array"
-                        }
-                    ]
-                },
-                "Metadata": {
-                    "type": "object"
-                },
-                "Properties": {
-                    "additionalProperties": false,
-                    "properties": {
-                        "ApplicationArn": {
-                            "type": "string"
-                        },
-                        "FleetName": {
-                            "type": "string"
-                        }
-                    },
-                    "required": [
-                        "ApplicationArn",
-                        "FleetName"
-                    ],
-                    "type": "object"
-                },
-                "Type": {
-                    "enum": [
-                        "AWS::AppStream::ApplicationFleetAssociation"
-                    ],
+                "S3Bucket": {
                     "type": "string"
                 },
-                "UpdateReplacePolicy": {
-                    "enum": [
-                        "Delete",
-                        "Retain",
-                        "Snapshot"
-                    ],
+                "S3Key": {
                     "type": "string"
                 }
             },
             "required": [
-                "Type",
-                "Properties"
+                "S3Bucket",
+                "S3Key"
             ],
             "type": "object"
         },
-        "AWS::AppStream::DirectoryConfig": {
+        "AWS::AppStream::ApplicationEntitlementAssociation": {
+            "additionalProperties": false,
+            "properties": {
+                "Condition": {
+                    "type": "string"
+                },
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "ApplicationIdentifier": {
+                            "type": "string"
+                        },
+                        "EntitlementName": {
+                            "type": "string"
+                        },
+                        "StackName": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "ApplicationIdentifier",
+                        "EntitlementName",
+                        "StackName"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::AppStream::ApplicationEntitlementAssociation"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::AppStream::ApplicationFleetAssociation": {
+            "additionalProperties": false,
+            "properties": {
+                "Condition": {
+                    "type": "string"
+                },
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "ApplicationArn": {
+                            "type": "string"
+                        },
+                        "FleetName": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "ApplicationArn",
+                        "FleetName"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::AppStream::ApplicationFleetAssociation"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::AppStream::DirectoryConfig": {
             "additionalProperties": false,
             "properties": {
                 "Condition": {
@@ -33583,6 +33804,235 @@
             ],
             "type": "object"
         },
+        "AWS::Comprehend::DocumentClassifier": {
+            "additionalProperties": false,
+            "properties": {
+                "Condition": {
+                    "type": "string"
+                },
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "DataAccessRoleArn": {
+                            "type": "string"
+                        },
+                        "DocumentClassifierName": {
+                            "type": "string"
+                        },
+                        "InputDataConfig": {
+                            "$ref": "#/definitions/AWS::Comprehend::DocumentClassifier.DocumentClassifierInputDataConfig"
+                        },
+                        "LanguageCode": {
+                            "type": "string"
+                        },
+                        "Mode": {
+                            "type": "string"
+                        },
+                        "ModelKmsKeyId": {
+                            "type": "string"
+                        },
+                        "ModelPolicy": {
+                            "type": "string"
+                        },
+                        "OutputDataConfig": {
+                            "$ref": "#/definitions/AWS::Comprehend::DocumentClassifier.DocumentClassifierOutputDataConfig"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        },
+                        "VersionName": {
+                            "type": "string"
+                        },
+                        "VolumeKmsKeyId": {
+                            "type": "string"
+                        },
+                        "VpcConfig": {
+                            "$ref": "#/definitions/AWS::Comprehend::DocumentClassifier.VpcConfig"
+                        }
+                    },
+                    "required": [
+                        "DataAccessRoleArn",
+                        "DocumentClassifierName",
+                        "InputDataConfig",
+                        "LanguageCode"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Comprehend::DocumentClassifier"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::Comprehend::DocumentClassifier.AugmentedManifestsListItem": {
+            "additionalProperties": false,
+            "properties": {
+                "AttributeNames": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "S3Uri": {
+                    "type": "string"
+                },
+                "Split": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "AttributeNames",
+                "S3Uri"
+            ],
+            "type": "object"
+        },
+        "AWS::Comprehend::DocumentClassifier.DocumentClassifierDocuments": {
+            "additionalProperties": false,
+            "properties": {
+                "S3Uri": {
+                    "type": "string"
+                },
+                "TestS3Uri": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "S3Uri"
+            ],
+            "type": "object"
+        },
+        "AWS::Comprehend::DocumentClassifier.DocumentClassifierInputDataConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "AugmentedManifests": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::Comprehend::DocumentClassifier.AugmentedManifestsListItem"
+                    },
+                    "type": "array"
+                },
+                "DataFormat": {
+                    "type": "string"
+                },
+                "DocumentReaderConfig": {
+                    "$ref": "#/definitions/AWS::Comprehend::DocumentClassifier.DocumentReaderConfig"
+                },
+                "DocumentType": {
+                    "type": "string"
+                },
+                "Documents": {
+                    "$ref": "#/definitions/AWS::Comprehend::DocumentClassifier.DocumentClassifierDocuments"
+                },
+                "LabelDelimiter": {
+                    "type": "string"
+                },
+                "S3Uri": {
+                    "type": "string"
+                },
+                "TestS3Uri": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Comprehend::DocumentClassifier.DocumentClassifierOutputDataConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "KmsKeyId": {
+                    "type": "string"
+                },
+                "S3Uri": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Comprehend::DocumentClassifier.DocumentReaderConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "DocumentReadAction": {
+                    "type": "string"
+                },
+                "DocumentReadMode": {
+                    "type": "string"
+                },
+                "FeatureTypes": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "DocumentReadAction"
+            ],
+            "type": "object"
+        },
+        "AWS::Comprehend::DocumentClassifier.VpcConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "SecurityGroupIds": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "Subnets": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "SecurityGroupIds",
+                "Subnets"
+            ],
+            "type": "object"
+        },
         "AWS::Comprehend::Flywheel": {
             "additionalProperties": false,
             "properties": {
@@ -48911,6 +49361,9 @@
                 "Properties": {
                     "additionalProperties": false,
                     "properties": {
+                        "KeyFormat": {
+                            "type": "string"
+                        },
                         "KeyName": {
                             "type": "string"
                         },
@@ -56272,9 +56725,15 @@
                 "CloudWatchLogs": {
                     "$ref": "#/definitions/AWS::EC2::VerifiedAccessInstance.CloudWatchLogs"
                 },
+                "IncludeTrustContext": {
+                    "type": "boolean"
+                },
                 "KinesisDataFirehose": {
                     "$ref": "#/definitions/AWS::EC2::VerifiedAccessInstance.KinesisDataFirehose"
                 },
+                "LogVersion": {
+                    "type": "string"
+                },
                 "S3": {
                     "$ref": "#/definitions/AWS::EC2::VerifiedAccessInstance.S3"
                 }
@@ -80078,9 +80537,6 @@
                             "type": "string"
                         }
                     },
-                    "required": [
-                        "AWSServiceName"
-                    ],
                     "type": "object"
                 },
                 "Type": {
@@ -80099,8 +80555,7 @@
                 }
             },
             "required": [
-                "Type",
-                "Properties"
+                "Type"
             ],
             "type": "object"
         },
@@ -99145,6 +99600,9 @@
                     "type": "string"
                 }
             },
+            "required": [
+                "DataLakePrincipalIdentifier"
+            ],
             "type": "object"
         },
         "AWS::LakeFormation::DataLakeSettings.ExternalDataFilteringAllowList": {
@@ -99152,21 +99610,23 @@
             "properties": {},
             "type": "object"
         },
-        "AWS::LakeFormation::DataLakeSettings.Permissions": {
-            "additionalProperties": false,
-            "properties": {},
-            "type": "object"
-        },
         "AWS::LakeFormation::DataLakeSettings.PrincipalPermissions": {
             "additionalProperties": false,
             "properties": {
                 "Permissions": {
-                    "$ref": "#/definitions/AWS::LakeFormation::DataLakeSettings.Permissions"
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
                 },
                 "Principal": {
                     "$ref": "#/definitions/AWS::LakeFormation::DataLakeSettings.DataLakePrincipal"
                 }
             },
+            "required": [
+                "Permissions",
+                "Principal"
+            ],
             "type": "object"
         },
         "AWS::LakeFormation::Permissions": {
@@ -117881,7 +118341,6 @@
                     },
                     "required": [
                         "ConnectAttachmentId",
-                        "InsideCidrBlocks",
                         "PeerAddress"
                     ],
                     "type": "object"
@@ -118188,6 +118647,9 @@
                 "Properties": {
                     "additionalProperties": false,
                     "properties": {
+                        "AWSLocation": {
+                            "$ref": "#/definitions/AWS::NetworkManager::Device.AWSLocation"
+                        },
                         "Description": {
                             "type": "string"
                         },
@@ -118245,6 +118707,18 @@
             ],
             "type": "object"
         },
+        "AWS::NetworkManager::Device.AWSLocation": {
+            "additionalProperties": false,
+            "properties": {
+                "SubnetArn": {
+                    "type": "string"
+                },
+                "Zone": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
         "AWS::NetworkManager::Device.Location": {
             "additionalProperties": false,
             "properties": {
@@ -123214,9 +123688,6 @@
                         "Description": {
                             "type": "string"
                         },
-                        "DeviceId": {
-                            "type": "string"
-                        },
                         "ManifestOverridesPayload": {
                             "$ref": "#/definitions/AWS::Panorama::ApplicationInstance.ManifestOverridesPayload"
                         },
@@ -123229,9 +123700,6 @@
                         "RuntimeRoleArn": {
                             "type": "string"
                         },
-                        "StatusFilter": {
-                            "type": "string"
-                        },
                         "Tags": {
                             "items": {
                                 "$ref": "#/definitions/Tag"
@@ -128534,7 +129002,6 @@
                 }
             },
             "required": [
-                "AggregationFunction",
                 "Column",
                 "SortDirection"
             ],
@@ -129413,24 +129880,9 @@
             ],
             "type": "object"
         },
-        "AWS::QuickSight::Analysis.ColorsConfiguration": {
-            "additionalProperties": false,
-            "properties": {
-                "CustomColors": {
-                    "items": {
-                        "$ref": "#/definitions/AWS::QuickSight::Analysis.CustomColor"
-                    },
-                    "type": "array"
-                }
-            },
-            "type": "object"
-        },
         "AWS::QuickSight::Analysis.ColumnConfiguration": {
             "additionalProperties": false,
             "properties": {
-                "ColorsConfiguration": {
-                    "$ref": "#/definitions/AWS::QuickSight::Analysis.ColorsConfiguration"
-                },
                 "Column": {
                     "$ref": "#/definitions/AWS::QuickSight::Analysis.ColumnIdentifier"
                 },
@@ -129948,24 +130400,6 @@
             ],
             "type": "object"
         },
-        "AWS::QuickSight::Analysis.CustomColor": {
-            "additionalProperties": false,
-            "properties": {
-                "Color": {
-                    "type": "string"
-                },
-                "FieldValue": {
-                    "type": "string"
-                },
-                "SpecialValue": {
-                    "type": "string"
-                }
-            },
-            "required": [
-                "Color"
-            ],
-            "type": "object"
-        },
         "AWS::QuickSight::Analysis.CustomContentConfiguration": {
             "additionalProperties": false,
             "properties": {
@@ -130201,6 +130635,9 @@
                 "Position": {
                     "type": "string"
                 },
+                "TotalsVisibility": {
+                    "type": "string"
+                },
                 "Visibility": {
                     "type": "string"
                 }
@@ -130673,6 +131110,9 @@
                 "SelectAllValueOptions": {
                     "type": "string"
                 },
+                "SourceColumn": {
+                    "$ref": "#/definitions/AWS::QuickSight::Analysis.ColumnIdentifier"
+                },
                 "SourceField": {
                     "type": "string"
                 },
@@ -131272,6 +131712,12 @@
         "AWS::QuickSight::Analysis.FilterOperationSelectedFieldsConfiguration": {
             "additionalProperties": false,
             "properties": {
+                "SelectedColumns": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::QuickSight::Analysis.ColumnIdentifier"
+                    },
+                    "type": "array"
+                },
                 "SelectedFieldOptions": {
                     "type": "string"
                 },
@@ -131964,6 +132410,39 @@
             ],
             "type": "object"
         },
+        "AWS::QuickSight::Analysis.GeospatialHeatmapColorScale": {
+            "additionalProperties": false,
+            "properties": {
+                "Colors": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::QuickSight::Analysis.GeospatialHeatmapDataColor"
+                    },
+                    "type": "array"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::QuickSight::Analysis.GeospatialHeatmapConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "HeatmapColor": {
+                    "$ref": "#/definitions/AWS::QuickSight::Analysis.GeospatialHeatmapColorScale"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::QuickSight::Analysis.GeospatialHeatmapDataColor": {
+            "additionalProperties": false,
+            "properties": {
+                "Color": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Color"
+            ],
+            "type": "object"
+        },
         "AWS::QuickSight::Analysis.GeospatialMapAggregatedFieldWells": {
             "additionalProperties": false,
             "properties": {
@@ -132072,6 +132551,9 @@
                 "ClusterMarkerConfiguration": {
                     "$ref": "#/definitions/AWS::QuickSight::Analysis.ClusterMarkerConfiguration"
                 },
+                "HeatmapConfiguration": {
+                    "$ref": "#/definitions/AWS::QuickSight::Analysis.GeospatialHeatmapConfiguration"
+                },
                 "SelectedPointStyle": {
                     "type": "string"
                 }
@@ -134102,6 +134584,12 @@
                 "Scope": {
                     "$ref": "#/definitions/AWS::QuickSight::Analysis.PivotTableConditionalFormattingScope"
                 },
+                "Scopes": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::QuickSight::Analysis.PivotTableConditionalFormattingScope"
+                    },
+                    "type": "array"
+                },
                 "TextFormat": {
                     "$ref": "#/definitions/AWS::QuickSight::Analysis.TextConditionalFormat"
                 }
@@ -134183,6 +134671,36 @@
             ],
             "type": "object"
         },
+        "AWS::QuickSight::Analysis.PivotTableFieldCollapseStateOption": {
+            "additionalProperties": false,
+            "properties": {
+                "State": {
+                    "type": "string"
+                },
+                "Target": {
+                    "$ref": "#/definitions/AWS::QuickSight::Analysis.PivotTableFieldCollapseStateTarget"
+                }
+            },
+            "required": [
+                "Target"
+            ],
+            "type": "object"
+        },
+        "AWS::QuickSight::Analysis.PivotTableFieldCollapseStateTarget": {
+            "additionalProperties": false,
+            "properties": {
+                "FieldDataPathValues": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::QuickSight::Analysis.DataPathValue"
+                    },
+                    "type": "array"
+                },
+                "FieldId": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
         "AWS::QuickSight::Analysis.PivotTableFieldOption": {
             "additionalProperties": false,
             "properties": {
@@ -134204,6 +134722,12 @@
         "AWS::QuickSight::Analysis.PivotTableFieldOptions": {
             "additionalProperties": false,
             "properties": {
+                "CollapseStateOptions": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::QuickSight::Analysis.PivotTableFieldCollapseStateOption"
+                    },
+                    "type": "array"
+                },
                 "DataPathOptions": {
                     "items": {
                         "$ref": "#/definitions/AWS::QuickSight::Analysis.PivotTableDataPathOption"
@@ -134243,6 +134767,9 @@
                 "CellStyle": {
                     "$ref": "#/definitions/AWS::QuickSight::Analysis.TableCellStyle"
                 },
+                "CollapsedRowDimensionsVisibility": {
+                    "type": "string"
+                },
                 "ColumnHeaderStyle": {
                     "$ref": "#/definitions/AWS::QuickSight::Analysis.TableCellStyle"
                 },
@@ -134463,6 +134990,9 @@
                 "AlternateBandOddColor": {
                     "type": "string"
                 },
+                "AxesRangeScale": {
+                    "type": "string"
+                },
                 "BaseSeriesSettings": {
                     "$ref": "#/definitions/AWS::QuickSight::Analysis.RadarChartSeriesSettings"
                 },
@@ -134646,8 +135176,7 @@
             },
             "required": [
                 "Calculation",
-                "Column",
-                "MeasureAggregationFunction"
+                "Column"
             ],
             "type": "object"
         },
@@ -134936,6 +135465,12 @@
                     },
                     "type": "array"
                 },
+                "Label": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::QuickSight::Analysis.DimensionField"
+                    },
+                    "type": "array"
+                },
                 "Size": {
                     "items": {
                         "$ref": "#/definitions/AWS::QuickSight::Analysis.MeasureField"
@@ -135005,6 +135540,18 @@
         "AWS::QuickSight::Analysis.ScatterPlotUnaggregatedFieldWells": {
             "additionalProperties": false,
             "properties": {
+                "Category": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::QuickSight::Analysis.DimensionField"
+                    },
+                    "type": "array"
+                },
+                "Label": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::QuickSight::Analysis.DimensionField"
+                    },
+                    "type": "array"
+                },
                 "Size": {
                     "items": {
                         "$ref": "#/definitions/AWS::QuickSight::Analysis.MeasureField"
@@ -137067,7 +137614,6 @@
                 }
             },
             "required": [
-                "AggregationFunction",
                 "Column",
                 "SortDirection"
             ],
@@ -137852,24 +138398,9 @@
             ],
             "type": "object"
         },
-        "AWS::QuickSight::Dashboard.ColorsConfiguration": {
-            "additionalProperties": false,
-            "properties": {
-                "CustomColors": {
-                    "items": {
-                        "$ref": "#/definitions/AWS::QuickSight::Dashboard.CustomColor"
-                    },
-                    "type": "array"
-                }
-            },
-            "type": "object"
-        },
         "AWS::QuickSight::Dashboard.ColumnConfiguration": {
             "additionalProperties": false,
             "properties": {
-                "ColorsConfiguration": {
-                    "$ref": "#/definitions/AWS::QuickSight::Dashboard.ColorsConfiguration"
-                },
                 "Column": {
                     "$ref": "#/definitions/AWS::QuickSight::Dashboard.ColumnIdentifier"
                 },
@@ -138387,24 +138918,6 @@
             ],
             "type": "object"
         },
-        "AWS::QuickSight::Dashboard.CustomColor": {
-            "additionalProperties": false,
-            "properties": {
-                "Color": {
-                    "type": "string"
-                },
-                "FieldValue": {
-                    "type": "string"
-                },
-                "SpecialValue": {
-                    "type": "string"
-                }
-            },
-            "required": [
-                "Color"
-            ],
-            "type": "object"
-        },
         "AWS::QuickSight::Dashboard.CustomContentConfiguration": {
             "additionalProperties": false,
             "properties": {
@@ -138827,6 +139340,9 @@
                 "Position": {
                     "type": "string"
                 },
+                "TotalsVisibility": {
+                    "type": "string"
+                },
                 "Visibility": {
                     "type": "string"
                 }
@@ -139326,6 +139842,9 @@
                 "SelectAllValueOptions": {
                     "type": "string"
                 },
+                "SourceColumn": {
+                    "$ref": "#/definitions/AWS::QuickSight::Dashboard.ColumnIdentifier"
+                },
                 "SourceField": {
                     "type": "string"
                 },
@@ -139952,6 +140471,12 @@
         "AWS::QuickSight::Dashboard.FilterOperationSelectedFieldsConfiguration": {
             "additionalProperties": false,
             "properties": {
+                "SelectedColumns": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::QuickSight::Dashboard.ColumnIdentifier"
+                    },
+                    "type": "array"
+                },
                 "SelectedFieldOptions": {
                     "type": "string"
                 },
@@ -140644,6 +141169,39 @@
             ],
             "type": "object"
         },
+        "AWS::QuickSight::Dashboard.GeospatialHeatmapColorScale": {
+            "additionalProperties": false,
+            "properties": {
+                "Colors": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::QuickSight::Dashboard.GeospatialHeatmapDataColor"
+                    },
+                    "type": "array"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::QuickSight::Dashboard.GeospatialHeatmapConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "HeatmapColor": {
+                    "$ref": "#/definitions/AWS::QuickSight::Dashboard.GeospatialHeatmapColorScale"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::QuickSight::Dashboard.GeospatialHeatmapDataColor": {
+            "additionalProperties": false,
+            "properties": {
+                "Color": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Color"
+            ],
+            "type": "object"
+        },
         "AWS::QuickSight::Dashboard.GeospatialMapAggregatedFieldWells": {
             "additionalProperties": false,
             "properties": {
@@ -140752,6 +141310,9 @@
                 "ClusterMarkerConfiguration": {
                     "$ref": "#/definitions/AWS::QuickSight::Dashboard.ClusterMarkerConfiguration"
                 },
+                "HeatmapConfiguration": {
+                    "$ref": "#/definitions/AWS::QuickSight::Dashboard.GeospatialHeatmapConfiguration"
+                },
                 "SelectedPointStyle": {
                     "type": "string"
                 }
@@ -142782,6 +143343,12 @@
                 "Scope": {
                     "$ref": "#/definitions/AWS::QuickSight::Dashboard.PivotTableConditionalFormattingScope"
                 },
+                "Scopes": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::QuickSight::Dashboard.PivotTableConditionalFormattingScope"
+                    },
+                    "type": "array"
+                },
                 "TextFormat": {
                     "$ref": "#/definitions/AWS::QuickSight::Dashboard.TextConditionalFormat"
                 }
@@ -142863,6 +143430,36 @@
             ],
             "type": "object"
         },
+        "AWS::QuickSight::Dashboard.PivotTableFieldCollapseStateOption": {
+            "additionalProperties": false,
+            "properties": {
+                "State": {
+                    "type": "string"
+                },
+                "Target": {
+                    "$ref": "#/definitions/AWS::QuickSight::Dashboard.PivotTableFieldCollapseStateTarget"
+                }
+            },
+            "required": [
+                "Target"
+            ],
+            "type": "object"
+        },
+        "AWS::QuickSight::Dashboard.PivotTableFieldCollapseStateTarget": {
+            "additionalProperties": false,
+            "properties": {
+                "FieldDataPathValues": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::QuickSight::Dashboard.DataPathValue"
+                    },
+                    "type": "array"
+                },
+                "FieldId": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
         "AWS::QuickSight::Dashboard.PivotTableFieldOption": {
             "additionalProperties": false,
             "properties": {
@@ -142884,6 +143481,12 @@
         "AWS::QuickSight::Dashboard.PivotTableFieldOptions": {
             "additionalProperties": false,
             "properties": {
+                "CollapseStateOptions": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::QuickSight::Dashboard.PivotTableFieldCollapseStateOption"
+                    },
+                    "type": "array"
+                },
                 "DataPathOptions": {
                     "items": {
                         "$ref": "#/definitions/AWS::QuickSight::Dashboard.PivotTableDataPathOption"
@@ -142923,6 +143526,9 @@
                 "CellStyle": {
                     "$ref": "#/definitions/AWS::QuickSight::Dashboard.TableCellStyle"
                 },
+                "CollapsedRowDimensionsVisibility": {
+                    "type": "string"
+                },
                 "ColumnHeaderStyle": {
                     "$ref": "#/definitions/AWS::QuickSight::Dashboard.TableCellStyle"
                 },
@@ -143143,6 +143749,9 @@
                 "AlternateBandOddColor": {
                     "type": "string"
                 },
+                "AxesRangeScale": {
+                    "type": "string"
+                },
                 "BaseSeriesSettings": {
                     "$ref": "#/definitions/AWS::QuickSight::Dashboard.RadarChartSeriesSettings"
                 },
@@ -143326,8 +143935,7 @@
             },
             "required": [
                 "Calculation",
-                "Column",
-                "MeasureAggregationFunction"
+                "Column"
             ],
             "type": "object"
         },
@@ -143616,6 +144224,12 @@
                     },
                     "type": "array"
                 },
+                "Label": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::QuickSight::Dashboard.DimensionField"
+                    },
+                    "type": "array"
+                },
                 "Size": {
                     "items": {
                         "$ref": "#/definitions/AWS::QuickSight::Dashboard.MeasureField"
@@ -143685,6 +144299,18 @@
         "AWS::QuickSight::Dashboard.ScatterPlotUnaggregatedFieldWells": {
             "additionalProperties": false,
             "properties": {
+                "Category": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::QuickSight::Dashboard.DimensionField"
+                    },
+                    "type": "array"
+                },
+                "Label": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::QuickSight::Dashboard.DimensionField"
+                    },
+                    "type": "array"
+                },
                 "Size": {
                     "items": {
                         "$ref": "#/definitions/AWS::QuickSight::Dashboard.MeasureField"
@@ -147424,7 +148050,6 @@
                 }
             },
             "required": [
-                "AggregationFunction",
                 "Column",
                 "SortDirection"
             ],
@@ -148209,24 +148834,9 @@
             ],
             "type": "object"
         },
-        "AWS::QuickSight::Template.ColorsConfiguration": {
-            "additionalProperties": false,
-            "properties": {
-                "CustomColors": {
-                    "items": {
-                        "$ref": "#/definitions/AWS::QuickSight::Template.CustomColor"
-                    },
-                    "type": "array"
-                }
-            },
-            "type": "object"
-        },
         "AWS::QuickSight::Template.ColumnConfiguration": {
             "additionalProperties": false,
             "properties": {
-                "ColorsConfiguration": {
-                    "$ref": "#/definitions/AWS::QuickSight::Template.ColorsConfiguration"
-                },
                 "Column": {
                     "$ref": "#/definitions/AWS::QuickSight::Template.ColumnIdentifier"
                 },
@@ -148783,24 +149393,6 @@
             ],
             "type": "object"
         },
-        "AWS::QuickSight::Template.CustomColor": {
-            "additionalProperties": false,
-            "properties": {
-                "Color": {
-                    "type": "string"
-                },
-                "FieldValue": {
-                    "type": "string"
-                },
-                "SpecialValue": {
-                    "type": "string"
-                }
-            },
-            "required": [
-                "Color"
-            ],
-            "type": "object"
-        },
         "AWS::QuickSight::Template.CustomContentConfiguration": {
             "additionalProperties": false,
             "properties": {
@@ -149036,6 +149628,9 @@
                 "Position": {
                     "type": "string"
                 },
+                "TotalsVisibility": {
+                    "type": "string"
+                },
                 "Visibility": {
                     "type": "string"
                 }
@@ -149484,6 +150079,9 @@
                 "SelectAllValueOptions": {
                     "type": "string"
                 },
+                "SourceColumn": {
+                    "$ref": "#/definitions/AWS::QuickSight::Template.ColumnIdentifier"
+                },
                 "SourceField": {
                     "type": "string"
                 },
@@ -150083,6 +150681,12 @@
         "AWS::QuickSight::Template.FilterOperationSelectedFieldsConfiguration": {
             "additionalProperties": false,
             "properties": {
+                "SelectedColumns": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::QuickSight::Template.ColumnIdentifier"
+                    },
+                    "type": "array"
+                },
                 "SelectedFieldOptions": {
                     "type": "string"
                 },
@@ -150775,6 +151379,39 @@
             ],
             "type": "object"
         },
+        "AWS::QuickSight::Template.GeospatialHeatmapColorScale": {
+            "additionalProperties": false,
+            "properties": {
+                "Colors": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::QuickSight::Template.GeospatialHeatmapDataColor"
+                    },
+                    "type": "array"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::QuickSight::Template.GeospatialHeatmapConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "HeatmapColor": {
+                    "$ref": "#/definitions/AWS::QuickSight::Template.GeospatialHeatmapColorScale"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::QuickSight::Template.GeospatialHeatmapDataColor": {
+            "additionalProperties": false,
+            "properties": {
+                "Color": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Color"
+            ],
+            "type": "object"
+        },
         "AWS::QuickSight::Template.GeospatialMapAggregatedFieldWells": {
             "additionalProperties": false,
             "properties": {
@@ -150883,6 +151520,9 @@
                 "ClusterMarkerConfiguration": {
                     "$ref": "#/definitions/AWS::QuickSight::Template.ClusterMarkerConfiguration"
                 },
+                "HeatmapConfiguration": {
+                    "$ref": "#/definitions/AWS::QuickSight::Template.GeospatialHeatmapConfiguration"
+                },
                 "SelectedPointStyle": {
                     "type": "string"
                 }
@@ -152864,6 +153504,12 @@
                 "Scope": {
                     "$ref": "#/definitions/AWS::QuickSight::Template.PivotTableConditionalFormattingScope"
                 },
+                "Scopes": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::QuickSight::Template.PivotTableConditionalFormattingScope"
+                    },
+                    "type": "array"
+                },
                 "TextFormat": {
                     "$ref": "#/definitions/AWS::QuickSight::Template.TextConditionalFormat"
                 }
@@ -152945,6 +153591,36 @@
             ],
             "type": "object"
         },
+        "AWS::QuickSight::Template.PivotTableFieldCollapseStateOption": {
+            "additionalProperties": false,
+            "properties": {
+                "State": {
+                    "type": "string"
+                },
+                "Target": {
+                    "$ref": "#/definitions/AWS::QuickSight::Template.PivotTableFieldCollapseStateTarget"
+                }
+            },
+            "required": [
+                "Target"
+            ],
+            "type": "object"
+        },
+        "AWS::QuickSight::Template.PivotTableFieldCollapseStateTarget": {
+            "additionalProperties": false,
+            "properties": {
+                "FieldDataPathValues": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::QuickSight::Template.DataPathValue"
+                    },
+                    "type": "array"
+                },
+                "FieldId": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
         "AWS::QuickSight::Template.PivotTableFieldOption": {
             "additionalProperties": false,
             "properties": {
@@ -152966,6 +153642,12 @@
         "AWS::QuickSight::Template.PivotTableFieldOptions": {
             "additionalProperties": false,
             "properties": {
+                "CollapseStateOptions": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::QuickSight::Template.PivotTableFieldCollapseStateOption"
+                    },
+                    "type": "array"
+                },
                 "DataPathOptions": {
                     "items": {
                         "$ref": "#/definitions/AWS::QuickSight::Template.PivotTableDataPathOption"
@@ -153005,6 +153687,9 @@
                 "CellStyle": {
                     "$ref": "#/definitions/AWS::QuickSight::Template.TableCellStyle"
                 },
+                "CollapsedRowDimensionsVisibility": {
+                    "type": "string"
+                },
                 "ColumnHeaderStyle": {
                     "$ref": "#/definitions/AWS::QuickSight::Template.TableCellStyle"
                 },
@@ -153225,6 +153910,9 @@
                 "AlternateBandOddColor": {
                     "type": "string"
                 },
+                "AxesRangeScale": {
+                    "type": "string"
+                },
                 "BaseSeriesSettings": {
                     "$ref": "#/definitions/AWS::QuickSight::Template.RadarChartSeriesSettings"
                 },
@@ -153408,8 +154096,7 @@
             },
             "required": [
                 "Calculation",
-                "Column",
-                "MeasureAggregationFunction"
+                "Column"
             ],
             "type": "object"
         },
@@ -153698,6 +154385,12 @@
                     },
                     "type": "array"
                 },
+                "Label": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::QuickSight::Template.DimensionField"
+                    },
+                    "type": "array"
+                },
                 "Size": {
                     "items": {
                         "$ref": "#/definitions/AWS::QuickSight::Template.MeasureField"
@@ -153767,6 +154460,18 @@
         "AWS::QuickSight::Template.ScatterPlotUnaggregatedFieldWells": {
             "additionalProperties": false,
             "properties": {
+                "Category": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::QuickSight::Template.DimensionField"
+                    },
+                    "type": "array"
+                },
+                "Label": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::QuickSight::Template.DimensionField"
+                    },
+                    "type": "array"
+                },
                 "Size": {
                     "items": {
                         "$ref": "#/definitions/AWS::QuickSight::Template.MeasureField"
@@ -155888,6 +156593,9 @@
                     },
                     "required": [
                         "AwsAccountId",
+                        "BaseThemeId",
+                        "Configuration",
+                        "Name",
                         "ThemeId"
                     ],
                     "type": "object"
@@ -155981,6 +156689,9 @@
                 },
                 "Principal": {
                     "type": "string"
+                },
+                "Resource": {
+                    "type": "string"
                 }
             },
             "required": [
@@ -176129,9 +176840,6 @@
                 "Properties": {
                     "additionalProperties": false,
                     "properties": {
-                        "AdditionalInferenceSpecificationDefinition": {
-                            "$ref": "#/definitions/AWS::SageMaker::ModelPackage.AdditionalInferenceSpecificationDefinition"
-                        },
                         "AdditionalInferenceSpecifications": {
                             "items": {
                                 "$ref": "#/definitions/AWS::SageMaker::ModelPackage.AdditionalInferenceSpecificationDefinition"
@@ -176153,9 +176861,6 @@
                         "ClientToken": {
                             "type": "string"
                         },
-                        "CreatedBy": {
-                            "$ref": "#/definitions/AWS::SageMaker::ModelPackage.UserContext"
-                        },
                         "CustomerMetadataProperties": {
                             "additionalProperties": true,
                             "patternProperties": {
@@ -176171,21 +176876,9 @@
                         "DriftCheckBaselines": {
                             "$ref": "#/definitions/AWS::SageMaker::ModelPackage.DriftCheckBaselines"
                         },
-                        "Environment": {
-                            "additionalProperties": true,
-                            "patternProperties": {
-                                "^[a-zA-Z0-9]+$": {
-                                    "type": "string"
-                                }
-                            },
-                            "type": "object"
-                        },
                         "InferenceSpecification": {
                             "$ref": "#/definitions/AWS::SageMaker::ModelPackage.InferenceSpecification"
                         },
-                        "LastModifiedBy": {
-                            "$ref": "#/definitions/AWS::SageMaker::ModelPackage.UserContext"
-                        },
                         "LastModifiedTime": {
                             "type": "string"
                         },
@@ -176210,9 +176903,6 @@
                         "ModelPackageStatusDetails": {
                             "$ref": "#/definitions/AWS::SageMaker::ModelPackage.ModelPackageStatusDetails"
                         },
-                        "ModelPackageStatusItem": {
-                            "$ref": "#/definitions/AWS::SageMaker::ModelPackage.ModelPackageStatusItem"
-                        },
                         "ModelPackageVersion": {
                             "type": "number"
                         },
@@ -176581,9 +177271,6 @@
                 },
                 "NearestModelName": {
                     "type": "string"
-                },
-                "ProductId": {
-                    "type": "string"
                 }
             },
             "required": [
@@ -176594,12 +177281,6 @@
         "AWS::SageMaker::ModelPackage.ModelPackageStatusDetails": {
             "additionalProperties": false,
             "properties": {
-                "ImageScanStatuses": {
-                    "items": {
-                        "$ref": "#/definitions/AWS::SageMaker::ModelPackage.ModelPackageStatusItem"
-                    },
-                    "type": "array"
-                },
                 "ValidationStatuses": {
                     "items": {
                         "$ref": "#/definitions/AWS::SageMaker::ModelPackage.ModelPackageStatusItem"
@@ -176607,9 +177288,6 @@
                     "type": "array"
                 }
             },
-            "required": [
-                "ValidationStatuses"
-            ],
             "type": "object"
         },
         "AWS::SageMaker::ModelPackage.ModelPackageStatusItem": {
@@ -176788,21 +177466,6 @@
             ],
             "type": "object"
         },
-        "AWS::SageMaker::ModelPackage.UserContext": {
-            "additionalProperties": false,
-            "properties": {
-                "DomainId": {
-                    "type": "string"
-                },
-                "UserProfileArn": {
-                    "type": "string"
-                },
-                "UserProfileName": {
-                    "type": "string"
-                }
-            },
-            "type": "object"
-        },
         "AWS::SageMaker::ModelPackage.ValidationProfile": {
             "additionalProperties": false,
             "properties": {
@@ -185621,36 +186284,398 @@
                 "Properties": {
                     "additionalProperties": false,
                     "properties": {
-                        "Description": {
-                            "type": "string"
-                        },
-                        "OnExceptionSteps": {
-                            "items": {
-                                "$ref": "#/definitions/AWS::Transfer::Workflow.WorkflowStep"
-                            },
-                            "type": "array"
-                        },
-                        "Steps": {
-                            "items": {
-                                "$ref": "#/definitions/AWS::Transfer::Workflow.WorkflowStep"
-                            },
-                            "type": "array"
+                        "Description": {
+                            "type": "string"
+                        },
+                        "OnExceptionSteps": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::Transfer::Workflow.WorkflowStep"
+                            },
+                            "type": "array"
+                        },
+                        "Steps": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::Transfer::Workflow.WorkflowStep"
+                            },
+                            "type": "array"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "Steps"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Transfer::Workflow"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::Transfer::Workflow.CopyStepDetails": {
+            "additionalProperties": false,
+            "properties": {
+                "DestinationFileLocation": {
+                    "$ref": "#/definitions/AWS::Transfer::Workflow.S3FileLocation"
+                },
+                "Name": {
+                    "type": "string"
+                },
+                "OverwriteExisting": {
+                    "type": "string"
+                },
+                "SourceFileLocation": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Transfer::Workflow.CustomStepDetails": {
+            "additionalProperties": false,
+            "properties": {
+                "Name": {
+                    "type": "string"
+                },
+                "SourceFileLocation": {
+                    "type": "string"
+                },
+                "Target": {
+                    "type": "string"
+                },
+                "TimeoutSeconds": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Transfer::Workflow.DecryptStepDetails": {
+            "additionalProperties": false,
+            "properties": {
+                "DestinationFileLocation": {
+                    "$ref": "#/definitions/AWS::Transfer::Workflow.InputFileLocation"
+                },
+                "Name": {
+                    "type": "string"
+                },
+                "OverwriteExisting": {
+                    "type": "string"
+                },
+                "SourceFileLocation": {
+                    "type": "string"
+                },
+                "Type": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Transfer::Workflow.DeleteStepDetails": {
+            "additionalProperties": false,
+            "properties": {
+                "Name": {
+                    "type": "string"
+                },
+                "SourceFileLocation": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Transfer::Workflow.EfsInputFileLocation": {
+            "additionalProperties": false,
+            "properties": {
+                "FileSystemId": {
+                    "type": "string"
+                },
+                "Path": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Transfer::Workflow.InputFileLocation": {
+            "additionalProperties": false,
+            "properties": {
+                "EfsFileLocation": {
+                    "$ref": "#/definitions/AWS::Transfer::Workflow.EfsInputFileLocation"
+                },
+                "S3FileLocation": {
+                    "$ref": "#/definitions/AWS::Transfer::Workflow.S3InputFileLocation"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Transfer::Workflow.S3FileLocation": {
+            "additionalProperties": false,
+            "properties": {
+                "S3FileLocation": {
+                    "$ref": "#/definitions/AWS::Transfer::Workflow.S3InputFileLocation"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Transfer::Workflow.S3InputFileLocation": {
+            "additionalProperties": false,
+            "properties": {
+                "Bucket": {
+                    "type": "string"
+                },
+                "Key": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Transfer::Workflow.S3Tag": {
+            "additionalProperties": false,
+            "properties": {
+                "Key": {
+                    "type": "string"
+                },
+                "Value": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Key",
+                "Value"
+            ],
+            "type": "object"
+        },
+        "AWS::Transfer::Workflow.TagStepDetails": {
+            "additionalProperties": false,
+            "properties": {
+                "Name": {
+                    "type": "string"
+                },
+                "SourceFileLocation": {
+                    "type": "string"
+                },
+                "Tags": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::Transfer::Workflow.S3Tag"
+                    },
+                    "type": "array"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Transfer::Workflow.WorkflowStep": {
+            "additionalProperties": false,
+            "properties": {
+                "CopyStepDetails": {
+                    "$ref": "#/definitions/AWS::Transfer::Workflow.CopyStepDetails"
+                },
+                "CustomStepDetails": {
+                    "$ref": "#/definitions/AWS::Transfer::Workflow.CustomStepDetails"
+                },
+                "DecryptStepDetails": {
+                    "$ref": "#/definitions/AWS::Transfer::Workflow.DecryptStepDetails"
+                },
+                "DeleteStepDetails": {
+                    "$ref": "#/definitions/AWS::Transfer::Workflow.DeleteStepDetails"
+                },
+                "TagStepDetails": {
+                    "$ref": "#/definitions/AWS::Transfer::Workflow.TagStepDetails"
+                },
+                "Type": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::VerifiedPermissions::IdentitySource": {
+            "additionalProperties": false,
+            "properties": {
+                "Condition": {
+                    "type": "string"
+                },
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "Configuration": {
+                            "$ref": "#/definitions/AWS::VerifiedPermissions::IdentitySource.IdentitySourceConfiguration"
+                        },
+                        "PolicyStoreId": {
+                            "type": "string"
+                        },
+                        "PrincipalEntityType": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "Configuration"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::VerifiedPermissions::IdentitySource"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::VerifiedPermissions::IdentitySource.CognitoUserPoolConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "ClientIds": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "UserPoolArn": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "UserPoolArn"
+            ],
+            "type": "object"
+        },
+        "AWS::VerifiedPermissions::IdentitySource.IdentitySourceConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "CognitoUserPoolConfiguration": {
+                    "$ref": "#/definitions/AWS::VerifiedPermissions::IdentitySource.CognitoUserPoolConfiguration"
+                }
+            },
+            "required": [
+                "CognitoUserPoolConfiguration"
+            ],
+            "type": "object"
+        },
+        "AWS::VerifiedPermissions::IdentitySource.IdentitySourceDetails": {
+            "additionalProperties": false,
+            "properties": {
+                "ClientIds": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "DiscoveryUrl": {
+                    "type": "string"
+                },
+                "OpenIdIssuer": {
+                    "type": "string"
+                },
+                "UserPoolArn": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::VerifiedPermissions::Policy": {
+            "additionalProperties": false,
+            "properties": {
+                "Condition": {
+                    "type": "string"
+                },
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "Definition": {
+                            "$ref": "#/definitions/AWS::VerifiedPermissions::Policy.PolicyDefinition"
                         },
-                        "Tags": {
-                            "items": {
-                                "$ref": "#/definitions/Tag"
-                            },
-                            "type": "array"
+                        "PolicyStoreId": {
+                            "type": "string"
                         }
                     },
                     "required": [
-                        "Steps"
+                        "Definition"
                     ],
                     "type": "object"
                 },
                 "Type": {
                     "enum": [
-                        "AWS::Transfer::Workflow"
+                        "AWS::VerifiedPermissions::Policy"
                     ],
                     "type": "string"
                 },
@@ -185669,176 +186694,225 @@
             ],
             "type": "object"
         },
-        "AWS::Transfer::Workflow.CopyStepDetails": {
+        "AWS::VerifiedPermissions::Policy.EntityIdentifier": {
             "additionalProperties": false,
             "properties": {
-                "DestinationFileLocation": {
-                    "$ref": "#/definitions/AWS::Transfer::Workflow.S3FileLocation"
-                },
-                "Name": {
-                    "type": "string"
-                },
-                "OverwriteExisting": {
+                "EntityId": {
                     "type": "string"
                 },
-                "SourceFileLocation": {
+                "EntityType": {
                     "type": "string"
                 }
             },
+            "required": [
+                "EntityId",
+                "EntityType"
+            ],
             "type": "object"
         },
-        "AWS::Transfer::Workflow.CustomStepDetails": {
+        "AWS::VerifiedPermissions::Policy.PolicyDefinition": {
             "additionalProperties": false,
             "properties": {
-                "Name": {
-                    "type": "string"
-                },
-                "SourceFileLocation": {
-                    "type": "string"
-                },
-                "Target": {
-                    "type": "string"
+                "Static": {
+                    "$ref": "#/definitions/AWS::VerifiedPermissions::Policy.StaticPolicyDefinition"
                 },
-                "TimeoutSeconds": {
-                    "type": "number"
+                "TemplateLinked": {
+                    "$ref": "#/definitions/AWS::VerifiedPermissions::Policy.TemplateLinkedPolicyDefinition"
                 }
             },
             "type": "object"
         },
-        "AWS::Transfer::Workflow.DecryptStepDetails": {
+        "AWS::VerifiedPermissions::Policy.StaticPolicyDefinition": {
             "additionalProperties": false,
             "properties": {
-                "DestinationFileLocation": {
-                    "$ref": "#/definitions/AWS::Transfer::Workflow.InputFileLocation"
-                },
-                "Name": {
-                    "type": "string"
-                },
-                "OverwriteExisting": {
-                    "type": "string"
-                },
-                "SourceFileLocation": {
+                "Description": {
                     "type": "string"
                 },
-                "Type": {
+                "Statement": {
                     "type": "string"
                 }
             },
+            "required": [
+                "Statement"
+            ],
             "type": "object"
         },
-        "AWS::Transfer::Workflow.DeleteStepDetails": {
+        "AWS::VerifiedPermissions::Policy.TemplateLinkedPolicyDefinition": {
             "additionalProperties": false,
             "properties": {
-                "Name": {
+                "PolicyTemplateId": {
                     "type": "string"
                 },
-                "SourceFileLocation": {
-                    "type": "string"
+                "Principal": {
+                    "$ref": "#/definitions/AWS::VerifiedPermissions::Policy.EntityIdentifier"
+                },
+                "Resource": {
+                    "$ref": "#/definitions/AWS::VerifiedPermissions::Policy.EntityIdentifier"
                 }
             },
+            "required": [
+                "PolicyTemplateId"
+            ],
             "type": "object"
         },
-        "AWS::Transfer::Workflow.EfsInputFileLocation": {
+        "AWS::VerifiedPermissions::PolicyStore": {
             "additionalProperties": false,
             "properties": {
-                "FileSystemId": {
+                "Condition": {
                     "type": "string"
                 },
-                "Path": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
                     "type": "string"
-                }
-            },
-            "type": "object"
-        },
-        "AWS::Transfer::Workflow.InputFileLocation": {
-            "additionalProperties": false,
-            "properties": {
-                "EfsFileLocation": {
-                    "$ref": "#/definitions/AWS::Transfer::Workflow.EfsInputFileLocation"
                 },
-                "S3FileLocation": {
-                    "$ref": "#/definitions/AWS::Transfer::Workflow.S3InputFileLocation"
-                }
-            },
-            "type": "object"
-        },
-        "AWS::Transfer::Workflow.S3FileLocation": {
-            "additionalProperties": false,
-            "properties": {
-                "S3FileLocation": {
-                    "$ref": "#/definitions/AWS::Transfer::Workflow.S3InputFileLocation"
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "Schema": {
+                            "$ref": "#/definitions/AWS::VerifiedPermissions::PolicyStore.SchemaDefinition"
+                        },
+                        "ValidationSettings": {
+                            "$ref": "#/definitions/AWS::VerifiedPermissions::PolicyStore.ValidationSettings"
+                        }
+                    },
+                    "required": [
+                        "ValidationSettings"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::VerifiedPermissions::PolicyStore"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
                 }
             },
+            "required": [
+                "Type",
+                "Properties"
+            ],
             "type": "object"
         },
-        "AWS::Transfer::Workflow.S3InputFileLocation": {
+        "AWS::VerifiedPermissions::PolicyStore.SchemaDefinition": {
             "additionalProperties": false,
             "properties": {
-                "Bucket": {
-                    "type": "string"
-                },
-                "Key": {
+                "CedarJson": {
                     "type": "string"
                 }
             },
             "type": "object"
         },
-        "AWS::Transfer::Workflow.S3Tag": {
+        "AWS::VerifiedPermissions::PolicyStore.ValidationSettings": {
             "additionalProperties": false,
             "properties": {
-                "Key": {
-                    "type": "string"
-                },
-                "Value": {
+                "Mode": {
                     "type": "string"
                 }
             },
             "required": [
-                "Key",
-                "Value"
+                "Mode"
             ],
             "type": "object"
         },
-        "AWS::Transfer::Workflow.TagStepDetails": {
+        "AWS::VerifiedPermissions::PolicyTemplate": {
             "additionalProperties": false,
             "properties": {
-                "Name": {
+                "Condition": {
                     "type": "string"
                 },
-                "SourceFileLocation": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
                     "type": "string"
                 },
-                "Tags": {
-                    "items": {
-                        "$ref": "#/definitions/AWS::Transfer::Workflow.S3Tag"
-                    },
-                    "type": "array"
-                }
-            },
-            "type": "object"
-        },
-        "AWS::Transfer::Workflow.WorkflowStep": {
-            "additionalProperties": false,
-            "properties": {
-                "CopyStepDetails": {
-                    "$ref": "#/definitions/AWS::Transfer::Workflow.CopyStepDetails"
-                },
-                "CustomStepDetails": {
-                    "$ref": "#/definitions/AWS::Transfer::Workflow.CustomStepDetails"
-                },
-                "DecryptStepDetails": {
-                    "$ref": "#/definitions/AWS::Transfer::Workflow.DecryptStepDetails"
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
                 },
-                "DeleteStepDetails": {
-                    "$ref": "#/definitions/AWS::Transfer::Workflow.DeleteStepDetails"
+                "Metadata": {
+                    "type": "object"
                 },
-                "TagStepDetails": {
-                    "$ref": "#/definitions/AWS::Transfer::Workflow.TagStepDetails"
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "Description": {
+                            "type": "string"
+                        },
+                        "PolicyStoreId": {
+                            "type": "string"
+                        },
+                        "Statement": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "Statement"
+                    ],
+                    "type": "object"
                 },
                 "Type": {
+                    "enum": [
+                        "AWS::VerifiedPermissions::PolicyTemplate"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
                     "type": "string"
                 }
             },
+            "required": [
+                "Type",
+                "Properties"
+            ],
             "type": "object"
         },
         "AWS::VoiceID::Domain": {
@@ -190108,6 +191182,9 @@
                 "Properties": {
                     "additionalProperties": false,
                     "properties": {
+                        "AssociationConfig": {
+                            "$ref": "#/definitions/AWS::WAFv2::WebACL.AssociationConfig"
+                        },
                         "CaptchaConfig": {
                             "$ref": "#/definitions/AWS::WAFv2::WebACL.CaptchaConfig"
                         },
@@ -190239,6 +191316,21 @@
             ],
             "type": "object"
         },
+        "AWS::WAFv2::WebACL.AssociationConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "RequestBody": {
+                    "additionalProperties": false,
+                    "patternProperties": {
+                        "^[a-zA-Z0-9]+$": {
+                            "$ref": "#/definitions/AWS::WAFv2::WebACL.RequestBodyAssociatedResourceTypeConfig"
+                        }
+                    },
+                    "type": "object"
+                }
+            },
+            "type": "object"
+        },
         "AWS::WAFv2::WebACL.BlockAction": {
             "additionalProperties": false,
             "properties": {
@@ -190867,6 +191959,18 @@
             ],
             "type": "object"
         },
+        "AWS::WAFv2::WebACL.RequestBodyAssociatedResourceTypeConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "DefaultSizeInspectionLimit": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "DefaultSizeInspectionLimit"
+            ],
+            "type": "object"
+        },
         "AWS::WAFv2::WebACL.RequestInspection": {
             "additionalProperties": false,
             "properties": {
@@ -192685,6 +193789,9 @@
                         {
                             "$ref": "#/definitions/AWS::AppMesh::VirtualService"
                         },
+                        {
+                            "$ref": "#/definitions/AWS::AppRunner::AutoScalingConfiguration"
+                        },
                         {
                             "$ref": "#/definitions/AWS::AppRunner::ObservabilityConfiguration"
                         },
@@ -192700,6 +193807,9 @@
                         {
                             "$ref": "#/definitions/AWS::AppStream::AppBlock"
                         },
+                        {
+                            "$ref": "#/definitions/AWS::AppStream::AppBlockBuilder"
+                        },
                         {
                             "$ref": "#/definitions/AWS::AppStream::Application"
                         },
@@ -193114,6 +194224,9 @@
                         {
                             "$ref": "#/definitions/AWS::Cognito::UserPoolUserToGroupAttachment"
                         },
+                        {
+                            "$ref": "#/definitions/AWS::Comprehend::DocumentClassifier"
+                        },
                         {
                             "$ref": "#/definitions/AWS::Comprehend::Flywheel"
                         },
@@ -195625,6 +196738,18 @@
                         {
                             "$ref": "#/definitions/AWS::Transfer::Workflow"
                         },
+                        {
+                            "$ref": "#/definitions/AWS::VerifiedPermissions::IdentitySource"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::VerifiedPermissions::Policy"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::VerifiedPermissions::PolicyStore"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::VerifiedPermissions::PolicyTemplate"
+                        },
                         {
                             "$ref": "#/definitions/AWS::VoiceID::Domain"
                         },
diff --git a/schema/cloudformation.go b/schema/cloudformation.go
index 0330ae6cc7..de6e35150f 100644
--- a/schema/cloudformation.go
+++ b/schema/cloudformation.go
@@ -12398,6 +12398,82 @@ var CloudformationSchema = `{
             },
             "type": "object"
         },
+        "AWS::AppRunner::AutoScalingConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "Condition": {
+                    "type": "string"
+                },
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "AutoScalingConfigurationName": {
+                            "type": "string"
+                        },
+                        "MaxConcurrency": {
+                            "type": "number"
+                        },
+                        "MaxSize": {
+                            "type": "number"
+                        },
+                        "MinSize": {
+                            "type": "number"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::AppRunner::AutoScalingConfiguration"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type"
+            ],
+            "type": "object"
+        },
         "AWS::AppRunner::ObservabilityConfiguration": {
             "additionalProperties": false,
             "properties": {
@@ -13066,6 +13142,12 @@ var CloudformationSchema = `{
                         "Name": {
                             "type": "string"
                         },
+                        "PackagingType": {
+                            "type": "string"
+                        },
+                        "PostSetupScriptDetails": {
+                            "$ref": "#/definitions/AWS::AppStream::AppBlock.ScriptDetails"
+                        },
                         "SetupScriptDetails": {
                             "$ref": "#/definitions/AWS::AppStream::AppBlock.ScriptDetails"
                         },
@@ -13081,7 +13163,6 @@ var CloudformationSchema = `{
                     },
                     "required": [
                         "Name",
-                        "SetupScriptDetails",
                         "SourceS3Location"
                     ],
                     "type": "object"
@@ -13118,8 +13199,7 @@ var CloudformationSchema = `{
                 }
             },
             "required": [
-                "S3Bucket",
-                "S3Key"
+                "S3Bucket"
             ],
             "type": "object"
         },
@@ -13146,7 +13226,7 @@ var CloudformationSchema = `{
             ],
             "type": "object"
         },
-        "AWS::AppStream::Application": {
+        "AWS::AppStream::AppBlockBuilder": {
             "additionalProperties": false,
             "properties": {
                 "Condition": {
@@ -13181,10 +13261,13 @@ var CloudformationSchema = `{
                 "Properties": {
                     "additionalProperties": false,
                     "properties": {
-                        "AppBlockArn": {
-                            "type": "string"
+                        "AccessEndpoints": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::AppStream::AppBlockBuilder.AccessEndpoint"
+                            },
+                            "type": "array"
                         },
-                        "AttributesToDelete": {
+                        "AppBlockArns": {
                             "items": {
                                 "type": "string"
                             },
@@ -13196,29 +13279,20 @@ var CloudformationSchema = `{
                         "DisplayName": {
                             "type": "string"
                         },
-                        "IconS3Location": {
-                            "$ref": "#/definitions/AWS::AppStream::Application.S3Location"
-                        },
-                        "InstanceFamilies": {
-                            "items": {
-                                "type": "string"
-                            },
-                            "type": "array"
+                        "EnableDefaultInternetAccess": {
+                            "type": "boolean"
                         },
-                        "LaunchParameters": {
+                        "IamRoleArn": {
                             "type": "string"
                         },
-                        "LaunchPath": {
+                        "InstanceType": {
                             "type": "string"
                         },
                         "Name": {
                             "type": "string"
                         },
-                        "Platforms": {
-                            "items": {
-                                "type": "string"
-                            },
-                            "type": "array"
+                        "Platform": {
+                            "type": "string"
                         },
                         "Tags": {
                             "items": {
@@ -13226,23 +13300,21 @@ var CloudformationSchema = `{
                             },
                             "type": "array"
                         },
-                        "WorkingDirectory": {
-                            "type": "string"
+                        "VpcConfig": {
+                            "$ref": "#/definitions/AWS::AppStream::AppBlockBuilder.VpcConfig"
                         }
                     },
                     "required": [
-                        "AppBlockArn",
-                        "IconS3Location",
-                        "InstanceFamilies",
-                        "LaunchPath",
+                        "InstanceType",
                         "Name",
-                        "Platforms"
+                        "Platform",
+                        "VpcConfig"
                     ],
                     "type": "object"
                 },
                 "Type": {
                     "enum": [
-                        "AWS::AppStream::Application"
+                        "AWS::AppStream::AppBlockBuilder"
                     ],
                     "type": "string"
                 },
@@ -13261,23 +13333,41 @@ var CloudformationSchema = `{
             ],
             "type": "object"
         },
-        "AWS::AppStream::Application.S3Location": {
+        "AWS::AppStream::AppBlockBuilder.AccessEndpoint": {
             "additionalProperties": false,
             "properties": {
-                "S3Bucket": {
+                "EndpointType": {
                     "type": "string"
                 },
-                "S3Key": {
+                "VpceId": {
                     "type": "string"
                 }
             },
             "required": [
-                "S3Bucket",
-                "S3Key"
+                "EndpointType",
+                "VpceId"
             ],
             "type": "object"
         },
-        "AWS::AppStream::ApplicationEntitlementAssociation": {
+        "AWS::AppStream::AppBlockBuilder.VpcConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "SecurityGroupIds": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "SubnetIds": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::AppStream::Application": {
             "additionalProperties": false,
             "properties": {
                 "Condition": {
@@ -13312,26 +13402,68 @@ var CloudformationSchema = `{
                 "Properties": {
                     "additionalProperties": false,
                     "properties": {
-                        "ApplicationIdentifier": {
+                        "AppBlockArn": {
                             "type": "string"
                         },
-                        "EntitlementName": {
+                        "AttributesToDelete": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "Description": {
                             "type": "string"
                         },
-                        "StackName": {
+                        "DisplayName": {
+                            "type": "string"
+                        },
+                        "IconS3Location": {
+                            "$ref": "#/definitions/AWS::AppStream::Application.S3Location"
+                        },
+                        "InstanceFamilies": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "LaunchParameters": {
+                            "type": "string"
+                        },
+                        "LaunchPath": {
+                            "type": "string"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "Platforms": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        },
+                        "WorkingDirectory": {
                             "type": "string"
                         }
                     },
                     "required": [
-                        "ApplicationIdentifier",
-                        "EntitlementName",
-                        "StackName"
+                        "AppBlockArn",
+                        "IconS3Location",
+                        "InstanceFamilies",
+                        "LaunchPath",
+                        "Name",
+                        "Platforms"
                     ],
                     "type": "object"
                 },
                 "Type": {
                     "enum": [
-                        "AWS::AppStream::ApplicationEntitlementAssociation"
+                        "AWS::AppStream::Application"
                     ],
                     "type": "string"
                 },
@@ -13350,76 +13482,165 @@ var CloudformationSchema = `{
             ],
             "type": "object"
         },
-        "AWS::AppStream::ApplicationFleetAssociation": {
+        "AWS::AppStream::Application.S3Location": {
             "additionalProperties": false,
             "properties": {
-                "Condition": {
-                    "type": "string"
-                },
-                "DeletionPolicy": {
-                    "enum": [
-                        "Delete",
-                        "Retain",
-                        "Snapshot"
-                    ],
-                    "type": "string"
-                },
-                "DependsOn": {
-                    "anyOf": [
-                        {
-                            "pattern": "^[a-zA-Z0-9]+$",
-                            "type": "string"
-                        },
-                        {
-                            "items": {
-                                "pattern": "^[a-zA-Z0-9]+$",
-                                "type": "string"
-                            },
-                            "type": "array"
-                        }
-                    ]
-                },
-                "Metadata": {
-                    "type": "object"
-                },
-                "Properties": {
-                    "additionalProperties": false,
-                    "properties": {
-                        "ApplicationArn": {
-                            "type": "string"
-                        },
-                        "FleetName": {
-                            "type": "string"
-                        }
-                    },
-                    "required": [
-                        "ApplicationArn",
-                        "FleetName"
-                    ],
-                    "type": "object"
-                },
-                "Type": {
-                    "enum": [
-                        "AWS::AppStream::ApplicationFleetAssociation"
-                    ],
+                "S3Bucket": {
                     "type": "string"
                 },
-                "UpdateReplacePolicy": {
-                    "enum": [
-                        "Delete",
-                        "Retain",
-                        "Snapshot"
-                    ],
+                "S3Key": {
                     "type": "string"
                 }
             },
             "required": [
-                "Type",
-                "Properties"
+                "S3Bucket",
+                "S3Key"
             ],
             "type": "object"
         },
-        "AWS::AppStream::DirectoryConfig": {
+        "AWS::AppStream::ApplicationEntitlementAssociation": {
+            "additionalProperties": false,
+            "properties": {
+                "Condition": {
+                    "type": "string"
+                },
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "ApplicationIdentifier": {
+                            "type": "string"
+                        },
+                        "EntitlementName": {
+                            "type": "string"
+                        },
+                        "StackName": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "ApplicationIdentifier",
+                        "EntitlementName",
+                        "StackName"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::AppStream::ApplicationEntitlementAssociation"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::AppStream::ApplicationFleetAssociation": {
+            "additionalProperties": false,
+            "properties": {
+                "Condition": {
+                    "type": "string"
+                },
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "ApplicationArn": {
+                            "type": "string"
+                        },
+                        "FleetName": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "ApplicationArn",
+                        "FleetName"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::AppStream::ApplicationFleetAssociation"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::AppStream::DirectoryConfig": {
             "additionalProperties": false,
             "properties": {
                 "Condition": {
@@ -33527,6 +33748,235 @@ var CloudformationSchema = `{
             ],
             "type": "object"
         },
+        "AWS::Comprehend::DocumentClassifier": {
+            "additionalProperties": false,
+            "properties": {
+                "Condition": {
+                    "type": "string"
+                },
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "DataAccessRoleArn": {
+                            "type": "string"
+                        },
+                        "DocumentClassifierName": {
+                            "type": "string"
+                        },
+                        "InputDataConfig": {
+                            "$ref": "#/definitions/AWS::Comprehend::DocumentClassifier.DocumentClassifierInputDataConfig"
+                        },
+                        "LanguageCode": {
+                            "type": "string"
+                        },
+                        "Mode": {
+                            "type": "string"
+                        },
+                        "ModelKmsKeyId": {
+                            "type": "string"
+                        },
+                        "ModelPolicy": {
+                            "type": "string"
+                        },
+                        "OutputDataConfig": {
+                            "$ref": "#/definitions/AWS::Comprehend::DocumentClassifier.DocumentClassifierOutputDataConfig"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        },
+                        "VersionName": {
+                            "type": "string"
+                        },
+                        "VolumeKmsKeyId": {
+                            "type": "string"
+                        },
+                        "VpcConfig": {
+                            "$ref": "#/definitions/AWS::Comprehend::DocumentClassifier.VpcConfig"
+                        }
+                    },
+                    "required": [
+                        "DataAccessRoleArn",
+                        "DocumentClassifierName",
+                        "InputDataConfig",
+                        "LanguageCode"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Comprehend::DocumentClassifier"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::Comprehend::DocumentClassifier.AugmentedManifestsListItem": {
+            "additionalProperties": false,
+            "properties": {
+                "AttributeNames": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "S3Uri": {
+                    "type": "string"
+                },
+                "Split": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "AttributeNames",
+                "S3Uri"
+            ],
+            "type": "object"
+        },
+        "AWS::Comprehend::DocumentClassifier.DocumentClassifierDocuments": {
+            "additionalProperties": false,
+            "properties": {
+                "S3Uri": {
+                    "type": "string"
+                },
+                "TestS3Uri": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "S3Uri"
+            ],
+            "type": "object"
+        },
+        "AWS::Comprehend::DocumentClassifier.DocumentClassifierInputDataConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "AugmentedManifests": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::Comprehend::DocumentClassifier.AugmentedManifestsListItem"
+                    },
+                    "type": "array"
+                },
+                "DataFormat": {
+                    "type": "string"
+                },
+                "DocumentReaderConfig": {
+                    "$ref": "#/definitions/AWS::Comprehend::DocumentClassifier.DocumentReaderConfig"
+                },
+                "DocumentType": {
+                    "type": "string"
+                },
+                "Documents": {
+                    "$ref": "#/definitions/AWS::Comprehend::DocumentClassifier.DocumentClassifierDocuments"
+                },
+                "LabelDelimiter": {
+                    "type": "string"
+                },
+                "S3Uri": {
+                    "type": "string"
+                },
+                "TestS3Uri": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Comprehend::DocumentClassifier.DocumentClassifierOutputDataConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "KmsKeyId": {
+                    "type": "string"
+                },
+                "S3Uri": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Comprehend::DocumentClassifier.DocumentReaderConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "DocumentReadAction": {
+                    "type": "string"
+                },
+                "DocumentReadMode": {
+                    "type": "string"
+                },
+                "FeatureTypes": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "DocumentReadAction"
+            ],
+            "type": "object"
+        },
+        "AWS::Comprehend::DocumentClassifier.VpcConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "SecurityGroupIds": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "Subnets": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "SecurityGroupIds",
+                "Subnets"
+            ],
+            "type": "object"
+        },
         "AWS::Comprehend::Flywheel": {
             "additionalProperties": false,
             "properties": {
@@ -48855,6 +49305,9 @@ var CloudformationSchema = `{
                 "Properties": {
                     "additionalProperties": false,
                     "properties": {
+                        "KeyFormat": {
+                            "type": "string"
+                        },
                         "KeyName": {
                             "type": "string"
                         },
@@ -56216,9 +56669,15 @@ var CloudformationSchema = `{
                 "CloudWatchLogs": {
                     "$ref": "#/definitions/AWS::EC2::VerifiedAccessInstance.CloudWatchLogs"
                 },
+                "IncludeTrustContext": {
+                    "type": "boolean"
+                },
                 "KinesisDataFirehose": {
                     "$ref": "#/definitions/AWS::EC2::VerifiedAccessInstance.KinesisDataFirehose"
                 },
+                "LogVersion": {
+                    "type": "string"
+                },
                 "S3": {
                     "$ref": "#/definitions/AWS::EC2::VerifiedAccessInstance.S3"
                 }
@@ -80022,9 +80481,6 @@ var CloudformationSchema = `{
                             "type": "string"
                         }
                     },
-                    "required": [
-                        "AWSServiceName"
-                    ],
                     "type": "object"
                 },
                 "Type": {
@@ -80043,8 +80499,7 @@ var CloudformationSchema = `{
                 }
             },
             "required": [
-                "Type",
-                "Properties"
+                "Type"
             ],
             "type": "object"
         },
@@ -99089,6 +99544,9 @@ var CloudformationSchema = `{
                     "type": "string"
                 }
             },
+            "required": [
+                "DataLakePrincipalIdentifier"
+            ],
             "type": "object"
         },
         "AWS::LakeFormation::DataLakeSettings.ExternalDataFilteringAllowList": {
@@ -99096,21 +99554,23 @@ var CloudformationSchema = `{
             "properties": {},
             "type": "object"
         },
-        "AWS::LakeFormation::DataLakeSettings.Permissions": {
-            "additionalProperties": false,
-            "properties": {},
-            "type": "object"
-        },
         "AWS::LakeFormation::DataLakeSettings.PrincipalPermissions": {
             "additionalProperties": false,
             "properties": {
                 "Permissions": {
-                    "$ref": "#/definitions/AWS::LakeFormation::DataLakeSettings.Permissions"
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
                 },
                 "Principal": {
                     "$ref": "#/definitions/AWS::LakeFormation::DataLakeSettings.DataLakePrincipal"
                 }
             },
+            "required": [
+                "Permissions",
+                "Principal"
+            ],
             "type": "object"
         },
         "AWS::LakeFormation::Permissions": {
@@ -117825,7 +118285,6 @@ var CloudformationSchema = `{
                     },
                     "required": [
                         "ConnectAttachmentId",
-                        "InsideCidrBlocks",
                         "PeerAddress"
                     ],
                     "type": "object"
@@ -118132,6 +118591,9 @@ var CloudformationSchema = `{
                 "Properties": {
                     "additionalProperties": false,
                     "properties": {
+                        "AWSLocation": {
+                            "$ref": "#/definitions/AWS::NetworkManager::Device.AWSLocation"
+                        },
                         "Description": {
                             "type": "string"
                         },
@@ -118189,6 +118651,18 @@ var CloudformationSchema = `{
             ],
             "type": "object"
         },
+        "AWS::NetworkManager::Device.AWSLocation": {
+            "additionalProperties": false,
+            "properties": {
+                "SubnetArn": {
+                    "type": "string"
+                },
+                "Zone": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
         "AWS::NetworkManager::Device.Location": {
             "additionalProperties": false,
             "properties": {
@@ -123158,9 +123632,6 @@ var CloudformationSchema = `{
                         "Description": {
                             "type": "string"
                         },
-                        "DeviceId": {
-                            "type": "string"
-                        },
                         "ManifestOverridesPayload": {
                             "$ref": "#/definitions/AWS::Panorama::ApplicationInstance.ManifestOverridesPayload"
                         },
@@ -123173,9 +123644,6 @@ var CloudformationSchema = `{
                         "RuntimeRoleArn": {
                             "type": "string"
                         },
-                        "StatusFilter": {
-                            "type": "string"
-                        },
                         "Tags": {
                             "items": {
                                 "$ref": "#/definitions/Tag"
@@ -128478,7 +128946,6 @@ var CloudformationSchema = `{
                 }
             },
             "required": [
-                "AggregationFunction",
                 "Column",
                 "SortDirection"
             ],
@@ -129357,24 +129824,9 @@ var CloudformationSchema = `{
             ],
             "type": "object"
         },
-        "AWS::QuickSight::Analysis.ColorsConfiguration": {
-            "additionalProperties": false,
-            "properties": {
-                "CustomColors": {
-                    "items": {
-                        "$ref": "#/definitions/AWS::QuickSight::Analysis.CustomColor"
-                    },
-                    "type": "array"
-                }
-            },
-            "type": "object"
-        },
         "AWS::QuickSight::Analysis.ColumnConfiguration": {
             "additionalProperties": false,
             "properties": {
-                "ColorsConfiguration": {
-                    "$ref": "#/definitions/AWS::QuickSight::Analysis.ColorsConfiguration"
-                },
                 "Column": {
                     "$ref": "#/definitions/AWS::QuickSight::Analysis.ColumnIdentifier"
                 },
@@ -129892,24 +130344,6 @@ var CloudformationSchema = `{
             ],
             "type": "object"
         },
-        "AWS::QuickSight::Analysis.CustomColor": {
-            "additionalProperties": false,
-            "properties": {
-                "Color": {
-                    "type": "string"
-                },
-                "FieldValue": {
-                    "type": "string"
-                },
-                "SpecialValue": {
-                    "type": "string"
-                }
-            },
-            "required": [
-                "Color"
-            ],
-            "type": "object"
-        },
         "AWS::QuickSight::Analysis.CustomContentConfiguration": {
             "additionalProperties": false,
             "properties": {
@@ -130145,6 +130579,9 @@ var CloudformationSchema = `{
                 "Position": {
                     "type": "string"
                 },
+                "TotalsVisibility": {
+                    "type": "string"
+                },
                 "Visibility": {
                     "type": "string"
                 }
@@ -130617,6 +131054,9 @@ var CloudformationSchema = `{
                 "SelectAllValueOptions": {
                     "type": "string"
                 },
+                "SourceColumn": {
+                    "$ref": "#/definitions/AWS::QuickSight::Analysis.ColumnIdentifier"
+                },
                 "SourceField": {
                     "type": "string"
                 },
@@ -131216,6 +131656,12 @@ var CloudformationSchema = `{
         "AWS::QuickSight::Analysis.FilterOperationSelectedFieldsConfiguration": {
             "additionalProperties": false,
             "properties": {
+                "SelectedColumns": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::QuickSight::Analysis.ColumnIdentifier"
+                    },
+                    "type": "array"
+                },
                 "SelectedFieldOptions": {
                     "type": "string"
                 },
@@ -131908,6 +132354,39 @@ var CloudformationSchema = `{
             ],
             "type": "object"
         },
+        "AWS::QuickSight::Analysis.GeospatialHeatmapColorScale": {
+            "additionalProperties": false,
+            "properties": {
+                "Colors": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::QuickSight::Analysis.GeospatialHeatmapDataColor"
+                    },
+                    "type": "array"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::QuickSight::Analysis.GeospatialHeatmapConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "HeatmapColor": {
+                    "$ref": "#/definitions/AWS::QuickSight::Analysis.GeospatialHeatmapColorScale"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::QuickSight::Analysis.GeospatialHeatmapDataColor": {
+            "additionalProperties": false,
+            "properties": {
+                "Color": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Color"
+            ],
+            "type": "object"
+        },
         "AWS::QuickSight::Analysis.GeospatialMapAggregatedFieldWells": {
             "additionalProperties": false,
             "properties": {
@@ -132016,6 +132495,9 @@ var CloudformationSchema = `{
                 "ClusterMarkerConfiguration": {
                     "$ref": "#/definitions/AWS::QuickSight::Analysis.ClusterMarkerConfiguration"
                 },
+                "HeatmapConfiguration": {
+                    "$ref": "#/definitions/AWS::QuickSight::Analysis.GeospatialHeatmapConfiguration"
+                },
                 "SelectedPointStyle": {
                     "type": "string"
                 }
@@ -134046,6 +134528,12 @@ var CloudformationSchema = `{
                 "Scope": {
                     "$ref": "#/definitions/AWS::QuickSight::Analysis.PivotTableConditionalFormattingScope"
                 },
+                "Scopes": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::QuickSight::Analysis.PivotTableConditionalFormattingScope"
+                    },
+                    "type": "array"
+                },
                 "TextFormat": {
                     "$ref": "#/definitions/AWS::QuickSight::Analysis.TextConditionalFormat"
                 }
@@ -134127,6 +134615,36 @@ var CloudformationSchema = `{
             ],
             "type": "object"
         },
+        "AWS::QuickSight::Analysis.PivotTableFieldCollapseStateOption": {
+            "additionalProperties": false,
+            "properties": {
+                "State": {
+                    "type": "string"
+                },
+                "Target": {
+                    "$ref": "#/definitions/AWS::QuickSight::Analysis.PivotTableFieldCollapseStateTarget"
+                }
+            },
+            "required": [
+                "Target"
+            ],
+            "type": "object"
+        },
+        "AWS::QuickSight::Analysis.PivotTableFieldCollapseStateTarget": {
+            "additionalProperties": false,
+            "properties": {
+                "FieldDataPathValues": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::QuickSight::Analysis.DataPathValue"
+                    },
+                    "type": "array"
+                },
+                "FieldId": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
         "AWS::QuickSight::Analysis.PivotTableFieldOption": {
             "additionalProperties": false,
             "properties": {
@@ -134148,6 +134666,12 @@ var CloudformationSchema = `{
         "AWS::QuickSight::Analysis.PivotTableFieldOptions": {
             "additionalProperties": false,
             "properties": {
+                "CollapseStateOptions": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::QuickSight::Analysis.PivotTableFieldCollapseStateOption"
+                    },
+                    "type": "array"
+                },
                 "DataPathOptions": {
                     "items": {
                         "$ref": "#/definitions/AWS::QuickSight::Analysis.PivotTableDataPathOption"
@@ -134187,6 +134711,9 @@ var CloudformationSchema = `{
                 "CellStyle": {
                     "$ref": "#/definitions/AWS::QuickSight::Analysis.TableCellStyle"
                 },
+                "CollapsedRowDimensionsVisibility": {
+                    "type": "string"
+                },
                 "ColumnHeaderStyle": {
                     "$ref": "#/definitions/AWS::QuickSight::Analysis.TableCellStyle"
                 },
@@ -134407,6 +134934,9 @@ var CloudformationSchema = `{
                 "AlternateBandOddColor": {
                     "type": "string"
                 },
+                "AxesRangeScale": {
+                    "type": "string"
+                },
                 "BaseSeriesSettings": {
                     "$ref": "#/definitions/AWS::QuickSight::Analysis.RadarChartSeriesSettings"
                 },
@@ -134590,8 +135120,7 @@ var CloudformationSchema = `{
             },
             "required": [
                 "Calculation",
-                "Column",
-                "MeasureAggregationFunction"
+                "Column"
             ],
             "type": "object"
         },
@@ -134880,6 +135409,12 @@ var CloudformationSchema = `{
                     },
                     "type": "array"
                 },
+                "Label": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::QuickSight::Analysis.DimensionField"
+                    },
+                    "type": "array"
+                },
                 "Size": {
                     "items": {
                         "$ref": "#/definitions/AWS::QuickSight::Analysis.MeasureField"
@@ -134949,6 +135484,18 @@ var CloudformationSchema = `{
         "AWS::QuickSight::Analysis.ScatterPlotUnaggregatedFieldWells": {
             "additionalProperties": false,
             "properties": {
+                "Category": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::QuickSight::Analysis.DimensionField"
+                    },
+                    "type": "array"
+                },
+                "Label": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::QuickSight::Analysis.DimensionField"
+                    },
+                    "type": "array"
+                },
                 "Size": {
                     "items": {
                         "$ref": "#/definitions/AWS::QuickSight::Analysis.MeasureField"
@@ -137011,7 +137558,6 @@ var CloudformationSchema = `{
                 }
             },
             "required": [
-                "AggregationFunction",
                 "Column",
                 "SortDirection"
             ],
@@ -137796,24 +138342,9 @@ var CloudformationSchema = `{
             ],
             "type": "object"
         },
-        "AWS::QuickSight::Dashboard.ColorsConfiguration": {
-            "additionalProperties": false,
-            "properties": {
-                "CustomColors": {
-                    "items": {
-                        "$ref": "#/definitions/AWS::QuickSight::Dashboard.CustomColor"
-                    },
-                    "type": "array"
-                }
-            },
-            "type": "object"
-        },
         "AWS::QuickSight::Dashboard.ColumnConfiguration": {
             "additionalProperties": false,
             "properties": {
-                "ColorsConfiguration": {
-                    "$ref": "#/definitions/AWS::QuickSight::Dashboard.ColorsConfiguration"
-                },
                 "Column": {
                     "$ref": "#/definitions/AWS::QuickSight::Dashboard.ColumnIdentifier"
                 },
@@ -138331,24 +138862,6 @@ var CloudformationSchema = `{
             ],
             "type": "object"
         },
-        "AWS::QuickSight::Dashboard.CustomColor": {
-            "additionalProperties": false,
-            "properties": {
-                "Color": {
-                    "type": "string"
-                },
-                "FieldValue": {
-                    "type": "string"
-                },
-                "SpecialValue": {
-                    "type": "string"
-                }
-            },
-            "required": [
-                "Color"
-            ],
-            "type": "object"
-        },
         "AWS::QuickSight::Dashboard.CustomContentConfiguration": {
             "additionalProperties": false,
             "properties": {
@@ -138771,6 +139284,9 @@ var CloudformationSchema = `{
                 "Position": {
                     "type": "string"
                 },
+                "TotalsVisibility": {
+                    "type": "string"
+                },
                 "Visibility": {
                     "type": "string"
                 }
@@ -139270,6 +139786,9 @@ var CloudformationSchema = `{
                 "SelectAllValueOptions": {
                     "type": "string"
                 },
+                "SourceColumn": {
+                    "$ref": "#/definitions/AWS::QuickSight::Dashboard.ColumnIdentifier"
+                },
                 "SourceField": {
                     "type": "string"
                 },
@@ -139896,6 +140415,12 @@ var CloudformationSchema = `{
         "AWS::QuickSight::Dashboard.FilterOperationSelectedFieldsConfiguration": {
             "additionalProperties": false,
             "properties": {
+                "SelectedColumns": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::QuickSight::Dashboard.ColumnIdentifier"
+                    },
+                    "type": "array"
+                },
                 "SelectedFieldOptions": {
                     "type": "string"
                 },
@@ -140588,6 +141113,39 @@ var CloudformationSchema = `{
             ],
             "type": "object"
         },
+        "AWS::QuickSight::Dashboard.GeospatialHeatmapColorScale": {
+            "additionalProperties": false,
+            "properties": {
+                "Colors": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::QuickSight::Dashboard.GeospatialHeatmapDataColor"
+                    },
+                    "type": "array"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::QuickSight::Dashboard.GeospatialHeatmapConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "HeatmapColor": {
+                    "$ref": "#/definitions/AWS::QuickSight::Dashboard.GeospatialHeatmapColorScale"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::QuickSight::Dashboard.GeospatialHeatmapDataColor": {
+            "additionalProperties": false,
+            "properties": {
+                "Color": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Color"
+            ],
+            "type": "object"
+        },
         "AWS::QuickSight::Dashboard.GeospatialMapAggregatedFieldWells": {
             "additionalProperties": false,
             "properties": {
@@ -140696,6 +141254,9 @@ var CloudformationSchema = `{
                 "ClusterMarkerConfiguration": {
                     "$ref": "#/definitions/AWS::QuickSight::Dashboard.ClusterMarkerConfiguration"
                 },
+                "HeatmapConfiguration": {
+                    "$ref": "#/definitions/AWS::QuickSight::Dashboard.GeospatialHeatmapConfiguration"
+                },
                 "SelectedPointStyle": {
                     "type": "string"
                 }
@@ -142726,6 +143287,12 @@ var CloudformationSchema = `{
                 "Scope": {
                     "$ref": "#/definitions/AWS::QuickSight::Dashboard.PivotTableConditionalFormattingScope"
                 },
+                "Scopes": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::QuickSight::Dashboard.PivotTableConditionalFormattingScope"
+                    },
+                    "type": "array"
+                },
                 "TextFormat": {
                     "$ref": "#/definitions/AWS::QuickSight::Dashboard.TextConditionalFormat"
                 }
@@ -142807,6 +143374,36 @@ var CloudformationSchema = `{
             ],
             "type": "object"
         },
+        "AWS::QuickSight::Dashboard.PivotTableFieldCollapseStateOption": {
+            "additionalProperties": false,
+            "properties": {
+                "State": {
+                    "type": "string"
+                },
+                "Target": {
+                    "$ref": "#/definitions/AWS::QuickSight::Dashboard.PivotTableFieldCollapseStateTarget"
+                }
+            },
+            "required": [
+                "Target"
+            ],
+            "type": "object"
+        },
+        "AWS::QuickSight::Dashboard.PivotTableFieldCollapseStateTarget": {
+            "additionalProperties": false,
+            "properties": {
+                "FieldDataPathValues": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::QuickSight::Dashboard.DataPathValue"
+                    },
+                    "type": "array"
+                },
+                "FieldId": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
         "AWS::QuickSight::Dashboard.PivotTableFieldOption": {
             "additionalProperties": false,
             "properties": {
@@ -142828,6 +143425,12 @@ var CloudformationSchema = `{
         "AWS::QuickSight::Dashboard.PivotTableFieldOptions": {
             "additionalProperties": false,
             "properties": {
+                "CollapseStateOptions": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::QuickSight::Dashboard.PivotTableFieldCollapseStateOption"
+                    },
+                    "type": "array"
+                },
                 "DataPathOptions": {
                     "items": {
                         "$ref": "#/definitions/AWS::QuickSight::Dashboard.PivotTableDataPathOption"
@@ -142867,6 +143470,9 @@ var CloudformationSchema = `{
                 "CellStyle": {
                     "$ref": "#/definitions/AWS::QuickSight::Dashboard.TableCellStyle"
                 },
+                "CollapsedRowDimensionsVisibility": {
+                    "type": "string"
+                },
                 "ColumnHeaderStyle": {
                     "$ref": "#/definitions/AWS::QuickSight::Dashboard.TableCellStyle"
                 },
@@ -143087,6 +143693,9 @@ var CloudformationSchema = `{
                 "AlternateBandOddColor": {
                     "type": "string"
                 },
+                "AxesRangeScale": {
+                    "type": "string"
+                },
                 "BaseSeriesSettings": {
                     "$ref": "#/definitions/AWS::QuickSight::Dashboard.RadarChartSeriesSettings"
                 },
@@ -143270,8 +143879,7 @@ var CloudformationSchema = `{
             },
             "required": [
                 "Calculation",
-                "Column",
-                "MeasureAggregationFunction"
+                "Column"
             ],
             "type": "object"
         },
@@ -143560,6 +144168,12 @@ var CloudformationSchema = `{
                     },
                     "type": "array"
                 },
+                "Label": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::QuickSight::Dashboard.DimensionField"
+                    },
+                    "type": "array"
+                },
                 "Size": {
                     "items": {
                         "$ref": "#/definitions/AWS::QuickSight::Dashboard.MeasureField"
@@ -143629,6 +144243,18 @@ var CloudformationSchema = `{
         "AWS::QuickSight::Dashboard.ScatterPlotUnaggregatedFieldWells": {
             "additionalProperties": false,
             "properties": {
+                "Category": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::QuickSight::Dashboard.DimensionField"
+                    },
+                    "type": "array"
+                },
+                "Label": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::QuickSight::Dashboard.DimensionField"
+                    },
+                    "type": "array"
+                },
                 "Size": {
                     "items": {
                         "$ref": "#/definitions/AWS::QuickSight::Dashboard.MeasureField"
@@ -147368,7 +147994,6 @@ var CloudformationSchema = `{
                 }
             },
             "required": [
-                "AggregationFunction",
                 "Column",
                 "SortDirection"
             ],
@@ -148153,24 +148778,9 @@ var CloudformationSchema = `{
             ],
             "type": "object"
         },
-        "AWS::QuickSight::Template.ColorsConfiguration": {
-            "additionalProperties": false,
-            "properties": {
-                "CustomColors": {
-                    "items": {
-                        "$ref": "#/definitions/AWS::QuickSight::Template.CustomColor"
-                    },
-                    "type": "array"
-                }
-            },
-            "type": "object"
-        },
         "AWS::QuickSight::Template.ColumnConfiguration": {
             "additionalProperties": false,
             "properties": {
-                "ColorsConfiguration": {
-                    "$ref": "#/definitions/AWS::QuickSight::Template.ColorsConfiguration"
-                },
                 "Column": {
                     "$ref": "#/definitions/AWS::QuickSight::Template.ColumnIdentifier"
                 },
@@ -148727,24 +149337,6 @@ var CloudformationSchema = `{
             ],
             "type": "object"
         },
-        "AWS::QuickSight::Template.CustomColor": {
-            "additionalProperties": false,
-            "properties": {
-                "Color": {
-                    "type": "string"
-                },
-                "FieldValue": {
-                    "type": "string"
-                },
-                "SpecialValue": {
-                    "type": "string"
-                }
-            },
-            "required": [
-                "Color"
-            ],
-            "type": "object"
-        },
         "AWS::QuickSight::Template.CustomContentConfiguration": {
             "additionalProperties": false,
             "properties": {
@@ -148980,6 +149572,9 @@ var CloudformationSchema = `{
                 "Position": {
                     "type": "string"
                 },
+                "TotalsVisibility": {
+                    "type": "string"
+                },
                 "Visibility": {
                     "type": "string"
                 }
@@ -149428,6 +150023,9 @@ var CloudformationSchema = `{
                 "SelectAllValueOptions": {
                     "type": "string"
                 },
+                "SourceColumn": {
+                    "$ref": "#/definitions/AWS::QuickSight::Template.ColumnIdentifier"
+                },
                 "SourceField": {
                     "type": "string"
                 },
@@ -150027,6 +150625,12 @@ var CloudformationSchema = `{
         "AWS::QuickSight::Template.FilterOperationSelectedFieldsConfiguration": {
             "additionalProperties": false,
             "properties": {
+                "SelectedColumns": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::QuickSight::Template.ColumnIdentifier"
+                    },
+                    "type": "array"
+                },
                 "SelectedFieldOptions": {
                     "type": "string"
                 },
@@ -150719,6 +151323,39 @@ var CloudformationSchema = `{
             ],
             "type": "object"
         },
+        "AWS::QuickSight::Template.GeospatialHeatmapColorScale": {
+            "additionalProperties": false,
+            "properties": {
+                "Colors": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::QuickSight::Template.GeospatialHeatmapDataColor"
+                    },
+                    "type": "array"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::QuickSight::Template.GeospatialHeatmapConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "HeatmapColor": {
+                    "$ref": "#/definitions/AWS::QuickSight::Template.GeospatialHeatmapColorScale"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::QuickSight::Template.GeospatialHeatmapDataColor": {
+            "additionalProperties": false,
+            "properties": {
+                "Color": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Color"
+            ],
+            "type": "object"
+        },
         "AWS::QuickSight::Template.GeospatialMapAggregatedFieldWells": {
             "additionalProperties": false,
             "properties": {
@@ -150827,6 +151464,9 @@ var CloudformationSchema = `{
                 "ClusterMarkerConfiguration": {
                     "$ref": "#/definitions/AWS::QuickSight::Template.ClusterMarkerConfiguration"
                 },
+                "HeatmapConfiguration": {
+                    "$ref": "#/definitions/AWS::QuickSight::Template.GeospatialHeatmapConfiguration"
+                },
                 "SelectedPointStyle": {
                     "type": "string"
                 }
@@ -152808,6 +153448,12 @@ var CloudformationSchema = `{
                 "Scope": {
                     "$ref": "#/definitions/AWS::QuickSight::Template.PivotTableConditionalFormattingScope"
                 },
+                "Scopes": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::QuickSight::Template.PivotTableConditionalFormattingScope"
+                    },
+                    "type": "array"
+                },
                 "TextFormat": {
                     "$ref": "#/definitions/AWS::QuickSight::Template.TextConditionalFormat"
                 }
@@ -152889,6 +153535,36 @@ var CloudformationSchema = `{
             ],
             "type": "object"
         },
+        "AWS::QuickSight::Template.PivotTableFieldCollapseStateOption": {
+            "additionalProperties": false,
+            "properties": {
+                "State": {
+                    "type": "string"
+                },
+                "Target": {
+                    "$ref": "#/definitions/AWS::QuickSight::Template.PivotTableFieldCollapseStateTarget"
+                }
+            },
+            "required": [
+                "Target"
+            ],
+            "type": "object"
+        },
+        "AWS::QuickSight::Template.PivotTableFieldCollapseStateTarget": {
+            "additionalProperties": false,
+            "properties": {
+                "FieldDataPathValues": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::QuickSight::Template.DataPathValue"
+                    },
+                    "type": "array"
+                },
+                "FieldId": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
         "AWS::QuickSight::Template.PivotTableFieldOption": {
             "additionalProperties": false,
             "properties": {
@@ -152910,6 +153586,12 @@ var CloudformationSchema = `{
         "AWS::QuickSight::Template.PivotTableFieldOptions": {
             "additionalProperties": false,
             "properties": {
+                "CollapseStateOptions": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::QuickSight::Template.PivotTableFieldCollapseStateOption"
+                    },
+                    "type": "array"
+                },
                 "DataPathOptions": {
                     "items": {
                         "$ref": "#/definitions/AWS::QuickSight::Template.PivotTableDataPathOption"
@@ -152949,6 +153631,9 @@ var CloudformationSchema = `{
                 "CellStyle": {
                     "$ref": "#/definitions/AWS::QuickSight::Template.TableCellStyle"
                 },
+                "CollapsedRowDimensionsVisibility": {
+                    "type": "string"
+                },
                 "ColumnHeaderStyle": {
                     "$ref": "#/definitions/AWS::QuickSight::Template.TableCellStyle"
                 },
@@ -153169,6 +153854,9 @@ var CloudformationSchema = `{
                 "AlternateBandOddColor": {
                     "type": "string"
                 },
+                "AxesRangeScale": {
+                    "type": "string"
+                },
                 "BaseSeriesSettings": {
                     "$ref": "#/definitions/AWS::QuickSight::Template.RadarChartSeriesSettings"
                 },
@@ -153352,8 +154040,7 @@ var CloudformationSchema = `{
             },
             "required": [
                 "Calculation",
-                "Column",
-                "MeasureAggregationFunction"
+                "Column"
             ],
             "type": "object"
         },
@@ -153642,6 +154329,12 @@ var CloudformationSchema = `{
                     },
                     "type": "array"
                 },
+                "Label": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::QuickSight::Template.DimensionField"
+                    },
+                    "type": "array"
+                },
                 "Size": {
                     "items": {
                         "$ref": "#/definitions/AWS::QuickSight::Template.MeasureField"
@@ -153711,6 +154404,18 @@ var CloudformationSchema = `{
         "AWS::QuickSight::Template.ScatterPlotUnaggregatedFieldWells": {
             "additionalProperties": false,
             "properties": {
+                "Category": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::QuickSight::Template.DimensionField"
+                    },
+                    "type": "array"
+                },
+                "Label": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::QuickSight::Template.DimensionField"
+                    },
+                    "type": "array"
+                },
                 "Size": {
                     "items": {
                         "$ref": "#/definitions/AWS::QuickSight::Template.MeasureField"
@@ -155832,6 +156537,9 @@ var CloudformationSchema = `{
                     },
                     "required": [
                         "AwsAccountId",
+                        "BaseThemeId",
+                        "Configuration",
+                        "Name",
                         "ThemeId"
                     ],
                     "type": "object"
@@ -155925,6 +156633,9 @@ var CloudformationSchema = `{
                 },
                 "Principal": {
                     "type": "string"
+                },
+                "Resource": {
+                    "type": "string"
                 }
             },
             "required": [
@@ -176073,9 +176784,6 @@ var CloudformationSchema = `{
                 "Properties": {
                     "additionalProperties": false,
                     "properties": {
-                        "AdditionalInferenceSpecificationDefinition": {
-                            "$ref": "#/definitions/AWS::SageMaker::ModelPackage.AdditionalInferenceSpecificationDefinition"
-                        },
                         "AdditionalInferenceSpecifications": {
                             "items": {
                                 "$ref": "#/definitions/AWS::SageMaker::ModelPackage.AdditionalInferenceSpecificationDefinition"
@@ -176097,9 +176805,6 @@ var CloudformationSchema = `{
                         "ClientToken": {
                             "type": "string"
                         },
-                        "CreatedBy": {
-                            "$ref": "#/definitions/AWS::SageMaker::ModelPackage.UserContext"
-                        },
                         "CustomerMetadataProperties": {
                             "additionalProperties": true,
                             "patternProperties": {
@@ -176115,21 +176820,9 @@ var CloudformationSchema = `{
                         "DriftCheckBaselines": {
                             "$ref": "#/definitions/AWS::SageMaker::ModelPackage.DriftCheckBaselines"
                         },
-                        "Environment": {
-                            "additionalProperties": true,
-                            "patternProperties": {
-                                "^[a-zA-Z0-9]+$": {
-                                    "type": "string"
-                                }
-                            },
-                            "type": "object"
-                        },
                         "InferenceSpecification": {
                             "$ref": "#/definitions/AWS::SageMaker::ModelPackage.InferenceSpecification"
                         },
-                        "LastModifiedBy": {
-                            "$ref": "#/definitions/AWS::SageMaker::ModelPackage.UserContext"
-                        },
                         "LastModifiedTime": {
                             "type": "string"
                         },
@@ -176154,9 +176847,6 @@ var CloudformationSchema = `{
                         "ModelPackageStatusDetails": {
                             "$ref": "#/definitions/AWS::SageMaker::ModelPackage.ModelPackageStatusDetails"
                         },
-                        "ModelPackageStatusItem": {
-                            "$ref": "#/definitions/AWS::SageMaker::ModelPackage.ModelPackageStatusItem"
-                        },
                         "ModelPackageVersion": {
                             "type": "number"
                         },
@@ -176525,9 +177215,6 @@ var CloudformationSchema = `{
                 },
                 "NearestModelName": {
                     "type": "string"
-                },
-                "ProductId": {
-                    "type": "string"
                 }
             },
             "required": [
@@ -176538,12 +177225,6 @@ var CloudformationSchema = `{
         "AWS::SageMaker::ModelPackage.ModelPackageStatusDetails": {
             "additionalProperties": false,
             "properties": {
-                "ImageScanStatuses": {
-                    "items": {
-                        "$ref": "#/definitions/AWS::SageMaker::ModelPackage.ModelPackageStatusItem"
-                    },
-                    "type": "array"
-                },
                 "ValidationStatuses": {
                     "items": {
                         "$ref": "#/definitions/AWS::SageMaker::ModelPackage.ModelPackageStatusItem"
@@ -176551,9 +177232,6 @@ var CloudformationSchema = `{
                     "type": "array"
                 }
             },
-            "required": [
-                "ValidationStatuses"
-            ],
             "type": "object"
         },
         "AWS::SageMaker::ModelPackage.ModelPackageStatusItem": {
@@ -176732,21 +177410,6 @@ var CloudformationSchema = `{
             ],
             "type": "object"
         },
-        "AWS::SageMaker::ModelPackage.UserContext": {
-            "additionalProperties": false,
-            "properties": {
-                "DomainId": {
-                    "type": "string"
-                },
-                "UserProfileArn": {
-                    "type": "string"
-                },
-                "UserProfileName": {
-                    "type": "string"
-                }
-            },
-            "type": "object"
-        },
         "AWS::SageMaker::ModelPackage.ValidationProfile": {
             "additionalProperties": false,
             "properties": {
@@ -185565,36 +186228,398 @@ var CloudformationSchema = `{
                 "Properties": {
                     "additionalProperties": false,
                     "properties": {
-                        "Description": {
-                            "type": "string"
-                        },
-                        "OnExceptionSteps": {
-                            "items": {
-                                "$ref": "#/definitions/AWS::Transfer::Workflow.WorkflowStep"
-                            },
-                            "type": "array"
-                        },
-                        "Steps": {
-                            "items": {
-                                "$ref": "#/definitions/AWS::Transfer::Workflow.WorkflowStep"
-                            },
-                            "type": "array"
+                        "Description": {
+                            "type": "string"
+                        },
+                        "OnExceptionSteps": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::Transfer::Workflow.WorkflowStep"
+                            },
+                            "type": "array"
+                        },
+                        "Steps": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::Transfer::Workflow.WorkflowStep"
+                            },
+                            "type": "array"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "Steps"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Transfer::Workflow"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::Transfer::Workflow.CopyStepDetails": {
+            "additionalProperties": false,
+            "properties": {
+                "DestinationFileLocation": {
+                    "$ref": "#/definitions/AWS::Transfer::Workflow.S3FileLocation"
+                },
+                "Name": {
+                    "type": "string"
+                },
+                "OverwriteExisting": {
+                    "type": "string"
+                },
+                "SourceFileLocation": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Transfer::Workflow.CustomStepDetails": {
+            "additionalProperties": false,
+            "properties": {
+                "Name": {
+                    "type": "string"
+                },
+                "SourceFileLocation": {
+                    "type": "string"
+                },
+                "Target": {
+                    "type": "string"
+                },
+                "TimeoutSeconds": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Transfer::Workflow.DecryptStepDetails": {
+            "additionalProperties": false,
+            "properties": {
+                "DestinationFileLocation": {
+                    "$ref": "#/definitions/AWS::Transfer::Workflow.InputFileLocation"
+                },
+                "Name": {
+                    "type": "string"
+                },
+                "OverwriteExisting": {
+                    "type": "string"
+                },
+                "SourceFileLocation": {
+                    "type": "string"
+                },
+                "Type": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Transfer::Workflow.DeleteStepDetails": {
+            "additionalProperties": false,
+            "properties": {
+                "Name": {
+                    "type": "string"
+                },
+                "SourceFileLocation": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Transfer::Workflow.EfsInputFileLocation": {
+            "additionalProperties": false,
+            "properties": {
+                "FileSystemId": {
+                    "type": "string"
+                },
+                "Path": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Transfer::Workflow.InputFileLocation": {
+            "additionalProperties": false,
+            "properties": {
+                "EfsFileLocation": {
+                    "$ref": "#/definitions/AWS::Transfer::Workflow.EfsInputFileLocation"
+                },
+                "S3FileLocation": {
+                    "$ref": "#/definitions/AWS::Transfer::Workflow.S3InputFileLocation"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Transfer::Workflow.S3FileLocation": {
+            "additionalProperties": false,
+            "properties": {
+                "S3FileLocation": {
+                    "$ref": "#/definitions/AWS::Transfer::Workflow.S3InputFileLocation"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Transfer::Workflow.S3InputFileLocation": {
+            "additionalProperties": false,
+            "properties": {
+                "Bucket": {
+                    "type": "string"
+                },
+                "Key": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Transfer::Workflow.S3Tag": {
+            "additionalProperties": false,
+            "properties": {
+                "Key": {
+                    "type": "string"
+                },
+                "Value": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Key",
+                "Value"
+            ],
+            "type": "object"
+        },
+        "AWS::Transfer::Workflow.TagStepDetails": {
+            "additionalProperties": false,
+            "properties": {
+                "Name": {
+                    "type": "string"
+                },
+                "SourceFileLocation": {
+                    "type": "string"
+                },
+                "Tags": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::Transfer::Workflow.S3Tag"
+                    },
+                    "type": "array"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Transfer::Workflow.WorkflowStep": {
+            "additionalProperties": false,
+            "properties": {
+                "CopyStepDetails": {
+                    "$ref": "#/definitions/AWS::Transfer::Workflow.CopyStepDetails"
+                },
+                "CustomStepDetails": {
+                    "$ref": "#/definitions/AWS::Transfer::Workflow.CustomStepDetails"
+                },
+                "DecryptStepDetails": {
+                    "$ref": "#/definitions/AWS::Transfer::Workflow.DecryptStepDetails"
+                },
+                "DeleteStepDetails": {
+                    "$ref": "#/definitions/AWS::Transfer::Workflow.DeleteStepDetails"
+                },
+                "TagStepDetails": {
+                    "$ref": "#/definitions/AWS::Transfer::Workflow.TagStepDetails"
+                },
+                "Type": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::VerifiedPermissions::IdentitySource": {
+            "additionalProperties": false,
+            "properties": {
+                "Condition": {
+                    "type": "string"
+                },
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "Configuration": {
+                            "$ref": "#/definitions/AWS::VerifiedPermissions::IdentitySource.IdentitySourceConfiguration"
+                        },
+                        "PolicyStoreId": {
+                            "type": "string"
+                        },
+                        "PrincipalEntityType": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "Configuration"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::VerifiedPermissions::IdentitySource"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::VerifiedPermissions::IdentitySource.CognitoUserPoolConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "ClientIds": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "UserPoolArn": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "UserPoolArn"
+            ],
+            "type": "object"
+        },
+        "AWS::VerifiedPermissions::IdentitySource.IdentitySourceConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "CognitoUserPoolConfiguration": {
+                    "$ref": "#/definitions/AWS::VerifiedPermissions::IdentitySource.CognitoUserPoolConfiguration"
+                }
+            },
+            "required": [
+                "CognitoUserPoolConfiguration"
+            ],
+            "type": "object"
+        },
+        "AWS::VerifiedPermissions::IdentitySource.IdentitySourceDetails": {
+            "additionalProperties": false,
+            "properties": {
+                "ClientIds": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "DiscoveryUrl": {
+                    "type": "string"
+                },
+                "OpenIdIssuer": {
+                    "type": "string"
+                },
+                "UserPoolArn": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::VerifiedPermissions::Policy": {
+            "additionalProperties": false,
+            "properties": {
+                "Condition": {
+                    "type": "string"
+                },
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "Definition": {
+                            "$ref": "#/definitions/AWS::VerifiedPermissions::Policy.PolicyDefinition"
                         },
-                        "Tags": {
-                            "items": {
-                                "$ref": "#/definitions/Tag"
-                            },
-                            "type": "array"
+                        "PolicyStoreId": {
+                            "type": "string"
                         }
                     },
                     "required": [
-                        "Steps"
+                        "Definition"
                     ],
                     "type": "object"
                 },
                 "Type": {
                     "enum": [
-                        "AWS::Transfer::Workflow"
+                        "AWS::VerifiedPermissions::Policy"
                     ],
                     "type": "string"
                 },
@@ -185613,176 +186638,225 @@ var CloudformationSchema = `{
             ],
             "type": "object"
         },
-        "AWS::Transfer::Workflow.CopyStepDetails": {
+        "AWS::VerifiedPermissions::Policy.EntityIdentifier": {
             "additionalProperties": false,
             "properties": {
-                "DestinationFileLocation": {
-                    "$ref": "#/definitions/AWS::Transfer::Workflow.S3FileLocation"
-                },
-                "Name": {
-                    "type": "string"
-                },
-                "OverwriteExisting": {
+                "EntityId": {
                     "type": "string"
                 },
-                "SourceFileLocation": {
+                "EntityType": {
                     "type": "string"
                 }
             },
+            "required": [
+                "EntityId",
+                "EntityType"
+            ],
             "type": "object"
         },
-        "AWS::Transfer::Workflow.CustomStepDetails": {
+        "AWS::VerifiedPermissions::Policy.PolicyDefinition": {
             "additionalProperties": false,
             "properties": {
-                "Name": {
-                    "type": "string"
-                },
-                "SourceFileLocation": {
-                    "type": "string"
-                },
-                "Target": {
-                    "type": "string"
+                "Static": {
+                    "$ref": "#/definitions/AWS::VerifiedPermissions::Policy.StaticPolicyDefinition"
                 },
-                "TimeoutSeconds": {
-                    "type": "number"
+                "TemplateLinked": {
+                    "$ref": "#/definitions/AWS::VerifiedPermissions::Policy.TemplateLinkedPolicyDefinition"
                 }
             },
             "type": "object"
         },
-        "AWS::Transfer::Workflow.DecryptStepDetails": {
+        "AWS::VerifiedPermissions::Policy.StaticPolicyDefinition": {
             "additionalProperties": false,
             "properties": {
-                "DestinationFileLocation": {
-                    "$ref": "#/definitions/AWS::Transfer::Workflow.InputFileLocation"
-                },
-                "Name": {
-                    "type": "string"
-                },
-                "OverwriteExisting": {
-                    "type": "string"
-                },
-                "SourceFileLocation": {
+                "Description": {
                     "type": "string"
                 },
-                "Type": {
+                "Statement": {
                     "type": "string"
                 }
             },
+            "required": [
+                "Statement"
+            ],
             "type": "object"
         },
-        "AWS::Transfer::Workflow.DeleteStepDetails": {
+        "AWS::VerifiedPermissions::Policy.TemplateLinkedPolicyDefinition": {
             "additionalProperties": false,
             "properties": {
-                "Name": {
+                "PolicyTemplateId": {
                     "type": "string"
                 },
-                "SourceFileLocation": {
-                    "type": "string"
+                "Principal": {
+                    "$ref": "#/definitions/AWS::VerifiedPermissions::Policy.EntityIdentifier"
+                },
+                "Resource": {
+                    "$ref": "#/definitions/AWS::VerifiedPermissions::Policy.EntityIdentifier"
                 }
             },
+            "required": [
+                "PolicyTemplateId"
+            ],
             "type": "object"
         },
-        "AWS::Transfer::Workflow.EfsInputFileLocation": {
+        "AWS::VerifiedPermissions::PolicyStore": {
             "additionalProperties": false,
             "properties": {
-                "FileSystemId": {
+                "Condition": {
                     "type": "string"
                 },
-                "Path": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
                     "type": "string"
-                }
-            },
-            "type": "object"
-        },
-        "AWS::Transfer::Workflow.InputFileLocation": {
-            "additionalProperties": false,
-            "properties": {
-                "EfsFileLocation": {
-                    "$ref": "#/definitions/AWS::Transfer::Workflow.EfsInputFileLocation"
                 },
-                "S3FileLocation": {
-                    "$ref": "#/definitions/AWS::Transfer::Workflow.S3InputFileLocation"
-                }
-            },
-            "type": "object"
-        },
-        "AWS::Transfer::Workflow.S3FileLocation": {
-            "additionalProperties": false,
-            "properties": {
-                "S3FileLocation": {
-                    "$ref": "#/definitions/AWS::Transfer::Workflow.S3InputFileLocation"
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "Schema": {
+                            "$ref": "#/definitions/AWS::VerifiedPermissions::PolicyStore.SchemaDefinition"
+                        },
+                        "ValidationSettings": {
+                            "$ref": "#/definitions/AWS::VerifiedPermissions::PolicyStore.ValidationSettings"
+                        }
+                    },
+                    "required": [
+                        "ValidationSettings"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::VerifiedPermissions::PolicyStore"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
                 }
             },
+            "required": [
+                "Type",
+                "Properties"
+            ],
             "type": "object"
         },
-        "AWS::Transfer::Workflow.S3InputFileLocation": {
+        "AWS::VerifiedPermissions::PolicyStore.SchemaDefinition": {
             "additionalProperties": false,
             "properties": {
-                "Bucket": {
-                    "type": "string"
-                },
-                "Key": {
+                "CedarJson": {
                     "type": "string"
                 }
             },
             "type": "object"
         },
-        "AWS::Transfer::Workflow.S3Tag": {
+        "AWS::VerifiedPermissions::PolicyStore.ValidationSettings": {
             "additionalProperties": false,
             "properties": {
-                "Key": {
-                    "type": "string"
-                },
-                "Value": {
+                "Mode": {
                     "type": "string"
                 }
             },
             "required": [
-                "Key",
-                "Value"
+                "Mode"
             ],
             "type": "object"
         },
-        "AWS::Transfer::Workflow.TagStepDetails": {
+        "AWS::VerifiedPermissions::PolicyTemplate": {
             "additionalProperties": false,
             "properties": {
-                "Name": {
+                "Condition": {
                     "type": "string"
                 },
-                "SourceFileLocation": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
                     "type": "string"
                 },
-                "Tags": {
-                    "items": {
-                        "$ref": "#/definitions/AWS::Transfer::Workflow.S3Tag"
-                    },
-                    "type": "array"
-                }
-            },
-            "type": "object"
-        },
-        "AWS::Transfer::Workflow.WorkflowStep": {
-            "additionalProperties": false,
-            "properties": {
-                "CopyStepDetails": {
-                    "$ref": "#/definitions/AWS::Transfer::Workflow.CopyStepDetails"
-                },
-                "CustomStepDetails": {
-                    "$ref": "#/definitions/AWS::Transfer::Workflow.CustomStepDetails"
-                },
-                "DecryptStepDetails": {
-                    "$ref": "#/definitions/AWS::Transfer::Workflow.DecryptStepDetails"
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
                 },
-                "DeleteStepDetails": {
-                    "$ref": "#/definitions/AWS::Transfer::Workflow.DeleteStepDetails"
+                "Metadata": {
+                    "type": "object"
                 },
-                "TagStepDetails": {
-                    "$ref": "#/definitions/AWS::Transfer::Workflow.TagStepDetails"
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "Description": {
+                            "type": "string"
+                        },
+                        "PolicyStoreId": {
+                            "type": "string"
+                        },
+                        "Statement": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "Statement"
+                    ],
+                    "type": "object"
                 },
                 "Type": {
+                    "enum": [
+                        "AWS::VerifiedPermissions::PolicyTemplate"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
                     "type": "string"
                 }
             },
+            "required": [
+                "Type",
+                "Properties"
+            ],
             "type": "object"
         },
         "AWS::VoiceID::Domain": {
@@ -190052,6 +191126,9 @@ var CloudformationSchema = `{
                 "Properties": {
                     "additionalProperties": false,
                     "properties": {
+                        "AssociationConfig": {
+                            "$ref": "#/definitions/AWS::WAFv2::WebACL.AssociationConfig"
+                        },
                         "CaptchaConfig": {
                             "$ref": "#/definitions/AWS::WAFv2::WebACL.CaptchaConfig"
                         },
@@ -190183,6 +191260,21 @@ var CloudformationSchema = `{
             ],
             "type": "object"
         },
+        "AWS::WAFv2::WebACL.AssociationConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "RequestBody": {
+                    "additionalProperties": false,
+                    "patternProperties": {
+                        "^[a-zA-Z0-9]+$": {
+                            "$ref": "#/definitions/AWS::WAFv2::WebACL.RequestBodyAssociatedResourceTypeConfig"
+                        }
+                    },
+                    "type": "object"
+                }
+            },
+            "type": "object"
+        },
         "AWS::WAFv2::WebACL.BlockAction": {
             "additionalProperties": false,
             "properties": {
@@ -190811,6 +191903,18 @@ var CloudformationSchema = `{
             ],
             "type": "object"
         },
+        "AWS::WAFv2::WebACL.RequestBodyAssociatedResourceTypeConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "DefaultSizeInspectionLimit": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "DefaultSizeInspectionLimit"
+            ],
+            "type": "object"
+        },
         "AWS::WAFv2::WebACL.RequestInspection": {
             "additionalProperties": false,
             "properties": {
@@ -192629,6 +193733,9 @@ var CloudformationSchema = `{
                         {
                             "$ref": "#/definitions/AWS::AppMesh::VirtualService"
                         },
+                        {
+                            "$ref": "#/definitions/AWS::AppRunner::AutoScalingConfiguration"
+                        },
                         {
                             "$ref": "#/definitions/AWS::AppRunner::ObservabilityConfiguration"
                         },
@@ -192644,6 +193751,9 @@ var CloudformationSchema = `{
                         {
                             "$ref": "#/definitions/AWS::AppStream::AppBlock"
                         },
+                        {
+                            "$ref": "#/definitions/AWS::AppStream::AppBlockBuilder"
+                        },
                         {
                             "$ref": "#/definitions/AWS::AppStream::Application"
                         },
@@ -193055,6 +194165,9 @@ var CloudformationSchema = `{
                         {
                             "$ref": "#/definitions/AWS::Cognito::UserPoolUserToGroupAttachment"
                         },
+                        {
+                            "$ref": "#/definitions/AWS::Comprehend::DocumentClassifier"
+                        },
                         {
                             "$ref": "#/definitions/AWS::Comprehend::Flywheel"
                         },
@@ -195566,6 +196679,18 @@ var CloudformationSchema = `{
                         {
                             "$ref": "#/definitions/AWS::Transfer::Workflow"
                         },
+                        {
+                            "$ref": "#/definitions/AWS::VerifiedPermissions::IdentitySource"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::VerifiedPermissions::Policy"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::VerifiedPermissions::PolicyStore"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::VerifiedPermissions::PolicyTemplate"
+                        },
                         {
                             "$ref": "#/definitions/AWS::VoiceID::Domain"
                         },
diff --git a/schema/cloudformation.schema.json b/schema/cloudformation.schema.json
index f97ec6c6bf..74f41abd58 100644
--- a/schema/cloudformation.schema.json
+++ b/schema/cloudformation.schema.json
@@ -12393,6 +12393,82 @@
             },
             "type": "object"
         },
+        "AWS::AppRunner::AutoScalingConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "Condition": {
+                    "type": "string"
+                },
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "AutoScalingConfigurationName": {
+                            "type": "string"
+                        },
+                        "MaxConcurrency": {
+                            "type": "number"
+                        },
+                        "MaxSize": {
+                            "type": "number"
+                        },
+                        "MinSize": {
+                            "type": "number"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::AppRunner::AutoScalingConfiguration"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type"
+            ],
+            "type": "object"
+        },
         "AWS::AppRunner::ObservabilityConfiguration": {
             "additionalProperties": false,
             "properties": {
@@ -13061,6 +13137,12 @@
                         "Name": {
                             "type": "string"
                         },
+                        "PackagingType": {
+                            "type": "string"
+                        },
+                        "PostSetupScriptDetails": {
+                            "$ref": "#/definitions/AWS::AppStream::AppBlock.ScriptDetails"
+                        },
                         "SetupScriptDetails": {
                             "$ref": "#/definitions/AWS::AppStream::AppBlock.ScriptDetails"
                         },
@@ -13076,7 +13158,6 @@
                     },
                     "required": [
                         "Name",
-                        "SetupScriptDetails",
                         "SourceS3Location"
                     ],
                     "type": "object"
@@ -13113,8 +13194,7 @@
                 }
             },
             "required": [
-                "S3Bucket",
-                "S3Key"
+                "S3Bucket"
             ],
             "type": "object"
         },
@@ -13141,7 +13221,7 @@
             ],
             "type": "object"
         },
-        "AWS::AppStream::Application": {
+        "AWS::AppStream::AppBlockBuilder": {
             "additionalProperties": false,
             "properties": {
                 "Condition": {
@@ -13176,10 +13256,13 @@
                 "Properties": {
                     "additionalProperties": false,
                     "properties": {
-                        "AppBlockArn": {
-                            "type": "string"
+                        "AccessEndpoints": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::AppStream::AppBlockBuilder.AccessEndpoint"
+                            },
+                            "type": "array"
                         },
-                        "AttributesToDelete": {
+                        "AppBlockArns": {
                             "items": {
                                 "type": "string"
                             },
@@ -13191,29 +13274,20 @@
                         "DisplayName": {
                             "type": "string"
                         },
-                        "IconS3Location": {
-                            "$ref": "#/definitions/AWS::AppStream::Application.S3Location"
-                        },
-                        "InstanceFamilies": {
-                            "items": {
-                                "type": "string"
-                            },
-                            "type": "array"
+                        "EnableDefaultInternetAccess": {
+                            "type": "boolean"
                         },
-                        "LaunchParameters": {
+                        "IamRoleArn": {
                             "type": "string"
                         },
-                        "LaunchPath": {
+                        "InstanceType": {
                             "type": "string"
                         },
                         "Name": {
                             "type": "string"
                         },
-                        "Platforms": {
-                            "items": {
-                                "type": "string"
-                            },
-                            "type": "array"
+                        "Platform": {
+                            "type": "string"
                         },
                         "Tags": {
                             "items": {
@@ -13221,23 +13295,21 @@
                             },
                             "type": "array"
                         },
-                        "WorkingDirectory": {
-                            "type": "string"
+                        "VpcConfig": {
+                            "$ref": "#/definitions/AWS::AppStream::AppBlockBuilder.VpcConfig"
                         }
                     },
                     "required": [
-                        "AppBlockArn",
-                        "IconS3Location",
-                        "InstanceFamilies",
-                        "LaunchPath",
+                        "InstanceType",
                         "Name",
-                        "Platforms"
+                        "Platform",
+                        "VpcConfig"
                     ],
                     "type": "object"
                 },
                 "Type": {
                     "enum": [
-                        "AWS::AppStream::Application"
+                        "AWS::AppStream::AppBlockBuilder"
                     ],
                     "type": "string"
                 },
@@ -13256,23 +13328,41 @@
             ],
             "type": "object"
         },
-        "AWS::AppStream::Application.S3Location": {
+        "AWS::AppStream::AppBlockBuilder.AccessEndpoint": {
             "additionalProperties": false,
             "properties": {
-                "S3Bucket": {
+                "EndpointType": {
                     "type": "string"
                 },
-                "S3Key": {
+                "VpceId": {
                     "type": "string"
                 }
             },
             "required": [
-                "S3Bucket",
-                "S3Key"
+                "EndpointType",
+                "VpceId"
             ],
             "type": "object"
         },
-        "AWS::AppStream::ApplicationEntitlementAssociation": {
+        "AWS::AppStream::AppBlockBuilder.VpcConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "SecurityGroupIds": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "SubnetIds": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::AppStream::Application": {
             "additionalProperties": false,
             "properties": {
                 "Condition": {
@@ -13307,26 +13397,68 @@
                 "Properties": {
                     "additionalProperties": false,
                     "properties": {
-                        "ApplicationIdentifier": {
+                        "AppBlockArn": {
                             "type": "string"
                         },
-                        "EntitlementName": {
+                        "AttributesToDelete": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "Description": {
                             "type": "string"
                         },
-                        "StackName": {
+                        "DisplayName": {
+                            "type": "string"
+                        },
+                        "IconS3Location": {
+                            "$ref": "#/definitions/AWS::AppStream::Application.S3Location"
+                        },
+                        "InstanceFamilies": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "LaunchParameters": {
+                            "type": "string"
+                        },
+                        "LaunchPath": {
+                            "type": "string"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "Platforms": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        },
+                        "WorkingDirectory": {
                             "type": "string"
                         }
                     },
                     "required": [
-                        "ApplicationIdentifier",
-                        "EntitlementName",
-                        "StackName"
+                        "AppBlockArn",
+                        "IconS3Location",
+                        "InstanceFamilies",
+                        "LaunchPath",
+                        "Name",
+                        "Platforms"
                     ],
                     "type": "object"
                 },
                 "Type": {
                     "enum": [
-                        "AWS::AppStream::ApplicationEntitlementAssociation"
+                        "AWS::AppStream::Application"
                     ],
                     "type": "string"
                 },
@@ -13345,76 +13477,165 @@
             ],
             "type": "object"
         },
-        "AWS::AppStream::ApplicationFleetAssociation": {
+        "AWS::AppStream::Application.S3Location": {
             "additionalProperties": false,
             "properties": {
-                "Condition": {
-                    "type": "string"
-                },
-                "DeletionPolicy": {
-                    "enum": [
-                        "Delete",
-                        "Retain",
-                        "Snapshot"
-                    ],
-                    "type": "string"
-                },
-                "DependsOn": {
-                    "anyOf": [
-                        {
-                            "pattern": "^[a-zA-Z0-9]+$",
-                            "type": "string"
-                        },
-                        {
-                            "items": {
-                                "pattern": "^[a-zA-Z0-9]+$",
-                                "type": "string"
-                            },
-                            "type": "array"
-                        }
-                    ]
-                },
-                "Metadata": {
-                    "type": "object"
-                },
-                "Properties": {
-                    "additionalProperties": false,
-                    "properties": {
-                        "ApplicationArn": {
-                            "type": "string"
-                        },
-                        "FleetName": {
-                            "type": "string"
-                        }
-                    },
-                    "required": [
-                        "ApplicationArn",
-                        "FleetName"
-                    ],
-                    "type": "object"
-                },
-                "Type": {
-                    "enum": [
-                        "AWS::AppStream::ApplicationFleetAssociation"
-                    ],
+                "S3Bucket": {
                     "type": "string"
                 },
-                "UpdateReplacePolicy": {
-                    "enum": [
-                        "Delete",
-                        "Retain",
-                        "Snapshot"
-                    ],
+                "S3Key": {
                     "type": "string"
                 }
             },
             "required": [
-                "Type",
-                "Properties"
+                "S3Bucket",
+                "S3Key"
             ],
             "type": "object"
         },
-        "AWS::AppStream::DirectoryConfig": {
+        "AWS::AppStream::ApplicationEntitlementAssociation": {
+            "additionalProperties": false,
+            "properties": {
+                "Condition": {
+                    "type": "string"
+                },
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "ApplicationIdentifier": {
+                            "type": "string"
+                        },
+                        "EntitlementName": {
+                            "type": "string"
+                        },
+                        "StackName": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "ApplicationIdentifier",
+                        "EntitlementName",
+                        "StackName"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::AppStream::ApplicationEntitlementAssociation"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::AppStream::ApplicationFleetAssociation": {
+            "additionalProperties": false,
+            "properties": {
+                "Condition": {
+                    "type": "string"
+                },
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "ApplicationArn": {
+                            "type": "string"
+                        },
+                        "FleetName": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "ApplicationArn",
+                        "FleetName"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::AppStream::ApplicationFleetAssociation"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::AppStream::DirectoryConfig": {
             "additionalProperties": false,
             "properties": {
                 "Condition": {
@@ -33522,6 +33743,235 @@
             ],
             "type": "object"
         },
+        "AWS::Comprehend::DocumentClassifier": {
+            "additionalProperties": false,
+            "properties": {
+                "Condition": {
+                    "type": "string"
+                },
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "DataAccessRoleArn": {
+                            "type": "string"
+                        },
+                        "DocumentClassifierName": {
+                            "type": "string"
+                        },
+                        "InputDataConfig": {
+                            "$ref": "#/definitions/AWS::Comprehend::DocumentClassifier.DocumentClassifierInputDataConfig"
+                        },
+                        "LanguageCode": {
+                            "type": "string"
+                        },
+                        "Mode": {
+                            "type": "string"
+                        },
+                        "ModelKmsKeyId": {
+                            "type": "string"
+                        },
+                        "ModelPolicy": {
+                            "type": "string"
+                        },
+                        "OutputDataConfig": {
+                            "$ref": "#/definitions/AWS::Comprehend::DocumentClassifier.DocumentClassifierOutputDataConfig"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        },
+                        "VersionName": {
+                            "type": "string"
+                        },
+                        "VolumeKmsKeyId": {
+                            "type": "string"
+                        },
+                        "VpcConfig": {
+                            "$ref": "#/definitions/AWS::Comprehend::DocumentClassifier.VpcConfig"
+                        }
+                    },
+                    "required": [
+                        "DataAccessRoleArn",
+                        "DocumentClassifierName",
+                        "InputDataConfig",
+                        "LanguageCode"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Comprehend::DocumentClassifier"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::Comprehend::DocumentClassifier.AugmentedManifestsListItem": {
+            "additionalProperties": false,
+            "properties": {
+                "AttributeNames": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "S3Uri": {
+                    "type": "string"
+                },
+                "Split": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "AttributeNames",
+                "S3Uri"
+            ],
+            "type": "object"
+        },
+        "AWS::Comprehend::DocumentClassifier.DocumentClassifierDocuments": {
+            "additionalProperties": false,
+            "properties": {
+                "S3Uri": {
+                    "type": "string"
+                },
+                "TestS3Uri": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "S3Uri"
+            ],
+            "type": "object"
+        },
+        "AWS::Comprehend::DocumentClassifier.DocumentClassifierInputDataConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "AugmentedManifests": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::Comprehend::DocumentClassifier.AugmentedManifestsListItem"
+                    },
+                    "type": "array"
+                },
+                "DataFormat": {
+                    "type": "string"
+                },
+                "DocumentReaderConfig": {
+                    "$ref": "#/definitions/AWS::Comprehend::DocumentClassifier.DocumentReaderConfig"
+                },
+                "DocumentType": {
+                    "type": "string"
+                },
+                "Documents": {
+                    "$ref": "#/definitions/AWS::Comprehend::DocumentClassifier.DocumentClassifierDocuments"
+                },
+                "LabelDelimiter": {
+                    "type": "string"
+                },
+                "S3Uri": {
+                    "type": "string"
+                },
+                "TestS3Uri": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Comprehend::DocumentClassifier.DocumentClassifierOutputDataConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "KmsKeyId": {
+                    "type": "string"
+                },
+                "S3Uri": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Comprehend::DocumentClassifier.DocumentReaderConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "DocumentReadAction": {
+                    "type": "string"
+                },
+                "DocumentReadMode": {
+                    "type": "string"
+                },
+                "FeatureTypes": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "DocumentReadAction"
+            ],
+            "type": "object"
+        },
+        "AWS::Comprehend::DocumentClassifier.VpcConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "SecurityGroupIds": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "Subnets": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "SecurityGroupIds",
+                "Subnets"
+            ],
+            "type": "object"
+        },
         "AWS::Comprehend::Flywheel": {
             "additionalProperties": false,
             "properties": {
@@ -48850,6 +49300,9 @@
                 "Properties": {
                     "additionalProperties": false,
                     "properties": {
+                        "KeyFormat": {
+                            "type": "string"
+                        },
                         "KeyName": {
                             "type": "string"
                         },
@@ -56211,9 +56664,15 @@
                 "CloudWatchLogs": {
                     "$ref": "#/definitions/AWS::EC2::VerifiedAccessInstance.CloudWatchLogs"
                 },
+                "IncludeTrustContext": {
+                    "type": "boolean"
+                },
                 "KinesisDataFirehose": {
                     "$ref": "#/definitions/AWS::EC2::VerifiedAccessInstance.KinesisDataFirehose"
                 },
+                "LogVersion": {
+                    "type": "string"
+                },
                 "S3": {
                     "$ref": "#/definitions/AWS::EC2::VerifiedAccessInstance.S3"
                 }
@@ -80017,9 +80476,6 @@
                             "type": "string"
                         }
                     },
-                    "required": [
-                        "AWSServiceName"
-                    ],
                     "type": "object"
                 },
                 "Type": {
@@ -80038,8 +80494,7 @@
                 }
             },
             "required": [
-                "Type",
-                "Properties"
+                "Type"
             ],
             "type": "object"
         },
@@ -99084,6 +99539,9 @@
                     "type": "string"
                 }
             },
+            "required": [
+                "DataLakePrincipalIdentifier"
+            ],
             "type": "object"
         },
         "AWS::LakeFormation::DataLakeSettings.ExternalDataFilteringAllowList": {
@@ -99091,21 +99549,23 @@
             "properties": {},
             "type": "object"
         },
-        "AWS::LakeFormation::DataLakeSettings.Permissions": {
-            "additionalProperties": false,
-            "properties": {},
-            "type": "object"
-        },
         "AWS::LakeFormation::DataLakeSettings.PrincipalPermissions": {
             "additionalProperties": false,
             "properties": {
                 "Permissions": {
-                    "$ref": "#/definitions/AWS::LakeFormation::DataLakeSettings.Permissions"
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
                 },
                 "Principal": {
                     "$ref": "#/definitions/AWS::LakeFormation::DataLakeSettings.DataLakePrincipal"
                 }
             },
+            "required": [
+                "Permissions",
+                "Principal"
+            ],
             "type": "object"
         },
         "AWS::LakeFormation::Permissions": {
@@ -117820,7 +118280,6 @@
                     },
                     "required": [
                         "ConnectAttachmentId",
-                        "InsideCidrBlocks",
                         "PeerAddress"
                     ],
                     "type": "object"
@@ -118127,6 +118586,9 @@
                 "Properties": {
                     "additionalProperties": false,
                     "properties": {
+                        "AWSLocation": {
+                            "$ref": "#/definitions/AWS::NetworkManager::Device.AWSLocation"
+                        },
                         "Description": {
                             "type": "string"
                         },
@@ -118184,6 +118646,18 @@
             ],
             "type": "object"
         },
+        "AWS::NetworkManager::Device.AWSLocation": {
+            "additionalProperties": false,
+            "properties": {
+                "SubnetArn": {
+                    "type": "string"
+                },
+                "Zone": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
         "AWS::NetworkManager::Device.Location": {
             "additionalProperties": false,
             "properties": {
@@ -123153,9 +123627,6 @@
                         "Description": {
                             "type": "string"
                         },
-                        "DeviceId": {
-                            "type": "string"
-                        },
                         "ManifestOverridesPayload": {
                             "$ref": "#/definitions/AWS::Panorama::ApplicationInstance.ManifestOverridesPayload"
                         },
@@ -123168,9 +123639,6 @@
                         "RuntimeRoleArn": {
                             "type": "string"
                         },
-                        "StatusFilter": {
-                            "type": "string"
-                        },
                         "Tags": {
                             "items": {
                                 "$ref": "#/definitions/Tag"
@@ -128473,7 +128941,6 @@
                 }
             },
             "required": [
-                "AggregationFunction",
                 "Column",
                 "SortDirection"
             ],
@@ -129352,24 +129819,9 @@
             ],
             "type": "object"
         },
-        "AWS::QuickSight::Analysis.ColorsConfiguration": {
-            "additionalProperties": false,
-            "properties": {
-                "CustomColors": {
-                    "items": {
-                        "$ref": "#/definitions/AWS::QuickSight::Analysis.CustomColor"
-                    },
-                    "type": "array"
-                }
-            },
-            "type": "object"
-        },
         "AWS::QuickSight::Analysis.ColumnConfiguration": {
             "additionalProperties": false,
             "properties": {
-                "ColorsConfiguration": {
-                    "$ref": "#/definitions/AWS::QuickSight::Analysis.ColorsConfiguration"
-                },
                 "Column": {
                     "$ref": "#/definitions/AWS::QuickSight::Analysis.ColumnIdentifier"
                 },
@@ -129887,24 +130339,6 @@
             ],
             "type": "object"
         },
-        "AWS::QuickSight::Analysis.CustomColor": {
-            "additionalProperties": false,
-            "properties": {
-                "Color": {
-                    "type": "string"
-                },
-                "FieldValue": {
-                    "type": "string"
-                },
-                "SpecialValue": {
-                    "type": "string"
-                }
-            },
-            "required": [
-                "Color"
-            ],
-            "type": "object"
-        },
         "AWS::QuickSight::Analysis.CustomContentConfiguration": {
             "additionalProperties": false,
             "properties": {
@@ -130140,6 +130574,9 @@
                 "Position": {
                     "type": "string"
                 },
+                "TotalsVisibility": {
+                    "type": "string"
+                },
                 "Visibility": {
                     "type": "string"
                 }
@@ -130612,6 +131049,9 @@
                 "SelectAllValueOptions": {
                     "type": "string"
                 },
+                "SourceColumn": {
+                    "$ref": "#/definitions/AWS::QuickSight::Analysis.ColumnIdentifier"
+                },
                 "SourceField": {
                     "type": "string"
                 },
@@ -131211,6 +131651,12 @@
         "AWS::QuickSight::Analysis.FilterOperationSelectedFieldsConfiguration": {
             "additionalProperties": false,
             "properties": {
+                "SelectedColumns": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::QuickSight::Analysis.ColumnIdentifier"
+                    },
+                    "type": "array"
+                },
                 "SelectedFieldOptions": {
                     "type": "string"
                 },
@@ -131903,6 +132349,39 @@
             ],
             "type": "object"
         },
+        "AWS::QuickSight::Analysis.GeospatialHeatmapColorScale": {
+            "additionalProperties": false,
+            "properties": {
+                "Colors": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::QuickSight::Analysis.GeospatialHeatmapDataColor"
+                    },
+                    "type": "array"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::QuickSight::Analysis.GeospatialHeatmapConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "HeatmapColor": {
+                    "$ref": "#/definitions/AWS::QuickSight::Analysis.GeospatialHeatmapColorScale"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::QuickSight::Analysis.GeospatialHeatmapDataColor": {
+            "additionalProperties": false,
+            "properties": {
+                "Color": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Color"
+            ],
+            "type": "object"
+        },
         "AWS::QuickSight::Analysis.GeospatialMapAggregatedFieldWells": {
             "additionalProperties": false,
             "properties": {
@@ -132011,6 +132490,9 @@
                 "ClusterMarkerConfiguration": {
                     "$ref": "#/definitions/AWS::QuickSight::Analysis.ClusterMarkerConfiguration"
                 },
+                "HeatmapConfiguration": {
+                    "$ref": "#/definitions/AWS::QuickSight::Analysis.GeospatialHeatmapConfiguration"
+                },
                 "SelectedPointStyle": {
                     "type": "string"
                 }
@@ -134041,6 +134523,12 @@
                 "Scope": {
                     "$ref": "#/definitions/AWS::QuickSight::Analysis.PivotTableConditionalFormattingScope"
                 },
+                "Scopes": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::QuickSight::Analysis.PivotTableConditionalFormattingScope"
+                    },
+                    "type": "array"
+                },
                 "TextFormat": {
                     "$ref": "#/definitions/AWS::QuickSight::Analysis.TextConditionalFormat"
                 }
@@ -134122,6 +134610,36 @@
             ],
             "type": "object"
         },
+        "AWS::QuickSight::Analysis.PivotTableFieldCollapseStateOption": {
+            "additionalProperties": false,
+            "properties": {
+                "State": {
+                    "type": "string"
+                },
+                "Target": {
+                    "$ref": "#/definitions/AWS::QuickSight::Analysis.PivotTableFieldCollapseStateTarget"
+                }
+            },
+            "required": [
+                "Target"
+            ],
+            "type": "object"
+        },
+        "AWS::QuickSight::Analysis.PivotTableFieldCollapseStateTarget": {
+            "additionalProperties": false,
+            "properties": {
+                "FieldDataPathValues": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::QuickSight::Analysis.DataPathValue"
+                    },
+                    "type": "array"
+                },
+                "FieldId": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
         "AWS::QuickSight::Analysis.PivotTableFieldOption": {
             "additionalProperties": false,
             "properties": {
@@ -134143,6 +134661,12 @@
         "AWS::QuickSight::Analysis.PivotTableFieldOptions": {
             "additionalProperties": false,
             "properties": {
+                "CollapseStateOptions": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::QuickSight::Analysis.PivotTableFieldCollapseStateOption"
+                    },
+                    "type": "array"
+                },
                 "DataPathOptions": {
                     "items": {
                         "$ref": "#/definitions/AWS::QuickSight::Analysis.PivotTableDataPathOption"
@@ -134182,6 +134706,9 @@
                 "CellStyle": {
                     "$ref": "#/definitions/AWS::QuickSight::Analysis.TableCellStyle"
                 },
+                "CollapsedRowDimensionsVisibility": {
+                    "type": "string"
+                },
                 "ColumnHeaderStyle": {
                     "$ref": "#/definitions/AWS::QuickSight::Analysis.TableCellStyle"
                 },
@@ -134402,6 +134929,9 @@
                 "AlternateBandOddColor": {
                     "type": "string"
                 },
+                "AxesRangeScale": {
+                    "type": "string"
+                },
                 "BaseSeriesSettings": {
                     "$ref": "#/definitions/AWS::QuickSight::Analysis.RadarChartSeriesSettings"
                 },
@@ -134585,8 +135115,7 @@
             },
             "required": [
                 "Calculation",
-                "Column",
-                "MeasureAggregationFunction"
+                "Column"
             ],
             "type": "object"
         },
@@ -134875,6 +135404,12 @@
                     },
                     "type": "array"
                 },
+                "Label": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::QuickSight::Analysis.DimensionField"
+                    },
+                    "type": "array"
+                },
                 "Size": {
                     "items": {
                         "$ref": "#/definitions/AWS::QuickSight::Analysis.MeasureField"
@@ -134944,6 +135479,18 @@
         "AWS::QuickSight::Analysis.ScatterPlotUnaggregatedFieldWells": {
             "additionalProperties": false,
             "properties": {
+                "Category": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::QuickSight::Analysis.DimensionField"
+                    },
+                    "type": "array"
+                },
+                "Label": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::QuickSight::Analysis.DimensionField"
+                    },
+                    "type": "array"
+                },
                 "Size": {
                     "items": {
                         "$ref": "#/definitions/AWS::QuickSight::Analysis.MeasureField"
@@ -137006,7 +137553,6 @@
                 }
             },
             "required": [
-                "AggregationFunction",
                 "Column",
                 "SortDirection"
             ],
@@ -137791,24 +138337,9 @@
             ],
             "type": "object"
         },
-        "AWS::QuickSight::Dashboard.ColorsConfiguration": {
-            "additionalProperties": false,
-            "properties": {
-                "CustomColors": {
-                    "items": {
-                        "$ref": "#/definitions/AWS::QuickSight::Dashboard.CustomColor"
-                    },
-                    "type": "array"
-                }
-            },
-            "type": "object"
-        },
         "AWS::QuickSight::Dashboard.ColumnConfiguration": {
             "additionalProperties": false,
             "properties": {
-                "ColorsConfiguration": {
-                    "$ref": "#/definitions/AWS::QuickSight::Dashboard.ColorsConfiguration"
-                },
                 "Column": {
                     "$ref": "#/definitions/AWS::QuickSight::Dashboard.ColumnIdentifier"
                 },
@@ -138326,24 +138857,6 @@
             ],
             "type": "object"
         },
-        "AWS::QuickSight::Dashboard.CustomColor": {
-            "additionalProperties": false,
-            "properties": {
-                "Color": {
-                    "type": "string"
-                },
-                "FieldValue": {
-                    "type": "string"
-                },
-                "SpecialValue": {
-                    "type": "string"
-                }
-            },
-            "required": [
-                "Color"
-            ],
-            "type": "object"
-        },
         "AWS::QuickSight::Dashboard.CustomContentConfiguration": {
             "additionalProperties": false,
             "properties": {
@@ -138766,6 +139279,9 @@
                 "Position": {
                     "type": "string"
                 },
+                "TotalsVisibility": {
+                    "type": "string"
+                },
                 "Visibility": {
                     "type": "string"
                 }
@@ -139265,6 +139781,9 @@
                 "SelectAllValueOptions": {
                     "type": "string"
                 },
+                "SourceColumn": {
+                    "$ref": "#/definitions/AWS::QuickSight::Dashboard.ColumnIdentifier"
+                },
                 "SourceField": {
                     "type": "string"
                 },
@@ -139891,6 +140410,12 @@
         "AWS::QuickSight::Dashboard.FilterOperationSelectedFieldsConfiguration": {
             "additionalProperties": false,
             "properties": {
+                "SelectedColumns": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::QuickSight::Dashboard.ColumnIdentifier"
+                    },
+                    "type": "array"
+                },
                 "SelectedFieldOptions": {
                     "type": "string"
                 },
@@ -140583,6 +141108,39 @@
             ],
             "type": "object"
         },
+        "AWS::QuickSight::Dashboard.GeospatialHeatmapColorScale": {
+            "additionalProperties": false,
+            "properties": {
+                "Colors": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::QuickSight::Dashboard.GeospatialHeatmapDataColor"
+                    },
+                    "type": "array"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::QuickSight::Dashboard.GeospatialHeatmapConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "HeatmapColor": {
+                    "$ref": "#/definitions/AWS::QuickSight::Dashboard.GeospatialHeatmapColorScale"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::QuickSight::Dashboard.GeospatialHeatmapDataColor": {
+            "additionalProperties": false,
+            "properties": {
+                "Color": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Color"
+            ],
+            "type": "object"
+        },
         "AWS::QuickSight::Dashboard.GeospatialMapAggregatedFieldWells": {
             "additionalProperties": false,
             "properties": {
@@ -140691,6 +141249,9 @@
                 "ClusterMarkerConfiguration": {
                     "$ref": "#/definitions/AWS::QuickSight::Dashboard.ClusterMarkerConfiguration"
                 },
+                "HeatmapConfiguration": {
+                    "$ref": "#/definitions/AWS::QuickSight::Dashboard.GeospatialHeatmapConfiguration"
+                },
                 "SelectedPointStyle": {
                     "type": "string"
                 }
@@ -142721,6 +143282,12 @@
                 "Scope": {
                     "$ref": "#/definitions/AWS::QuickSight::Dashboard.PivotTableConditionalFormattingScope"
                 },
+                "Scopes": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::QuickSight::Dashboard.PivotTableConditionalFormattingScope"
+                    },
+                    "type": "array"
+                },
                 "TextFormat": {
                     "$ref": "#/definitions/AWS::QuickSight::Dashboard.TextConditionalFormat"
                 }
@@ -142802,6 +143369,36 @@
             ],
             "type": "object"
         },
+        "AWS::QuickSight::Dashboard.PivotTableFieldCollapseStateOption": {
+            "additionalProperties": false,
+            "properties": {
+                "State": {
+                    "type": "string"
+                },
+                "Target": {
+                    "$ref": "#/definitions/AWS::QuickSight::Dashboard.PivotTableFieldCollapseStateTarget"
+                }
+            },
+            "required": [
+                "Target"
+            ],
+            "type": "object"
+        },
+        "AWS::QuickSight::Dashboard.PivotTableFieldCollapseStateTarget": {
+            "additionalProperties": false,
+            "properties": {
+                "FieldDataPathValues": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::QuickSight::Dashboard.DataPathValue"
+                    },
+                    "type": "array"
+                },
+                "FieldId": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
         "AWS::QuickSight::Dashboard.PivotTableFieldOption": {
             "additionalProperties": false,
             "properties": {
@@ -142823,6 +143420,12 @@
         "AWS::QuickSight::Dashboard.PivotTableFieldOptions": {
             "additionalProperties": false,
             "properties": {
+                "CollapseStateOptions": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::QuickSight::Dashboard.PivotTableFieldCollapseStateOption"
+                    },
+                    "type": "array"
+                },
                 "DataPathOptions": {
                     "items": {
                         "$ref": "#/definitions/AWS::QuickSight::Dashboard.PivotTableDataPathOption"
@@ -142862,6 +143465,9 @@
                 "CellStyle": {
                     "$ref": "#/definitions/AWS::QuickSight::Dashboard.TableCellStyle"
                 },
+                "CollapsedRowDimensionsVisibility": {
+                    "type": "string"
+                },
                 "ColumnHeaderStyle": {
                     "$ref": "#/definitions/AWS::QuickSight::Dashboard.TableCellStyle"
                 },
@@ -143082,6 +143688,9 @@
                 "AlternateBandOddColor": {
                     "type": "string"
                 },
+                "AxesRangeScale": {
+                    "type": "string"
+                },
                 "BaseSeriesSettings": {
                     "$ref": "#/definitions/AWS::QuickSight::Dashboard.RadarChartSeriesSettings"
                 },
@@ -143265,8 +143874,7 @@
             },
             "required": [
                 "Calculation",
-                "Column",
-                "MeasureAggregationFunction"
+                "Column"
             ],
             "type": "object"
         },
@@ -143555,6 +144163,12 @@
                     },
                     "type": "array"
                 },
+                "Label": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::QuickSight::Dashboard.DimensionField"
+                    },
+                    "type": "array"
+                },
                 "Size": {
                     "items": {
                         "$ref": "#/definitions/AWS::QuickSight::Dashboard.MeasureField"
@@ -143624,6 +144238,18 @@
         "AWS::QuickSight::Dashboard.ScatterPlotUnaggregatedFieldWells": {
             "additionalProperties": false,
             "properties": {
+                "Category": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::QuickSight::Dashboard.DimensionField"
+                    },
+                    "type": "array"
+                },
+                "Label": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::QuickSight::Dashboard.DimensionField"
+                    },
+                    "type": "array"
+                },
                 "Size": {
                     "items": {
                         "$ref": "#/definitions/AWS::QuickSight::Dashboard.MeasureField"
@@ -147363,7 +147989,6 @@
                 }
             },
             "required": [
-                "AggregationFunction",
                 "Column",
                 "SortDirection"
             ],
@@ -148148,24 +148773,9 @@
             ],
             "type": "object"
         },
-        "AWS::QuickSight::Template.ColorsConfiguration": {
-            "additionalProperties": false,
-            "properties": {
-                "CustomColors": {
-                    "items": {
-                        "$ref": "#/definitions/AWS::QuickSight::Template.CustomColor"
-                    },
-                    "type": "array"
-                }
-            },
-            "type": "object"
-        },
         "AWS::QuickSight::Template.ColumnConfiguration": {
             "additionalProperties": false,
             "properties": {
-                "ColorsConfiguration": {
-                    "$ref": "#/definitions/AWS::QuickSight::Template.ColorsConfiguration"
-                },
                 "Column": {
                     "$ref": "#/definitions/AWS::QuickSight::Template.ColumnIdentifier"
                 },
@@ -148722,24 +149332,6 @@
             ],
             "type": "object"
         },
-        "AWS::QuickSight::Template.CustomColor": {
-            "additionalProperties": false,
-            "properties": {
-                "Color": {
-                    "type": "string"
-                },
-                "FieldValue": {
-                    "type": "string"
-                },
-                "SpecialValue": {
-                    "type": "string"
-                }
-            },
-            "required": [
-                "Color"
-            ],
-            "type": "object"
-        },
         "AWS::QuickSight::Template.CustomContentConfiguration": {
             "additionalProperties": false,
             "properties": {
@@ -148975,6 +149567,9 @@
                 "Position": {
                     "type": "string"
                 },
+                "TotalsVisibility": {
+                    "type": "string"
+                },
                 "Visibility": {
                     "type": "string"
                 }
@@ -149423,6 +150018,9 @@
                 "SelectAllValueOptions": {
                     "type": "string"
                 },
+                "SourceColumn": {
+                    "$ref": "#/definitions/AWS::QuickSight::Template.ColumnIdentifier"
+                },
                 "SourceField": {
                     "type": "string"
                 },
@@ -150022,6 +150620,12 @@
         "AWS::QuickSight::Template.FilterOperationSelectedFieldsConfiguration": {
             "additionalProperties": false,
             "properties": {
+                "SelectedColumns": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::QuickSight::Template.ColumnIdentifier"
+                    },
+                    "type": "array"
+                },
                 "SelectedFieldOptions": {
                     "type": "string"
                 },
@@ -150714,6 +151318,39 @@
             ],
             "type": "object"
         },
+        "AWS::QuickSight::Template.GeospatialHeatmapColorScale": {
+            "additionalProperties": false,
+            "properties": {
+                "Colors": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::QuickSight::Template.GeospatialHeatmapDataColor"
+                    },
+                    "type": "array"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::QuickSight::Template.GeospatialHeatmapConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "HeatmapColor": {
+                    "$ref": "#/definitions/AWS::QuickSight::Template.GeospatialHeatmapColorScale"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::QuickSight::Template.GeospatialHeatmapDataColor": {
+            "additionalProperties": false,
+            "properties": {
+                "Color": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Color"
+            ],
+            "type": "object"
+        },
         "AWS::QuickSight::Template.GeospatialMapAggregatedFieldWells": {
             "additionalProperties": false,
             "properties": {
@@ -150822,6 +151459,9 @@
                 "ClusterMarkerConfiguration": {
                     "$ref": "#/definitions/AWS::QuickSight::Template.ClusterMarkerConfiguration"
                 },
+                "HeatmapConfiguration": {
+                    "$ref": "#/definitions/AWS::QuickSight::Template.GeospatialHeatmapConfiguration"
+                },
                 "SelectedPointStyle": {
                     "type": "string"
                 }
@@ -152803,6 +153443,12 @@
                 "Scope": {
                     "$ref": "#/definitions/AWS::QuickSight::Template.PivotTableConditionalFormattingScope"
                 },
+                "Scopes": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::QuickSight::Template.PivotTableConditionalFormattingScope"
+                    },
+                    "type": "array"
+                },
                 "TextFormat": {
                     "$ref": "#/definitions/AWS::QuickSight::Template.TextConditionalFormat"
                 }
@@ -152884,6 +153530,36 @@
             ],
             "type": "object"
         },
+        "AWS::QuickSight::Template.PivotTableFieldCollapseStateOption": {
+            "additionalProperties": false,
+            "properties": {
+                "State": {
+                    "type": "string"
+                },
+                "Target": {
+                    "$ref": "#/definitions/AWS::QuickSight::Template.PivotTableFieldCollapseStateTarget"
+                }
+            },
+            "required": [
+                "Target"
+            ],
+            "type": "object"
+        },
+        "AWS::QuickSight::Template.PivotTableFieldCollapseStateTarget": {
+            "additionalProperties": false,
+            "properties": {
+                "FieldDataPathValues": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::QuickSight::Template.DataPathValue"
+                    },
+                    "type": "array"
+                },
+                "FieldId": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
         "AWS::QuickSight::Template.PivotTableFieldOption": {
             "additionalProperties": false,
             "properties": {
@@ -152905,6 +153581,12 @@
         "AWS::QuickSight::Template.PivotTableFieldOptions": {
             "additionalProperties": false,
             "properties": {
+                "CollapseStateOptions": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::QuickSight::Template.PivotTableFieldCollapseStateOption"
+                    },
+                    "type": "array"
+                },
                 "DataPathOptions": {
                     "items": {
                         "$ref": "#/definitions/AWS::QuickSight::Template.PivotTableDataPathOption"
@@ -152944,6 +153626,9 @@
                 "CellStyle": {
                     "$ref": "#/definitions/AWS::QuickSight::Template.TableCellStyle"
                 },
+                "CollapsedRowDimensionsVisibility": {
+                    "type": "string"
+                },
                 "ColumnHeaderStyle": {
                     "$ref": "#/definitions/AWS::QuickSight::Template.TableCellStyle"
                 },
@@ -153164,6 +153849,9 @@
                 "AlternateBandOddColor": {
                     "type": "string"
                 },
+                "AxesRangeScale": {
+                    "type": "string"
+                },
                 "BaseSeriesSettings": {
                     "$ref": "#/definitions/AWS::QuickSight::Template.RadarChartSeriesSettings"
                 },
@@ -153347,8 +154035,7 @@
             },
             "required": [
                 "Calculation",
-                "Column",
-                "MeasureAggregationFunction"
+                "Column"
             ],
             "type": "object"
         },
@@ -153637,6 +154324,12 @@
                     },
                     "type": "array"
                 },
+                "Label": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::QuickSight::Template.DimensionField"
+                    },
+                    "type": "array"
+                },
                 "Size": {
                     "items": {
                         "$ref": "#/definitions/AWS::QuickSight::Template.MeasureField"
@@ -153706,6 +154399,18 @@
         "AWS::QuickSight::Template.ScatterPlotUnaggregatedFieldWells": {
             "additionalProperties": false,
             "properties": {
+                "Category": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::QuickSight::Template.DimensionField"
+                    },
+                    "type": "array"
+                },
+                "Label": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::QuickSight::Template.DimensionField"
+                    },
+                    "type": "array"
+                },
                 "Size": {
                     "items": {
                         "$ref": "#/definitions/AWS::QuickSight::Template.MeasureField"
@@ -155827,6 +156532,9 @@
                     },
                     "required": [
                         "AwsAccountId",
+                        "BaseThemeId",
+                        "Configuration",
+                        "Name",
                         "ThemeId"
                     ],
                     "type": "object"
@@ -155920,6 +156628,9 @@
                 },
                 "Principal": {
                     "type": "string"
+                },
+                "Resource": {
+                    "type": "string"
                 }
             },
             "required": [
@@ -176068,9 +176779,6 @@
                 "Properties": {
                     "additionalProperties": false,
                     "properties": {
-                        "AdditionalInferenceSpecificationDefinition": {
-                            "$ref": "#/definitions/AWS::SageMaker::ModelPackage.AdditionalInferenceSpecificationDefinition"
-                        },
                         "AdditionalInferenceSpecifications": {
                             "items": {
                                 "$ref": "#/definitions/AWS::SageMaker::ModelPackage.AdditionalInferenceSpecificationDefinition"
@@ -176092,9 +176800,6 @@
                         "ClientToken": {
                             "type": "string"
                         },
-                        "CreatedBy": {
-                            "$ref": "#/definitions/AWS::SageMaker::ModelPackage.UserContext"
-                        },
                         "CustomerMetadataProperties": {
                             "additionalProperties": true,
                             "patternProperties": {
@@ -176110,21 +176815,9 @@
                         "DriftCheckBaselines": {
                             "$ref": "#/definitions/AWS::SageMaker::ModelPackage.DriftCheckBaselines"
                         },
-                        "Environment": {
-                            "additionalProperties": true,
-                            "patternProperties": {
-                                "^[a-zA-Z0-9]+$": {
-                                    "type": "string"
-                                }
-                            },
-                            "type": "object"
-                        },
                         "InferenceSpecification": {
                             "$ref": "#/definitions/AWS::SageMaker::ModelPackage.InferenceSpecification"
                         },
-                        "LastModifiedBy": {
-                            "$ref": "#/definitions/AWS::SageMaker::ModelPackage.UserContext"
-                        },
                         "LastModifiedTime": {
                             "type": "string"
                         },
@@ -176149,9 +176842,6 @@
                         "ModelPackageStatusDetails": {
                             "$ref": "#/definitions/AWS::SageMaker::ModelPackage.ModelPackageStatusDetails"
                         },
-                        "ModelPackageStatusItem": {
-                            "$ref": "#/definitions/AWS::SageMaker::ModelPackage.ModelPackageStatusItem"
-                        },
                         "ModelPackageVersion": {
                             "type": "number"
                         },
@@ -176520,9 +177210,6 @@
                 },
                 "NearestModelName": {
                     "type": "string"
-                },
-                "ProductId": {
-                    "type": "string"
                 }
             },
             "required": [
@@ -176533,12 +177220,6 @@
         "AWS::SageMaker::ModelPackage.ModelPackageStatusDetails": {
             "additionalProperties": false,
             "properties": {
-                "ImageScanStatuses": {
-                    "items": {
-                        "$ref": "#/definitions/AWS::SageMaker::ModelPackage.ModelPackageStatusItem"
-                    },
-                    "type": "array"
-                },
                 "ValidationStatuses": {
                     "items": {
                         "$ref": "#/definitions/AWS::SageMaker::ModelPackage.ModelPackageStatusItem"
@@ -176546,9 +177227,6 @@
                     "type": "array"
                 }
             },
-            "required": [
-                "ValidationStatuses"
-            ],
             "type": "object"
         },
         "AWS::SageMaker::ModelPackage.ModelPackageStatusItem": {
@@ -176727,21 +177405,6 @@
             ],
             "type": "object"
         },
-        "AWS::SageMaker::ModelPackage.UserContext": {
-            "additionalProperties": false,
-            "properties": {
-                "DomainId": {
-                    "type": "string"
-                },
-                "UserProfileArn": {
-                    "type": "string"
-                },
-                "UserProfileName": {
-                    "type": "string"
-                }
-            },
-            "type": "object"
-        },
         "AWS::SageMaker::ModelPackage.ValidationProfile": {
             "additionalProperties": false,
             "properties": {
@@ -185560,36 +186223,398 @@
                 "Properties": {
                     "additionalProperties": false,
                     "properties": {
-                        "Description": {
-                            "type": "string"
-                        },
-                        "OnExceptionSteps": {
-                            "items": {
-                                "$ref": "#/definitions/AWS::Transfer::Workflow.WorkflowStep"
-                            },
-                            "type": "array"
-                        },
-                        "Steps": {
-                            "items": {
-                                "$ref": "#/definitions/AWS::Transfer::Workflow.WorkflowStep"
-                            },
-                            "type": "array"
+                        "Description": {
+                            "type": "string"
+                        },
+                        "OnExceptionSteps": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::Transfer::Workflow.WorkflowStep"
+                            },
+                            "type": "array"
+                        },
+                        "Steps": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::Transfer::Workflow.WorkflowStep"
+                            },
+                            "type": "array"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "Steps"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Transfer::Workflow"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::Transfer::Workflow.CopyStepDetails": {
+            "additionalProperties": false,
+            "properties": {
+                "DestinationFileLocation": {
+                    "$ref": "#/definitions/AWS::Transfer::Workflow.S3FileLocation"
+                },
+                "Name": {
+                    "type": "string"
+                },
+                "OverwriteExisting": {
+                    "type": "string"
+                },
+                "SourceFileLocation": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Transfer::Workflow.CustomStepDetails": {
+            "additionalProperties": false,
+            "properties": {
+                "Name": {
+                    "type": "string"
+                },
+                "SourceFileLocation": {
+                    "type": "string"
+                },
+                "Target": {
+                    "type": "string"
+                },
+                "TimeoutSeconds": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Transfer::Workflow.DecryptStepDetails": {
+            "additionalProperties": false,
+            "properties": {
+                "DestinationFileLocation": {
+                    "$ref": "#/definitions/AWS::Transfer::Workflow.InputFileLocation"
+                },
+                "Name": {
+                    "type": "string"
+                },
+                "OverwriteExisting": {
+                    "type": "string"
+                },
+                "SourceFileLocation": {
+                    "type": "string"
+                },
+                "Type": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Transfer::Workflow.DeleteStepDetails": {
+            "additionalProperties": false,
+            "properties": {
+                "Name": {
+                    "type": "string"
+                },
+                "SourceFileLocation": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Transfer::Workflow.EfsInputFileLocation": {
+            "additionalProperties": false,
+            "properties": {
+                "FileSystemId": {
+                    "type": "string"
+                },
+                "Path": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Transfer::Workflow.InputFileLocation": {
+            "additionalProperties": false,
+            "properties": {
+                "EfsFileLocation": {
+                    "$ref": "#/definitions/AWS::Transfer::Workflow.EfsInputFileLocation"
+                },
+                "S3FileLocation": {
+                    "$ref": "#/definitions/AWS::Transfer::Workflow.S3InputFileLocation"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Transfer::Workflow.S3FileLocation": {
+            "additionalProperties": false,
+            "properties": {
+                "S3FileLocation": {
+                    "$ref": "#/definitions/AWS::Transfer::Workflow.S3InputFileLocation"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Transfer::Workflow.S3InputFileLocation": {
+            "additionalProperties": false,
+            "properties": {
+                "Bucket": {
+                    "type": "string"
+                },
+                "Key": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Transfer::Workflow.S3Tag": {
+            "additionalProperties": false,
+            "properties": {
+                "Key": {
+                    "type": "string"
+                },
+                "Value": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Key",
+                "Value"
+            ],
+            "type": "object"
+        },
+        "AWS::Transfer::Workflow.TagStepDetails": {
+            "additionalProperties": false,
+            "properties": {
+                "Name": {
+                    "type": "string"
+                },
+                "SourceFileLocation": {
+                    "type": "string"
+                },
+                "Tags": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::Transfer::Workflow.S3Tag"
+                    },
+                    "type": "array"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Transfer::Workflow.WorkflowStep": {
+            "additionalProperties": false,
+            "properties": {
+                "CopyStepDetails": {
+                    "$ref": "#/definitions/AWS::Transfer::Workflow.CopyStepDetails"
+                },
+                "CustomStepDetails": {
+                    "$ref": "#/definitions/AWS::Transfer::Workflow.CustomStepDetails"
+                },
+                "DecryptStepDetails": {
+                    "$ref": "#/definitions/AWS::Transfer::Workflow.DecryptStepDetails"
+                },
+                "DeleteStepDetails": {
+                    "$ref": "#/definitions/AWS::Transfer::Workflow.DeleteStepDetails"
+                },
+                "TagStepDetails": {
+                    "$ref": "#/definitions/AWS::Transfer::Workflow.TagStepDetails"
+                },
+                "Type": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::VerifiedPermissions::IdentitySource": {
+            "additionalProperties": false,
+            "properties": {
+                "Condition": {
+                    "type": "string"
+                },
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "Configuration": {
+                            "$ref": "#/definitions/AWS::VerifiedPermissions::IdentitySource.IdentitySourceConfiguration"
+                        },
+                        "PolicyStoreId": {
+                            "type": "string"
+                        },
+                        "PrincipalEntityType": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "Configuration"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::VerifiedPermissions::IdentitySource"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::VerifiedPermissions::IdentitySource.CognitoUserPoolConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "ClientIds": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "UserPoolArn": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "UserPoolArn"
+            ],
+            "type": "object"
+        },
+        "AWS::VerifiedPermissions::IdentitySource.IdentitySourceConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "CognitoUserPoolConfiguration": {
+                    "$ref": "#/definitions/AWS::VerifiedPermissions::IdentitySource.CognitoUserPoolConfiguration"
+                }
+            },
+            "required": [
+                "CognitoUserPoolConfiguration"
+            ],
+            "type": "object"
+        },
+        "AWS::VerifiedPermissions::IdentitySource.IdentitySourceDetails": {
+            "additionalProperties": false,
+            "properties": {
+                "ClientIds": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "DiscoveryUrl": {
+                    "type": "string"
+                },
+                "OpenIdIssuer": {
+                    "type": "string"
+                },
+                "UserPoolArn": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::VerifiedPermissions::Policy": {
+            "additionalProperties": false,
+            "properties": {
+                "Condition": {
+                    "type": "string"
+                },
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "Definition": {
+                            "$ref": "#/definitions/AWS::VerifiedPermissions::Policy.PolicyDefinition"
                         },
-                        "Tags": {
-                            "items": {
-                                "$ref": "#/definitions/Tag"
-                            },
-                            "type": "array"
+                        "PolicyStoreId": {
+                            "type": "string"
                         }
                     },
                     "required": [
-                        "Steps"
+                        "Definition"
                     ],
                     "type": "object"
                 },
                 "Type": {
                     "enum": [
-                        "AWS::Transfer::Workflow"
+                        "AWS::VerifiedPermissions::Policy"
                     ],
                     "type": "string"
                 },
@@ -185608,176 +186633,225 @@
             ],
             "type": "object"
         },
-        "AWS::Transfer::Workflow.CopyStepDetails": {
+        "AWS::VerifiedPermissions::Policy.EntityIdentifier": {
             "additionalProperties": false,
             "properties": {
-                "DestinationFileLocation": {
-                    "$ref": "#/definitions/AWS::Transfer::Workflow.S3FileLocation"
-                },
-                "Name": {
-                    "type": "string"
-                },
-                "OverwriteExisting": {
+                "EntityId": {
                     "type": "string"
                 },
-                "SourceFileLocation": {
+                "EntityType": {
                     "type": "string"
                 }
             },
+            "required": [
+                "EntityId",
+                "EntityType"
+            ],
             "type": "object"
         },
-        "AWS::Transfer::Workflow.CustomStepDetails": {
+        "AWS::VerifiedPermissions::Policy.PolicyDefinition": {
             "additionalProperties": false,
             "properties": {
-                "Name": {
-                    "type": "string"
-                },
-                "SourceFileLocation": {
-                    "type": "string"
-                },
-                "Target": {
-                    "type": "string"
+                "Static": {
+                    "$ref": "#/definitions/AWS::VerifiedPermissions::Policy.StaticPolicyDefinition"
                 },
-                "TimeoutSeconds": {
-                    "type": "number"
+                "TemplateLinked": {
+                    "$ref": "#/definitions/AWS::VerifiedPermissions::Policy.TemplateLinkedPolicyDefinition"
                 }
             },
             "type": "object"
         },
-        "AWS::Transfer::Workflow.DecryptStepDetails": {
+        "AWS::VerifiedPermissions::Policy.StaticPolicyDefinition": {
             "additionalProperties": false,
             "properties": {
-                "DestinationFileLocation": {
-                    "$ref": "#/definitions/AWS::Transfer::Workflow.InputFileLocation"
-                },
-                "Name": {
-                    "type": "string"
-                },
-                "OverwriteExisting": {
-                    "type": "string"
-                },
-                "SourceFileLocation": {
+                "Description": {
                     "type": "string"
                 },
-                "Type": {
+                "Statement": {
                     "type": "string"
                 }
             },
+            "required": [
+                "Statement"
+            ],
             "type": "object"
         },
-        "AWS::Transfer::Workflow.DeleteStepDetails": {
+        "AWS::VerifiedPermissions::Policy.TemplateLinkedPolicyDefinition": {
             "additionalProperties": false,
             "properties": {
-                "Name": {
+                "PolicyTemplateId": {
                     "type": "string"
                 },
-                "SourceFileLocation": {
-                    "type": "string"
+                "Principal": {
+                    "$ref": "#/definitions/AWS::VerifiedPermissions::Policy.EntityIdentifier"
+                },
+                "Resource": {
+                    "$ref": "#/definitions/AWS::VerifiedPermissions::Policy.EntityIdentifier"
                 }
             },
+            "required": [
+                "PolicyTemplateId"
+            ],
             "type": "object"
         },
-        "AWS::Transfer::Workflow.EfsInputFileLocation": {
+        "AWS::VerifiedPermissions::PolicyStore": {
             "additionalProperties": false,
             "properties": {
-                "FileSystemId": {
+                "Condition": {
                     "type": "string"
                 },
-                "Path": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
                     "type": "string"
-                }
-            },
-            "type": "object"
-        },
-        "AWS::Transfer::Workflow.InputFileLocation": {
-            "additionalProperties": false,
-            "properties": {
-                "EfsFileLocation": {
-                    "$ref": "#/definitions/AWS::Transfer::Workflow.EfsInputFileLocation"
                 },
-                "S3FileLocation": {
-                    "$ref": "#/definitions/AWS::Transfer::Workflow.S3InputFileLocation"
-                }
-            },
-            "type": "object"
-        },
-        "AWS::Transfer::Workflow.S3FileLocation": {
-            "additionalProperties": false,
-            "properties": {
-                "S3FileLocation": {
-                    "$ref": "#/definitions/AWS::Transfer::Workflow.S3InputFileLocation"
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "Schema": {
+                            "$ref": "#/definitions/AWS::VerifiedPermissions::PolicyStore.SchemaDefinition"
+                        },
+                        "ValidationSettings": {
+                            "$ref": "#/definitions/AWS::VerifiedPermissions::PolicyStore.ValidationSettings"
+                        }
+                    },
+                    "required": [
+                        "ValidationSettings"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::VerifiedPermissions::PolicyStore"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
                 }
             },
+            "required": [
+                "Type",
+                "Properties"
+            ],
             "type": "object"
         },
-        "AWS::Transfer::Workflow.S3InputFileLocation": {
+        "AWS::VerifiedPermissions::PolicyStore.SchemaDefinition": {
             "additionalProperties": false,
             "properties": {
-                "Bucket": {
-                    "type": "string"
-                },
-                "Key": {
+                "CedarJson": {
                     "type": "string"
                 }
             },
             "type": "object"
         },
-        "AWS::Transfer::Workflow.S3Tag": {
+        "AWS::VerifiedPermissions::PolicyStore.ValidationSettings": {
             "additionalProperties": false,
             "properties": {
-                "Key": {
-                    "type": "string"
-                },
-                "Value": {
+                "Mode": {
                     "type": "string"
                 }
             },
             "required": [
-                "Key",
-                "Value"
+                "Mode"
             ],
             "type": "object"
         },
-        "AWS::Transfer::Workflow.TagStepDetails": {
+        "AWS::VerifiedPermissions::PolicyTemplate": {
             "additionalProperties": false,
             "properties": {
-                "Name": {
+                "Condition": {
                     "type": "string"
                 },
-                "SourceFileLocation": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
                     "type": "string"
                 },
-                "Tags": {
-                    "items": {
-                        "$ref": "#/definitions/AWS::Transfer::Workflow.S3Tag"
-                    },
-                    "type": "array"
-                }
-            },
-            "type": "object"
-        },
-        "AWS::Transfer::Workflow.WorkflowStep": {
-            "additionalProperties": false,
-            "properties": {
-                "CopyStepDetails": {
-                    "$ref": "#/definitions/AWS::Transfer::Workflow.CopyStepDetails"
-                },
-                "CustomStepDetails": {
-                    "$ref": "#/definitions/AWS::Transfer::Workflow.CustomStepDetails"
-                },
-                "DecryptStepDetails": {
-                    "$ref": "#/definitions/AWS::Transfer::Workflow.DecryptStepDetails"
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
                 },
-                "DeleteStepDetails": {
-                    "$ref": "#/definitions/AWS::Transfer::Workflow.DeleteStepDetails"
+                "Metadata": {
+                    "type": "object"
                 },
-                "TagStepDetails": {
-                    "$ref": "#/definitions/AWS::Transfer::Workflow.TagStepDetails"
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "Description": {
+                            "type": "string"
+                        },
+                        "PolicyStoreId": {
+                            "type": "string"
+                        },
+                        "Statement": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "Statement"
+                    ],
+                    "type": "object"
                 },
                 "Type": {
+                    "enum": [
+                        "AWS::VerifiedPermissions::PolicyTemplate"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
                     "type": "string"
                 }
             },
+            "required": [
+                "Type",
+                "Properties"
+            ],
             "type": "object"
         },
         "AWS::VoiceID::Domain": {
@@ -190047,6 +191121,9 @@
                 "Properties": {
                     "additionalProperties": false,
                     "properties": {
+                        "AssociationConfig": {
+                            "$ref": "#/definitions/AWS::WAFv2::WebACL.AssociationConfig"
+                        },
                         "CaptchaConfig": {
                             "$ref": "#/definitions/AWS::WAFv2::WebACL.CaptchaConfig"
                         },
@@ -190178,6 +191255,21 @@
             ],
             "type": "object"
         },
+        "AWS::WAFv2::WebACL.AssociationConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "RequestBody": {
+                    "additionalProperties": false,
+                    "patternProperties": {
+                        "^[a-zA-Z0-9]+$": {
+                            "$ref": "#/definitions/AWS::WAFv2::WebACL.RequestBodyAssociatedResourceTypeConfig"
+                        }
+                    },
+                    "type": "object"
+                }
+            },
+            "type": "object"
+        },
         "AWS::WAFv2::WebACL.BlockAction": {
             "additionalProperties": false,
             "properties": {
@@ -190806,6 +191898,18 @@
             ],
             "type": "object"
         },
+        "AWS::WAFv2::WebACL.RequestBodyAssociatedResourceTypeConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "DefaultSizeInspectionLimit": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "DefaultSizeInspectionLimit"
+            ],
+            "type": "object"
+        },
         "AWS::WAFv2::WebACL.RequestInspection": {
             "additionalProperties": false,
             "properties": {
@@ -192624,6 +193728,9 @@
                         {
                             "$ref": "#/definitions/AWS::AppMesh::VirtualService"
                         },
+                        {
+                            "$ref": "#/definitions/AWS::AppRunner::AutoScalingConfiguration"
+                        },
                         {
                             "$ref": "#/definitions/AWS::AppRunner::ObservabilityConfiguration"
                         },
@@ -192639,6 +193746,9 @@
                         {
                             "$ref": "#/definitions/AWS::AppStream::AppBlock"
                         },
+                        {
+                            "$ref": "#/definitions/AWS::AppStream::AppBlockBuilder"
+                        },
                         {
                             "$ref": "#/definitions/AWS::AppStream::Application"
                         },
@@ -193050,6 +194160,9 @@
                         {
                             "$ref": "#/definitions/AWS::Cognito::UserPoolUserToGroupAttachment"
                         },
+                        {
+                            "$ref": "#/definitions/AWS::Comprehend::DocumentClassifier"
+                        },
                         {
                             "$ref": "#/definitions/AWS::Comprehend::Flywheel"
                         },
@@ -195561,6 +196674,18 @@
                         {
                             "$ref": "#/definitions/AWS::Transfer::Workflow"
                         },
+                        {
+                            "$ref": "#/definitions/AWS::VerifiedPermissions::IdentitySource"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::VerifiedPermissions::Policy"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::VerifiedPermissions::PolicyStore"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::VerifiedPermissions::PolicyTemplate"
+                        },
                         {
                             "$ref": "#/definitions/AWS::VoiceID::Domain"
                         },
diff --git a/schema/sam.go b/schema/sam.go
index 7ff56f72c3..08dff62fe0 100644
--- a/schema/sam.go
+++ b/schema/sam.go
@@ -12398,6 +12398,82 @@ var SamSchema = `{
             },
             "type": "object"
         },
+        "AWS::AppRunner::AutoScalingConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "Condition": {
+                    "type": "string"
+                },
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "AutoScalingConfigurationName": {
+                            "type": "string"
+                        },
+                        "MaxConcurrency": {
+                            "type": "number"
+                        },
+                        "MaxSize": {
+                            "type": "number"
+                        },
+                        "MinSize": {
+                            "type": "number"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::AppRunner::AutoScalingConfiguration"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type"
+            ],
+            "type": "object"
+        },
         "AWS::AppRunner::ObservabilityConfiguration": {
             "additionalProperties": false,
             "properties": {
@@ -13066,6 +13142,12 @@ var SamSchema = `{
                         "Name": {
                             "type": "string"
                         },
+                        "PackagingType": {
+                            "type": "string"
+                        },
+                        "PostSetupScriptDetails": {
+                            "$ref": "#/definitions/AWS::AppStream::AppBlock.ScriptDetails"
+                        },
                         "SetupScriptDetails": {
                             "$ref": "#/definitions/AWS::AppStream::AppBlock.ScriptDetails"
                         },
@@ -13081,7 +13163,6 @@ var SamSchema = `{
                     },
                     "required": [
                         "Name",
-                        "SetupScriptDetails",
                         "SourceS3Location"
                     ],
                     "type": "object"
@@ -13118,8 +13199,7 @@ var SamSchema = `{
                 }
             },
             "required": [
-                "S3Bucket",
-                "S3Key"
+                "S3Bucket"
             ],
             "type": "object"
         },
@@ -13146,7 +13226,7 @@ var SamSchema = `{
             ],
             "type": "object"
         },
-        "AWS::AppStream::Application": {
+        "AWS::AppStream::AppBlockBuilder": {
             "additionalProperties": false,
             "properties": {
                 "Condition": {
@@ -13181,10 +13261,13 @@ var SamSchema = `{
                 "Properties": {
                     "additionalProperties": false,
                     "properties": {
-                        "AppBlockArn": {
-                            "type": "string"
+                        "AccessEndpoints": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::AppStream::AppBlockBuilder.AccessEndpoint"
+                            },
+                            "type": "array"
                         },
-                        "AttributesToDelete": {
+                        "AppBlockArns": {
                             "items": {
                                 "type": "string"
                             },
@@ -13196,29 +13279,20 @@ var SamSchema = `{
                         "DisplayName": {
                             "type": "string"
                         },
-                        "IconS3Location": {
-                            "$ref": "#/definitions/AWS::AppStream::Application.S3Location"
-                        },
-                        "InstanceFamilies": {
-                            "items": {
-                                "type": "string"
-                            },
-                            "type": "array"
+                        "EnableDefaultInternetAccess": {
+                            "type": "boolean"
                         },
-                        "LaunchParameters": {
+                        "IamRoleArn": {
                             "type": "string"
                         },
-                        "LaunchPath": {
+                        "InstanceType": {
                             "type": "string"
                         },
                         "Name": {
                             "type": "string"
                         },
-                        "Platforms": {
-                            "items": {
-                                "type": "string"
-                            },
-                            "type": "array"
+                        "Platform": {
+                            "type": "string"
                         },
                         "Tags": {
                             "items": {
@@ -13226,23 +13300,21 @@ var SamSchema = `{
                             },
                             "type": "array"
                         },
-                        "WorkingDirectory": {
-                            "type": "string"
+                        "VpcConfig": {
+                            "$ref": "#/definitions/AWS::AppStream::AppBlockBuilder.VpcConfig"
                         }
                     },
                     "required": [
-                        "AppBlockArn",
-                        "IconS3Location",
-                        "InstanceFamilies",
-                        "LaunchPath",
+                        "InstanceType",
                         "Name",
-                        "Platforms"
+                        "Platform",
+                        "VpcConfig"
                     ],
                     "type": "object"
                 },
                 "Type": {
                     "enum": [
-                        "AWS::AppStream::Application"
+                        "AWS::AppStream::AppBlockBuilder"
                     ],
                     "type": "string"
                 },
@@ -13261,23 +13333,41 @@ var SamSchema = `{
             ],
             "type": "object"
         },
-        "AWS::AppStream::Application.S3Location": {
+        "AWS::AppStream::AppBlockBuilder.AccessEndpoint": {
             "additionalProperties": false,
             "properties": {
-                "S3Bucket": {
+                "EndpointType": {
                     "type": "string"
                 },
-                "S3Key": {
+                "VpceId": {
                     "type": "string"
                 }
             },
             "required": [
-                "S3Bucket",
-                "S3Key"
+                "EndpointType",
+                "VpceId"
             ],
             "type": "object"
         },
-        "AWS::AppStream::ApplicationEntitlementAssociation": {
+        "AWS::AppStream::AppBlockBuilder.VpcConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "SecurityGroupIds": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "SubnetIds": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::AppStream::Application": {
             "additionalProperties": false,
             "properties": {
                 "Condition": {
@@ -13312,26 +13402,68 @@ var SamSchema = `{
                 "Properties": {
                     "additionalProperties": false,
                     "properties": {
-                        "ApplicationIdentifier": {
+                        "AppBlockArn": {
                             "type": "string"
                         },
-                        "EntitlementName": {
+                        "AttributesToDelete": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "Description": {
                             "type": "string"
                         },
-                        "StackName": {
+                        "DisplayName": {
+                            "type": "string"
+                        },
+                        "IconS3Location": {
+                            "$ref": "#/definitions/AWS::AppStream::Application.S3Location"
+                        },
+                        "InstanceFamilies": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "LaunchParameters": {
+                            "type": "string"
+                        },
+                        "LaunchPath": {
+                            "type": "string"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "Platforms": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        },
+                        "WorkingDirectory": {
                             "type": "string"
                         }
                     },
                     "required": [
-                        "ApplicationIdentifier",
-                        "EntitlementName",
-                        "StackName"
+                        "AppBlockArn",
+                        "IconS3Location",
+                        "InstanceFamilies",
+                        "LaunchPath",
+                        "Name",
+                        "Platforms"
                     ],
                     "type": "object"
                 },
                 "Type": {
                     "enum": [
-                        "AWS::AppStream::ApplicationEntitlementAssociation"
+                        "AWS::AppStream::Application"
                     ],
                     "type": "string"
                 },
@@ -13350,76 +13482,165 @@ var SamSchema = `{
             ],
             "type": "object"
         },
-        "AWS::AppStream::ApplicationFleetAssociation": {
+        "AWS::AppStream::Application.S3Location": {
             "additionalProperties": false,
             "properties": {
-                "Condition": {
-                    "type": "string"
-                },
-                "DeletionPolicy": {
-                    "enum": [
-                        "Delete",
-                        "Retain",
-                        "Snapshot"
-                    ],
-                    "type": "string"
-                },
-                "DependsOn": {
-                    "anyOf": [
-                        {
-                            "pattern": "^[a-zA-Z0-9]+$",
-                            "type": "string"
-                        },
-                        {
-                            "items": {
-                                "pattern": "^[a-zA-Z0-9]+$",
-                                "type": "string"
-                            },
-                            "type": "array"
-                        }
-                    ]
-                },
-                "Metadata": {
-                    "type": "object"
-                },
-                "Properties": {
-                    "additionalProperties": false,
-                    "properties": {
-                        "ApplicationArn": {
-                            "type": "string"
-                        },
-                        "FleetName": {
-                            "type": "string"
-                        }
-                    },
-                    "required": [
-                        "ApplicationArn",
-                        "FleetName"
-                    ],
-                    "type": "object"
-                },
-                "Type": {
-                    "enum": [
-                        "AWS::AppStream::ApplicationFleetAssociation"
-                    ],
+                "S3Bucket": {
                     "type": "string"
                 },
-                "UpdateReplacePolicy": {
-                    "enum": [
-                        "Delete",
-                        "Retain",
-                        "Snapshot"
-                    ],
+                "S3Key": {
                     "type": "string"
                 }
             },
             "required": [
-                "Type",
-                "Properties"
+                "S3Bucket",
+                "S3Key"
             ],
             "type": "object"
         },
-        "AWS::AppStream::DirectoryConfig": {
+        "AWS::AppStream::ApplicationEntitlementAssociation": {
+            "additionalProperties": false,
+            "properties": {
+                "Condition": {
+                    "type": "string"
+                },
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "ApplicationIdentifier": {
+                            "type": "string"
+                        },
+                        "EntitlementName": {
+                            "type": "string"
+                        },
+                        "StackName": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "ApplicationIdentifier",
+                        "EntitlementName",
+                        "StackName"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::AppStream::ApplicationEntitlementAssociation"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::AppStream::ApplicationFleetAssociation": {
+            "additionalProperties": false,
+            "properties": {
+                "Condition": {
+                    "type": "string"
+                },
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "ApplicationArn": {
+                            "type": "string"
+                        },
+                        "FleetName": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "ApplicationArn",
+                        "FleetName"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::AppStream::ApplicationFleetAssociation"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::AppStream::DirectoryConfig": {
             "additionalProperties": false,
             "properties": {
                 "Condition": {
@@ -33527,6 +33748,235 @@ var SamSchema = `{
             ],
             "type": "object"
         },
+        "AWS::Comprehend::DocumentClassifier": {
+            "additionalProperties": false,
+            "properties": {
+                "Condition": {
+                    "type": "string"
+                },
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "DataAccessRoleArn": {
+                            "type": "string"
+                        },
+                        "DocumentClassifierName": {
+                            "type": "string"
+                        },
+                        "InputDataConfig": {
+                            "$ref": "#/definitions/AWS::Comprehend::DocumentClassifier.DocumentClassifierInputDataConfig"
+                        },
+                        "LanguageCode": {
+                            "type": "string"
+                        },
+                        "Mode": {
+                            "type": "string"
+                        },
+                        "ModelKmsKeyId": {
+                            "type": "string"
+                        },
+                        "ModelPolicy": {
+                            "type": "string"
+                        },
+                        "OutputDataConfig": {
+                            "$ref": "#/definitions/AWS::Comprehend::DocumentClassifier.DocumentClassifierOutputDataConfig"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        },
+                        "VersionName": {
+                            "type": "string"
+                        },
+                        "VolumeKmsKeyId": {
+                            "type": "string"
+                        },
+                        "VpcConfig": {
+                            "$ref": "#/definitions/AWS::Comprehend::DocumentClassifier.VpcConfig"
+                        }
+                    },
+                    "required": [
+                        "DataAccessRoleArn",
+                        "DocumentClassifierName",
+                        "InputDataConfig",
+                        "LanguageCode"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Comprehend::DocumentClassifier"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::Comprehend::DocumentClassifier.AugmentedManifestsListItem": {
+            "additionalProperties": false,
+            "properties": {
+                "AttributeNames": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "S3Uri": {
+                    "type": "string"
+                },
+                "Split": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "AttributeNames",
+                "S3Uri"
+            ],
+            "type": "object"
+        },
+        "AWS::Comprehend::DocumentClassifier.DocumentClassifierDocuments": {
+            "additionalProperties": false,
+            "properties": {
+                "S3Uri": {
+                    "type": "string"
+                },
+                "TestS3Uri": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "S3Uri"
+            ],
+            "type": "object"
+        },
+        "AWS::Comprehend::DocumentClassifier.DocumentClassifierInputDataConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "AugmentedManifests": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::Comprehend::DocumentClassifier.AugmentedManifestsListItem"
+                    },
+                    "type": "array"
+                },
+                "DataFormat": {
+                    "type": "string"
+                },
+                "DocumentReaderConfig": {
+                    "$ref": "#/definitions/AWS::Comprehend::DocumentClassifier.DocumentReaderConfig"
+                },
+                "DocumentType": {
+                    "type": "string"
+                },
+                "Documents": {
+                    "$ref": "#/definitions/AWS::Comprehend::DocumentClassifier.DocumentClassifierDocuments"
+                },
+                "LabelDelimiter": {
+                    "type": "string"
+                },
+                "S3Uri": {
+                    "type": "string"
+                },
+                "TestS3Uri": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Comprehend::DocumentClassifier.DocumentClassifierOutputDataConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "KmsKeyId": {
+                    "type": "string"
+                },
+                "S3Uri": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Comprehend::DocumentClassifier.DocumentReaderConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "DocumentReadAction": {
+                    "type": "string"
+                },
+                "DocumentReadMode": {
+                    "type": "string"
+                },
+                "FeatureTypes": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "DocumentReadAction"
+            ],
+            "type": "object"
+        },
+        "AWS::Comprehend::DocumentClassifier.VpcConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "SecurityGroupIds": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "Subnets": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "SecurityGroupIds",
+                "Subnets"
+            ],
+            "type": "object"
+        },
         "AWS::Comprehend::Flywheel": {
             "additionalProperties": false,
             "properties": {
@@ -48855,6 +49305,9 @@ var SamSchema = `{
                 "Properties": {
                     "additionalProperties": false,
                     "properties": {
+                        "KeyFormat": {
+                            "type": "string"
+                        },
                         "KeyName": {
                             "type": "string"
                         },
@@ -56216,9 +56669,15 @@ var SamSchema = `{
                 "CloudWatchLogs": {
                     "$ref": "#/definitions/AWS::EC2::VerifiedAccessInstance.CloudWatchLogs"
                 },
+                "IncludeTrustContext": {
+                    "type": "boolean"
+                },
                 "KinesisDataFirehose": {
                     "$ref": "#/definitions/AWS::EC2::VerifiedAccessInstance.KinesisDataFirehose"
                 },
+                "LogVersion": {
+                    "type": "string"
+                },
                 "S3": {
                     "$ref": "#/definitions/AWS::EC2::VerifiedAccessInstance.S3"
                 }
@@ -80022,9 +80481,6 @@ var SamSchema = `{
                             "type": "string"
                         }
                     },
-                    "required": [
-                        "AWSServiceName"
-                    ],
                     "type": "object"
                 },
                 "Type": {
@@ -80043,8 +80499,7 @@ var SamSchema = `{
                 }
             },
             "required": [
-                "Type",
-                "Properties"
+                "Type"
             ],
             "type": "object"
         },
@@ -99089,6 +99544,9 @@ var SamSchema = `{
                     "type": "string"
                 }
             },
+            "required": [
+                "DataLakePrincipalIdentifier"
+            ],
             "type": "object"
         },
         "AWS::LakeFormation::DataLakeSettings.ExternalDataFilteringAllowList": {
@@ -99096,21 +99554,23 @@ var SamSchema = `{
             "properties": {},
             "type": "object"
         },
-        "AWS::LakeFormation::DataLakeSettings.Permissions": {
-            "additionalProperties": false,
-            "properties": {},
-            "type": "object"
-        },
         "AWS::LakeFormation::DataLakeSettings.PrincipalPermissions": {
             "additionalProperties": false,
             "properties": {
                 "Permissions": {
-                    "$ref": "#/definitions/AWS::LakeFormation::DataLakeSettings.Permissions"
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
                 },
                 "Principal": {
                     "$ref": "#/definitions/AWS::LakeFormation::DataLakeSettings.DataLakePrincipal"
                 }
             },
+            "required": [
+                "Permissions",
+                "Principal"
+            ],
             "type": "object"
         },
         "AWS::LakeFormation::Permissions": {
@@ -117825,7 +118285,6 @@ var SamSchema = `{
                     },
                     "required": [
                         "ConnectAttachmentId",
-                        "InsideCidrBlocks",
                         "PeerAddress"
                     ],
                     "type": "object"
@@ -118132,6 +118591,9 @@ var SamSchema = `{
                 "Properties": {
                     "additionalProperties": false,
                     "properties": {
+                        "AWSLocation": {
+                            "$ref": "#/definitions/AWS::NetworkManager::Device.AWSLocation"
+                        },
                         "Description": {
                             "type": "string"
                         },
@@ -118189,6 +118651,18 @@ var SamSchema = `{
             ],
             "type": "object"
         },
+        "AWS::NetworkManager::Device.AWSLocation": {
+            "additionalProperties": false,
+            "properties": {
+                "SubnetArn": {
+                    "type": "string"
+                },
+                "Zone": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
         "AWS::NetworkManager::Device.Location": {
             "additionalProperties": false,
             "properties": {
@@ -123158,9 +123632,6 @@ var SamSchema = `{
                         "Description": {
                             "type": "string"
                         },
-                        "DeviceId": {
-                            "type": "string"
-                        },
                         "ManifestOverridesPayload": {
                             "$ref": "#/definitions/AWS::Panorama::ApplicationInstance.ManifestOverridesPayload"
                         },
@@ -123173,9 +123644,6 @@ var SamSchema = `{
                         "RuntimeRoleArn": {
                             "type": "string"
                         },
-                        "StatusFilter": {
-                            "type": "string"
-                        },
                         "Tags": {
                             "items": {
                                 "$ref": "#/definitions/Tag"
@@ -128478,7 +128946,6 @@ var SamSchema = `{
                 }
             },
             "required": [
-                "AggregationFunction",
                 "Column",
                 "SortDirection"
             ],
@@ -129357,24 +129824,9 @@ var SamSchema = `{
             ],
             "type": "object"
         },
-        "AWS::QuickSight::Analysis.ColorsConfiguration": {
-            "additionalProperties": false,
-            "properties": {
-                "CustomColors": {
-                    "items": {
-                        "$ref": "#/definitions/AWS::QuickSight::Analysis.CustomColor"
-                    },
-                    "type": "array"
-                }
-            },
-            "type": "object"
-        },
         "AWS::QuickSight::Analysis.ColumnConfiguration": {
             "additionalProperties": false,
             "properties": {
-                "ColorsConfiguration": {
-                    "$ref": "#/definitions/AWS::QuickSight::Analysis.ColorsConfiguration"
-                },
                 "Column": {
                     "$ref": "#/definitions/AWS::QuickSight::Analysis.ColumnIdentifier"
                 },
@@ -129892,24 +130344,6 @@ var SamSchema = `{
             ],
             "type": "object"
         },
-        "AWS::QuickSight::Analysis.CustomColor": {
-            "additionalProperties": false,
-            "properties": {
-                "Color": {
-                    "type": "string"
-                },
-                "FieldValue": {
-                    "type": "string"
-                },
-                "SpecialValue": {
-                    "type": "string"
-                }
-            },
-            "required": [
-                "Color"
-            ],
-            "type": "object"
-        },
         "AWS::QuickSight::Analysis.CustomContentConfiguration": {
             "additionalProperties": false,
             "properties": {
@@ -130145,6 +130579,9 @@ var SamSchema = `{
                 "Position": {
                     "type": "string"
                 },
+                "TotalsVisibility": {
+                    "type": "string"
+                },
                 "Visibility": {
                     "type": "string"
                 }
@@ -130617,6 +131054,9 @@ var SamSchema = `{
                 "SelectAllValueOptions": {
                     "type": "string"
                 },
+                "SourceColumn": {
+                    "$ref": "#/definitions/AWS::QuickSight::Analysis.ColumnIdentifier"
+                },
                 "SourceField": {
                     "type": "string"
                 },
@@ -131216,6 +131656,12 @@ var SamSchema = `{
         "AWS::QuickSight::Analysis.FilterOperationSelectedFieldsConfiguration": {
             "additionalProperties": false,
             "properties": {
+                "SelectedColumns": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::QuickSight::Analysis.ColumnIdentifier"
+                    },
+                    "type": "array"
+                },
                 "SelectedFieldOptions": {
                     "type": "string"
                 },
@@ -131908,6 +132354,39 @@ var SamSchema = `{
             ],
             "type": "object"
         },
+        "AWS::QuickSight::Analysis.GeospatialHeatmapColorScale": {
+            "additionalProperties": false,
+            "properties": {
+                "Colors": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::QuickSight::Analysis.GeospatialHeatmapDataColor"
+                    },
+                    "type": "array"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::QuickSight::Analysis.GeospatialHeatmapConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "HeatmapColor": {
+                    "$ref": "#/definitions/AWS::QuickSight::Analysis.GeospatialHeatmapColorScale"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::QuickSight::Analysis.GeospatialHeatmapDataColor": {
+            "additionalProperties": false,
+            "properties": {
+                "Color": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Color"
+            ],
+            "type": "object"
+        },
         "AWS::QuickSight::Analysis.GeospatialMapAggregatedFieldWells": {
             "additionalProperties": false,
             "properties": {
@@ -132016,6 +132495,9 @@ var SamSchema = `{
                 "ClusterMarkerConfiguration": {
                     "$ref": "#/definitions/AWS::QuickSight::Analysis.ClusterMarkerConfiguration"
                 },
+                "HeatmapConfiguration": {
+                    "$ref": "#/definitions/AWS::QuickSight::Analysis.GeospatialHeatmapConfiguration"
+                },
                 "SelectedPointStyle": {
                     "type": "string"
                 }
@@ -134046,6 +134528,12 @@ var SamSchema = `{
                 "Scope": {
                     "$ref": "#/definitions/AWS::QuickSight::Analysis.PivotTableConditionalFormattingScope"
                 },
+                "Scopes": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::QuickSight::Analysis.PivotTableConditionalFormattingScope"
+                    },
+                    "type": "array"
+                },
                 "TextFormat": {
                     "$ref": "#/definitions/AWS::QuickSight::Analysis.TextConditionalFormat"
                 }
@@ -134127,6 +134615,36 @@ var SamSchema = `{
             ],
             "type": "object"
         },
+        "AWS::QuickSight::Analysis.PivotTableFieldCollapseStateOption": {
+            "additionalProperties": false,
+            "properties": {
+                "State": {
+                    "type": "string"
+                },
+                "Target": {
+                    "$ref": "#/definitions/AWS::QuickSight::Analysis.PivotTableFieldCollapseStateTarget"
+                }
+            },
+            "required": [
+                "Target"
+            ],
+            "type": "object"
+        },
+        "AWS::QuickSight::Analysis.PivotTableFieldCollapseStateTarget": {
+            "additionalProperties": false,
+            "properties": {
+                "FieldDataPathValues": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::QuickSight::Analysis.DataPathValue"
+                    },
+                    "type": "array"
+                },
+                "FieldId": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
         "AWS::QuickSight::Analysis.PivotTableFieldOption": {
             "additionalProperties": false,
             "properties": {
@@ -134148,6 +134666,12 @@ var SamSchema = `{
         "AWS::QuickSight::Analysis.PivotTableFieldOptions": {
             "additionalProperties": false,
             "properties": {
+                "CollapseStateOptions": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::QuickSight::Analysis.PivotTableFieldCollapseStateOption"
+                    },
+                    "type": "array"
+                },
                 "DataPathOptions": {
                     "items": {
                         "$ref": "#/definitions/AWS::QuickSight::Analysis.PivotTableDataPathOption"
@@ -134187,6 +134711,9 @@ var SamSchema = `{
                 "CellStyle": {
                     "$ref": "#/definitions/AWS::QuickSight::Analysis.TableCellStyle"
                 },
+                "CollapsedRowDimensionsVisibility": {
+                    "type": "string"
+                },
                 "ColumnHeaderStyle": {
                     "$ref": "#/definitions/AWS::QuickSight::Analysis.TableCellStyle"
                 },
@@ -134407,6 +134934,9 @@ var SamSchema = `{
                 "AlternateBandOddColor": {
                     "type": "string"
                 },
+                "AxesRangeScale": {
+                    "type": "string"
+                },
                 "BaseSeriesSettings": {
                     "$ref": "#/definitions/AWS::QuickSight::Analysis.RadarChartSeriesSettings"
                 },
@@ -134590,8 +135120,7 @@ var SamSchema = `{
             },
             "required": [
                 "Calculation",
-                "Column",
-                "MeasureAggregationFunction"
+                "Column"
             ],
             "type": "object"
         },
@@ -134880,6 +135409,12 @@ var SamSchema = `{
                     },
                     "type": "array"
                 },
+                "Label": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::QuickSight::Analysis.DimensionField"
+                    },
+                    "type": "array"
+                },
                 "Size": {
                     "items": {
                         "$ref": "#/definitions/AWS::QuickSight::Analysis.MeasureField"
@@ -134949,6 +135484,18 @@ var SamSchema = `{
         "AWS::QuickSight::Analysis.ScatterPlotUnaggregatedFieldWells": {
             "additionalProperties": false,
             "properties": {
+                "Category": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::QuickSight::Analysis.DimensionField"
+                    },
+                    "type": "array"
+                },
+                "Label": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::QuickSight::Analysis.DimensionField"
+                    },
+                    "type": "array"
+                },
                 "Size": {
                     "items": {
                         "$ref": "#/definitions/AWS::QuickSight::Analysis.MeasureField"
@@ -137011,7 +137558,6 @@ var SamSchema = `{
                 }
             },
             "required": [
-                "AggregationFunction",
                 "Column",
                 "SortDirection"
             ],
@@ -137796,24 +138342,9 @@ var SamSchema = `{
             ],
             "type": "object"
         },
-        "AWS::QuickSight::Dashboard.ColorsConfiguration": {
-            "additionalProperties": false,
-            "properties": {
-                "CustomColors": {
-                    "items": {
-                        "$ref": "#/definitions/AWS::QuickSight::Dashboard.CustomColor"
-                    },
-                    "type": "array"
-                }
-            },
-            "type": "object"
-        },
         "AWS::QuickSight::Dashboard.ColumnConfiguration": {
             "additionalProperties": false,
             "properties": {
-                "ColorsConfiguration": {
-                    "$ref": "#/definitions/AWS::QuickSight::Dashboard.ColorsConfiguration"
-                },
                 "Column": {
                     "$ref": "#/definitions/AWS::QuickSight::Dashboard.ColumnIdentifier"
                 },
@@ -138331,24 +138862,6 @@ var SamSchema = `{
             ],
             "type": "object"
         },
-        "AWS::QuickSight::Dashboard.CustomColor": {
-            "additionalProperties": false,
-            "properties": {
-                "Color": {
-                    "type": "string"
-                },
-                "FieldValue": {
-                    "type": "string"
-                },
-                "SpecialValue": {
-                    "type": "string"
-                }
-            },
-            "required": [
-                "Color"
-            ],
-            "type": "object"
-        },
         "AWS::QuickSight::Dashboard.CustomContentConfiguration": {
             "additionalProperties": false,
             "properties": {
@@ -138771,6 +139284,9 @@ var SamSchema = `{
                 "Position": {
                     "type": "string"
                 },
+                "TotalsVisibility": {
+                    "type": "string"
+                },
                 "Visibility": {
                     "type": "string"
                 }
@@ -139270,6 +139786,9 @@ var SamSchema = `{
                 "SelectAllValueOptions": {
                     "type": "string"
                 },
+                "SourceColumn": {
+                    "$ref": "#/definitions/AWS::QuickSight::Dashboard.ColumnIdentifier"
+                },
                 "SourceField": {
                     "type": "string"
                 },
@@ -139896,6 +140415,12 @@ var SamSchema = `{
         "AWS::QuickSight::Dashboard.FilterOperationSelectedFieldsConfiguration": {
             "additionalProperties": false,
             "properties": {
+                "SelectedColumns": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::QuickSight::Dashboard.ColumnIdentifier"
+                    },
+                    "type": "array"
+                },
                 "SelectedFieldOptions": {
                     "type": "string"
                 },
@@ -140588,6 +141113,39 @@ var SamSchema = `{
             ],
             "type": "object"
         },
+        "AWS::QuickSight::Dashboard.GeospatialHeatmapColorScale": {
+            "additionalProperties": false,
+            "properties": {
+                "Colors": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::QuickSight::Dashboard.GeospatialHeatmapDataColor"
+                    },
+                    "type": "array"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::QuickSight::Dashboard.GeospatialHeatmapConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "HeatmapColor": {
+                    "$ref": "#/definitions/AWS::QuickSight::Dashboard.GeospatialHeatmapColorScale"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::QuickSight::Dashboard.GeospatialHeatmapDataColor": {
+            "additionalProperties": false,
+            "properties": {
+                "Color": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Color"
+            ],
+            "type": "object"
+        },
         "AWS::QuickSight::Dashboard.GeospatialMapAggregatedFieldWells": {
             "additionalProperties": false,
             "properties": {
@@ -140696,6 +141254,9 @@ var SamSchema = `{
                 "ClusterMarkerConfiguration": {
                     "$ref": "#/definitions/AWS::QuickSight::Dashboard.ClusterMarkerConfiguration"
                 },
+                "HeatmapConfiguration": {
+                    "$ref": "#/definitions/AWS::QuickSight::Dashboard.GeospatialHeatmapConfiguration"
+                },
                 "SelectedPointStyle": {
                     "type": "string"
                 }
@@ -142726,6 +143287,12 @@ var SamSchema = `{
                 "Scope": {
                     "$ref": "#/definitions/AWS::QuickSight::Dashboard.PivotTableConditionalFormattingScope"
                 },
+                "Scopes": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::QuickSight::Dashboard.PivotTableConditionalFormattingScope"
+                    },
+                    "type": "array"
+                },
                 "TextFormat": {
                     "$ref": "#/definitions/AWS::QuickSight::Dashboard.TextConditionalFormat"
                 }
@@ -142807,6 +143374,36 @@ var SamSchema = `{
             ],
             "type": "object"
         },
+        "AWS::QuickSight::Dashboard.PivotTableFieldCollapseStateOption": {
+            "additionalProperties": false,
+            "properties": {
+                "State": {
+                    "type": "string"
+                },
+                "Target": {
+                    "$ref": "#/definitions/AWS::QuickSight::Dashboard.PivotTableFieldCollapseStateTarget"
+                }
+            },
+            "required": [
+                "Target"
+            ],
+            "type": "object"
+        },
+        "AWS::QuickSight::Dashboard.PivotTableFieldCollapseStateTarget": {
+            "additionalProperties": false,
+            "properties": {
+                "FieldDataPathValues": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::QuickSight::Dashboard.DataPathValue"
+                    },
+                    "type": "array"
+                },
+                "FieldId": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
         "AWS::QuickSight::Dashboard.PivotTableFieldOption": {
             "additionalProperties": false,
             "properties": {
@@ -142828,6 +143425,12 @@ var SamSchema = `{
         "AWS::QuickSight::Dashboard.PivotTableFieldOptions": {
             "additionalProperties": false,
             "properties": {
+                "CollapseStateOptions": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::QuickSight::Dashboard.PivotTableFieldCollapseStateOption"
+                    },
+                    "type": "array"
+                },
                 "DataPathOptions": {
                     "items": {
                         "$ref": "#/definitions/AWS::QuickSight::Dashboard.PivotTableDataPathOption"
@@ -142867,6 +143470,9 @@ var SamSchema = `{
                 "CellStyle": {
                     "$ref": "#/definitions/AWS::QuickSight::Dashboard.TableCellStyle"
                 },
+                "CollapsedRowDimensionsVisibility": {
+                    "type": "string"
+                },
                 "ColumnHeaderStyle": {
                     "$ref": "#/definitions/AWS::QuickSight::Dashboard.TableCellStyle"
                 },
@@ -143087,6 +143693,9 @@ var SamSchema = `{
                 "AlternateBandOddColor": {
                     "type": "string"
                 },
+                "AxesRangeScale": {
+                    "type": "string"
+                },
                 "BaseSeriesSettings": {
                     "$ref": "#/definitions/AWS::QuickSight::Dashboard.RadarChartSeriesSettings"
                 },
@@ -143270,8 +143879,7 @@ var SamSchema = `{
             },
             "required": [
                 "Calculation",
-                "Column",
-                "MeasureAggregationFunction"
+                "Column"
             ],
             "type": "object"
         },
@@ -143560,6 +144168,12 @@ var SamSchema = `{
                     },
                     "type": "array"
                 },
+                "Label": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::QuickSight::Dashboard.DimensionField"
+                    },
+                    "type": "array"
+                },
                 "Size": {
                     "items": {
                         "$ref": "#/definitions/AWS::QuickSight::Dashboard.MeasureField"
@@ -143629,6 +144243,18 @@ var SamSchema = `{
         "AWS::QuickSight::Dashboard.ScatterPlotUnaggregatedFieldWells": {
             "additionalProperties": false,
             "properties": {
+                "Category": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::QuickSight::Dashboard.DimensionField"
+                    },
+                    "type": "array"
+                },
+                "Label": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::QuickSight::Dashboard.DimensionField"
+                    },
+                    "type": "array"
+                },
                 "Size": {
                     "items": {
                         "$ref": "#/definitions/AWS::QuickSight::Dashboard.MeasureField"
@@ -147368,7 +147994,6 @@ var SamSchema = `{
                 }
             },
             "required": [
-                "AggregationFunction",
                 "Column",
                 "SortDirection"
             ],
@@ -148153,24 +148778,9 @@ var SamSchema = `{
             ],
             "type": "object"
         },
-        "AWS::QuickSight::Template.ColorsConfiguration": {
-            "additionalProperties": false,
-            "properties": {
-                "CustomColors": {
-                    "items": {
-                        "$ref": "#/definitions/AWS::QuickSight::Template.CustomColor"
-                    },
-                    "type": "array"
-                }
-            },
-            "type": "object"
-        },
         "AWS::QuickSight::Template.ColumnConfiguration": {
             "additionalProperties": false,
             "properties": {
-                "ColorsConfiguration": {
-                    "$ref": "#/definitions/AWS::QuickSight::Template.ColorsConfiguration"
-                },
                 "Column": {
                     "$ref": "#/definitions/AWS::QuickSight::Template.ColumnIdentifier"
                 },
@@ -148727,24 +149337,6 @@ var SamSchema = `{
             ],
             "type": "object"
         },
-        "AWS::QuickSight::Template.CustomColor": {
-            "additionalProperties": false,
-            "properties": {
-                "Color": {
-                    "type": "string"
-                },
-                "FieldValue": {
-                    "type": "string"
-                },
-                "SpecialValue": {
-                    "type": "string"
-                }
-            },
-            "required": [
-                "Color"
-            ],
-            "type": "object"
-        },
         "AWS::QuickSight::Template.CustomContentConfiguration": {
             "additionalProperties": false,
             "properties": {
@@ -148980,6 +149572,9 @@ var SamSchema = `{
                 "Position": {
                     "type": "string"
                 },
+                "TotalsVisibility": {
+                    "type": "string"
+                },
                 "Visibility": {
                     "type": "string"
                 }
@@ -149428,6 +150023,9 @@ var SamSchema = `{
                 "SelectAllValueOptions": {
                     "type": "string"
                 },
+                "SourceColumn": {
+                    "$ref": "#/definitions/AWS::QuickSight::Template.ColumnIdentifier"
+                },
                 "SourceField": {
                     "type": "string"
                 },
@@ -150027,6 +150625,12 @@ var SamSchema = `{
         "AWS::QuickSight::Template.FilterOperationSelectedFieldsConfiguration": {
             "additionalProperties": false,
             "properties": {
+                "SelectedColumns": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::QuickSight::Template.ColumnIdentifier"
+                    },
+                    "type": "array"
+                },
                 "SelectedFieldOptions": {
                     "type": "string"
                 },
@@ -150719,6 +151323,39 @@ var SamSchema = `{
             ],
             "type": "object"
         },
+        "AWS::QuickSight::Template.GeospatialHeatmapColorScale": {
+            "additionalProperties": false,
+            "properties": {
+                "Colors": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::QuickSight::Template.GeospatialHeatmapDataColor"
+                    },
+                    "type": "array"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::QuickSight::Template.GeospatialHeatmapConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "HeatmapColor": {
+                    "$ref": "#/definitions/AWS::QuickSight::Template.GeospatialHeatmapColorScale"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::QuickSight::Template.GeospatialHeatmapDataColor": {
+            "additionalProperties": false,
+            "properties": {
+                "Color": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Color"
+            ],
+            "type": "object"
+        },
         "AWS::QuickSight::Template.GeospatialMapAggregatedFieldWells": {
             "additionalProperties": false,
             "properties": {
@@ -150827,6 +151464,9 @@ var SamSchema = `{
                 "ClusterMarkerConfiguration": {
                     "$ref": "#/definitions/AWS::QuickSight::Template.ClusterMarkerConfiguration"
                 },
+                "HeatmapConfiguration": {
+                    "$ref": "#/definitions/AWS::QuickSight::Template.GeospatialHeatmapConfiguration"
+                },
                 "SelectedPointStyle": {
                     "type": "string"
                 }
@@ -152808,6 +153448,12 @@ var SamSchema = `{
                 "Scope": {
                     "$ref": "#/definitions/AWS::QuickSight::Template.PivotTableConditionalFormattingScope"
                 },
+                "Scopes": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::QuickSight::Template.PivotTableConditionalFormattingScope"
+                    },
+                    "type": "array"
+                },
                 "TextFormat": {
                     "$ref": "#/definitions/AWS::QuickSight::Template.TextConditionalFormat"
                 }
@@ -152889,6 +153535,36 @@ var SamSchema = `{
             ],
             "type": "object"
         },
+        "AWS::QuickSight::Template.PivotTableFieldCollapseStateOption": {
+            "additionalProperties": false,
+            "properties": {
+                "State": {
+                    "type": "string"
+                },
+                "Target": {
+                    "$ref": "#/definitions/AWS::QuickSight::Template.PivotTableFieldCollapseStateTarget"
+                }
+            },
+            "required": [
+                "Target"
+            ],
+            "type": "object"
+        },
+        "AWS::QuickSight::Template.PivotTableFieldCollapseStateTarget": {
+            "additionalProperties": false,
+            "properties": {
+                "FieldDataPathValues": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::QuickSight::Template.DataPathValue"
+                    },
+                    "type": "array"
+                },
+                "FieldId": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
         "AWS::QuickSight::Template.PivotTableFieldOption": {
             "additionalProperties": false,
             "properties": {
@@ -152910,6 +153586,12 @@ var SamSchema = `{
         "AWS::QuickSight::Template.PivotTableFieldOptions": {
             "additionalProperties": false,
             "properties": {
+                "CollapseStateOptions": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::QuickSight::Template.PivotTableFieldCollapseStateOption"
+                    },
+                    "type": "array"
+                },
                 "DataPathOptions": {
                     "items": {
                         "$ref": "#/definitions/AWS::QuickSight::Template.PivotTableDataPathOption"
@@ -152949,6 +153631,9 @@ var SamSchema = `{
                 "CellStyle": {
                     "$ref": "#/definitions/AWS::QuickSight::Template.TableCellStyle"
                 },
+                "CollapsedRowDimensionsVisibility": {
+                    "type": "string"
+                },
                 "ColumnHeaderStyle": {
                     "$ref": "#/definitions/AWS::QuickSight::Template.TableCellStyle"
                 },
@@ -153169,6 +153854,9 @@ var SamSchema = `{
                 "AlternateBandOddColor": {
                     "type": "string"
                 },
+                "AxesRangeScale": {
+                    "type": "string"
+                },
                 "BaseSeriesSettings": {
                     "$ref": "#/definitions/AWS::QuickSight::Template.RadarChartSeriesSettings"
                 },
@@ -153352,8 +154040,7 @@ var SamSchema = `{
             },
             "required": [
                 "Calculation",
-                "Column",
-                "MeasureAggregationFunction"
+                "Column"
             ],
             "type": "object"
         },
@@ -153642,6 +154329,12 @@ var SamSchema = `{
                     },
                     "type": "array"
                 },
+                "Label": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::QuickSight::Template.DimensionField"
+                    },
+                    "type": "array"
+                },
                 "Size": {
                     "items": {
                         "$ref": "#/definitions/AWS::QuickSight::Template.MeasureField"
@@ -153711,6 +154404,18 @@ var SamSchema = `{
         "AWS::QuickSight::Template.ScatterPlotUnaggregatedFieldWells": {
             "additionalProperties": false,
             "properties": {
+                "Category": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::QuickSight::Template.DimensionField"
+                    },
+                    "type": "array"
+                },
+                "Label": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::QuickSight::Template.DimensionField"
+                    },
+                    "type": "array"
+                },
                 "Size": {
                     "items": {
                         "$ref": "#/definitions/AWS::QuickSight::Template.MeasureField"
@@ -155832,6 +156537,9 @@ var SamSchema = `{
                     },
                     "required": [
                         "AwsAccountId",
+                        "BaseThemeId",
+                        "Configuration",
+                        "Name",
                         "ThemeId"
                     ],
                     "type": "object"
@@ -155925,6 +156633,9 @@ var SamSchema = `{
                 },
                 "Principal": {
                     "type": "string"
+                },
+                "Resource": {
+                    "type": "string"
                 }
             },
             "required": [
@@ -176073,9 +176784,6 @@ var SamSchema = `{
                 "Properties": {
                     "additionalProperties": false,
                     "properties": {
-                        "AdditionalInferenceSpecificationDefinition": {
-                            "$ref": "#/definitions/AWS::SageMaker::ModelPackage.AdditionalInferenceSpecificationDefinition"
-                        },
                         "AdditionalInferenceSpecifications": {
                             "items": {
                                 "$ref": "#/definitions/AWS::SageMaker::ModelPackage.AdditionalInferenceSpecificationDefinition"
@@ -176097,9 +176805,6 @@ var SamSchema = `{
                         "ClientToken": {
                             "type": "string"
                         },
-                        "CreatedBy": {
-                            "$ref": "#/definitions/AWS::SageMaker::ModelPackage.UserContext"
-                        },
                         "CustomerMetadataProperties": {
                             "additionalProperties": true,
                             "patternProperties": {
@@ -176115,21 +176820,9 @@ var SamSchema = `{
                         "DriftCheckBaselines": {
                             "$ref": "#/definitions/AWS::SageMaker::ModelPackage.DriftCheckBaselines"
                         },
-                        "Environment": {
-                            "additionalProperties": true,
-                            "patternProperties": {
-                                "^[a-zA-Z0-9]+$": {
-                                    "type": "string"
-                                }
-                            },
-                            "type": "object"
-                        },
                         "InferenceSpecification": {
                             "$ref": "#/definitions/AWS::SageMaker::ModelPackage.InferenceSpecification"
                         },
-                        "LastModifiedBy": {
-                            "$ref": "#/definitions/AWS::SageMaker::ModelPackage.UserContext"
-                        },
                         "LastModifiedTime": {
                             "type": "string"
                         },
@@ -176154,9 +176847,6 @@ var SamSchema = `{
                         "ModelPackageStatusDetails": {
                             "$ref": "#/definitions/AWS::SageMaker::ModelPackage.ModelPackageStatusDetails"
                         },
-                        "ModelPackageStatusItem": {
-                            "$ref": "#/definitions/AWS::SageMaker::ModelPackage.ModelPackageStatusItem"
-                        },
                         "ModelPackageVersion": {
                             "type": "number"
                         },
@@ -176525,9 +177215,6 @@ var SamSchema = `{
                 },
                 "NearestModelName": {
                     "type": "string"
-                },
-                "ProductId": {
-                    "type": "string"
                 }
             },
             "required": [
@@ -176538,12 +177225,6 @@ var SamSchema = `{
         "AWS::SageMaker::ModelPackage.ModelPackageStatusDetails": {
             "additionalProperties": false,
             "properties": {
-                "ImageScanStatuses": {
-                    "items": {
-                        "$ref": "#/definitions/AWS::SageMaker::ModelPackage.ModelPackageStatusItem"
-                    },
-                    "type": "array"
-                },
                 "ValidationStatuses": {
                     "items": {
                         "$ref": "#/definitions/AWS::SageMaker::ModelPackage.ModelPackageStatusItem"
@@ -176551,9 +177232,6 @@ var SamSchema = `{
                     "type": "array"
                 }
             },
-            "required": [
-                "ValidationStatuses"
-            ],
             "type": "object"
         },
         "AWS::SageMaker::ModelPackage.ModelPackageStatusItem": {
@@ -176732,21 +177410,6 @@ var SamSchema = `{
             ],
             "type": "object"
         },
-        "AWS::SageMaker::ModelPackage.UserContext": {
-            "additionalProperties": false,
-            "properties": {
-                "DomainId": {
-                    "type": "string"
-                },
-                "UserProfileArn": {
-                    "type": "string"
-                },
-                "UserProfileName": {
-                    "type": "string"
-                }
-            },
-            "type": "object"
-        },
         "AWS::SageMaker::ModelPackage.ValidationProfile": {
             "additionalProperties": false,
             "properties": {
@@ -188280,36 +188943,398 @@ var SamSchema = `{
                 "Properties": {
                     "additionalProperties": false,
                     "properties": {
-                        "Description": {
-                            "type": "string"
-                        },
-                        "OnExceptionSteps": {
-                            "items": {
-                                "$ref": "#/definitions/AWS::Transfer::Workflow.WorkflowStep"
-                            },
-                            "type": "array"
-                        },
-                        "Steps": {
-                            "items": {
-                                "$ref": "#/definitions/AWS::Transfer::Workflow.WorkflowStep"
-                            },
-                            "type": "array"
+                        "Description": {
+                            "type": "string"
+                        },
+                        "OnExceptionSteps": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::Transfer::Workflow.WorkflowStep"
+                            },
+                            "type": "array"
+                        },
+                        "Steps": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::Transfer::Workflow.WorkflowStep"
+                            },
+                            "type": "array"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "Steps"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Transfer::Workflow"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::Transfer::Workflow.CopyStepDetails": {
+            "additionalProperties": false,
+            "properties": {
+                "DestinationFileLocation": {
+                    "$ref": "#/definitions/AWS::Transfer::Workflow.S3FileLocation"
+                },
+                "Name": {
+                    "type": "string"
+                },
+                "OverwriteExisting": {
+                    "type": "string"
+                },
+                "SourceFileLocation": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Transfer::Workflow.CustomStepDetails": {
+            "additionalProperties": false,
+            "properties": {
+                "Name": {
+                    "type": "string"
+                },
+                "SourceFileLocation": {
+                    "type": "string"
+                },
+                "Target": {
+                    "type": "string"
+                },
+                "TimeoutSeconds": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Transfer::Workflow.DecryptStepDetails": {
+            "additionalProperties": false,
+            "properties": {
+                "DestinationFileLocation": {
+                    "$ref": "#/definitions/AWS::Transfer::Workflow.InputFileLocation"
+                },
+                "Name": {
+                    "type": "string"
+                },
+                "OverwriteExisting": {
+                    "type": "string"
+                },
+                "SourceFileLocation": {
+                    "type": "string"
+                },
+                "Type": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Transfer::Workflow.DeleteStepDetails": {
+            "additionalProperties": false,
+            "properties": {
+                "Name": {
+                    "type": "string"
+                },
+                "SourceFileLocation": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Transfer::Workflow.EfsInputFileLocation": {
+            "additionalProperties": false,
+            "properties": {
+                "FileSystemId": {
+                    "type": "string"
+                },
+                "Path": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Transfer::Workflow.InputFileLocation": {
+            "additionalProperties": false,
+            "properties": {
+                "EfsFileLocation": {
+                    "$ref": "#/definitions/AWS::Transfer::Workflow.EfsInputFileLocation"
+                },
+                "S3FileLocation": {
+                    "$ref": "#/definitions/AWS::Transfer::Workflow.S3InputFileLocation"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Transfer::Workflow.S3FileLocation": {
+            "additionalProperties": false,
+            "properties": {
+                "S3FileLocation": {
+                    "$ref": "#/definitions/AWS::Transfer::Workflow.S3InputFileLocation"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Transfer::Workflow.S3InputFileLocation": {
+            "additionalProperties": false,
+            "properties": {
+                "Bucket": {
+                    "type": "string"
+                },
+                "Key": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Transfer::Workflow.S3Tag": {
+            "additionalProperties": false,
+            "properties": {
+                "Key": {
+                    "type": "string"
+                },
+                "Value": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Key",
+                "Value"
+            ],
+            "type": "object"
+        },
+        "AWS::Transfer::Workflow.TagStepDetails": {
+            "additionalProperties": false,
+            "properties": {
+                "Name": {
+                    "type": "string"
+                },
+                "SourceFileLocation": {
+                    "type": "string"
+                },
+                "Tags": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::Transfer::Workflow.S3Tag"
+                    },
+                    "type": "array"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Transfer::Workflow.WorkflowStep": {
+            "additionalProperties": false,
+            "properties": {
+                "CopyStepDetails": {
+                    "$ref": "#/definitions/AWS::Transfer::Workflow.CopyStepDetails"
+                },
+                "CustomStepDetails": {
+                    "$ref": "#/definitions/AWS::Transfer::Workflow.CustomStepDetails"
+                },
+                "DecryptStepDetails": {
+                    "$ref": "#/definitions/AWS::Transfer::Workflow.DecryptStepDetails"
+                },
+                "DeleteStepDetails": {
+                    "$ref": "#/definitions/AWS::Transfer::Workflow.DeleteStepDetails"
+                },
+                "TagStepDetails": {
+                    "$ref": "#/definitions/AWS::Transfer::Workflow.TagStepDetails"
+                },
+                "Type": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::VerifiedPermissions::IdentitySource": {
+            "additionalProperties": false,
+            "properties": {
+                "Condition": {
+                    "type": "string"
+                },
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "Configuration": {
+                            "$ref": "#/definitions/AWS::VerifiedPermissions::IdentitySource.IdentitySourceConfiguration"
+                        },
+                        "PolicyStoreId": {
+                            "type": "string"
+                        },
+                        "PrincipalEntityType": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "Configuration"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::VerifiedPermissions::IdentitySource"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::VerifiedPermissions::IdentitySource.CognitoUserPoolConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "ClientIds": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "UserPoolArn": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "UserPoolArn"
+            ],
+            "type": "object"
+        },
+        "AWS::VerifiedPermissions::IdentitySource.IdentitySourceConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "CognitoUserPoolConfiguration": {
+                    "$ref": "#/definitions/AWS::VerifiedPermissions::IdentitySource.CognitoUserPoolConfiguration"
+                }
+            },
+            "required": [
+                "CognitoUserPoolConfiguration"
+            ],
+            "type": "object"
+        },
+        "AWS::VerifiedPermissions::IdentitySource.IdentitySourceDetails": {
+            "additionalProperties": false,
+            "properties": {
+                "ClientIds": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "DiscoveryUrl": {
+                    "type": "string"
+                },
+                "OpenIdIssuer": {
+                    "type": "string"
+                },
+                "UserPoolArn": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::VerifiedPermissions::Policy": {
+            "additionalProperties": false,
+            "properties": {
+                "Condition": {
+                    "type": "string"
+                },
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "Definition": {
+                            "$ref": "#/definitions/AWS::VerifiedPermissions::Policy.PolicyDefinition"
                         },
-                        "Tags": {
-                            "items": {
-                                "$ref": "#/definitions/Tag"
-                            },
-                            "type": "array"
+                        "PolicyStoreId": {
+                            "type": "string"
                         }
                     },
                     "required": [
-                        "Steps"
+                        "Definition"
                     ],
                     "type": "object"
                 },
                 "Type": {
                     "enum": [
-                        "AWS::Transfer::Workflow"
+                        "AWS::VerifiedPermissions::Policy"
                     ],
                     "type": "string"
                 },
@@ -188328,176 +189353,225 @@ var SamSchema = `{
             ],
             "type": "object"
         },
-        "AWS::Transfer::Workflow.CopyStepDetails": {
+        "AWS::VerifiedPermissions::Policy.EntityIdentifier": {
             "additionalProperties": false,
             "properties": {
-                "DestinationFileLocation": {
-                    "$ref": "#/definitions/AWS::Transfer::Workflow.S3FileLocation"
-                },
-                "Name": {
-                    "type": "string"
-                },
-                "OverwriteExisting": {
+                "EntityId": {
                     "type": "string"
                 },
-                "SourceFileLocation": {
+                "EntityType": {
                     "type": "string"
                 }
             },
+            "required": [
+                "EntityId",
+                "EntityType"
+            ],
             "type": "object"
         },
-        "AWS::Transfer::Workflow.CustomStepDetails": {
+        "AWS::VerifiedPermissions::Policy.PolicyDefinition": {
             "additionalProperties": false,
             "properties": {
-                "Name": {
-                    "type": "string"
-                },
-                "SourceFileLocation": {
-                    "type": "string"
-                },
-                "Target": {
-                    "type": "string"
+                "Static": {
+                    "$ref": "#/definitions/AWS::VerifiedPermissions::Policy.StaticPolicyDefinition"
                 },
-                "TimeoutSeconds": {
-                    "type": "number"
+                "TemplateLinked": {
+                    "$ref": "#/definitions/AWS::VerifiedPermissions::Policy.TemplateLinkedPolicyDefinition"
                 }
             },
             "type": "object"
         },
-        "AWS::Transfer::Workflow.DecryptStepDetails": {
+        "AWS::VerifiedPermissions::Policy.StaticPolicyDefinition": {
             "additionalProperties": false,
             "properties": {
-                "DestinationFileLocation": {
-                    "$ref": "#/definitions/AWS::Transfer::Workflow.InputFileLocation"
-                },
-                "Name": {
-                    "type": "string"
-                },
-                "OverwriteExisting": {
-                    "type": "string"
-                },
-                "SourceFileLocation": {
+                "Description": {
                     "type": "string"
                 },
-                "Type": {
+                "Statement": {
                     "type": "string"
                 }
             },
+            "required": [
+                "Statement"
+            ],
             "type": "object"
         },
-        "AWS::Transfer::Workflow.DeleteStepDetails": {
+        "AWS::VerifiedPermissions::Policy.TemplateLinkedPolicyDefinition": {
             "additionalProperties": false,
             "properties": {
-                "Name": {
+                "PolicyTemplateId": {
                     "type": "string"
                 },
-                "SourceFileLocation": {
-                    "type": "string"
+                "Principal": {
+                    "$ref": "#/definitions/AWS::VerifiedPermissions::Policy.EntityIdentifier"
+                },
+                "Resource": {
+                    "$ref": "#/definitions/AWS::VerifiedPermissions::Policy.EntityIdentifier"
                 }
             },
+            "required": [
+                "PolicyTemplateId"
+            ],
             "type": "object"
         },
-        "AWS::Transfer::Workflow.EfsInputFileLocation": {
+        "AWS::VerifiedPermissions::PolicyStore": {
             "additionalProperties": false,
             "properties": {
-                "FileSystemId": {
+                "Condition": {
                     "type": "string"
                 },
-                "Path": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
                     "type": "string"
-                }
-            },
-            "type": "object"
-        },
-        "AWS::Transfer::Workflow.InputFileLocation": {
-            "additionalProperties": false,
-            "properties": {
-                "EfsFileLocation": {
-                    "$ref": "#/definitions/AWS::Transfer::Workflow.EfsInputFileLocation"
                 },
-                "S3FileLocation": {
-                    "$ref": "#/definitions/AWS::Transfer::Workflow.S3InputFileLocation"
-                }
-            },
-            "type": "object"
-        },
-        "AWS::Transfer::Workflow.S3FileLocation": {
-            "additionalProperties": false,
-            "properties": {
-                "S3FileLocation": {
-                    "$ref": "#/definitions/AWS::Transfer::Workflow.S3InputFileLocation"
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "Schema": {
+                            "$ref": "#/definitions/AWS::VerifiedPermissions::PolicyStore.SchemaDefinition"
+                        },
+                        "ValidationSettings": {
+                            "$ref": "#/definitions/AWS::VerifiedPermissions::PolicyStore.ValidationSettings"
+                        }
+                    },
+                    "required": [
+                        "ValidationSettings"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::VerifiedPermissions::PolicyStore"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
                 }
             },
+            "required": [
+                "Type",
+                "Properties"
+            ],
             "type": "object"
         },
-        "AWS::Transfer::Workflow.S3InputFileLocation": {
+        "AWS::VerifiedPermissions::PolicyStore.SchemaDefinition": {
             "additionalProperties": false,
             "properties": {
-                "Bucket": {
-                    "type": "string"
-                },
-                "Key": {
+                "CedarJson": {
                     "type": "string"
                 }
             },
             "type": "object"
         },
-        "AWS::Transfer::Workflow.S3Tag": {
+        "AWS::VerifiedPermissions::PolicyStore.ValidationSettings": {
             "additionalProperties": false,
             "properties": {
-                "Key": {
-                    "type": "string"
-                },
-                "Value": {
+                "Mode": {
                     "type": "string"
                 }
             },
             "required": [
-                "Key",
-                "Value"
+                "Mode"
             ],
             "type": "object"
         },
-        "AWS::Transfer::Workflow.TagStepDetails": {
+        "AWS::VerifiedPermissions::PolicyTemplate": {
             "additionalProperties": false,
             "properties": {
-                "Name": {
+                "Condition": {
                     "type": "string"
                 },
-                "SourceFileLocation": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
                     "type": "string"
                 },
-                "Tags": {
-                    "items": {
-                        "$ref": "#/definitions/AWS::Transfer::Workflow.S3Tag"
-                    },
-                    "type": "array"
-                }
-            },
-            "type": "object"
-        },
-        "AWS::Transfer::Workflow.WorkflowStep": {
-            "additionalProperties": false,
-            "properties": {
-                "CopyStepDetails": {
-                    "$ref": "#/definitions/AWS::Transfer::Workflow.CopyStepDetails"
-                },
-                "CustomStepDetails": {
-                    "$ref": "#/definitions/AWS::Transfer::Workflow.CustomStepDetails"
-                },
-                "DecryptStepDetails": {
-                    "$ref": "#/definitions/AWS::Transfer::Workflow.DecryptStepDetails"
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
                 },
-                "DeleteStepDetails": {
-                    "$ref": "#/definitions/AWS::Transfer::Workflow.DeleteStepDetails"
+                "Metadata": {
+                    "type": "object"
                 },
-                "TagStepDetails": {
-                    "$ref": "#/definitions/AWS::Transfer::Workflow.TagStepDetails"
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "Description": {
+                            "type": "string"
+                        },
+                        "PolicyStoreId": {
+                            "type": "string"
+                        },
+                        "Statement": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "Statement"
+                    ],
+                    "type": "object"
                 },
                 "Type": {
+                    "enum": [
+                        "AWS::VerifiedPermissions::PolicyTemplate"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
                     "type": "string"
                 }
             },
+            "required": [
+                "Type",
+                "Properties"
+            ],
             "type": "object"
         },
         "AWS::VoiceID::Domain": {
@@ -192767,6 +193841,9 @@ var SamSchema = `{
                 "Properties": {
                     "additionalProperties": false,
                     "properties": {
+                        "AssociationConfig": {
+                            "$ref": "#/definitions/AWS::WAFv2::WebACL.AssociationConfig"
+                        },
                         "CaptchaConfig": {
                             "$ref": "#/definitions/AWS::WAFv2::WebACL.CaptchaConfig"
                         },
@@ -192898,6 +193975,21 @@ var SamSchema = `{
             ],
             "type": "object"
         },
+        "AWS::WAFv2::WebACL.AssociationConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "RequestBody": {
+                    "additionalProperties": false,
+                    "patternProperties": {
+                        "^[a-zA-Z0-9]+$": {
+                            "$ref": "#/definitions/AWS::WAFv2::WebACL.RequestBodyAssociatedResourceTypeConfig"
+                        }
+                    },
+                    "type": "object"
+                }
+            },
+            "type": "object"
+        },
         "AWS::WAFv2::WebACL.BlockAction": {
             "additionalProperties": false,
             "properties": {
@@ -193526,6 +194618,18 @@ var SamSchema = `{
             ],
             "type": "object"
         },
+        "AWS::WAFv2::WebACL.RequestBodyAssociatedResourceTypeConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "DefaultSizeInspectionLimit": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "DefaultSizeInspectionLimit"
+            ],
+            "type": "object"
+        },
         "AWS::WAFv2::WebACL.RequestInspection": {
             "additionalProperties": false,
             "properties": {
@@ -195636,6 +196740,9 @@ var SamSchema = `{
                         {
                             "$ref": "#/definitions/AWS::AppMesh::VirtualService"
                         },
+                        {
+                            "$ref": "#/definitions/AWS::AppRunner::AutoScalingConfiguration"
+                        },
                         {
                             "$ref": "#/definitions/AWS::AppRunner::ObservabilityConfiguration"
                         },
@@ -195651,6 +196758,9 @@ var SamSchema = `{
                         {
                             "$ref": "#/definitions/AWS::AppStream::AppBlock"
                         },
+                        {
+                            "$ref": "#/definitions/AWS::AppStream::AppBlockBuilder"
+                        },
                         {
                             "$ref": "#/definitions/AWS::AppStream::Application"
                         },
@@ -196062,6 +197172,9 @@ var SamSchema = `{
                         {
                             "$ref": "#/definitions/AWS::Cognito::UserPoolUserToGroupAttachment"
                         },
+                        {
+                            "$ref": "#/definitions/AWS::Comprehend::DocumentClassifier"
+                        },
                         {
                             "$ref": "#/definitions/AWS::Comprehend::Flywheel"
                         },
@@ -198594,6 +199707,18 @@ var SamSchema = `{
                         {
                             "$ref": "#/definitions/AWS::Transfer::Workflow"
                         },
+                        {
+                            "$ref": "#/definitions/AWS::VerifiedPermissions::IdentitySource"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::VerifiedPermissions::Policy"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::VerifiedPermissions::PolicyStore"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::VerifiedPermissions::PolicyTemplate"
+                        },
                         {
                             "$ref": "#/definitions/AWS::VoiceID::Domain"
                         },
diff --git a/schema/sam.schema.json b/schema/sam.schema.json
index d6261ec013..906d0f8b42 100644
--- a/schema/sam.schema.json
+++ b/schema/sam.schema.json
@@ -12393,6 +12393,82 @@
             },
             "type": "object"
         },
+        "AWS::AppRunner::AutoScalingConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "Condition": {
+                    "type": "string"
+                },
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "AutoScalingConfigurationName": {
+                            "type": "string"
+                        },
+                        "MaxConcurrency": {
+                            "type": "number"
+                        },
+                        "MaxSize": {
+                            "type": "number"
+                        },
+                        "MinSize": {
+                            "type": "number"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::AppRunner::AutoScalingConfiguration"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type"
+            ],
+            "type": "object"
+        },
         "AWS::AppRunner::ObservabilityConfiguration": {
             "additionalProperties": false,
             "properties": {
@@ -13061,6 +13137,12 @@
                         "Name": {
                             "type": "string"
                         },
+                        "PackagingType": {
+                            "type": "string"
+                        },
+                        "PostSetupScriptDetails": {
+                            "$ref": "#/definitions/AWS::AppStream::AppBlock.ScriptDetails"
+                        },
                         "SetupScriptDetails": {
                             "$ref": "#/definitions/AWS::AppStream::AppBlock.ScriptDetails"
                         },
@@ -13076,7 +13158,6 @@
                     },
                     "required": [
                         "Name",
-                        "SetupScriptDetails",
                         "SourceS3Location"
                     ],
                     "type": "object"
@@ -13113,8 +13194,7 @@
                 }
             },
             "required": [
-                "S3Bucket",
-                "S3Key"
+                "S3Bucket"
             ],
             "type": "object"
         },
@@ -13141,7 +13221,7 @@
             ],
             "type": "object"
         },
-        "AWS::AppStream::Application": {
+        "AWS::AppStream::AppBlockBuilder": {
             "additionalProperties": false,
             "properties": {
                 "Condition": {
@@ -13176,10 +13256,13 @@
                 "Properties": {
                     "additionalProperties": false,
                     "properties": {
-                        "AppBlockArn": {
-                            "type": "string"
+                        "AccessEndpoints": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::AppStream::AppBlockBuilder.AccessEndpoint"
+                            },
+                            "type": "array"
                         },
-                        "AttributesToDelete": {
+                        "AppBlockArns": {
                             "items": {
                                 "type": "string"
                             },
@@ -13191,29 +13274,20 @@
                         "DisplayName": {
                             "type": "string"
                         },
-                        "IconS3Location": {
-                            "$ref": "#/definitions/AWS::AppStream::Application.S3Location"
-                        },
-                        "InstanceFamilies": {
-                            "items": {
-                                "type": "string"
-                            },
-                            "type": "array"
+                        "EnableDefaultInternetAccess": {
+                            "type": "boolean"
                         },
-                        "LaunchParameters": {
+                        "IamRoleArn": {
                             "type": "string"
                         },
-                        "LaunchPath": {
+                        "InstanceType": {
                             "type": "string"
                         },
                         "Name": {
                             "type": "string"
                         },
-                        "Platforms": {
-                            "items": {
-                                "type": "string"
-                            },
-                            "type": "array"
+                        "Platform": {
+                            "type": "string"
                         },
                         "Tags": {
                             "items": {
@@ -13221,23 +13295,21 @@
                             },
                             "type": "array"
                         },
-                        "WorkingDirectory": {
-                            "type": "string"
+                        "VpcConfig": {
+                            "$ref": "#/definitions/AWS::AppStream::AppBlockBuilder.VpcConfig"
                         }
                     },
                     "required": [
-                        "AppBlockArn",
-                        "IconS3Location",
-                        "InstanceFamilies",
-                        "LaunchPath",
+                        "InstanceType",
                         "Name",
-                        "Platforms"
+                        "Platform",
+                        "VpcConfig"
                     ],
                     "type": "object"
                 },
                 "Type": {
                     "enum": [
-                        "AWS::AppStream::Application"
+                        "AWS::AppStream::AppBlockBuilder"
                     ],
                     "type": "string"
                 },
@@ -13256,23 +13328,41 @@
             ],
             "type": "object"
         },
-        "AWS::AppStream::Application.S3Location": {
+        "AWS::AppStream::AppBlockBuilder.AccessEndpoint": {
             "additionalProperties": false,
             "properties": {
-                "S3Bucket": {
+                "EndpointType": {
                     "type": "string"
                 },
-                "S3Key": {
+                "VpceId": {
                     "type": "string"
                 }
             },
             "required": [
-                "S3Bucket",
-                "S3Key"
+                "EndpointType",
+                "VpceId"
             ],
             "type": "object"
         },
-        "AWS::AppStream::ApplicationEntitlementAssociation": {
+        "AWS::AppStream::AppBlockBuilder.VpcConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "SecurityGroupIds": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "SubnetIds": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::AppStream::Application": {
             "additionalProperties": false,
             "properties": {
                 "Condition": {
@@ -13307,26 +13397,68 @@
                 "Properties": {
                     "additionalProperties": false,
                     "properties": {
-                        "ApplicationIdentifier": {
+                        "AppBlockArn": {
                             "type": "string"
                         },
-                        "EntitlementName": {
+                        "AttributesToDelete": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "Description": {
                             "type": "string"
                         },
-                        "StackName": {
+                        "DisplayName": {
+                            "type": "string"
+                        },
+                        "IconS3Location": {
+                            "$ref": "#/definitions/AWS::AppStream::Application.S3Location"
+                        },
+                        "InstanceFamilies": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "LaunchParameters": {
+                            "type": "string"
+                        },
+                        "LaunchPath": {
+                            "type": "string"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "Platforms": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        },
+                        "WorkingDirectory": {
                             "type": "string"
                         }
                     },
                     "required": [
-                        "ApplicationIdentifier",
-                        "EntitlementName",
-                        "StackName"
+                        "AppBlockArn",
+                        "IconS3Location",
+                        "InstanceFamilies",
+                        "LaunchPath",
+                        "Name",
+                        "Platforms"
                     ],
                     "type": "object"
                 },
                 "Type": {
                     "enum": [
-                        "AWS::AppStream::ApplicationEntitlementAssociation"
+                        "AWS::AppStream::Application"
                     ],
                     "type": "string"
                 },
@@ -13345,76 +13477,165 @@
             ],
             "type": "object"
         },
-        "AWS::AppStream::ApplicationFleetAssociation": {
+        "AWS::AppStream::Application.S3Location": {
             "additionalProperties": false,
             "properties": {
-                "Condition": {
-                    "type": "string"
-                },
-                "DeletionPolicy": {
-                    "enum": [
-                        "Delete",
-                        "Retain",
-                        "Snapshot"
-                    ],
-                    "type": "string"
-                },
-                "DependsOn": {
-                    "anyOf": [
-                        {
-                            "pattern": "^[a-zA-Z0-9]+$",
-                            "type": "string"
-                        },
-                        {
-                            "items": {
-                                "pattern": "^[a-zA-Z0-9]+$",
-                                "type": "string"
-                            },
-                            "type": "array"
-                        }
-                    ]
-                },
-                "Metadata": {
-                    "type": "object"
-                },
-                "Properties": {
-                    "additionalProperties": false,
-                    "properties": {
-                        "ApplicationArn": {
-                            "type": "string"
-                        },
-                        "FleetName": {
-                            "type": "string"
-                        }
-                    },
-                    "required": [
-                        "ApplicationArn",
-                        "FleetName"
-                    ],
-                    "type": "object"
-                },
-                "Type": {
-                    "enum": [
-                        "AWS::AppStream::ApplicationFleetAssociation"
-                    ],
+                "S3Bucket": {
                     "type": "string"
                 },
-                "UpdateReplacePolicy": {
-                    "enum": [
-                        "Delete",
-                        "Retain",
-                        "Snapshot"
-                    ],
+                "S3Key": {
                     "type": "string"
                 }
             },
             "required": [
-                "Type",
-                "Properties"
+                "S3Bucket",
+                "S3Key"
             ],
             "type": "object"
         },
-        "AWS::AppStream::DirectoryConfig": {
+        "AWS::AppStream::ApplicationEntitlementAssociation": {
+            "additionalProperties": false,
+            "properties": {
+                "Condition": {
+                    "type": "string"
+                },
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "ApplicationIdentifier": {
+                            "type": "string"
+                        },
+                        "EntitlementName": {
+                            "type": "string"
+                        },
+                        "StackName": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "ApplicationIdentifier",
+                        "EntitlementName",
+                        "StackName"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::AppStream::ApplicationEntitlementAssociation"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::AppStream::ApplicationFleetAssociation": {
+            "additionalProperties": false,
+            "properties": {
+                "Condition": {
+                    "type": "string"
+                },
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "ApplicationArn": {
+                            "type": "string"
+                        },
+                        "FleetName": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "ApplicationArn",
+                        "FleetName"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::AppStream::ApplicationFleetAssociation"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::AppStream::DirectoryConfig": {
             "additionalProperties": false,
             "properties": {
                 "Condition": {
@@ -33522,6 +33743,235 @@
             ],
             "type": "object"
         },
+        "AWS::Comprehend::DocumentClassifier": {
+            "additionalProperties": false,
+            "properties": {
+                "Condition": {
+                    "type": "string"
+                },
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "DataAccessRoleArn": {
+                            "type": "string"
+                        },
+                        "DocumentClassifierName": {
+                            "type": "string"
+                        },
+                        "InputDataConfig": {
+                            "$ref": "#/definitions/AWS::Comprehend::DocumentClassifier.DocumentClassifierInputDataConfig"
+                        },
+                        "LanguageCode": {
+                            "type": "string"
+                        },
+                        "Mode": {
+                            "type": "string"
+                        },
+                        "ModelKmsKeyId": {
+                            "type": "string"
+                        },
+                        "ModelPolicy": {
+                            "type": "string"
+                        },
+                        "OutputDataConfig": {
+                            "$ref": "#/definitions/AWS::Comprehend::DocumentClassifier.DocumentClassifierOutputDataConfig"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        },
+                        "VersionName": {
+                            "type": "string"
+                        },
+                        "VolumeKmsKeyId": {
+                            "type": "string"
+                        },
+                        "VpcConfig": {
+                            "$ref": "#/definitions/AWS::Comprehend::DocumentClassifier.VpcConfig"
+                        }
+                    },
+                    "required": [
+                        "DataAccessRoleArn",
+                        "DocumentClassifierName",
+                        "InputDataConfig",
+                        "LanguageCode"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Comprehend::DocumentClassifier"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::Comprehend::DocumentClassifier.AugmentedManifestsListItem": {
+            "additionalProperties": false,
+            "properties": {
+                "AttributeNames": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "S3Uri": {
+                    "type": "string"
+                },
+                "Split": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "AttributeNames",
+                "S3Uri"
+            ],
+            "type": "object"
+        },
+        "AWS::Comprehend::DocumentClassifier.DocumentClassifierDocuments": {
+            "additionalProperties": false,
+            "properties": {
+                "S3Uri": {
+                    "type": "string"
+                },
+                "TestS3Uri": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "S3Uri"
+            ],
+            "type": "object"
+        },
+        "AWS::Comprehend::DocumentClassifier.DocumentClassifierInputDataConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "AugmentedManifests": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::Comprehend::DocumentClassifier.AugmentedManifestsListItem"
+                    },
+                    "type": "array"
+                },
+                "DataFormat": {
+                    "type": "string"
+                },
+                "DocumentReaderConfig": {
+                    "$ref": "#/definitions/AWS::Comprehend::DocumentClassifier.DocumentReaderConfig"
+                },
+                "DocumentType": {
+                    "type": "string"
+                },
+                "Documents": {
+                    "$ref": "#/definitions/AWS::Comprehend::DocumentClassifier.DocumentClassifierDocuments"
+                },
+                "LabelDelimiter": {
+                    "type": "string"
+                },
+                "S3Uri": {
+                    "type": "string"
+                },
+                "TestS3Uri": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Comprehend::DocumentClassifier.DocumentClassifierOutputDataConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "KmsKeyId": {
+                    "type": "string"
+                },
+                "S3Uri": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Comprehend::DocumentClassifier.DocumentReaderConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "DocumentReadAction": {
+                    "type": "string"
+                },
+                "DocumentReadMode": {
+                    "type": "string"
+                },
+                "FeatureTypes": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "DocumentReadAction"
+            ],
+            "type": "object"
+        },
+        "AWS::Comprehend::DocumentClassifier.VpcConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "SecurityGroupIds": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "Subnets": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "SecurityGroupIds",
+                "Subnets"
+            ],
+            "type": "object"
+        },
         "AWS::Comprehend::Flywheel": {
             "additionalProperties": false,
             "properties": {
@@ -48850,6 +49300,9 @@
                 "Properties": {
                     "additionalProperties": false,
                     "properties": {
+                        "KeyFormat": {
+                            "type": "string"
+                        },
                         "KeyName": {
                             "type": "string"
                         },
@@ -56211,9 +56664,15 @@
                 "CloudWatchLogs": {
                     "$ref": "#/definitions/AWS::EC2::VerifiedAccessInstance.CloudWatchLogs"
                 },
+                "IncludeTrustContext": {
+                    "type": "boolean"
+                },
                 "KinesisDataFirehose": {
                     "$ref": "#/definitions/AWS::EC2::VerifiedAccessInstance.KinesisDataFirehose"
                 },
+                "LogVersion": {
+                    "type": "string"
+                },
                 "S3": {
                     "$ref": "#/definitions/AWS::EC2::VerifiedAccessInstance.S3"
                 }
@@ -80017,9 +80476,6 @@
                             "type": "string"
                         }
                     },
-                    "required": [
-                        "AWSServiceName"
-                    ],
                     "type": "object"
                 },
                 "Type": {
@@ -80038,8 +80494,7 @@
                 }
             },
             "required": [
-                "Type",
-                "Properties"
+                "Type"
             ],
             "type": "object"
         },
@@ -99084,6 +99539,9 @@
                     "type": "string"
                 }
             },
+            "required": [
+                "DataLakePrincipalIdentifier"
+            ],
             "type": "object"
         },
         "AWS::LakeFormation::DataLakeSettings.ExternalDataFilteringAllowList": {
@@ -99091,21 +99549,23 @@
             "properties": {},
             "type": "object"
         },
-        "AWS::LakeFormation::DataLakeSettings.Permissions": {
-            "additionalProperties": false,
-            "properties": {},
-            "type": "object"
-        },
         "AWS::LakeFormation::DataLakeSettings.PrincipalPermissions": {
             "additionalProperties": false,
             "properties": {
                 "Permissions": {
-                    "$ref": "#/definitions/AWS::LakeFormation::DataLakeSettings.Permissions"
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
                 },
                 "Principal": {
                     "$ref": "#/definitions/AWS::LakeFormation::DataLakeSettings.DataLakePrincipal"
                 }
             },
+            "required": [
+                "Permissions",
+                "Principal"
+            ],
             "type": "object"
         },
         "AWS::LakeFormation::Permissions": {
@@ -117820,7 +118280,6 @@
                     },
                     "required": [
                         "ConnectAttachmentId",
-                        "InsideCidrBlocks",
                         "PeerAddress"
                     ],
                     "type": "object"
@@ -118127,6 +118586,9 @@
                 "Properties": {
                     "additionalProperties": false,
                     "properties": {
+                        "AWSLocation": {
+                            "$ref": "#/definitions/AWS::NetworkManager::Device.AWSLocation"
+                        },
                         "Description": {
                             "type": "string"
                         },
@@ -118184,6 +118646,18 @@
             ],
             "type": "object"
         },
+        "AWS::NetworkManager::Device.AWSLocation": {
+            "additionalProperties": false,
+            "properties": {
+                "SubnetArn": {
+                    "type": "string"
+                },
+                "Zone": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
         "AWS::NetworkManager::Device.Location": {
             "additionalProperties": false,
             "properties": {
@@ -123153,9 +123627,6 @@
                         "Description": {
                             "type": "string"
                         },
-                        "DeviceId": {
-                            "type": "string"
-                        },
                         "ManifestOverridesPayload": {
                             "$ref": "#/definitions/AWS::Panorama::ApplicationInstance.ManifestOverridesPayload"
                         },
@@ -123168,9 +123639,6 @@
                         "RuntimeRoleArn": {
                             "type": "string"
                         },
-                        "StatusFilter": {
-                            "type": "string"
-                        },
                         "Tags": {
                             "items": {
                                 "$ref": "#/definitions/Tag"
@@ -128473,7 +128941,6 @@
                 }
             },
             "required": [
-                "AggregationFunction",
                 "Column",
                 "SortDirection"
             ],
@@ -129352,24 +129819,9 @@
             ],
             "type": "object"
         },
-        "AWS::QuickSight::Analysis.ColorsConfiguration": {
-            "additionalProperties": false,
-            "properties": {
-                "CustomColors": {
-                    "items": {
-                        "$ref": "#/definitions/AWS::QuickSight::Analysis.CustomColor"
-                    },
-                    "type": "array"
-                }
-            },
-            "type": "object"
-        },
         "AWS::QuickSight::Analysis.ColumnConfiguration": {
             "additionalProperties": false,
             "properties": {
-                "ColorsConfiguration": {
-                    "$ref": "#/definitions/AWS::QuickSight::Analysis.ColorsConfiguration"
-                },
                 "Column": {
                     "$ref": "#/definitions/AWS::QuickSight::Analysis.ColumnIdentifier"
                 },
@@ -129887,24 +130339,6 @@
             ],
             "type": "object"
         },
-        "AWS::QuickSight::Analysis.CustomColor": {
-            "additionalProperties": false,
-            "properties": {
-                "Color": {
-                    "type": "string"
-                },
-                "FieldValue": {
-                    "type": "string"
-                },
-                "SpecialValue": {
-                    "type": "string"
-                }
-            },
-            "required": [
-                "Color"
-            ],
-            "type": "object"
-        },
         "AWS::QuickSight::Analysis.CustomContentConfiguration": {
             "additionalProperties": false,
             "properties": {
@@ -130140,6 +130574,9 @@
                 "Position": {
                     "type": "string"
                 },
+                "TotalsVisibility": {
+                    "type": "string"
+                },
                 "Visibility": {
                     "type": "string"
                 }
@@ -130612,6 +131049,9 @@
                 "SelectAllValueOptions": {
                     "type": "string"
                 },
+                "SourceColumn": {
+                    "$ref": "#/definitions/AWS::QuickSight::Analysis.ColumnIdentifier"
+                },
                 "SourceField": {
                     "type": "string"
                 },
@@ -131211,6 +131651,12 @@
         "AWS::QuickSight::Analysis.FilterOperationSelectedFieldsConfiguration": {
             "additionalProperties": false,
             "properties": {
+                "SelectedColumns": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::QuickSight::Analysis.ColumnIdentifier"
+                    },
+                    "type": "array"
+                },
                 "SelectedFieldOptions": {
                     "type": "string"
                 },
@@ -131903,6 +132349,39 @@
             ],
             "type": "object"
         },
+        "AWS::QuickSight::Analysis.GeospatialHeatmapColorScale": {
+            "additionalProperties": false,
+            "properties": {
+                "Colors": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::QuickSight::Analysis.GeospatialHeatmapDataColor"
+                    },
+                    "type": "array"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::QuickSight::Analysis.GeospatialHeatmapConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "HeatmapColor": {
+                    "$ref": "#/definitions/AWS::QuickSight::Analysis.GeospatialHeatmapColorScale"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::QuickSight::Analysis.GeospatialHeatmapDataColor": {
+            "additionalProperties": false,
+            "properties": {
+                "Color": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Color"
+            ],
+            "type": "object"
+        },
         "AWS::QuickSight::Analysis.GeospatialMapAggregatedFieldWells": {
             "additionalProperties": false,
             "properties": {
@@ -132011,6 +132490,9 @@
                 "ClusterMarkerConfiguration": {
                     "$ref": "#/definitions/AWS::QuickSight::Analysis.ClusterMarkerConfiguration"
                 },
+                "HeatmapConfiguration": {
+                    "$ref": "#/definitions/AWS::QuickSight::Analysis.GeospatialHeatmapConfiguration"
+                },
                 "SelectedPointStyle": {
                     "type": "string"
                 }
@@ -134041,6 +134523,12 @@
                 "Scope": {
                     "$ref": "#/definitions/AWS::QuickSight::Analysis.PivotTableConditionalFormattingScope"
                 },
+                "Scopes": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::QuickSight::Analysis.PivotTableConditionalFormattingScope"
+                    },
+                    "type": "array"
+                },
                 "TextFormat": {
                     "$ref": "#/definitions/AWS::QuickSight::Analysis.TextConditionalFormat"
                 }
@@ -134122,6 +134610,36 @@
             ],
             "type": "object"
         },
+        "AWS::QuickSight::Analysis.PivotTableFieldCollapseStateOption": {
+            "additionalProperties": false,
+            "properties": {
+                "State": {
+                    "type": "string"
+                },
+                "Target": {
+                    "$ref": "#/definitions/AWS::QuickSight::Analysis.PivotTableFieldCollapseStateTarget"
+                }
+            },
+            "required": [
+                "Target"
+            ],
+            "type": "object"
+        },
+        "AWS::QuickSight::Analysis.PivotTableFieldCollapseStateTarget": {
+            "additionalProperties": false,
+            "properties": {
+                "FieldDataPathValues": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::QuickSight::Analysis.DataPathValue"
+                    },
+                    "type": "array"
+                },
+                "FieldId": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
         "AWS::QuickSight::Analysis.PivotTableFieldOption": {
             "additionalProperties": false,
             "properties": {
@@ -134143,6 +134661,12 @@
         "AWS::QuickSight::Analysis.PivotTableFieldOptions": {
             "additionalProperties": false,
             "properties": {
+                "CollapseStateOptions": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::QuickSight::Analysis.PivotTableFieldCollapseStateOption"
+                    },
+                    "type": "array"
+                },
                 "DataPathOptions": {
                     "items": {
                         "$ref": "#/definitions/AWS::QuickSight::Analysis.PivotTableDataPathOption"
@@ -134182,6 +134706,9 @@
                 "CellStyle": {
                     "$ref": "#/definitions/AWS::QuickSight::Analysis.TableCellStyle"
                 },
+                "CollapsedRowDimensionsVisibility": {
+                    "type": "string"
+                },
                 "ColumnHeaderStyle": {
                     "$ref": "#/definitions/AWS::QuickSight::Analysis.TableCellStyle"
                 },
@@ -134402,6 +134929,9 @@
                 "AlternateBandOddColor": {
                     "type": "string"
                 },
+                "AxesRangeScale": {
+                    "type": "string"
+                },
                 "BaseSeriesSettings": {
                     "$ref": "#/definitions/AWS::QuickSight::Analysis.RadarChartSeriesSettings"
                 },
@@ -134585,8 +135115,7 @@
             },
             "required": [
                 "Calculation",
-                "Column",
-                "MeasureAggregationFunction"
+                "Column"
             ],
             "type": "object"
         },
@@ -134875,6 +135404,12 @@
                     },
                     "type": "array"
                 },
+                "Label": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::QuickSight::Analysis.DimensionField"
+                    },
+                    "type": "array"
+                },
                 "Size": {
                     "items": {
                         "$ref": "#/definitions/AWS::QuickSight::Analysis.MeasureField"
@@ -134944,6 +135479,18 @@
         "AWS::QuickSight::Analysis.ScatterPlotUnaggregatedFieldWells": {
             "additionalProperties": false,
             "properties": {
+                "Category": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::QuickSight::Analysis.DimensionField"
+                    },
+                    "type": "array"
+                },
+                "Label": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::QuickSight::Analysis.DimensionField"
+                    },
+                    "type": "array"
+                },
                 "Size": {
                     "items": {
                         "$ref": "#/definitions/AWS::QuickSight::Analysis.MeasureField"
@@ -137006,7 +137553,6 @@
                 }
             },
             "required": [
-                "AggregationFunction",
                 "Column",
                 "SortDirection"
             ],
@@ -137791,24 +138337,9 @@
             ],
             "type": "object"
         },
-        "AWS::QuickSight::Dashboard.ColorsConfiguration": {
-            "additionalProperties": false,
-            "properties": {
-                "CustomColors": {
-                    "items": {
-                        "$ref": "#/definitions/AWS::QuickSight::Dashboard.CustomColor"
-                    },
-                    "type": "array"
-                }
-            },
-            "type": "object"
-        },
         "AWS::QuickSight::Dashboard.ColumnConfiguration": {
             "additionalProperties": false,
             "properties": {
-                "ColorsConfiguration": {
-                    "$ref": "#/definitions/AWS::QuickSight::Dashboard.ColorsConfiguration"
-                },
                 "Column": {
                     "$ref": "#/definitions/AWS::QuickSight::Dashboard.ColumnIdentifier"
                 },
@@ -138326,24 +138857,6 @@
             ],
             "type": "object"
         },
-        "AWS::QuickSight::Dashboard.CustomColor": {
-            "additionalProperties": false,
-            "properties": {
-                "Color": {
-                    "type": "string"
-                },
-                "FieldValue": {
-                    "type": "string"
-                },
-                "SpecialValue": {
-                    "type": "string"
-                }
-            },
-            "required": [
-                "Color"
-            ],
-            "type": "object"
-        },
         "AWS::QuickSight::Dashboard.CustomContentConfiguration": {
             "additionalProperties": false,
             "properties": {
@@ -138766,6 +139279,9 @@
                 "Position": {
                     "type": "string"
                 },
+                "TotalsVisibility": {
+                    "type": "string"
+                },
                 "Visibility": {
                     "type": "string"
                 }
@@ -139265,6 +139781,9 @@
                 "SelectAllValueOptions": {
                     "type": "string"
                 },
+                "SourceColumn": {
+                    "$ref": "#/definitions/AWS::QuickSight::Dashboard.ColumnIdentifier"
+                },
                 "SourceField": {
                     "type": "string"
                 },
@@ -139891,6 +140410,12 @@
         "AWS::QuickSight::Dashboard.FilterOperationSelectedFieldsConfiguration": {
             "additionalProperties": false,
             "properties": {
+                "SelectedColumns": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::QuickSight::Dashboard.ColumnIdentifier"
+                    },
+                    "type": "array"
+                },
                 "SelectedFieldOptions": {
                     "type": "string"
                 },
@@ -140583,6 +141108,39 @@
             ],
             "type": "object"
         },
+        "AWS::QuickSight::Dashboard.GeospatialHeatmapColorScale": {
+            "additionalProperties": false,
+            "properties": {
+                "Colors": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::QuickSight::Dashboard.GeospatialHeatmapDataColor"
+                    },
+                    "type": "array"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::QuickSight::Dashboard.GeospatialHeatmapConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "HeatmapColor": {
+                    "$ref": "#/definitions/AWS::QuickSight::Dashboard.GeospatialHeatmapColorScale"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::QuickSight::Dashboard.GeospatialHeatmapDataColor": {
+            "additionalProperties": false,
+            "properties": {
+                "Color": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Color"
+            ],
+            "type": "object"
+        },
         "AWS::QuickSight::Dashboard.GeospatialMapAggregatedFieldWells": {
             "additionalProperties": false,
             "properties": {
@@ -140691,6 +141249,9 @@
                 "ClusterMarkerConfiguration": {
                     "$ref": "#/definitions/AWS::QuickSight::Dashboard.ClusterMarkerConfiguration"
                 },
+                "HeatmapConfiguration": {
+                    "$ref": "#/definitions/AWS::QuickSight::Dashboard.GeospatialHeatmapConfiguration"
+                },
                 "SelectedPointStyle": {
                     "type": "string"
                 }
@@ -142721,6 +143282,12 @@
                 "Scope": {
                     "$ref": "#/definitions/AWS::QuickSight::Dashboard.PivotTableConditionalFormattingScope"
                 },
+                "Scopes": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::QuickSight::Dashboard.PivotTableConditionalFormattingScope"
+                    },
+                    "type": "array"
+                },
                 "TextFormat": {
                     "$ref": "#/definitions/AWS::QuickSight::Dashboard.TextConditionalFormat"
                 }
@@ -142802,6 +143369,36 @@
             ],
             "type": "object"
         },
+        "AWS::QuickSight::Dashboard.PivotTableFieldCollapseStateOption": {
+            "additionalProperties": false,
+            "properties": {
+                "State": {
+                    "type": "string"
+                },
+                "Target": {
+                    "$ref": "#/definitions/AWS::QuickSight::Dashboard.PivotTableFieldCollapseStateTarget"
+                }
+            },
+            "required": [
+                "Target"
+            ],
+            "type": "object"
+        },
+        "AWS::QuickSight::Dashboard.PivotTableFieldCollapseStateTarget": {
+            "additionalProperties": false,
+            "properties": {
+                "FieldDataPathValues": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::QuickSight::Dashboard.DataPathValue"
+                    },
+                    "type": "array"
+                },
+                "FieldId": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
         "AWS::QuickSight::Dashboard.PivotTableFieldOption": {
             "additionalProperties": false,
             "properties": {
@@ -142823,6 +143420,12 @@
         "AWS::QuickSight::Dashboard.PivotTableFieldOptions": {
             "additionalProperties": false,
             "properties": {
+                "CollapseStateOptions": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::QuickSight::Dashboard.PivotTableFieldCollapseStateOption"
+                    },
+                    "type": "array"
+                },
                 "DataPathOptions": {
                     "items": {
                         "$ref": "#/definitions/AWS::QuickSight::Dashboard.PivotTableDataPathOption"
@@ -142862,6 +143465,9 @@
                 "CellStyle": {
                     "$ref": "#/definitions/AWS::QuickSight::Dashboard.TableCellStyle"
                 },
+                "CollapsedRowDimensionsVisibility": {
+                    "type": "string"
+                },
                 "ColumnHeaderStyle": {
                     "$ref": "#/definitions/AWS::QuickSight::Dashboard.TableCellStyle"
                 },
@@ -143082,6 +143688,9 @@
                 "AlternateBandOddColor": {
                     "type": "string"
                 },
+                "AxesRangeScale": {
+                    "type": "string"
+                },
                 "BaseSeriesSettings": {
                     "$ref": "#/definitions/AWS::QuickSight::Dashboard.RadarChartSeriesSettings"
                 },
@@ -143265,8 +143874,7 @@
             },
             "required": [
                 "Calculation",
-                "Column",
-                "MeasureAggregationFunction"
+                "Column"
             ],
             "type": "object"
         },
@@ -143555,6 +144163,12 @@
                     },
                     "type": "array"
                 },
+                "Label": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::QuickSight::Dashboard.DimensionField"
+                    },
+                    "type": "array"
+                },
                 "Size": {
                     "items": {
                         "$ref": "#/definitions/AWS::QuickSight::Dashboard.MeasureField"
@@ -143624,6 +144238,18 @@
         "AWS::QuickSight::Dashboard.ScatterPlotUnaggregatedFieldWells": {
             "additionalProperties": false,
             "properties": {
+                "Category": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::QuickSight::Dashboard.DimensionField"
+                    },
+                    "type": "array"
+                },
+                "Label": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::QuickSight::Dashboard.DimensionField"
+                    },
+                    "type": "array"
+                },
                 "Size": {
                     "items": {
                         "$ref": "#/definitions/AWS::QuickSight::Dashboard.MeasureField"
@@ -147363,7 +147989,6 @@
                 }
             },
             "required": [
-                "AggregationFunction",
                 "Column",
                 "SortDirection"
             ],
@@ -148148,24 +148773,9 @@
             ],
             "type": "object"
         },
-        "AWS::QuickSight::Template.ColorsConfiguration": {
-            "additionalProperties": false,
-            "properties": {
-                "CustomColors": {
-                    "items": {
-                        "$ref": "#/definitions/AWS::QuickSight::Template.CustomColor"
-                    },
-                    "type": "array"
-                }
-            },
-            "type": "object"
-        },
         "AWS::QuickSight::Template.ColumnConfiguration": {
             "additionalProperties": false,
             "properties": {
-                "ColorsConfiguration": {
-                    "$ref": "#/definitions/AWS::QuickSight::Template.ColorsConfiguration"
-                },
                 "Column": {
                     "$ref": "#/definitions/AWS::QuickSight::Template.ColumnIdentifier"
                 },
@@ -148722,24 +149332,6 @@
             ],
             "type": "object"
         },
-        "AWS::QuickSight::Template.CustomColor": {
-            "additionalProperties": false,
-            "properties": {
-                "Color": {
-                    "type": "string"
-                },
-                "FieldValue": {
-                    "type": "string"
-                },
-                "SpecialValue": {
-                    "type": "string"
-                }
-            },
-            "required": [
-                "Color"
-            ],
-            "type": "object"
-        },
         "AWS::QuickSight::Template.CustomContentConfiguration": {
             "additionalProperties": false,
             "properties": {
@@ -148975,6 +149567,9 @@
                 "Position": {
                     "type": "string"
                 },
+                "TotalsVisibility": {
+                    "type": "string"
+                },
                 "Visibility": {
                     "type": "string"
                 }
@@ -149423,6 +150018,9 @@
                 "SelectAllValueOptions": {
                     "type": "string"
                 },
+                "SourceColumn": {
+                    "$ref": "#/definitions/AWS::QuickSight::Template.ColumnIdentifier"
+                },
                 "SourceField": {
                     "type": "string"
                 },
@@ -150022,6 +150620,12 @@
         "AWS::QuickSight::Template.FilterOperationSelectedFieldsConfiguration": {
             "additionalProperties": false,
             "properties": {
+                "SelectedColumns": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::QuickSight::Template.ColumnIdentifier"
+                    },
+                    "type": "array"
+                },
                 "SelectedFieldOptions": {
                     "type": "string"
                 },
@@ -150714,6 +151318,39 @@
             ],
             "type": "object"
         },
+        "AWS::QuickSight::Template.GeospatialHeatmapColorScale": {
+            "additionalProperties": false,
+            "properties": {
+                "Colors": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::QuickSight::Template.GeospatialHeatmapDataColor"
+                    },
+                    "type": "array"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::QuickSight::Template.GeospatialHeatmapConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "HeatmapColor": {
+                    "$ref": "#/definitions/AWS::QuickSight::Template.GeospatialHeatmapColorScale"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::QuickSight::Template.GeospatialHeatmapDataColor": {
+            "additionalProperties": false,
+            "properties": {
+                "Color": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Color"
+            ],
+            "type": "object"
+        },
         "AWS::QuickSight::Template.GeospatialMapAggregatedFieldWells": {
             "additionalProperties": false,
             "properties": {
@@ -150822,6 +151459,9 @@
                 "ClusterMarkerConfiguration": {
                     "$ref": "#/definitions/AWS::QuickSight::Template.ClusterMarkerConfiguration"
                 },
+                "HeatmapConfiguration": {
+                    "$ref": "#/definitions/AWS::QuickSight::Template.GeospatialHeatmapConfiguration"
+                },
                 "SelectedPointStyle": {
                     "type": "string"
                 }
@@ -152803,6 +153443,12 @@
                 "Scope": {
                     "$ref": "#/definitions/AWS::QuickSight::Template.PivotTableConditionalFormattingScope"
                 },
+                "Scopes": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::QuickSight::Template.PivotTableConditionalFormattingScope"
+                    },
+                    "type": "array"
+                },
                 "TextFormat": {
                     "$ref": "#/definitions/AWS::QuickSight::Template.TextConditionalFormat"
                 }
@@ -152884,6 +153530,36 @@
             ],
             "type": "object"
         },
+        "AWS::QuickSight::Template.PivotTableFieldCollapseStateOption": {
+            "additionalProperties": false,
+            "properties": {
+                "State": {
+                    "type": "string"
+                },
+                "Target": {
+                    "$ref": "#/definitions/AWS::QuickSight::Template.PivotTableFieldCollapseStateTarget"
+                }
+            },
+            "required": [
+                "Target"
+            ],
+            "type": "object"
+        },
+        "AWS::QuickSight::Template.PivotTableFieldCollapseStateTarget": {
+            "additionalProperties": false,
+            "properties": {
+                "FieldDataPathValues": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::QuickSight::Template.DataPathValue"
+                    },
+                    "type": "array"
+                },
+                "FieldId": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
         "AWS::QuickSight::Template.PivotTableFieldOption": {
             "additionalProperties": false,
             "properties": {
@@ -152905,6 +153581,12 @@
         "AWS::QuickSight::Template.PivotTableFieldOptions": {
             "additionalProperties": false,
             "properties": {
+                "CollapseStateOptions": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::QuickSight::Template.PivotTableFieldCollapseStateOption"
+                    },
+                    "type": "array"
+                },
                 "DataPathOptions": {
                     "items": {
                         "$ref": "#/definitions/AWS::QuickSight::Template.PivotTableDataPathOption"
@@ -152944,6 +153626,9 @@
                 "CellStyle": {
                     "$ref": "#/definitions/AWS::QuickSight::Template.TableCellStyle"
                 },
+                "CollapsedRowDimensionsVisibility": {
+                    "type": "string"
+                },
                 "ColumnHeaderStyle": {
                     "$ref": "#/definitions/AWS::QuickSight::Template.TableCellStyle"
                 },
@@ -153164,6 +153849,9 @@
                 "AlternateBandOddColor": {
                     "type": "string"
                 },
+                "AxesRangeScale": {
+                    "type": "string"
+                },
                 "BaseSeriesSettings": {
                     "$ref": "#/definitions/AWS::QuickSight::Template.RadarChartSeriesSettings"
                 },
@@ -153347,8 +154035,7 @@
             },
             "required": [
                 "Calculation",
-                "Column",
-                "MeasureAggregationFunction"
+                "Column"
             ],
             "type": "object"
         },
@@ -153637,6 +154324,12 @@
                     },
                     "type": "array"
                 },
+                "Label": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::QuickSight::Template.DimensionField"
+                    },
+                    "type": "array"
+                },
                 "Size": {
                     "items": {
                         "$ref": "#/definitions/AWS::QuickSight::Template.MeasureField"
@@ -153706,6 +154399,18 @@
         "AWS::QuickSight::Template.ScatterPlotUnaggregatedFieldWells": {
             "additionalProperties": false,
             "properties": {
+                "Category": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::QuickSight::Template.DimensionField"
+                    },
+                    "type": "array"
+                },
+                "Label": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::QuickSight::Template.DimensionField"
+                    },
+                    "type": "array"
+                },
                 "Size": {
                     "items": {
                         "$ref": "#/definitions/AWS::QuickSight::Template.MeasureField"
@@ -155827,6 +156532,9 @@
                     },
                     "required": [
                         "AwsAccountId",
+                        "BaseThemeId",
+                        "Configuration",
+                        "Name",
                         "ThemeId"
                     ],
                     "type": "object"
@@ -155920,6 +156628,9 @@
                 },
                 "Principal": {
                     "type": "string"
+                },
+                "Resource": {
+                    "type": "string"
                 }
             },
             "required": [
@@ -176068,9 +176779,6 @@
                 "Properties": {
                     "additionalProperties": false,
                     "properties": {
-                        "AdditionalInferenceSpecificationDefinition": {
-                            "$ref": "#/definitions/AWS::SageMaker::ModelPackage.AdditionalInferenceSpecificationDefinition"
-                        },
                         "AdditionalInferenceSpecifications": {
                             "items": {
                                 "$ref": "#/definitions/AWS::SageMaker::ModelPackage.AdditionalInferenceSpecificationDefinition"
@@ -176092,9 +176800,6 @@
                         "ClientToken": {
                             "type": "string"
                         },
-                        "CreatedBy": {
-                            "$ref": "#/definitions/AWS::SageMaker::ModelPackage.UserContext"
-                        },
                         "CustomerMetadataProperties": {
                             "additionalProperties": true,
                             "patternProperties": {
@@ -176110,21 +176815,9 @@
                         "DriftCheckBaselines": {
                             "$ref": "#/definitions/AWS::SageMaker::ModelPackage.DriftCheckBaselines"
                         },
-                        "Environment": {
-                            "additionalProperties": true,
-                            "patternProperties": {
-                                "^[a-zA-Z0-9]+$": {
-                                    "type": "string"
-                                }
-                            },
-                            "type": "object"
-                        },
                         "InferenceSpecification": {
                             "$ref": "#/definitions/AWS::SageMaker::ModelPackage.InferenceSpecification"
                         },
-                        "LastModifiedBy": {
-                            "$ref": "#/definitions/AWS::SageMaker::ModelPackage.UserContext"
-                        },
                         "LastModifiedTime": {
                             "type": "string"
                         },
@@ -176149,9 +176842,6 @@
                         "ModelPackageStatusDetails": {
                             "$ref": "#/definitions/AWS::SageMaker::ModelPackage.ModelPackageStatusDetails"
                         },
-                        "ModelPackageStatusItem": {
-                            "$ref": "#/definitions/AWS::SageMaker::ModelPackage.ModelPackageStatusItem"
-                        },
                         "ModelPackageVersion": {
                             "type": "number"
                         },
@@ -176520,9 +177210,6 @@
                 },
                 "NearestModelName": {
                     "type": "string"
-                },
-                "ProductId": {
-                    "type": "string"
                 }
             },
             "required": [
@@ -176533,12 +177220,6 @@
         "AWS::SageMaker::ModelPackage.ModelPackageStatusDetails": {
             "additionalProperties": false,
             "properties": {
-                "ImageScanStatuses": {
-                    "items": {
-                        "$ref": "#/definitions/AWS::SageMaker::ModelPackage.ModelPackageStatusItem"
-                    },
-                    "type": "array"
-                },
                 "ValidationStatuses": {
                     "items": {
                         "$ref": "#/definitions/AWS::SageMaker::ModelPackage.ModelPackageStatusItem"
@@ -176546,9 +177227,6 @@
                     "type": "array"
                 }
             },
-            "required": [
-                "ValidationStatuses"
-            ],
             "type": "object"
         },
         "AWS::SageMaker::ModelPackage.ModelPackageStatusItem": {
@@ -176727,21 +177405,6 @@
             ],
             "type": "object"
         },
-        "AWS::SageMaker::ModelPackage.UserContext": {
-            "additionalProperties": false,
-            "properties": {
-                "DomainId": {
-                    "type": "string"
-                },
-                "UserProfileArn": {
-                    "type": "string"
-                },
-                "UserProfileName": {
-                    "type": "string"
-                }
-            },
-            "type": "object"
-        },
         "AWS::SageMaker::ModelPackage.ValidationProfile": {
             "additionalProperties": false,
             "properties": {
@@ -188275,36 +188938,398 @@
                 "Properties": {
                     "additionalProperties": false,
                     "properties": {
-                        "Description": {
-                            "type": "string"
-                        },
-                        "OnExceptionSteps": {
-                            "items": {
-                                "$ref": "#/definitions/AWS::Transfer::Workflow.WorkflowStep"
-                            },
-                            "type": "array"
-                        },
-                        "Steps": {
-                            "items": {
-                                "$ref": "#/definitions/AWS::Transfer::Workflow.WorkflowStep"
-                            },
-                            "type": "array"
+                        "Description": {
+                            "type": "string"
+                        },
+                        "OnExceptionSteps": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::Transfer::Workflow.WorkflowStep"
+                            },
+                            "type": "array"
+                        },
+                        "Steps": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::Transfer::Workflow.WorkflowStep"
+                            },
+                            "type": "array"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "Steps"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Transfer::Workflow"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::Transfer::Workflow.CopyStepDetails": {
+            "additionalProperties": false,
+            "properties": {
+                "DestinationFileLocation": {
+                    "$ref": "#/definitions/AWS::Transfer::Workflow.S3FileLocation"
+                },
+                "Name": {
+                    "type": "string"
+                },
+                "OverwriteExisting": {
+                    "type": "string"
+                },
+                "SourceFileLocation": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Transfer::Workflow.CustomStepDetails": {
+            "additionalProperties": false,
+            "properties": {
+                "Name": {
+                    "type": "string"
+                },
+                "SourceFileLocation": {
+                    "type": "string"
+                },
+                "Target": {
+                    "type": "string"
+                },
+                "TimeoutSeconds": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Transfer::Workflow.DecryptStepDetails": {
+            "additionalProperties": false,
+            "properties": {
+                "DestinationFileLocation": {
+                    "$ref": "#/definitions/AWS::Transfer::Workflow.InputFileLocation"
+                },
+                "Name": {
+                    "type": "string"
+                },
+                "OverwriteExisting": {
+                    "type": "string"
+                },
+                "SourceFileLocation": {
+                    "type": "string"
+                },
+                "Type": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Transfer::Workflow.DeleteStepDetails": {
+            "additionalProperties": false,
+            "properties": {
+                "Name": {
+                    "type": "string"
+                },
+                "SourceFileLocation": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Transfer::Workflow.EfsInputFileLocation": {
+            "additionalProperties": false,
+            "properties": {
+                "FileSystemId": {
+                    "type": "string"
+                },
+                "Path": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Transfer::Workflow.InputFileLocation": {
+            "additionalProperties": false,
+            "properties": {
+                "EfsFileLocation": {
+                    "$ref": "#/definitions/AWS::Transfer::Workflow.EfsInputFileLocation"
+                },
+                "S3FileLocation": {
+                    "$ref": "#/definitions/AWS::Transfer::Workflow.S3InputFileLocation"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Transfer::Workflow.S3FileLocation": {
+            "additionalProperties": false,
+            "properties": {
+                "S3FileLocation": {
+                    "$ref": "#/definitions/AWS::Transfer::Workflow.S3InputFileLocation"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Transfer::Workflow.S3InputFileLocation": {
+            "additionalProperties": false,
+            "properties": {
+                "Bucket": {
+                    "type": "string"
+                },
+                "Key": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Transfer::Workflow.S3Tag": {
+            "additionalProperties": false,
+            "properties": {
+                "Key": {
+                    "type": "string"
+                },
+                "Value": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Key",
+                "Value"
+            ],
+            "type": "object"
+        },
+        "AWS::Transfer::Workflow.TagStepDetails": {
+            "additionalProperties": false,
+            "properties": {
+                "Name": {
+                    "type": "string"
+                },
+                "SourceFileLocation": {
+                    "type": "string"
+                },
+                "Tags": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::Transfer::Workflow.S3Tag"
+                    },
+                    "type": "array"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Transfer::Workflow.WorkflowStep": {
+            "additionalProperties": false,
+            "properties": {
+                "CopyStepDetails": {
+                    "$ref": "#/definitions/AWS::Transfer::Workflow.CopyStepDetails"
+                },
+                "CustomStepDetails": {
+                    "$ref": "#/definitions/AWS::Transfer::Workflow.CustomStepDetails"
+                },
+                "DecryptStepDetails": {
+                    "$ref": "#/definitions/AWS::Transfer::Workflow.DecryptStepDetails"
+                },
+                "DeleteStepDetails": {
+                    "$ref": "#/definitions/AWS::Transfer::Workflow.DeleteStepDetails"
+                },
+                "TagStepDetails": {
+                    "$ref": "#/definitions/AWS::Transfer::Workflow.TagStepDetails"
+                },
+                "Type": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::VerifiedPermissions::IdentitySource": {
+            "additionalProperties": false,
+            "properties": {
+                "Condition": {
+                    "type": "string"
+                },
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "Configuration": {
+                            "$ref": "#/definitions/AWS::VerifiedPermissions::IdentitySource.IdentitySourceConfiguration"
+                        },
+                        "PolicyStoreId": {
+                            "type": "string"
+                        },
+                        "PrincipalEntityType": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "Configuration"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::VerifiedPermissions::IdentitySource"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::VerifiedPermissions::IdentitySource.CognitoUserPoolConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "ClientIds": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "UserPoolArn": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "UserPoolArn"
+            ],
+            "type": "object"
+        },
+        "AWS::VerifiedPermissions::IdentitySource.IdentitySourceConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "CognitoUserPoolConfiguration": {
+                    "$ref": "#/definitions/AWS::VerifiedPermissions::IdentitySource.CognitoUserPoolConfiguration"
+                }
+            },
+            "required": [
+                "CognitoUserPoolConfiguration"
+            ],
+            "type": "object"
+        },
+        "AWS::VerifiedPermissions::IdentitySource.IdentitySourceDetails": {
+            "additionalProperties": false,
+            "properties": {
+                "ClientIds": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "DiscoveryUrl": {
+                    "type": "string"
+                },
+                "OpenIdIssuer": {
+                    "type": "string"
+                },
+                "UserPoolArn": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::VerifiedPermissions::Policy": {
+            "additionalProperties": false,
+            "properties": {
+                "Condition": {
+                    "type": "string"
+                },
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "Definition": {
+                            "$ref": "#/definitions/AWS::VerifiedPermissions::Policy.PolicyDefinition"
                         },
-                        "Tags": {
-                            "items": {
-                                "$ref": "#/definitions/Tag"
-                            },
-                            "type": "array"
+                        "PolicyStoreId": {
+                            "type": "string"
                         }
                     },
                     "required": [
-                        "Steps"
+                        "Definition"
                     ],
                     "type": "object"
                 },
                 "Type": {
                     "enum": [
-                        "AWS::Transfer::Workflow"
+                        "AWS::VerifiedPermissions::Policy"
                     ],
                     "type": "string"
                 },
@@ -188323,176 +189348,225 @@
             ],
             "type": "object"
         },
-        "AWS::Transfer::Workflow.CopyStepDetails": {
+        "AWS::VerifiedPermissions::Policy.EntityIdentifier": {
             "additionalProperties": false,
             "properties": {
-                "DestinationFileLocation": {
-                    "$ref": "#/definitions/AWS::Transfer::Workflow.S3FileLocation"
-                },
-                "Name": {
-                    "type": "string"
-                },
-                "OverwriteExisting": {
+                "EntityId": {
                     "type": "string"
                 },
-                "SourceFileLocation": {
+                "EntityType": {
                     "type": "string"
                 }
             },
+            "required": [
+                "EntityId",
+                "EntityType"
+            ],
             "type": "object"
         },
-        "AWS::Transfer::Workflow.CustomStepDetails": {
+        "AWS::VerifiedPermissions::Policy.PolicyDefinition": {
             "additionalProperties": false,
             "properties": {
-                "Name": {
-                    "type": "string"
-                },
-                "SourceFileLocation": {
-                    "type": "string"
-                },
-                "Target": {
-                    "type": "string"
+                "Static": {
+                    "$ref": "#/definitions/AWS::VerifiedPermissions::Policy.StaticPolicyDefinition"
                 },
-                "TimeoutSeconds": {
-                    "type": "number"
+                "TemplateLinked": {
+                    "$ref": "#/definitions/AWS::VerifiedPermissions::Policy.TemplateLinkedPolicyDefinition"
                 }
             },
             "type": "object"
         },
-        "AWS::Transfer::Workflow.DecryptStepDetails": {
+        "AWS::VerifiedPermissions::Policy.StaticPolicyDefinition": {
             "additionalProperties": false,
             "properties": {
-                "DestinationFileLocation": {
-                    "$ref": "#/definitions/AWS::Transfer::Workflow.InputFileLocation"
-                },
-                "Name": {
-                    "type": "string"
-                },
-                "OverwriteExisting": {
-                    "type": "string"
-                },
-                "SourceFileLocation": {
+                "Description": {
                     "type": "string"
                 },
-                "Type": {
+                "Statement": {
                     "type": "string"
                 }
             },
+            "required": [
+                "Statement"
+            ],
             "type": "object"
         },
-        "AWS::Transfer::Workflow.DeleteStepDetails": {
+        "AWS::VerifiedPermissions::Policy.TemplateLinkedPolicyDefinition": {
             "additionalProperties": false,
             "properties": {
-                "Name": {
+                "PolicyTemplateId": {
                     "type": "string"
                 },
-                "SourceFileLocation": {
-                    "type": "string"
+                "Principal": {
+                    "$ref": "#/definitions/AWS::VerifiedPermissions::Policy.EntityIdentifier"
+                },
+                "Resource": {
+                    "$ref": "#/definitions/AWS::VerifiedPermissions::Policy.EntityIdentifier"
                 }
             },
+            "required": [
+                "PolicyTemplateId"
+            ],
             "type": "object"
         },
-        "AWS::Transfer::Workflow.EfsInputFileLocation": {
+        "AWS::VerifiedPermissions::PolicyStore": {
             "additionalProperties": false,
             "properties": {
-                "FileSystemId": {
+                "Condition": {
                     "type": "string"
                 },
-                "Path": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
                     "type": "string"
-                }
-            },
-            "type": "object"
-        },
-        "AWS::Transfer::Workflow.InputFileLocation": {
-            "additionalProperties": false,
-            "properties": {
-                "EfsFileLocation": {
-                    "$ref": "#/definitions/AWS::Transfer::Workflow.EfsInputFileLocation"
                 },
-                "S3FileLocation": {
-                    "$ref": "#/definitions/AWS::Transfer::Workflow.S3InputFileLocation"
-                }
-            },
-            "type": "object"
-        },
-        "AWS::Transfer::Workflow.S3FileLocation": {
-            "additionalProperties": false,
-            "properties": {
-                "S3FileLocation": {
-                    "$ref": "#/definitions/AWS::Transfer::Workflow.S3InputFileLocation"
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "Schema": {
+                            "$ref": "#/definitions/AWS::VerifiedPermissions::PolicyStore.SchemaDefinition"
+                        },
+                        "ValidationSettings": {
+                            "$ref": "#/definitions/AWS::VerifiedPermissions::PolicyStore.ValidationSettings"
+                        }
+                    },
+                    "required": [
+                        "ValidationSettings"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::VerifiedPermissions::PolicyStore"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
                 }
             },
+            "required": [
+                "Type",
+                "Properties"
+            ],
             "type": "object"
         },
-        "AWS::Transfer::Workflow.S3InputFileLocation": {
+        "AWS::VerifiedPermissions::PolicyStore.SchemaDefinition": {
             "additionalProperties": false,
             "properties": {
-                "Bucket": {
-                    "type": "string"
-                },
-                "Key": {
+                "CedarJson": {
                     "type": "string"
                 }
             },
             "type": "object"
         },
-        "AWS::Transfer::Workflow.S3Tag": {
+        "AWS::VerifiedPermissions::PolicyStore.ValidationSettings": {
             "additionalProperties": false,
             "properties": {
-                "Key": {
-                    "type": "string"
-                },
-                "Value": {
+                "Mode": {
                     "type": "string"
                 }
             },
             "required": [
-                "Key",
-                "Value"
+                "Mode"
             ],
             "type": "object"
         },
-        "AWS::Transfer::Workflow.TagStepDetails": {
+        "AWS::VerifiedPermissions::PolicyTemplate": {
             "additionalProperties": false,
             "properties": {
-                "Name": {
+                "Condition": {
                     "type": "string"
                 },
-                "SourceFileLocation": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
                     "type": "string"
                 },
-                "Tags": {
-                    "items": {
-                        "$ref": "#/definitions/AWS::Transfer::Workflow.S3Tag"
-                    },
-                    "type": "array"
-                }
-            },
-            "type": "object"
-        },
-        "AWS::Transfer::Workflow.WorkflowStep": {
-            "additionalProperties": false,
-            "properties": {
-                "CopyStepDetails": {
-                    "$ref": "#/definitions/AWS::Transfer::Workflow.CopyStepDetails"
-                },
-                "CustomStepDetails": {
-                    "$ref": "#/definitions/AWS::Transfer::Workflow.CustomStepDetails"
-                },
-                "DecryptStepDetails": {
-                    "$ref": "#/definitions/AWS::Transfer::Workflow.DecryptStepDetails"
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
                 },
-                "DeleteStepDetails": {
-                    "$ref": "#/definitions/AWS::Transfer::Workflow.DeleteStepDetails"
+                "Metadata": {
+                    "type": "object"
                 },
-                "TagStepDetails": {
-                    "$ref": "#/definitions/AWS::Transfer::Workflow.TagStepDetails"
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "Description": {
+                            "type": "string"
+                        },
+                        "PolicyStoreId": {
+                            "type": "string"
+                        },
+                        "Statement": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "Statement"
+                    ],
+                    "type": "object"
                 },
                 "Type": {
+                    "enum": [
+                        "AWS::VerifiedPermissions::PolicyTemplate"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
                     "type": "string"
                 }
             },
+            "required": [
+                "Type",
+                "Properties"
+            ],
             "type": "object"
         },
         "AWS::VoiceID::Domain": {
@@ -192762,6 +193836,9 @@
                 "Properties": {
                     "additionalProperties": false,
                     "properties": {
+                        "AssociationConfig": {
+                            "$ref": "#/definitions/AWS::WAFv2::WebACL.AssociationConfig"
+                        },
                         "CaptchaConfig": {
                             "$ref": "#/definitions/AWS::WAFv2::WebACL.CaptchaConfig"
                         },
@@ -192893,6 +193970,21 @@
             ],
             "type": "object"
         },
+        "AWS::WAFv2::WebACL.AssociationConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "RequestBody": {
+                    "additionalProperties": false,
+                    "patternProperties": {
+                        "^[a-zA-Z0-9]+$": {
+                            "$ref": "#/definitions/AWS::WAFv2::WebACL.RequestBodyAssociatedResourceTypeConfig"
+                        }
+                    },
+                    "type": "object"
+                }
+            },
+            "type": "object"
+        },
         "AWS::WAFv2::WebACL.BlockAction": {
             "additionalProperties": false,
             "properties": {
@@ -193521,6 +194613,18 @@
             ],
             "type": "object"
         },
+        "AWS::WAFv2::WebACL.RequestBodyAssociatedResourceTypeConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "DefaultSizeInspectionLimit": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "DefaultSizeInspectionLimit"
+            ],
+            "type": "object"
+        },
         "AWS::WAFv2::WebACL.RequestInspection": {
             "additionalProperties": false,
             "properties": {
@@ -195631,6 +196735,9 @@
                         {
                             "$ref": "#/definitions/AWS::AppMesh::VirtualService"
                         },
+                        {
+                            "$ref": "#/definitions/AWS::AppRunner::AutoScalingConfiguration"
+                        },
                         {
                             "$ref": "#/definitions/AWS::AppRunner::ObservabilityConfiguration"
                         },
@@ -195646,6 +196753,9 @@
                         {
                             "$ref": "#/definitions/AWS::AppStream::AppBlock"
                         },
+                        {
+                            "$ref": "#/definitions/AWS::AppStream::AppBlockBuilder"
+                        },
                         {
                             "$ref": "#/definitions/AWS::AppStream::Application"
                         },
@@ -196057,6 +197167,9 @@
                         {
                             "$ref": "#/definitions/AWS::Cognito::UserPoolUserToGroupAttachment"
                         },
+                        {
+                            "$ref": "#/definitions/AWS::Comprehend::DocumentClassifier"
+                        },
                         {
                             "$ref": "#/definitions/AWS::Comprehend::Flywheel"
                         },
@@ -198589,6 +199702,18 @@
                         {
                             "$ref": "#/definitions/AWS::Transfer::Workflow"
                         },
+                        {
+                            "$ref": "#/definitions/AWS::VerifiedPermissions::IdentitySource"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::VerifiedPermissions::Policy"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::VerifiedPermissions::PolicyStore"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::VerifiedPermissions::PolicyTemplate"
+                        },
                         {
                             "$ref": "#/definitions/AWS::VoiceID::Domain"
                         },